diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 21:16:02 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 21:16:02 +0000 |
| commit | d37231fa18e0978822c6aa2c9d03e7a56e61810b (patch) | |
| tree | 2765f8b09fe2f23a667cc1c0fb821d384a35dbd0 /webkit | |
| parent | 7b70a92006d329a3e2df40ec6b61322212f75d95 (diff) | |
| download | chromium_src-d37231fa18e0978822c6aa2c9d03e7a56e61810b.zip chromium_src-d37231fa18e0978822c6aa2c9d03e7a56e61810b.tar.gz chromium_src-d37231fa18e0978822c6aa2c9d03e7a56e61810b.tar.bz2 | |
- Extracted platform specific code from GLES2 command decoder to platform specific GLContext classes.
- GLContext encapsulates management of GL contexts on each platform.
- ReadPixels uses actual current window size to validate source rectangle.
TEST=trybots, running Pepper 3D and WebGL demos on all platforms
BUG=none
Review URL: http://codereview.chromium.org/1605014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl_mac.mm | 3 | ||||
| -rw-r--r-- | webkit/tools/test_shell/mac/accelerated_surface_stub.cc | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm index 1051e09..3e86a7b 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm +++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm @@ -736,8 +736,7 @@ void WebPluginDelegateImpl::UpdateAcceleratedSurface() { window_rect_.width(), window_rect_.height())]; [renderer_ setBounds:[layer_ bounds]]; - uint64 io_surface_id = surface_->SetSurfaceSize(window_rect_.width(), - window_rect_.height()); + uint64 io_surface_id = surface_->SetSurfaceSize(window_rect_.size()); if (io_surface_id) { plugin_->SetAcceleratedSurface(windowed_handle(), window_rect_.width(), diff --git a/webkit/tools/test_shell/mac/accelerated_surface_stub.cc b/webkit/tools/test_shell/mac/accelerated_surface_stub.cc index c983de5..a4ca5de 100644 --- a/webkit/tools/test_shell/mac/accelerated_surface_stub.cc +++ b/webkit/tools/test_shell/mac/accelerated_surface_stub.cc @@ -15,6 +15,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "gfx/rect.h" +#include "gfx/size.h" class TransportDIB { public: @@ -29,7 +30,7 @@ class AcceleratedSurface { bool Initialize(); void Destroy(); - uint64 SetSurfaceSize(int32 width, int32 height); + uint64 SetSurfaceSize(const gfx::Size& size); bool MakeCurrent(); void Clear(const gfx::Rect& rect); void SwapBuffers(); @@ -42,7 +43,7 @@ AcceleratedSurface::AcceleratedSurface() { } AcceleratedSurface::~AcceleratedSurface() { } bool AcceleratedSurface::Initialize() { return false; } void AcceleratedSurface::Destroy() { } -uint64 AcceleratedSurface::SetSurfaceSize(int32 width, int32 height) +uint64 AcceleratedSurface::SetSurfaceSize(const gfx::Size& size) { return 0; } bool AcceleratedSurface::MakeCurrent() { return false; } void AcceleratedSurface::Clear(const gfx::Rect& rect) { } |