Index: Source/web/WebViewImpl.cpp |
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp |
index 1995d9f3f24ceb383a9b57896908a5199127888e..d3dca340ce08a9000852f2a1dd70ea821cc1d60f 100644 |
--- a/Source/web/WebViewImpl.cpp |
+++ b/Source/web/WebViewImpl.cpp |
@@ -79,10 +79,13 @@ |
#include "core/page/ScopedPageLoadDeferrer.h" |
#include "core/page/TouchDisambiguation.h" |
#include "core/rendering/FastTextAutosizer.h" |
+#include "core/rendering/RenderGeometryMap.h" |
#include "core/rendering/RenderView.h" |
#include "core/rendering/RenderWidget.h" |
#include "core/rendering/TextAutosizer.h" |
+#include "core/rendering/compositing/CompositedLayerMapping.h" |
#include "core/rendering/compositing/RenderLayerCompositor.h" |
+#include "core/timing/Performance.h" |
#include "modules/device_orientation/DeviceOrientationInspectorAgent.h" |
#include "modules/encryptedmedia/MediaKeysController.h" |
#include "modules/filesystem/InspectorFileSystemAgent.h" |
@@ -120,11 +123,13 @@ |
#include "public/web/WebAXObject.h" |
#include "public/web/WebActiveWheelFlingParameters.h" |
#include "public/web/WebAutofillClient.h" |
+#include "public/web/WebFrame.h" |
#include "public/web/WebFrameClient.h" |
#include "public/web/WebHitTestResult.h" |
#include "public/web/WebInputElement.h" |
#include "public/web/WebMediaPlayerAction.h" |
#include "public/web/WebNode.h" |
+#include "public/web/WebPerformance.h" |
#include "public/web/WebPlugin.h" |
#include "public/web/WebPluginAction.h" |
#include "public/web/WebRange.h" |
@@ -1755,6 +1760,9 @@ void WebViewImpl::animate(double monotonicFrameBeginTime) |
} |
} |
+typedef WTF::HashMap<const GraphicsLayer*, std::vector<std::pair<int64_t, WebRect> > > |
+GraphicsLayerDrawRects; |
+ |
void WebViewImpl::layout() |
{ |
TRACE_EVENT0("blink", "WebViewImpl::layout"); |
@@ -1767,6 +1775,48 @@ void WebViewImpl::layout() |
for (size_t i = 0; i < m_linkHighlights.size(); ++i) |
m_linkHighlights[i]->updateGeometry(); |
+ GraphicsLayerDrawRects glRects; |
+ |
+ Frame* frame = m_page ? m_page->mainFrame() : 0; |
+ while (frame) { |
chrishtr
2014/07/16 20:00:25
Random nit, but I would make this a for loop.
|
+ if (!frame->isLocalFrame()) { |
+ frame = frame->tree().traverseNext(); |
+ continue; |
+ } |
+ LocalFrame* localframe = toLocalFrame(frame); |
+ |
+ const GraphicsLayer* graphicsLayer = |
+ localframe->document()->renderView()->enclosingLayer() |
+ ->enclosingLayerForPaintInvalidationCrossingFrameBoundaries() |
+ ->graphicsLayerBackingForScrolling(); |
+ |
+ // Find frame's rect in graphics layer space |
+ LayoutRect rect = |
+ localframe->contentRenderer()->rectForPaintInvalidation(); |
+ RenderLayerModelObject* paintInvalidationContainer = |
+ localframe->contentRenderer()->enclosingLayer() |
+ ->enclosingLayerForPaintInvalidationCrossingFrameBoundaries() |
+ ->renderer(); |
+ RenderLayer::mapRectToPaintBackingCoordinates(paintInvalidationContainer, rect); |
chrishtr
2014/07/16 20:00:25
This looks right.
|
+ |
+ GraphicsLayerDrawRects::iterator glIter = glRects.find(graphicsLayer); |
+ std::vector<std::pair<int64_t, WebRect> > *glVector; |
+ if (glIter == glRects.end()) { |
+ glVector = &glRects.add(graphicsLayer, |
+ std::vector<std::pair<int64_t, WebRect> >()).storedValue->value; |
+ } else { |
+ glVector = &glIter->value; |
+ } |
+ glVector->push_back(std::make_pair(frame->frameID(), enclosingIntRect(rect))); |
+ |
+ frame = frame->tree().traverseNext(); |
+ } |
+ |
+ for (GraphicsLayerDrawRects::const_iterator iter = glRects.begin(); iter != glRects.end(); ++iter) { |
+ const GraphicsLayer* graphicsLayer = iter->key; |
+ graphicsLayer->platformLayer()->setDrawFrameRequestRects(iter->value); |
+ } |
+ |
if (m_devToolsAgent) |
m_devToolsAgent->didLayout(); |
} |
@@ -4100,6 +4150,29 @@ void WebViewImpl::applyScrollAndScale(const WebSize& scrollDelta, float pageScal |
} |
} |
+void WebViewImpl::recordDrawTiming(int64_t FrameId, const WebVector<std::pair<int, double> >& draws) |
+{ |
+ if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
+ return; |
+ |
+ Frame* frame = m_page ? m_page->mainFrame() : 0; |
+ |
+ while (frame && frame->frameID() != FrameId) { |
+ frame = frame->tree().traverseNext(); |
+ } |
+ |
+ if (!frame) |
+ return; // ASSERT? Other way to report error? |
+ |
+ ASSERT(frame->isLocalFrame()); |
+ |
+ WebCore::LocalDOMWindow* domWindow = toLocalFrame(frame)->domWindow(); |
+ WebCore::Performance& performance = domWindow->performance(); |
+ for (size_t i = 0; i < draws.size(); ++i) { |
+ performance.addDrawTiming(domWindow->document(), draws[i].first, draws[i].second); |
+ } |
+} |
+ |
void WebViewImpl::updateLayerTreeViewport() |
{ |
if (!page() || !m_layerTreeView) |