| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_VIEW_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_H_ |
| 6 #define CONTENT_RENDERER_RENDER_VIEW_H_ | 6 #define CONTENT_RENDERER_RENDER_VIEW_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <deque> | 9 #include <deque> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 656 virtual void OnWasRestored(bool needs_repainting); | 656 virtual void OnWasRestored(bool needs_repainting); |
| 657 virtual bool SupportsAsynchronousSwapBuffers() OVERRIDE; | 657 virtual bool SupportsAsynchronousSwapBuffers() OVERRIDE; |
| 658 virtual void OnImeSetComposition( | 658 virtual void OnImeSetComposition( |
| 659 const string16& text, | 659 const string16& text, |
| 660 const std::vector<WebKit::WebCompositionUnderline>& underlines, | 660 const std::vector<WebKit::WebCompositionUnderline>& underlines, |
| 661 int selection_start, | 661 int selection_start, |
| 662 int selection_end) OVERRIDE; | 662 int selection_end) OVERRIDE; |
| 663 virtual void OnImeConfirmComposition(const string16& text) OVERRIDE; | 663 virtual void OnImeConfirmComposition(const string16& text) OVERRIDE; |
| 664 virtual ui::TextInputType GetTextInputType() OVERRIDE; | 664 virtual ui::TextInputType GetTextInputType() OVERRIDE; |
| 665 virtual bool CanComposeInline() OVERRIDE; | 665 virtual bool CanComposeInline() OVERRIDE; |
| 666 virtual bool WebWidgetHandlesCompositorScheduling() const OVERRIDE; |
| 666 | 667 |
| 667 private: | 668 private: |
| 668 // For unit tests. | 669 // For unit tests. |
| 669 friend class ExternalPopupMenuTest; | 670 friend class ExternalPopupMenuTest; |
| 670 friend class PepperDeviceTest; | 671 friend class PepperDeviceTest; |
| 671 friend class RenderViewTest; | 672 friend class RenderViewTest; |
| 672 | 673 |
| 673 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange); | 674 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange); |
| 674 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase); | 675 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase); |
| 675 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); | 676 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1234 // bunch of stuff, you should probably create a helper class and put your | 1235 // bunch of stuff, you should probably create a helper class and put your |
| 1235 // data and methods on that to avoid bloating RenderView more. You can use | 1236 // data and methods on that to avoid bloating RenderView more. You can use |
| 1236 // the Observer interface to filter IPC messages and receive frame change | 1237 // the Observer interface to filter IPC messages and receive frame change |
| 1237 // notifications. | 1238 // notifications. |
| 1238 // --------------------------------------------------------------------------- | 1239 // --------------------------------------------------------------------------- |
| 1239 | 1240 |
| 1240 DISALLOW_COPY_AND_ASSIGN(RenderView); | 1241 DISALLOW_COPY_AND_ASSIGN(RenderView); |
| 1241 }; | 1242 }; |
| 1242 | 1243 |
| 1243 #endif // CONTENT_RENDERER_RENDER_VIEW_H_ | 1244 #endif // CONTENT_RENDERER_RENDER_VIEW_H_ |
| OLD | NEW |