Revert 175827

content/renderer/render_widget.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <deque>
 #include <map>
 
@@ skipping 14 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidgetClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
 #include "ui/surface/transport_dib.h"
-#include "webkit/compositor_bindings/web_layer_tree_view_impl.h"
 #include "webkit/glue/webcursor.h"
 
 struct ViewHostMsg_UpdateRect_Params;
 class ViewHostMsg_UpdateRect;
 
 namespace IPC {
 class SyncMessage;
 }
 
 namespace WebKit {
@@ skipping 69 matching lines @@
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // WebKit::WebWidgetClient
   virtual void willBeginCompositorFrame();
   virtual void didInvalidateRect(const WebKit::WebRect&);
   virtual void didScrollRect(int dx, int dy,
                              const WebKit::WebRect& clipRect);
   virtual void didAutoResize(const WebKit::WebSize& new_size);
   virtual void didActivateCompositor(int input_handler_identifier);
   virtual void didDeactivateCompositor();
-  virtual void initializeLayerTreeView(
-      WebKit::WebLayerTreeViewClient* client,
-      const WebKit::WebLayer& root_layer,
-      const WebKit::WebLayerTreeView::Settings& settings);
-  virtual WebKit::WebLayerTreeView* layerTreeView();
   virtual void didBecomeReadyForAdditionalInput();
   virtual void didCommitAndDrawCompositorFrame();
   virtual void didCompleteSwapBuffers();
   virtual void scheduleComposite();
   virtual void scheduleAnimation();
   virtual void didFocus();
   virtual void didBlur();
   virtual void didChangeCursor(const WebKit::WebCursorInfo&);
   virtual void closeWidgetSoon();
   virtual void show(WebKit::WebNavigationPolicy);
@@ skipping 309 matching lines @@
 
   // Routing ID that allows us to communicate to the parent browser process
   // RenderWidgetHost. When MSG_ROUTING_NONE, no messages may be sent.
   int32 routing_id_;
 
   int32 surface_id_;
 
   // We are responsible for destroying this object via its Close method.
   WebKit::WebWidget* webwidget_;
 
-  // This is lazily constructed and must not outlive webwidget_.
-  scoped_ptr<WebKit::WebLayerTreeViewImpl> web_layer_tree_view_;
-
   // Set to the ID of the view that initiated creating this view, if any. When
   // the view was initiated by the browser (the common case), this will be
   // MSG_ROUTING_NONE. This is used in determining ownership when opening
   // child tabs. See RenderWidget::createWebViewWithRequest.
   //
   // This ID may refer to an invalid view if that view is closed before this
   // view is.
   int32 opener_id_;
 
   // The position where this view should be initially shown.
@@ skipping 165 matching lines @@
 
   // Specified whether the compositor will run in its own thread.
   bool is_threaded_compositing_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_