OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include "chrome/renderer/render_widget_fullscreen_pepper.h" | 5 #include "chrome/renderer/render_widget_fullscreen_pepper.h" |
6 | 6 |
7 #include "chrome/common/render_messages.h" | 7 #include "chrome/common/render_messages.h" |
8 #include "chrome/renderer/ggl/ggl.h" | 8 #include "chrome/renderer/ggl/ggl.h" |
9 #include "chrome/renderer/gpu_channel_host.h" | 9 #include "chrome/renderer/gpu_channel_host.h" |
10 #include "chrome/renderer/pepper_platform_context_3d_impl.h" | 10 #include "chrome/renderer/pepper_platform_context_3d_impl.h" |
11 #include "chrome/renderer/render_thread.h" | 11 #include "chrome/renderer/render_thread.h" |
12 #include "gpu/command_buffer/client/gles2_implementation.h" | 12 #include "gpu/command_buffer/client/gles2_implementation.h" |
13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" | 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" |
| 14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h" |
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" | 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" |
15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" | 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" |
16 #include "webkit/plugins/ppapi/plugin_delegate.h" | 17 #include "webkit/plugins/ppapi/plugin_delegate.h" |
17 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" | 18 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" |
18 | 19 |
19 using WebKit::WebCanvas; | 20 using WebKit::WebCanvas; |
20 using WebKit::WebCompositionUnderline; | 21 using WebKit::WebCompositionUnderline; |
21 using WebKit::WebCursorInfo; | 22 using WebKit::WebCursorInfo; |
22 using WebKit::WebInputEvent; | 23 using WebKit::WebInputEvent; |
| 24 using WebKit::WebRange; |
23 using WebKit::WebRect; | 25 using WebKit::WebRect; |
24 using WebKit::WebSize; | 26 using WebKit::WebSize; |
25 using WebKit::WebString; | 27 using WebKit::WebString; |
26 using WebKit::WebTextDirection; | 28 using WebKit::WebTextDirection; |
27 using WebKit::WebTextInputType; | 29 using WebKit::WebTextInputType; |
28 using WebKit::WebVector; | 30 using WebKit::WebVector; |
29 using WebKit::WebWidget; | 31 using WebKit::WebWidget; |
30 | 32 |
31 namespace { | 33 namespace { |
32 | 34 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 virtual bool confirmComposition() { | 111 virtual bool confirmComposition() { |
110 NOTIMPLEMENTED(); | 112 NOTIMPLEMENTED(); |
111 return false; | 113 return false; |
112 } | 114 } |
113 | 115 |
114 virtual bool confirmComposition(const WebString& text) { | 116 virtual bool confirmComposition(const WebString& text) { |
115 NOTIMPLEMENTED(); | 117 NOTIMPLEMENTED(); |
116 return false; | 118 return false; |
117 } | 119 } |
118 | 120 |
| 121 virtual WebRange compositionRange() { |
| 122 NOTIMPLEMENTED(); |
| 123 return WebRange(); |
| 124 } |
| 125 |
119 virtual WebTextInputType textInputType() { | 126 virtual WebTextInputType textInputType() { |
120 NOTIMPLEMENTED(); | 127 NOTIMPLEMENTED(); |
121 return WebKit::WebTextInputTypeNone; | 128 return WebKit::WebTextInputTypeNone; |
122 } | 129 } |
123 | 130 |
124 virtual WebRect caretOrSelectionBounds() { | 131 virtual WebRect caretOrSelectionBounds() { |
125 NOTIMPLEMENTED(); | 132 NOTIMPLEMENTED(); |
126 return WebRect(); | 133 return WebRect(); |
127 } | 134 } |
128 | 135 |
| 136 virtual WebRange caretOrSelectionRange() { |
| 137 NOTIMPLEMENTED(); |
| 138 return WebRange(); |
| 139 } |
| 140 |
129 virtual void setTextDirection(WebTextDirection) { | 141 virtual void setTextDirection(WebTextDirection) { |
130 NOTIMPLEMENTED(); | 142 NOTIMPLEMENTED(); |
131 } | 143 } |
132 | 144 |
133 virtual bool isAcceleratedCompositingActive() const { | 145 virtual bool isAcceleratedCompositingActive() const { |
134 return widget_->context() && plugin_ && | 146 return widget_->context() && plugin_ && |
135 (plugin_->GetBackingTextureId() != 0); | 147 (plugin_->GetBackingTextureId() != 0); |
136 } | 148 } |
137 | 149 |
138 private: | 150 private: |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 return true; | 408 return true; |
397 } | 409 } |
398 | 410 |
399 bool RenderWidgetFullscreenPepper::CheckCompositing() { | 411 bool RenderWidgetFullscreenPepper::CheckCompositing() { |
400 bool compositing = webwidget_->isAcceleratedCompositingActive(); | 412 bool compositing = webwidget_->isAcceleratedCompositingActive(); |
401 if (compositing != is_accelerated_compositing_active_) { | 413 if (compositing != is_accelerated_compositing_active_) { |
402 didActivateAcceleratedCompositing(compositing); | 414 didActivateAcceleratedCompositing(compositing); |
403 } | 415 } |
404 return compositing; | 416 return compositing; |
405 } | 417 } |
OLD | NEW |