OLD | NEW |
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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 // IPC::Sender | 123 // IPC::Sender |
124 virtual bool Send(IPC::Message* msg) OVERRIDE; | 124 virtual bool Send(IPC::Message* msg) OVERRIDE; |
125 | 125 |
126 // blink::WebWidgetClient | 126 // blink::WebWidgetClient |
127 virtual void suppressCompositorScheduling(bool enable); | 127 virtual void suppressCompositorScheduling(bool enable); |
128 virtual void willBeginCompositorFrame(); | 128 virtual void willBeginCompositorFrame(); |
129 virtual void didInvalidateRect(const blink::WebRect&); | 129 virtual void didInvalidateRect(const blink::WebRect&); |
130 virtual void didScrollRect(int dx, int dy, | 130 virtual void didScrollRect(int dx, int dy, |
131 const blink::WebRect& clipRect); | 131 const blink::WebRect& clipRect); |
132 virtual void didAutoResize(const blink::WebSize& new_size); | 132 virtual void didAutoResize(const blink::WebSize& new_size); |
| 133 // FIXME: To be removed as soon as chromium and blink side changes land |
| 134 // didActivateCompositor with parameters is still kept in order to land |
| 135 // these changes s-chromium - https://codereview.chromium.org/137893025/. |
| 136 // s-blink - https://codereview.chromium.org/138523003/ |
133 virtual void didActivateCompositor(int input_handler_identifier); | 137 virtual void didActivateCompositor(int input_handler_identifier); |
| 138 virtual void didActivateCompositor() OVERRIDE; |
134 virtual void didDeactivateCompositor(); | 139 virtual void didDeactivateCompositor(); |
135 virtual void initializeLayerTreeView(); | 140 virtual void initializeLayerTreeView(); |
136 virtual blink::WebLayerTreeView* layerTreeView(); | 141 virtual blink::WebLayerTreeView* layerTreeView(); |
137 virtual void didBecomeReadyForAdditionalInput(); | 142 virtual void didBecomeReadyForAdditionalInput(); |
138 virtual void didCommitAndDrawCompositorFrame(); | 143 virtual void didCommitAndDrawCompositorFrame(); |
139 virtual void didCompleteSwapBuffers(); | 144 virtual void didCompleteSwapBuffers(); |
140 virtual void scheduleComposite(); | 145 virtual void scheduleComposite(); |
141 virtual void scheduleAnimation(); | 146 virtual void scheduleAnimation(); |
142 virtual void didFocus(); | 147 virtual void didFocus(); |
143 virtual void didBlur(); | 148 virtual void didBlur(); |
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
784 | 789 |
785 ui::MenuSourceType context_menu_source_type_; | 790 ui::MenuSourceType context_menu_source_type_; |
786 gfx::Point touch_editing_context_menu_location_; | 791 gfx::Point touch_editing_context_menu_location_; |
787 | 792 |
788 DISALLOW_COPY_AND_ASSIGN(RenderWidget); | 793 DISALLOW_COPY_AND_ASSIGN(RenderWidget); |
789 }; | 794 }; |
790 | 795 |
791 } // namespace content | 796 } // namespace content |
792 | 797 |
793 #endif // CONTENT_RENDERER_RENDER_WIDGET_H_ | 798 #endif // CONTENT_RENDERER_RENDER_WIDGET_H_ |
OLD | NEW |