Title: [128678] trunk/Source/WebKit2
- Revision
- 128678
- Author
- bda...@apple.com
- Date
- 2012-09-14 18:38:05 -0700 (Fri, 14 Sep 2012)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=96846
Tests failing on WK2 bots after giving fixed positioning its own
stacking context
Reviewed by Geoffrey Garen.
Tests are failing because I checked in updated results that expect
fixed positioning to create a stacking context. However,
WebKitTestRunner does not enable ScrollingCoordinator, so the code
that I added to enable stacking contexts for fixedPos is never
actually running. This patch moves that code to a place where it will
run for the testing tools, which matches the patch for WK1.
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::updatePreferences):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128677 => 128678)
--- trunk/Source/WebKit2/ChangeLog 2012-09-15 01:24:30 UTC (rev 128677)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-15 01:38:05 UTC (rev 128678)
@@ -1,3 +1,22 @@
+2012-09-14 Beth Dakin <bda...@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=96846
+ Tests failing on WK2 bots after giving fixed positioning its own
+ stacking context
+
+ Reviewed by Geoffrey Garen.
+
+ Tests are failing because I checked in updated results that expect
+ fixed positioning to create a stacking context. However,
+ WebKitTestRunner does not enable ScrollingCoordinator, so the code
+ that I added to enable stacking contexts for fixedPos is never
+ actually running. This patch moves that code to a place where it will
+ run for the testing tools, which matches the patch for WK1.
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::updatePreferences):
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea):
+
2012-09-14 Julien Chaffraix <jchaffr...@webkit.org>
Revert r127457 and following fixes due to several hit-testing regressions
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (128677 => 128678)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2012-09-15 01:24:30 UTC (rev 128677)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2012-09-15 01:38:05 UTC (rev 128678)
@@ -261,9 +261,15 @@
void DrawingAreaImpl::updatePreferences(const WebPreferencesStore& store)
{
+#if PLATFORM(MAC)
+ // Soon we want pages with fixed positioned elements to be able to be scrolled by the ScrollingCoordinator.
+ // As a part of that work, we have to composite fixed position elements, and we have to allow those
+ // elements to create a stacking context.
+ m_webPage->corePage()->settings()->setAcceleratedCompositingForFixedPositionEnabled(true);
+ m_webPage->corePage()->settings()->setFixedPositionCreatesStackingContext(true);
+
// <rdar://problem/10697417>: It is necessary to force compositing when accelerate drawing
// is enabled on Mac so that scrollbars are always in their own layers.
-#if PLATFORM(MAC)
if (m_webPage->corePage()->settings()->acceleratedDrawingEnabled())
m_webPage->corePage()->settings()->setForceCompositingMode(LayerTreeHost::supportsAcceleratedCompositing());
else
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (128677 => 128678)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2012-09-15 01:24:30 UTC (rev 128677)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2012-09-15 01:38:05 UTC (rev 128678)
@@ -76,12 +76,6 @@
page->settings()->setScrollingCoordinatorEnabled(true);
page->settings()->setForceCompositingMode(true);
- // Soon we want pages with fixed positioned elements to be able to be scrolled by the ScrollingCoordinator.
- // As a part of that work, we have to composite fixed position elements, and we have to allow those
- // elements to create a stacking context.
- page->settings()->setAcceleratedCompositingForFixedPositionEnabled(true);
- page->settings()->setFixedPositionCreatesStackingContext(true);
-
WebProcess::shared().eventDispatcher().addScrollingTreeForPage(webPage);
m_rootLayer = [CALayer layer];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
