Changeset 148316 in webkit

Timestamp:

Apr 12, 2013 4:47:12 PM (11 years ago)

Author:

Simon Fraser

Message:

Demystify some code in RenderLayer::updateScrollableAreaSet()
​https://bugs.webkit.org/show_bug.cgi?id=114543

Reviewed by Tim Horton.

Clean up some code that called functions with important side effects
inside a ternary operator, and clean up the #ifdefs.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::updateScrollableAreaSet):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Demystify some code in RenderLayer::updateScrollableAreaSet()
+        https://bugs.webkit.org/show_bug.cgi?id=114543
+
+        Reviewed by Tim Horton.
+
+        Clean up some code that called functions with important side effects
+        inside a ternary operator, and clean up the #ifdefs.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateScrollableAreaSet):
+
 2013-04-12  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -6192 +6192 @@
         isVisibleToHitTest &= owner->renderer() && owner->renderer()->visibleToHitTesting();
 
-    if (hasOverflow && isVisibleToHitTest ? frameView->addScrollableArea(this) : frameView->removeScrollableArea(this))
+    bool isScrollable = hasOverflow && isVisibleToHitTest;
+    bool addedOrRemoved = false;
+    if (isScrollable)
+        addedOrRemoved = frameView->addScrollableArea(this);
+    else
+        addedOrRemoved = frameView->removeScrollableArea(this);
+    
+    if (addedOrRemoved) {
 #if USE(ACCELERATED_COMPOSITING)
         updateNeedsCompositedScrolling();
-#else
-        return;
-#endif
+#endif
+    }
 }