Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(334)

Side by Side Diff: content/renderer/render_widget.h

Issue 11575049: Make RenderWidget responsible for the composited view's lifetime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make cc::LayerTreeHost getter chromium-style Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_ 5 #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_
6 #define CONTENT_RENDERER_RENDER_WIDGET_H_ 6 #define CONTENT_RENDERER_RENDER_WIDGET_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 10
(...skipping 14 matching lines...) Expand all
25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputInfo.h" 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputInfo.h"
26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidgetClient.h" 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidgetClient.h"
27 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" 27 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
28 #include "third_party/skia/include/core/SkBitmap.h" 28 #include "third_party/skia/include/core/SkBitmap.h"
29 #include "ui/base/ime/text_input_type.h" 29 #include "ui/base/ime/text_input_type.h"
30 #include "ui/base/range/range.h" 30 #include "ui/base/range/range.h"
31 #include "ui/gfx/native_widget_types.h" 31 #include "ui/gfx/native_widget_types.h"
32 #include "ui/gfx/rect.h" 32 #include "ui/gfx/rect.h"
33 #include "ui/gfx/vector2d.h" 33 #include "ui/gfx/vector2d.h"
34 #include "ui/surface/transport_dib.h" 34 #include "ui/surface/transport_dib.h"
35 #include "webkit/compositor_bindings/web_layer_tree_view_impl.h"
35 #include "webkit/glue/webcursor.h" 36 #include "webkit/glue/webcursor.h"
36 37
37 struct ViewHostMsg_UpdateRect_Params; 38 struct ViewHostMsg_UpdateRect_Params;
38 class ViewHostMsg_UpdateRect; 39 class ViewHostMsg_UpdateRect;
39 40
40 namespace IPC { 41 namespace IPC {
41 class SyncMessage; 42 class SyncMessage;
42 } 43 }
43 44
44 namespace WebKit { 45 namespace WebKit {
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 // Routing ID that allows us to communicate to the parent browser process 450 // Routing ID that allows us to communicate to the parent browser process
450 // RenderWidgetHost. When MSG_ROUTING_NONE, no messages may be sent. 451 // RenderWidgetHost. When MSG_ROUTING_NONE, no messages may be sent.
451 int32 routing_id_; 452 int32 routing_id_;
452 453
453 int32 surface_id_; 454 int32 surface_id_;
454 455
455 // We are responsible for destroying this object via its Close method. 456 // We are responsible for destroying this object via its Close method.
456 WebKit::WebWidget* webwidget_; 457 WebKit::WebWidget* webwidget_;
457 458
458 // This is lazily constructed and must not outlive webwidget_. 459 // This is lazily constructed and must not outlive webwidget_.
459 scoped_ptr<WebKit::WebLayerTreeView> web_layer_tree_view_; 460 scoped_ptr<WebKit::WebLayerTreeViewImpl> web_layer_tree_view_;
460 461
461 // Set to the ID of the view that initiated creating this view, if any. When 462 // Set to the ID of the view that initiated creating this view, if any. When
462 // the view was initiated by the browser (the common case), this will be 463 // the view was initiated by the browser (the common case), this will be
463 // MSG_ROUTING_NONE. This is used in determining ownership when opening 464 // MSG_ROUTING_NONE. This is used in determining ownership when opening
464 // child tabs. See RenderWidget::createWebViewWithRequest. 465 // child tabs. See RenderWidget::createWebViewWithRequest.
465 // 466 //
466 // This ID may refer to an invalid view if that view is closed before this 467 // This ID may refer to an invalid view if that view is closed before this
467 // view is. 468 // view is.
468 int32 opener_id_; 469 int32 opener_id_;
469 470
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 637
637 // Specified whether the compositor will run in its own thread. 638 // Specified whether the compositor will run in its own thread.
638 bool is_threaded_compositing_enabled_; 639 bool is_threaded_compositing_enabled_;
639 640
640 DISALLOW_COPY_AND_ASSIGN(RenderWidget); 641 DISALLOW_COPY_AND_ASSIGN(RenderWidget);
641 }; 642 };
642 643
643 } // namespace content 644 } // namespace content
644 645
645 #endif // CONTENT_RENDERER_RENDER_WIDGET_H_ 646 #endif // CONTENT_RENDERER_RENDER_WIDGET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698