| 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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 10 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/process.h" | 11 #include "base/process.h" |
| 11 #include "content/browser/renderer_host/ime_adapter_android.h" | 12 #include "content/browser/renderer_host/ime_adapter_android.h" |
| 12 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 13 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
| 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureL
ayer.h" |
| 13 #include "ui/gfx/size.h" | 15 #include "ui/gfx/size.h" |
| 14 | 16 |
| 15 struct ViewHostMsg_TextInputState_Params; | 17 struct ViewHostMsg_TextInputState_Params; |
| 16 | 18 |
| 17 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params; | 19 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params; |
| 18 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params; | 20 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params; |
| 19 | 21 |
| 20 namespace content { | 22 namespace content { |
| 21 class ContentViewCoreImpl; | 23 class ContentViewCoreImpl; |
| 22 class RenderWidgetHost; | 24 class RenderWidgetHost; |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 | 122 |
| 121 // ContentViewCoreImpl is our interface to the view system. | 123 // ContentViewCoreImpl is our interface to the view system. |
| 122 ContentViewCoreImpl* content_view_core_; | 124 ContentViewCoreImpl* content_view_core_; |
| 123 | 125 |
| 124 // The size that we want the renderer to be. We keep this in a separate | 126 // The size that we want the renderer to be. We keep this in a separate |
| 125 // variable because resizing is async. | 127 // variable because resizing is async. |
| 126 gfx::Size requested_size_; | 128 gfx::Size requested_size_; |
| 127 | 129 |
| 128 ImeAdapterAndroid ime_adapter_android_; | 130 ImeAdapterAndroid ime_adapter_android_; |
| 129 | 131 |
| 132 // The texture layer for this view when using browser-side compositing. |
| 133 scoped_ptr<WebKit::WebExternalTextureLayer> texture_layer_; |
| 134 |
| 130 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); | 135 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); |
| 131 }; | 136 }; |
| 132 | 137 |
| 133 } // namespace content | 138 } // namespace content |
| 134 | 139 |
| 135 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 140 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
| OLD | NEW |