Title: [148316] trunk/Source/WebCore
- Revision
- 148316
- Author
- [email protected]
- Date
- 2013-04-12 16:47:12 -0700 (Fri, 12 Apr 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (148315 => 148316)
--- trunk/Source/WebCore/ChangeLog 2013-04-12 23:46:38 UTC (rev 148315)
+++ trunk/Source/WebCore/ChangeLog 2013-04-12 23:47:12 UTC (rev 148316)
@@ -1,3 +1,16 @@
+2013-04-12 Simon Fraser <[email protected]>
+
+ 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 <[email protected]>
<rdar://problem/13277362> REGRESSION (r141981): Crash when closing a Google Docs document
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (148315 => 148316)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-04-12 23:46:38 UTC (rev 148315)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-04-12 23:47:12 UTC (rev 148316)
@@ -6191,12 +6191,18 @@
if (HTMLFrameOwnerElement* owner = frame->ownerElement())
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
+ }
}
void RenderLayer::updateScrollCornerStyle()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
