diff options
author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 14:36:51 +0000 |
---|---|---|
committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 14:36:51 +0000 |
commit | 4ac0a0958a86c3310f36745cf9bb08ced79f7336 (patch) | |
tree | 2a2a2192048478df67beb18e841c904a9c95d989 /webkit/tools | |
parent | f8ee26e45e8a04bb75a3e7b0449b8acf3efb04e2 (diff) | |
download | chromium_src-4ac0a0958a86c3310f36745cf9bb08ced79f7336.zip chromium_src-4ac0a0958a86c3310f36745cf9bb08ced79f7336.tar.gz chromium_src-4ac0a0958a86c3310f36745cf9bb08ced79f7336.tar.bz2 |
Revert 41158 - Implement the CoreAnimation drawing model for plugins, sharing IPC and some rendering code with the GPU Plugin. The drawing model negotiation is currently disabled so this should have no visible impact to plugins.
BUG=32012
TEST=make sure the pepper GPU plugins still work.
Review URL: http://codereview.chromium.org/673001
TBR=pinkerton@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r-- | webkit/tools/test_shell/mac/accelerated_surface_stub.cc | 52 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 1 |
2 files changed, 0 insertions, 53 deletions
diff --git a/webkit/tools/test_shell/mac/accelerated_surface_stub.cc b/webkit/tools/test_shell/mac/accelerated_surface_stub.cc deleted file mode 100644 index 77ca622..0000000 --- a/webkit/tools/test_shell/mac/accelerated_surface_stub.cc +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file is a complete and total hack intended to stub out some classes -// used by WebPluginDelegateImpl on Mac. Unfortunately, they live in -// chrome/common, so we can't compile them into TestShell. Instead, provide -// some stubs. It will need to be updated if new methods are added to -// AcceleratedSurface that get called from WebPluginDelegateImpl. It's not -// like plug-ins work in TestShell anyway. - -#include <CoreFoundation/CoreFoundation.h> -#include <OpenGL/OpenGL.h> - -#include "base/basictypes.h" -#include "base/gfx/rect.h" -#include "base/scoped_ptr.h" - -class TransportDIB { - public: - TransportDIB() { } - ~TransportDIB() { } -}; - -class AcceleratedSurface { - public: - AcceleratedSurface(); - virtual ~AcceleratedSurface(); - - bool Initialize(); - void Destroy(); - uint64 SetSurfaceSize(int32 width, int32 height); - bool MakeCurrent(); - void Clear(const gfx::Rect& rect); - void SwapBuffers(); - CGLContextObj context() { return NULL; } - private: - scoped_ptr<TransportDIB> ignore_; -}; - -AcceleratedSurface::AcceleratedSurface() { } -AcceleratedSurface::~AcceleratedSurface() { } -bool AcceleratedSurface::Initialize() { return false; } -void AcceleratedSurface::Destroy() { } -uint64 AcceleratedSurface::SetSurfaceSize(int32 width, int32 height) - { return 0; } -bool AcceleratedSurface::MakeCurrent() { return false; } -void AcceleratedSurface::Clear(const gfx::Rect& rect) { } -void AcceleratedSurface::SwapBuffers() { } - -// Needs to be instantiated in order to generate the dtor for the scoped_ptr. -AcceleratedSurface s; diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index a1bd3cb..a28daf2 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -48,7 +48,6 @@ ], 'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC', 'sources': [ - 'mac/accelerated_surface_stub.cc', 'mac/DumpRenderTreePasteboard.h', 'mac/DumpRenderTreePasteboard.m', 'mac/test_shell_webview.h', |