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

Side by Side Diff: webkit/support/webkit_support.h

Issue 13159005: Enable media stream layout test with content_shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 8 months 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/test_media_stream_client.h ('k') | webkit/support/webkit_support.gypi » ('j') | 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) 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 WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ 5 #ifndef WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_
6 #define WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ 6 #define WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 // Returns a pointer to a Platform implementation for 82 // Returns a pointer to a Platform implementation for
83 // DumpRenderTree. Needs to call SetUpTestEnvironment() before this. 83 // DumpRenderTree. Needs to call SetUpTestEnvironment() before this.
84 // This returns a pointer to a static instance. Don't delete it. 84 // This returns a pointer to a static instance. Don't delete it.
85 WebKit::Platform* GetWebKitPlatformSupport(); 85 WebKit::Platform* GetWebKitPlatformSupport();
86 86
87 // This is used by WebFrameClient::createPlugin(). 87 // This is used by WebFrameClient::createPlugin().
88 WebKit::WebPlugin* CreateWebPlugin(WebKit::WebFrame* frame, 88 WebKit::WebPlugin* CreateWebPlugin(WebKit::WebFrame* frame,
89 const WebKit::WebPluginParams& params); 89 const WebKit::WebPluginParams& params);
90 90
91 // TODO(wjia): remove CreateMediaPlayer once
92 // https://bugs.webkit.org/show_bug.cgi?id=113633 is fixed, since it has been
93 // moved into webkit/mocks.
91 // This is used by WebFrameClient::createMediaPlayer(). 94 // This is used by WebFrameClient::createMediaPlayer().
92 WebKit::WebMediaPlayer* CreateMediaPlayer( 95 WebKit::WebMediaPlayer* CreateMediaPlayer(
93 WebKit::WebFrame* frame, 96 WebKit::WebFrame* frame,
94 const WebKit::WebURL& url, 97 const WebKit::WebURL& url,
95 WebKit::WebMediaPlayerClient* client, 98 WebKit::WebMediaPlayerClient* client,
96 webkit_media::MediaStreamClient* media_stream_client); 99 webkit_media::MediaStreamClient* media_stream_client);
97 100
98 // This is used by WebFrameClient::createMediaPlayer(). 101 // This is used by WebFrameClient::createMediaPlayer().
99 WebKit::WebMediaPlayer* CreateMediaPlayer( 102 WebKit::WebMediaPlayer* CreateMediaPlayer(
100 WebKit::WebFrame* frame, 103 WebKit::WebFrame* frame,
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 302
300 void EnableWebCoreLogChannels(const std::string& channels); 303 void EnableWebCoreLogChannels(const std::string& channels);
301 304
302 // - Gamepad 305 // - Gamepad
303 306
304 void SetGamepadData(const WebKit::WebGamepads& pads); 307 void SetGamepadData(const WebKit::WebGamepads& pads);
305 308
306 } // namespace webkit_support 309 } // namespace webkit_support
307 310
308 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ 311 #endif // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_
OLDNEW
« no previous file with comments | « webkit/support/test_media_stream_client.h ('k') | webkit/support/webkit_support.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698