From: Fabian Lange <lange.fabian@gmail.com>
Date: Mon, 2 Mar 2015 10:18:23 +0000 (+0100)
Subject: LayoutManager reuses shortcut Element instance for measure (#16964).
X-Git-Tag: 7.4.1~25
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ea9b7e0508e5c9e96edcd2f72699af29b705e361;p=vaadin-framework.git

LayoutManager reuses shortcut Element instance for measure (#16964).

This change prevents the duplicate getter chain lookup
connector.getWidget().getElement() on the very hot measureConnector
method.

Change-Id: Ia59c9ef2e6bbcf9402424bc565bc9ee3977e3c6e
---

diff --git a/client/src/com/vaadin/client/LayoutManager.java b/client/src/com/vaadin/client/LayoutManager.java
index 9775c29ab6..f77b61a5a3 100644
--- a/client/src/com/vaadin/client/LayoutManager.java
+++ b/client/src/com/vaadin/client/LayoutManager.java
@@ -189,8 +189,7 @@ public class LayoutManager {
         return element.vMeasuredSize || defaultSize;
     }-*/;
 
-    private final MeasuredSize getMeasuredSize(ComponentConnector connector) {
-        Element element = connector.getWidget().getElement();
+    private final MeasuredSize getMeasuredSize(Element element) {
         MeasuredSize measuredSize = getMeasuredSize(element, null);
         if (measuredSize == null) {
             measuredSize = new MeasuredSize();
@@ -736,7 +735,7 @@ public class LayoutManager {
     private void measureConnector(ComponentConnector connector) {
         Profiler.enter("LayoutManager.measureConnector");
         Element element = connector.getWidget().getElement();
-        MeasuredSize measuredSize = getMeasuredSize(connector);
+        MeasuredSize measuredSize = getMeasuredSize(element);
         MeasureResult measureResult = measuredAndUpdate(element, measuredSize);
 
         if (measureResult.isChanged()) {
@@ -1442,14 +1441,14 @@ public class LayoutManager {
      *            of the component in pixels
      */
     public void reportOuterHeight(ComponentConnector component, int outerHeight) {
-        MeasuredSize measuredSize = getMeasuredSize(component);
+        Element element = component.getWidget().getElement();
+        MeasuredSize measuredSize = getMeasuredSize(element);
         if (isLayoutRunning()) {
             boolean heightChanged = measuredSize.setOuterHeight(outerHeight);
 
             if (heightChanged) {
                 onConnectorChange(component, false, true);
-                notifyListenersAndDepdendents(component.getWidget()
-                        .getElement(), false, true);
+                notifyListenersAndDepdendents(element, false, true);
             }
             currentDependencyTree.setNeedsVerticalMeasure(component, false);
         } else if (measuredSize.getOuterHeight() != outerHeight) {
@@ -1523,14 +1522,14 @@ public class LayoutManager {
      *            of the component in pixels
      */
     public void reportOuterWidth(ComponentConnector component, int outerWidth) {
-        MeasuredSize measuredSize = getMeasuredSize(component);
+        Element element = component.getWidget().getElement();
+        MeasuredSize measuredSize = getMeasuredSize(element);
         if (isLayoutRunning()) {
             boolean widthChanged = measuredSize.setOuterWidth(outerWidth);
 
             if (widthChanged) {
                 onConnectorChange(component, true, false);
-                notifyListenersAndDepdendents(component.getWidget()
-                        .getElement(), true, false);
+                notifyListenersAndDepdendents(element, true, false);
             }
             currentDependencyTree.setNeedsHorizontalMeasure(component, false);
         } else if (measuredSize.getOuterWidth() != outerWidth) {