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

Side by Side Diff: webkit/tools/test_shell/test_webview_delegate.cc

Issue 4991003: Revert 66125 -- Broke Windows build - Move FilterType into MediaFilterCollect... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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
« no previous file with comments | « webkit/support/webkit_support.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // This file contains the implementation of TestWebViewDelegate, which serves 5 // This file contains the implementation of TestWebViewDelegate, which serves
6 // as the WebViewDelegate for the TestShellWebHost. The host is expected to 6 // as the WebViewDelegate for the TestShellWebHost. The host is expected to
7 // have initialized a MessageLoop before these methods are called. 7 // have initialized a MessageLoop before these methods are called.
8 8
9 #include "webkit/tools/test_shell/test_webview_delegate.h" 9 #include "webkit/tools/test_shell/test_webview_delegate.h"
10 10
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 new webkit_glue::MediaResourceLoaderBridgeFactory( 736 new webkit_glue::MediaResourceLoaderBridgeFactory(
737 GURL(frame->url()), // referrer 737 GURL(frame->url()), // referrer
738 "null", // frame origin 738 "null", // frame origin
739 "null", // main_frame_origin 739 "null", // main_frame_origin
740 base::GetCurrentProcId(), 740 base::GetCurrentProcId(),
741 appcache_host ? appcache_host->host_id() : appcache::kNoHostId, 741 appcache_host ? appcache_host->host_id() : appcache::kNoHostId,
742 0); 742 0);
743 743
744 scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( 744 scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer(
745 new webkit_glue::VideoRendererImpl(false)); 745 new webkit_glue::VideoRendererImpl(false));
746 collection->AddVideoRenderer(video_renderer); 746 collection->AddFilter(video_renderer);
747 747
748 return new webkit_glue::WebMediaPlayerImpl( 748 return new webkit_glue::WebMediaPlayerImpl(
749 client, collection.release(), bridge_factory_simple, 749 client, collection.release(), bridge_factory_simple,
750 bridge_factory_buffered, false, video_renderer); 750 bridge_factory_buffered, false, video_renderer);
751 } 751 }
752 752
753 WebApplicationCacheHost* TestWebViewDelegate::createApplicationCacheHost( 753 WebApplicationCacheHost* TestWebViewDelegate::createApplicationCacheHost(
754 WebFrame* frame, WebApplicationCacheHostClient* client) { 754 WebFrame* frame, WebApplicationCacheHostClient* client) {
755 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); 755 return SimpleAppCacheSystem::CreateApplicationCacheHost(client);
756 } 756 }
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
1347 } 1347 }
1348 1348
1349 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) { 1349 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
1350 fake_rect_ = rect; 1350 fake_rect_ = rect;
1351 using_fake_rect_ = true; 1351 using_fake_rect_ = true;
1352 } 1352 }
1353 1353
1354 WebRect TestWebViewDelegate::fake_window_rect() { 1354 WebRect TestWebViewDelegate::fake_window_rect() {
1355 return fake_rect_; 1355 return fake_rect_;
1356 } 1356 }
OLDNEW
« no previous file with comments | « webkit/support/webkit_support.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698