Title: [144960] trunk/Source/WebKit2
- Revision
- 144960
- Author
- [email protected]
- Date
- 2013-03-06 12:05:33 -0800 (Wed, 06 Mar 2013)
Log Message
[wk2] Page Overlays: Hook up the layer border/repaint counter setting to the overlay layer
https://bugs.webkit.org/show_bug.cgi?id=111547
<rdar://problem/13355801>
Reviewed by Simon Fraser.
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::updatePreferences):
(WebKit::TiledCoreAnimationDrawingArea::createPageOverlayLayer):
Keep the page overlay layer's debug border and repaint counter settings updated.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (144959 => 144960)
--- trunk/Source/WebKit2/ChangeLog 2013-03-06 19:51:58 UTC (rev 144959)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-06 20:05:33 UTC (rev 144960)
@@ -1,3 +1,16 @@
+2013-03-06 Tim Horton <[email protected]>
+
+ [wk2] Page Overlays: Hook up the layer border/repaint counter setting to the overlay layer
+ https://bugs.webkit.org/show_bug.cgi?id=111547
+ <rdar://problem/13355801>
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::updatePreferences):
+ (WebKit::TiledCoreAnimationDrawingArea::createPageOverlayLayer):
+ Keep the page overlay layer's debug border and repaint counter settings updated.
+
2013-03-06 Geoffrey Garen <[email protected]>
Joing the adoptNS/adoptCF/adoptRef club.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (144959 => 144960)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-03-06 19:51:58 UTC (rev 144959)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-03-06 20:05:33 UTC (rev 144960)
@@ -202,19 +202,25 @@
void TiledCoreAnimationDrawingArea::updatePreferences(const WebPreferencesStore&)
{
+ Settings* settings = m_webPage->corePage()->settings();
bool scrollingPerformanceLoggingEnabled = m_webPage->scrollingPerformanceLoggingEnabled();
ScrollingThread::dispatch(bind(&ScrollingTree::setScrollingPerformanceLoggingEnabled, m_webPage->corePage()->scrollingCoordinator()->scrollingTree(), scrollingPerformanceLoggingEnabled));
if (TiledBacking* tiledBacking = mainFrameTiledBacking())
- tiledBacking->setAggressivelyRetainsTiles(m_webPage->corePage()->settings()->aggressiveTileRetentionEnabled());
+ tiledBacking->setAggressivelyRetainsTiles(settings->aggressiveTileRetentionEnabled());
+
+ if (m_pageOverlayLayer) {
+ m_pageOverlayLayer->setShowDebugBorder(settings->showDebugBorders());
+ m_pageOverlayLayer->setShowRepaintCounter(settings->showRepaintCounter());
+ }
// 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);
+ settings->setAcceleratedCompositingForFixedPositionEnabled(true);
+ settings->setFixedPositionCreatesStackingContext(true);
- bool showTiledScrollingIndicator = m_webPage->corePage()->settings()->showTiledScrollingIndicator();
+ bool showTiledScrollingIndicator = settings->showTiledScrollingIndicator();
if (showTiledScrollingIndicator == !!m_debugInfoLayer)
return;
@@ -498,6 +504,8 @@
m_pageOverlayLayer->setAcceleratesDrawing(true);
m_pageOverlayLayer->setDrawsContent(true);
m_pageOverlayLayer->setSize(expandedIntSize(FloatSize(m_rootLayer.get().frame.size)));
+ m_pageOverlayLayer->setShowDebugBorder(m_webPage->corePage()->settings()->showDebugBorders());
+ m_pageOverlayLayer->setShowRepaintCounter(m_webPage->corePage()->settings()->showRepaintCounter());
m_pageOverlayPlatformLayer = m_pageOverlayLayer->platformLayer();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
