diff options
| author | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 16:36:28 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 16:36:28 +0000 |
| commit | f16fcd76330a51070e377e66fdcdedd4c9383f98 (patch) | |
| tree | 7e7ac868eee62b687030c2c0fbe074177c00963c /content/test | |
| parent | 64e36fbfba8cb050221ce576f9a6ffbff74d9f6a (diff) | |
| download | chromium_src-f16fcd76330a51070e377e66fdcdedd4c9383f98.zip chromium_src-f16fcd76330a51070e377e66fdcdedd4c9383f98.tar.gz chromium_src-f16fcd76330a51070e377e66fdcdedd4c9383f98.tar.bz2 | |
Revert "Implement WebFrameClient in RenderFrame and proxy all calls to RenderView (for now)." (r207825).
Many failures on layout tests, e.g., fast/animation/request-animation-frame-during-modal.html
BUG=245126
TBR=nasko
Review URL: https://codereview.chromium.org/17068011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207857 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
| -rw-r--r-- | content/test/layouttest_support.cc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc index 3cd4917..4993130 100644 --- a/content/test/layouttest_support.cc +++ b/content/test/layouttest_support.cc @@ -11,9 +11,8 @@ #include "content/renderer/render_thread_impl.h" #include "content/renderer/render_view_impl.h" #include "content/renderer/renderer_webkitplatformsupport_impl.h" -#include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebFrameTestProxy.h" -#include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h" #include "third_party/WebKit/public/platform/WebGamepads.h" +#include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h" #if defined(OS_WIN) && !defined(USE_AURA) #include "content/browser/web_contents/web_contents_drag_win.h" @@ -26,7 +25,6 @@ using WebKit::WebGamepads; using WebKit::WebRect; using WebKit::WebSize; -using WebTestRunner::WebFrameTestProxy; using WebTestRunner::WebTestProxy; using WebTestRunner::WebTestProxyBase; @@ -48,18 +46,6 @@ RenderViewImpl* CreateWebTestProxy(RenderViewImplParams* params) { return render_view_proxy; } -RenderFrameImpl* CreateWebFrameTestProxy( - RenderViewImpl* render_view, - int32 routing_id) { - typedef WebTestProxy<RenderViewImpl, RenderViewImplParams*> ViewProxy; - typedef WebFrameTestProxy<RenderFrameImpl, RenderViewImpl*, int32> FrameProxy; - - ViewProxy* render_view_proxy = static_cast<ViewProxy*>(render_view); - FrameProxy* render_frame_proxy = new FrameProxy(render_view, routing_id); - render_frame_proxy->setBaseProxy(render_view_proxy); - return render_frame_proxy; -} - } // namespace @@ -67,7 +53,6 @@ void EnableWebTestProxyCreation( const base::Callback<void(RenderView*, WebTestProxyBase*)>& callback) { g_callback.Get() = callback; RenderViewImpl::InstallCreateHook(CreateWebTestProxy); - RenderFrameImpl::InstallCreateHook(CreateWebFrameTestProxy); } void SetMockGamepads(const WebGamepads& pads) { |