Index: Source/web/WebViewImpl.cpp |
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp |
index dcad19b352389879f734234ca6fe73442cc48d20..5fa8e8eff661beb1acc01713e6b5d76df4d35a0c 100644 |
--- a/Source/web/WebViewImpl.cpp |
+++ b/Source/web/WebViewImpl.cpp |
@@ -1833,7 +1833,7 @@ void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect, PaintOptions opt |
FrameView* view = page()->mainFrame()->view(); |
PaintBehavior oldPaintBehavior = view->paintBehavior(); |
if (isAcceleratedCompositingActive()) { |
- ASSERT(option == ForceSoftwareRenderingAndIgnoreGPUResidentContent); |
+ ASSERT(option == ForceSoftwareRenderingAndIgnoreGPUResidentContent); |
view->setPaintBehavior(oldPaintBehavior | PaintBehaviorFlattenCompositingLayers); |
} |
@@ -1845,7 +1845,7 @@ void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect, PaintOptions opt |
WebKit::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30); |
if (isAcceleratedCompositingActive()) { |
- ASSERT(option == ForceSoftwareRenderingAndIgnoreGPUResidentContent); |
+ ASSERT(option == ForceSoftwareRenderingAndIgnoreGPUResidentContent); |
view->setPaintBehavior(oldPaintBehavior); |
} |
} |
@@ -3383,11 +3383,14 @@ WebDragOperation WebViewImpl::dragTargetDragEnterOrOver(const WebPoint& clientPo |
void WebViewImpl::sendResizeEventAndRepaint() |
{ |
- if (mainFrameImpl()->frameView()) { |
- // Enqueues the resize event. |
- mainFrameImpl()->frame()->eventHandler()->sendResizeEvent(); |
- } |
+ // FIXME: This is wrong. The FrameView is responsible sending a resizeEvent |
+ // as part of layout. Layout is also responsible for sending invalidations |
+ // to the embedder. This method and all callers may be wrong. |
+ // This method used to send a resizeEvent, presumably in compensation for |
+ // layout() being supressed for the first 250ms and thus not always sending |
+ // repaintEvents for the initial layout. |
+ // This paint invalidation should not be necessary, but won't harm anything either. |
esprehn
2013/07/25 01:15:34
FIXME
|
if (m_client) { |
if (isAcceleratedCompositingActive()) { |
updateLayerTreeViewport(); |
@@ -3396,6 +3399,7 @@ void WebViewImpl::sendResizeEventAndRepaint() |
m_client->didInvalidateRect(damagedRect); |
} |
} |
+ // Unclear what this is doing. Callers may actually need this code. |
esprehn
2013/07/25 01:15:34
FIXME:
|
if (m_pageOverlays) |
m_pageOverlays->update(); |
} |