Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(544)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 11194042: Implement TextureImageTransportSurface using texture mailbox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <map>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/i18n/rtl.h" 11 #include "base/i18n/rtl.h"
10 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
11 #include "base/process.h" 13 #include "base/process.h"
12 #include "content/browser/renderer_host/ime_adapter_android.h" 14 #include "content/browser/renderer_host/ime_adapter_android.h"
13 #include "content/browser/renderer_host/render_widget_host_view_base.h" 15 #include "content/browser/renderer_host/render_widget_host_view_base.h"
14 #include "third_party/skia/include/core/SkColor.h" 16 #include "third_party/skia/include/core/SkColor.h"
15 #include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureL ayer.h" 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureL ayer.h"
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h" 18 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"
17 #include "ui/gfx/size.h" 19 #include "ui/gfx/size.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 const gfx::Rect& end_rect, 89 const gfx::Rect& end_rect,
88 WebKit::WebTextDirection end_direction) OVERRIDE; 90 WebKit::WebTextDirection end_direction) OVERRIDE;
89 virtual void OnAcceleratedCompositingStateChange() OVERRIDE; 91 virtual void OnAcceleratedCompositingStateChange() OVERRIDE;
90 virtual void AcceleratedSurfaceBuffersSwapped( 92 virtual void AcceleratedSurfaceBuffersSwapped(
91 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, 93 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
92 int gpu_host_id) OVERRIDE; 94 int gpu_host_id) OVERRIDE;
93 virtual void AcceleratedSurfacePostSubBuffer( 95 virtual void AcceleratedSurfacePostSubBuffer(
94 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, 96 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
95 int gpu_host_id) OVERRIDE; 97 int gpu_host_id) OVERRIDE;
96 virtual void AcceleratedSurfaceSuspend() OVERRIDE; 98 virtual void AcceleratedSurfaceSuspend() OVERRIDE;
99 virtual void AcceleratedSurfaceNew(int32 width_in_pixel,
100 int32 height_in_pixel,
101 uint64 surface_id,
102 const std::string& mailbox_name) OVERRIDE;
103 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE;
97 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; 104 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
98 virtual void SetBackground(const SkBitmap& background) OVERRIDE; 105 virtual void SetBackground(const SkBitmap& background) OVERRIDE;
99 virtual void CopyFromCompositingSurface( 106 virtual void CopyFromCompositingSurface(
100 const gfx::Rect& src_subrect, 107 const gfx::Rect& src_subrect,
101 const gfx::Size& dst_size, 108 const gfx::Size& dst_size,
102 const base::Callback<void(bool)>& callback, 109 const base::Callback<void(bool)>& callback,
103 skia::PlatformBitmap* output) OVERRIDE; 110 skia::PlatformBitmap* output) OVERRIDE;
104 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE; 111 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;
105 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 112 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
106 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; 113 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 // The texture layer for this view when using browser-side compositing. 170 // The texture layer for this view when using browser-side compositing.
164 scoped_ptr<WebKit::WebExternalTextureLayer> texture_layer_; 171 scoped_ptr<WebKit::WebExternalTextureLayer> texture_layer_;
165 172
166 // The most recent texture id that was pushed to the texture layer. 173 // The most recent texture id that was pushed to the texture layer.
167 unsigned int texture_id_in_layer_; 174 unsigned int texture_id_in_layer_;
168 175
169 // The handle for the transport surface (between renderer and browser-side 176 // The handle for the transport surface (between renderer and browser-side
170 // compositor) for this view. 177 // compositor) for this view.
171 gfx::GLSurfaceHandle shared_surface_; 178 gfx::GLSurfaceHandle shared_surface_;
172 179
180 struct TextureInfo {
181 TextureInfo()
182 : id(0) {}
apatrick_chromium 2012/11/05 20:58:56 nit: fits on one line!
183
184 uint32 id;
185 scoped_array<signed char> mailbox_name;
186 };
187 typedef std::map<uint64, TextureInfo*> TextureMap;
188 // Maps a texture image transport buffer identifier to a texture that
189 // we created to host it.
190 TextureMap id_to_texture_map_;
191
192 // The identifier of the previously received frame
193 uint64 current_buffer_id_;
194
173 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); 195 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
174 }; 196 };
175 197
176 } // namespace content 198 } // namespace content
177 199
178 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 200 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698