Add LayerTreeHostClient::{will,did}UpdateLayer, report layer updates to DevTools

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 921 matching lines @@
   new TextInputClientObserver(this);
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_ANDROID)
   media_player_manager_.reset(new RendererMediaPlayerManager());
 #endif
 
   // The next group of objects all implement RenderViewObserver, so are deleted
   // along with the RenderView automatically.
   devtools_agent_ = new DevToolsAgent(this);
+  if (RenderWidgetCompositor* rwc = compositor()) {
+    webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId());

[jamesr, 2013/07/22 18:01:02]

hmm, why is this grabbing the devtools agent via the webview? is it different
from the devtools_agent_ parameter allocated on the previous line?

[caseq, 2013/07/22 18:56:47]

Yes, it's different: webview() returns WebKit::WebView, so its devToolsAgent()
returns WebKit::WebDevToolsAgent, not the chromium-side DevToolsAgent. Another
way to say that would be
devtools_agent_->GetWebAgent() (but that would expand to
webview()->devToolsAgent() plus null checks).

+  }
   mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this);
-
   new ImageLoadingHelper(this);
 
   // Create renderer_accessibility_ if needed.
   OnSetAccessibilityMode(params->accessibility_mode);
 
   new IdleUserDetector(this);
 
   if (command_line.HasSwitch(switches::kDomAutomationController))
     enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION;
   if (command_line.HasSwitch(switches::kStatsCollectionController))
@@ skipping 1854 matching lines @@
 }
 
 void RenderViewImpl::didHandleGestureEvent(
     const WebGestureEvent& event,
     bool event_cancelled) {
   RenderWidget::didHandleGestureEvent(event, event_cancelled);
   FOR_EACH_OBSERVER(RenderViewObserver, observers_,
                     DidHandleGestureEvent(event));
 }
 
+void RenderViewImpl::initializeLayerTreeView() {
+  RenderWidget::initializeLayerTreeView();
+  RenderWidgetCompositor* rwc = compositor();
+  if (!rwc || !webview() || !webview()->devToolsAgent())
+    return;
+  webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId());
+}
+
 // WebKit::WebFrameClient -----------------------------------------------------
 
 WebKit::WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame,
                                                 const WebPluginParams& params) {
   WebKit::WebPlugin* plugin = NULL;
   if (GetContentClient()->renderer()->OverrideCreatePlugin(
           this, frame, params, &plugin)) {
     return plugin;
   }
 
@@ skipping 3911 matching lines @@
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 
 }  // namespace content