Changeset 113236 in webkit

Timestamp:

Apr 4, 2012 2:06:12 PM (12 years ago)

Author:

eae@chromium.org

Message:

Fix getFilterOutsets parameter types in RenderLayer
​https://bugs.webkit.org/show_bug.cgi?id=83041

Reviewed by Julien Chaffraix.

The getFilterOutsets method was changed to take integers in r112475, update
RenderLayer to use the right data type for the outset arguments.

No new tests, no change in functionality.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::setFilterBackendNeedsRepaintingInRect):
(WebCore::RenderLayer::calculateLayerBounds):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-04  Emil A Eklund  <eae@chromium.org>
+
+        Fix getFilterOutsets parameter types in RenderLayer
+        https://bugs.webkit.org/show_bug.cgi?id=83041
+
+        Reviewed by Julien Chaffraix.
+
+        The getFilterOutsets method was changed to take integers in r112475, update
+        RenderLayer to use the right data type for the outset arguments.
+
+        No new tests, no change in functionality.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::setFilterBackendNeedsRepaintingInRect):
+        (WebCore::RenderLayer::calculateLayerBounds):
+
 2012-04-04  Erik Arvidsson  <arv@chromium.org>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -989 +989 @@
 #if ENABLE(CSS_FILTERS)
     if (renderer()->style()->hasFilterOutsets()) {
-        LayoutUnit topOutset;
-        LayoutUnit rightOutset;
-        LayoutUnit bottomOutset;
-        LayoutUnit leftOutset;
+        int topOutset;
+        int rightOutset;
+        int bottomOutset;
+        int leftOutset;
         renderer()->style()->getFilterOutsets(topOutset, rightOutset, bottomOutset, leftOutset);
         rectForRepaint.move(-leftOutset, -topOutset);
@@ -4113 +4113 @@
     if (RenderLayer* reflection = layer->reflectionLayer()) {
         if (!reflection->isComposited()) {
-            LayoutRect childUnionBounds = calculateLayerBounds(reflection, layer);
+            IntRect childUnionBounds = calculateLayerBounds(reflection, layer);
             unionBounds.unite(childUnionBounds);
         }
@@ -4125 +4125 @@
             RenderLayer* curLayer = negZOrderList->at(i);
             if (!curLayer->isComposited()) {
-                LayoutRect childUnionBounds = calculateLayerBounds(curLayer, layer);
+                IntRect childUnionBounds = calculateLayerBounds(curLayer, layer);
                 unionBounds.unite(childUnionBounds);
             }
@@ -4136 +4136 @@
             RenderLayer* curLayer = posZOrderList->at(i);
             if (!curLayer->isComposited()) {
-                LayoutRect childUnionBounds = calculateLayerBounds(curLayer, layer);
+                IntRect childUnionBounds = calculateLayerBounds(curLayer, layer);
                 unionBounds.unite(childUnionBounds);
             }
@@ -4147 +4147 @@
             RenderLayer* curLayer = normalFlowList->at(i);
             if (!curLayer->isComposited()) {
-                LayoutRect curAbsBounds = calculateLayerBounds(curLayer, layer);
+                IntRect curAbsBounds = calculateLayerBounds(curLayer, layer);
                 unionBounds.unite(curAbsBounds);
             }
@@ -4158 +4158 @@
     // https://bugs.webkit.org/show_bug.cgi?id=81239
     if (includeLayerFilterOutsets && layer->renderer()->style()->hasFilterOutsets()) {
-        LayoutUnit topOutset;
-        LayoutUnit rightOutset;
-        LayoutUnit bottomOutset;
-        LayoutUnit leftOutset;
+        int topOutset;
+        int rightOutset;
+        int bottomOutset;
+        int leftOutset;
         layer->renderer()->style()->getFilterOutsets(topOutset, rightOutset, bottomOutset, leftOutset);
         unionBounds.move(-leftOutset, -topOutset);