Changeset 85577 in webkit

Timestamp:

May 2, 2011 7:22:44 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-02 Ben Wells <​benwells@chromium.org>

Reviewed by Simon Fraser.

Cleanup variable usage in RenderObject.cpp paintOutline()
​https://bugs.webkit.org/show_bug.cgi?id=59911

No new tests for this, there should be no change in behaviour.

• rendering/RenderObject.cpp: (WebCore::RenderObject::paintOutline):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-02  Ben Wells  <benwells@chromium.org>
+
+        Reviewed by Simon Fraser.
+
+        Cleanup variable usage in RenderObject.cpp paintOutline()
+        https://bugs.webkit.org/show_bug.cgi?id=59911
+
+        No new tests for this, there should be no change in behaviour.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::paintOutline):
+
 2011-05-02  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1027 +1027 @@
 
     RenderStyle* styleToUse = style();
-    int ow = styleToUse->outlineWidth();
-    EBorderStyle os = styleToUse->outlineStyle();
-
-    Color oc = styleToUse->visitedDependentColor(CSSPropertyOutlineColor);
+    int outlineWidth = styleToUse->outlineWidth();
+    EBorderStyle outlineStyle = styleToUse->outlineStyle();
+
+    Color outlineColor = styleToUse->visitedDependentColor(CSSPropertyOutlineColor);
 
     int offset = styleToUse->outlineOffset();
@@ -1052 +1052 @@
         return;
 
-    drawLineForBoxSide(graphicsContext, tx - ow, ty - ow, tx, ty + h + ow, BSLeft, oc, os, ow, ow);
-    drawLineForBoxSide(graphicsContext, tx - ow, ty - ow, tx + w + ow, ty, BSTop, oc, os, ow, ow);
-    drawLineForBoxSide(graphicsContext, tx + w, ty - ow, tx + w + ow, ty + h + ow, BSRight, oc, os, ow, ow);
-    drawLineForBoxSide(graphicsContext, tx - ow, ty + h, tx + w + ow, ty + h + ow, BSBottom, oc, os, ow, ow);
+    int leftOuter = tx - outlineWidth;
+    int leftInner = tx;
+    int rightOuter = tx + w + outlineWidth;
+    int rightInner = tx + w;
+    int topOuter = ty - outlineWidth;
+    int topInner = ty;
+    int bottomOuter = ty + h + outlineWidth;
+    int bottomInner = ty + h;
+    
+    drawLineForBoxSide(graphicsContext, leftOuter, topOuter, leftInner, bottomOuter, BSLeft, outlineColor, outlineStyle, outlineWidth, outlineWidth);
+    drawLineForBoxSide(graphicsContext, leftOuter, topOuter, rightOuter, topInner, BSTop, outlineColor, outlineStyle, outlineWidth, outlineWidth);
+    drawLineForBoxSide(graphicsContext, rightInner, topOuter, rightOuter, bottomOuter, BSRight, outlineColor, outlineStyle, outlineWidth, outlineWidth);
+    drawLineForBoxSide(graphicsContext, leftOuter, bottomInner, rightOuter, bottomOuter, BSBottom, outlineColor, outlineStyle, outlineWidth, outlineWidth);
 }