Title: [150650] branches/safari-537.43-branch/Source/WebCore
- Revision
- 150650
- Author
- lforsch...@apple.com
- Date
- 2013-05-24 11:46:41 -0700 (Fri, 24 May 2013)
Log Message
Merged r150631. <rdar://problem/13963712>
Modified Paths
Diff
Modified: branches/safari-537.43-branch/Source/WebCore/ChangeLog (150649 => 150650)
--- branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-24 18:42:31 UTC (rev 150649)
+++ branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-24 18:46:41 UTC (rev 150650)
@@ -1,3 +1,20 @@
+2013-05-24 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r150631
+
+ 2013-05-23 Beth Dakin <bda...@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=116702
+ REGRESSION (r150399): Scrollbar missing for all overflow scroll
+ -and corresponding-
+ <rdar://problem/13963712>
+
+ Reviewed by Simon Fraser.
+
+ This was a silly copy-paste error.
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollbarAnimationsAreSuppressed):
+
2013-05-23 Lucas Forschler <lforsch...@apple.com>
Merge r150556
Modified: branches/safari-537.43-branch/Source/WebCore/rendering/RenderLayer.cpp (150649 => 150650)
--- branches/safari-537.43-branch/Source/WebCore/rendering/RenderLayer.cpp 2013-05-24 18:42:31 UTC (rev 150649)
+++ branches/safari-537.43-branch/Source/WebCore/rendering/RenderLayer.cpp 2013-05-24 18:46:41 UTC (rev 150650)
@@ -1400,7 +1400,7 @@
RenderView* view = renderer()->view();
if (!view)
return false;
- return view->frameView()->scrollbarsCanBeActive();
+ return view->frameView()->scrollbarAnimationsAreSuppressed();
}
RenderLayer* RenderLayer::enclosingTransformedAncestor() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
