Title: [148143] trunk/Source/WebKit2
- Revision
- 148143
- Author
- [email protected]
- Date
- 2013-04-10 15:35:29 -0700 (Wed, 10 Apr 2013)
Log Message
[wk2] Un-pollute TCADA methods with "PageOverlayLayerMap::iterator end"
https://bugs.webkit.org/show_bug.cgi?id=114387
Reviewed by Simon Fraser.
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::updatePreferences):
(WebKit::TiledCoreAnimationDrawingArea::paintContents):
(WebKit::TiledCoreAnimationDrawingArea::flushLayers):
(WebKit::TiledCoreAnimationDrawingArea::setExposedRect):
(WebKit::TiledCoreAnimationDrawingArea::mainFrameScrollabilityChanged):
(WebKit::TiledCoreAnimationDrawingArea::updateGeometry):
(WebKit::TiledCoreAnimationDrawingArea::setRootCompositingLayer):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (148142 => 148143)
--- trunk/Source/WebKit2/ChangeLog 2013-04-10 22:25:36 UTC (rev 148142)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-10 22:35:29 UTC (rev 148143)
@@ -1,5 +1,21 @@
2013-04-10 Tim Horton <[email protected]>
+ [wk2] Un-pollute TCADA methods with "PageOverlayLayerMap::iterator end"
+ https://bugs.webkit.org/show_bug.cgi?id=114387
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::updatePreferences):
+ (WebKit::TiledCoreAnimationDrawingArea::paintContents):
+ (WebKit::TiledCoreAnimationDrawingArea::flushLayers):
+ (WebKit::TiledCoreAnimationDrawingArea::setExposedRect):
+ (WebKit::TiledCoreAnimationDrawingArea::mainFrameScrollabilityChanged):
+ (WebKit::TiledCoreAnimationDrawingArea::updateGeometry):
+ (WebKit::TiledCoreAnimationDrawingArea::setRootCompositingLayer):
+
+2013-04-10 Tim Horton <[email protected]>
+
[wk2] REGRESSION: Find highlight does not update when the view is resized
https://bugs.webkit.org/show_bug.cgi?id=114382
<rdar://problem/13599797>
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (148142 => 148143)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-04-10 22:25:36 UTC (rev 148142)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-04-10 22:35:29 UTC (rev 148143)
@@ -234,8 +234,7 @@
if (TiledBacking* tiledBacking = mainFrameTiledBacking())
tiledBacking->setAggressivelyRetainsTiles(settings->aggressiveTileRetentionEnabled());
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it) {
+ for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it) {
it->value->setAcceleratesDrawing(settings->acceleratedDrawingEnabled());
it->value->setShowDebugBorder(settings->showDebugBorders());
it->value->setShowRepaintCounter(settings->showRepaintCounter());
@@ -324,8 +323,7 @@
void TiledCoreAnimationDrawingArea::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const IntRect& clipRect)
{
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it) {
+ for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it) {
if (it->value == graphicsLayer) {
m_webPage->drawPageOverlay(it->key, graphicsContext, clipRect);
break;
@@ -352,11 +350,10 @@
m_pendingRootCompositingLayer = nullptr;
}
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
IntRect visibleRect = enclosingIntRect(m_rootLayer.get().frame);
if (m_clipsToExposedRect)
visibleRect.intersect(enclosingIntRect(m_exposedRect));
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it) {
+ for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it) {
GraphicsLayer* layer = it->value.get();
layer->flushCompositingState(visibleRect);
}
@@ -401,8 +398,7 @@
mainFrameTiledBacking()->setExposedRect(exposedRect);
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it)
+ for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it)
if (TiledBacking* tiledBacking = it->value->tiledBacking())
tiledBacking->setExposedRect(exposedRect);
}
@@ -412,8 +408,7 @@
m_clipsToExposedRect = !isScrollable;
mainFrameTiledBacking()->setClipsToExposedRect(!isScrollable);
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it)
+ for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it)
if (TiledBacking* tiledBacking = it->value->tiledBacking())
tiledBacking->setClipsToExposedRect(!isScrollable);
}
@@ -435,8 +430,7 @@
size = contentSize;
}
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it) {
+ for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it) {
GraphicsLayer* layer = it->value.get();
if (layer->drawsContent())
layer->setSize(viewSize);
@@ -534,8 +528,7 @@
if (hadRootCompositingLayer != m_hasRootCompositingLayer)
m_layerHostingContext->setRootLayer(m_hasRootCompositingLayer ? m_rootLayer.get() : 0);
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it)
+ for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it)
[m_rootLayer.get() addSublayer:it->value->platformLayer()];
if (TiledBacking* tiledBacking = mainFrameTiledBacking()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
