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

Side by Side Diff: public/testing/WebTestDelegate.h

Issue 18130006: Remove WebTestProxy override of WebFrameClient::createMediaPlayer(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 7 years, 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 24 matching lines...) Expand all
35 #include "public/platform/WebURL.h" 35 #include "public/platform/WebURL.h"
36 #include "public/platform/WebVector.h" 36 #include "public/platform/WebVector.h"
37 #include <string> 37 #include <string>
38 38
39 #define WEBTESTRUNNER_NEW_HISTORY_CAPTURE 39 #define WEBTESTRUNNER_NEW_HISTORY_CAPTURE
40 40
41 namespace WebKit { 41 namespace WebKit {
42 class WebFrame; 42 class WebFrame;
43 class WebGamepads; 43 class WebGamepads;
44 class WebHistoryItem; 44 class WebHistoryItem;
45 class WebMediaPlayer;
46 class WebMediaPlayerClient;
47 struct WebRect; 45 struct WebRect;
48 struct WebSize; 46 struct WebSize;
49 struct WebURLError; 47 struct WebURLError;
50 } 48 }
51 49
52 namespace WebTestRunner { 50 namespace WebTestRunner {
53 51
54 struct WebPreferences; 52 struct WebPreferences;
55 class WebTask; 53 class WebTask;
56 class WebTestProxyBase; 54 class WebTestProxyBase;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 virtual void goToOffset(int offset) = 0; 153 virtual void goToOffset(int offset) = 0;
156 virtual void reload() = 0; 154 virtual void reload() = 0;
157 virtual void loadURLForFrame(const WebKit::WebURL&, const std::string& frame Name) = 0; 155 virtual void loadURLForFrame(const WebKit::WebURL&, const std::string& frame Name) = 0;
158 156
159 // Returns true if resource requests to external URLs should be permitted. 157 // Returns true if resource requests to external URLs should be permitted.
160 virtual bool allowExternalPages() = 0; 158 virtual bool allowExternalPages() = 0;
161 159
162 // Returns the back/forward history for the WebView associated with the 160 // Returns the back/forward history for the WebView associated with the
163 // given WebTestProxyBase as well as the index of the current entry. 161 // given WebTestProxyBase as well as the index of the current entry.
164 virtual void captureHistoryForWindow(WebTestProxyBase*, WebKit::WebVector<We bKit::WebHistoryItem>*, size_t* currentEntryIndex) = 0; 162 virtual void captureHistoryForWindow(WebTestProxyBase*, WebKit::WebVector<We bKit::WebHistoryItem>*, size_t* currentEntryIndex) = 0;
165
166 // Returns a media player corresponding to |url| as src.
167 virtual WebKit::WebMediaPlayer* createWebMediaPlayer(WebKit::WebFrame*, cons t WebKit::WebURL&, WebKit::WebMediaPlayerClient*) = 0;
168 }; 163 };
169 164
170 } 165 }
171 166
172 #endif // WebTestDelegate_h 167 #endif // WebTestDelegate_h
OLDNEW
« no previous file with comments | « Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp ('k') | public/testing/WebTestProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698