Force all LayoutUnit construction to be explicit

third_party/WebKit/Source/core/dom/Element.cpp

Index: third_party/WebKit/Source/core/dom/Element.cpp
diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
index 14628de47a416b2e9d08f8af2425aebdcd7f4e66..45c8a691fb5f958146046721b475be43163c5b8c 100644
--- a/third_party/WebKit/Source/core/dom/Element.cpp
+++ b/third_party/WebKit/Source/core/dom/Element.cpp
@@ -612,7 +612,7 @@ int Element::offsetLeft()
 {
     document().updateLayoutIgnorePendingStylesheets();
     if (LayoutBoxModelObject* layoutObject = layoutBoxModelObject())
-        return adjustLayoutUnitForAbsoluteZoom(layoutObject->pixelSnappedOffsetLeft(), *layoutObject).round();
+        return adjustForAbsoluteZoom(layoutObject->pixelSnappedOffsetLeft(), layoutObject->style());
     return 0;
 }
 
@@ -620,7 +620,7 @@ int Element::offsetTop()
 {
     document().updateLayoutIgnorePendingStylesheets();
     if (LayoutBoxModelObject* layoutObject = layoutBoxModelObject())
-        return adjustLayoutUnitForAbsoluteZoom(layoutObject->pixelSnappedOffsetTop(), *layoutObject).round();
+        return adjustForAbsoluteZoom(layoutObject->pixelSnappedOffsetTop(), layoutObject->style());
     return 0;
 }
 
@@ -628,7 +628,7 @@ int Element::offsetWidth()
 {
     document().updateLayoutIgnorePendingStylesheets();
     if (LayoutBoxModelObject* layoutObject = layoutBoxModelObject())
-        return adjustLayoutUnitForAbsoluteZoom(layoutObject->pixelSnappedOffsetWidth(), *layoutObject).round();
+        return adjustForAbsoluteZoom(layoutObject->pixelSnappedOffsetWidth(), layoutObject->style());
     return 0;
 }
 
@@ -636,7 +636,7 @@ int Element::offsetHeight()
 {
     document().updateLayoutIgnorePendingStylesheets();
     if (LayoutBoxModelObject* layoutObject = layoutBoxModelObject())
-        return adjustLayoutUnitForAbsoluteZoom(layoutObject->pixelSnappedOffsetHeight(), *layoutObject).round();
+        return adjustForAbsoluteZoom(layoutObject->pixelSnappedOffsetHeight(), layoutObject->style());
     return 0;
 }
 
@@ -663,7 +663,7 @@ int Element::clientLeft()
     document().updateLayoutIgnorePendingStylesheets();
 
     if (LayoutBox* layoutObject = layoutBox())
-        return adjustLayoutUnitForAbsoluteZoom(roundToInt(layoutObject->clientLeft()), *layoutObject);
+        return adjustForAbsoluteZoom(roundToInt(layoutObject->clientLeft()), layoutObject->style());
     return 0;
 }
 
@@ -672,7 +672,7 @@ int Element::clientTop()
     document().updateLayoutIgnorePendingStylesheets();
 
     if (LayoutBox* layoutObject = layoutBox())
-        return adjustLayoutUnitForAbsoluteZoom(roundToInt(layoutObject->clientTop()), *layoutObject);
+        return adjustForAbsoluteZoom(roundToInt(layoutObject->clientTop()), layoutObject->style());
     return 0;
 }
 
@@ -687,13 +687,13 @@ int Element::clientWidth()
         || (inQuirksMode && isHTMLElement() && document().body() == this)) {
         if (LayoutView* layoutView = document().layoutView()) {
             if (document().page()->settings().forceZeroLayoutHeight())
-                return adjustLayoutUnitForAbsoluteZoom(layoutView->overflowClipRect(LayoutPoint()).width(), *layoutView);
-            return adjustLayoutUnitForAbsoluteZoom(layoutView->layoutSize().width(), *layoutView);
+                return adjustForAbsoluteZoom(layoutView->overflowClipRect(LayoutPoint()).width(), layoutView->style());
+            return adjustForAbsoluteZoom(layoutView->layoutSize().width(), layoutView->style());
         }
     }
 
     if (LayoutBox* layoutObject = layoutBox())
-        return adjustLayoutUnitForAbsoluteZoom(layoutObject->pixelSnappedClientWidth(), *layoutObject).round();
+        return adjustForAbsoluteZoom(layoutObject->pixelSnappedClientWidth(), layoutObject->style());
     return 0;
 }
 
@@ -709,13 +709,13 @@ int Element::clientHeight()
         || (inQuirksMode && isHTMLElement() && document().body() == this)) {
         if (LayoutView* layoutView = document().layoutView()) {
             if (document().page()->settings().forceZeroLayoutHeight())
-                return adjustLayoutUnitForAbsoluteZoom(layoutView->overflowClipRect(LayoutPoint()).height(), *layoutView);
-            return adjustLayoutUnitForAbsoluteZoom(layoutView->layoutSize().height(), *layoutView);
+                return adjustForAbsoluteZoom(layoutView->overflowClipRect(LayoutPoint()).height(), layoutView->style());
+            return adjustForAbsoluteZoom(layoutView->layoutSize().height(), layoutView->style());
         }
     }
 
     if (LayoutBox* layoutObject = layoutBox())
-        return adjustLayoutUnitForAbsoluteZoom(layoutObject->pixelSnappedClientHeight(), *layoutObject).round();
+        return adjustForAbsoluteZoom(layoutObject->pixelSnappedClientHeight(), layoutObject->style());
     return 0;
 }