| 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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #if defined(OS_MACOSX) | 9 #if defined(OS_MACOSX) |
| 10 #include <OpenGL/OpenGL.h> | 10 #include <OpenGL/OpenGL.h> |
| 11 #endif | 11 #endif |
| 12 | 12 |
| 13 #include <string> | 13 #include <string> |
| 14 #include <vector> | 14 #include <vector> |
| 15 | 15 |
| 16 #include "base/process_util.h" | 16 #include "base/process_util.h" |
| 17 #include "third_party/skia/include/core/SkBitmap.h" | 17 #include "third_party/skia/include/core/SkBitmap.h" |
| 18 #include "third_party/skia/include/core/SkColor.h" | 18 #include "third_party/skia/include/core/SkColor.h" |
| 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" | 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" |
| 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputType.h" | 20 #include "ui/base/ime/text_input_type.h" |
| 21 #include "ui/base/range/range.h" | 21 #include "ui/base/range/range.h" |
| 22 #include "ui/gfx/native_widget_types.h" | 22 #include "ui/gfx/native_widget_types.h" |
| 23 #include "ui/gfx/rect.h" | 23 #include "ui/gfx/rect.h" |
| 24 #include "ui/gfx/surface/transport_dib.h" | 24 #include "ui/gfx/surface/transport_dib.h" |
| 25 | 25 |
| 26 namespace gfx { | 26 namespace gfx { |
| 27 class Rect; | 27 class Rect; |
| 28 class Size; | 28 class Size; |
| 29 } | 29 } |
| 30 namespace IPC { | 30 namespace IPC { |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 // Retrieve the bounds of the View, in screen coordinates. | 127 // Retrieve the bounds of the View, in screen coordinates. |
| 128 virtual gfx::Rect GetViewBounds() const = 0; | 128 virtual gfx::Rect GetViewBounds() const = 0; |
| 129 | 129 |
| 130 // Sets the cursor to the one associated with the specified cursor_type | 130 // Sets the cursor to the one associated with the specified cursor_type |
| 131 virtual void UpdateCursor(const WebCursor& cursor) = 0; | 131 virtual void UpdateCursor(const WebCursor& cursor) = 0; |
| 132 | 132 |
| 133 // Indicates whether the page has finished loading. | 133 // Indicates whether the page has finished loading. |
| 134 virtual void SetIsLoading(bool is_loading) = 0; | 134 virtual void SetIsLoading(bool is_loading) = 0; |
| 135 | 135 |
| 136 // Updates the state of the input method attached to the view. | 136 // Updates the state of the input method attached to the view. |
| 137 virtual void ImeUpdateTextInputState(WebKit::WebTextInputType type, | 137 virtual void ImeUpdateTextInputState(ui::TextInputType type, |
| 138 bool can_compose_inline, |
| 138 const gfx::Rect& caret_rect) = 0; | 139 const gfx::Rect& caret_rect) = 0; |
| 139 | 140 |
| 140 // Cancel the ongoing composition of the input method attached to the view. | 141 // Cancel the ongoing composition of the input method attached to the view. |
| 141 virtual void ImeCancelComposition() = 0; | 142 virtual void ImeCancelComposition() = 0; |
| 142 | 143 |
| 143 // Updates the range of the marked text in an IME composition. | 144 // Updates the range of the marked text in an IME composition. |
| 144 virtual void ImeCompositionRangeChanged(const ui::Range& range) {} | 145 virtual void ImeCompositionRangeChanged(const ui::Range& range) {} |
| 145 | 146 |
| 146 // Informs the view that a portion of the widget's backing store was scrolled | 147 // Informs the view that a portion of the widget's backing store was scrolled |
| 147 // and/or painted. The view should ensure this gets copied to the screen. | 148 // and/or painted. The view should ensure this gets copied to the screen. |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 | 327 |
| 327 // The current reserved area in view coordinates where contents should not be | 328 // The current reserved area in view coordinates where contents should not be |
| 328 // rendered to draw the resize corner, sidebar mini tabs etc. | 329 // rendered to draw the resize corner, sidebar mini tabs etc. |
| 329 gfx::Rect reserved_rect_; | 330 gfx::Rect reserved_rect_; |
| 330 | 331 |
| 331 private: | 332 private: |
| 332 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostView); | 333 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostView); |
| 333 }; | 334 }; |
| 334 | 335 |
| 335 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_ | 336 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_ |
| OLD | NEW |