[not for review] Add Draw entries to window Performance Timeline

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 61 matching lines @@
 #include "core/page/EventWithHitTestResults.h"
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
 #include "core/page/InjectedStyleSheets.h"
 #include "core/page/Page.h"
 #include "core/page/PagePopupClient.h"
 #include "core/page/PointerLockController.h"
 #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"
 #include "modules/indexeddb/InspectorIndexedDBAgent.h"
 #include "modules/push_messaging/PushController.h"
 #include "platform/ContextMenu.h"
 #include "platform/ContextMenuItem.h"
 #include "platform/Cursor.h"
 #include "platform/KeyboardCodes.h"
 #include "platform/NotImplemented.h"
@@ skipping 17 matching lines @@
 #include "public/platform/WebDragData.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebGestureCurve.h"
 #include "public/platform/WebImage.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebVector.h"
 #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"
 #include "public/web/WebTextInputInfo.h"
 #include "public/web/WebViewClient.h"
 #include "public/web/WebWindowFeatures.h"
 #include "web/CompositionUnderlineVectorBuilder.h"
 #include "web/ContextFeaturesClientImpl.h"
 #include "web/DatabaseClientImpl.h"
 #include "web/FullscreenController.h"
@@ skipping 1610 matching lines @@
         return;
 
     PageWidgetDelegate::animate(m_page.get(), monotonicFrameBeginTime);
 
     if (m_continuousPaintingEnabled) {
         ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageOverlays.get());
         m_client->scheduleAnimation();
     }
 }
 
+typedef WTF::HashMap<const GraphicsLayer*, std::vector<std::pair<int64_t, WebRect> > >
+GraphicsLayerDrawRects;
+
 void WebViewImpl::layout()
 {
     TRACE_EVENT0("blink", "WebViewImpl::layout");
     if (!localFrameRootTemporary())
         return;
 
     PageWidgetDelegate::layout(m_page.get(), localFrameRootTemporary()->frame());
     updateLayerTreeBackgroundColor();
 
     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();
 }
 
 void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect)
 {
     // This should only be used when compositing is not being used for this
     // WebView, and it is painting into the recording of its parent.
     ASSERT(!isAcceleratedCompositingActive());
 
@@ skipping 2313 matching lines @@
         WebSize scrollOffset = mainFrame()->scrollOffset();
         scrollOffset.width += scrollDelta.width;
         scrollOffset.height += scrollDelta.height;
 
         WebPoint scrollPoint(scrollOffset.width, scrollOffset.height);
         setPageScaleFactor(pageScaleFactor() * pageScaleDelta, scrollPoint);
         m_doubleTapZoomPending = false;
     }
 }
 
+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)
         return;
 
     m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), minimumPageScaleFactor(), maximumPageScaleFactor());
 }
 
 void WebViewImpl::updateLayerTreeBackgroundColor()
 {
@@ skipping 126 matching lines @@
     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefinedConstraints();
 
     if (!mainFrameImpl() || !mainFrameImpl()->frameView())
         return false;
 
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 } // namespace blink