summaryrefslogtreecommitdiffstats
path: root/webkit/mocks
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-24 17:01:41 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-24 17:01:41 +0000
commitc29bdcf3f973fcc76fec6b9038a7891e472b7f2f (patch)
tree2db64bd9504bcf94942ed659d7c6835b4741f6f6 /webkit/mocks
parent867e46d0a91880fdf7fbc5649f9028b73c2886ed (diff)
downloadchromium_src-c29bdcf3f973fcc76fec6b9038a7891e472b7f2f.zip
chromium_src-c29bdcf3f973fcc76fec6b9038a7891e472b7f2f.tar.gz
chromium_src-c29bdcf3f973fcc76fec6b9038a7891e472b7f2f.tar.bz2
Prepare mock WebFrame for change in WebKit::WebFrame interface, by adding CreateAssociatedURLLoader overload that takes WebURLLoaderOptions.
Review URL: http://codereview.chromium.org/6725033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/mocks')
-rw-r--r--webkit/mocks/mock_webframe.cc6
-rw-r--r--webkit/mocks/mock_webframe.h11
2 files changed, 17 insertions, 0 deletions
diff --git a/webkit/mocks/mock_webframe.cc b/webkit/mocks/mock_webframe.cc
index 25b236c..44cc690 100644
--- a/webkit/mocks/mock_webframe.cc
+++ b/webkit/mocks/mock_webframe.cc
@@ -217,10 +217,16 @@ bool MockWebFrame::isViewSourceModeEnabled() const {
return false;
}
+// TODO(bbudge) remove once WebKit change lands.
WebURLLoader* MockWebFrame::createAssociatedURLLoader() {
return NULL;
}
+WebURLLoader* MockWebFrame::createAssociatedURLLoader(
+ const WebURLLoaderOptions& options) {
+ return NULL;
+}
+
void MockWebFrame::commitDocumentData(const char* data, size_t length) {}
unsigned MockWebFrame::unloadListenerCount() const {
diff --git a/webkit/mocks/mock_webframe.h b/webkit/mocks/mock_webframe.h
index 581c551..41ee875 100644
--- a/webkit/mocks/mock_webframe.h
+++ b/webkit/mocks/mock_webframe.h
@@ -18,6 +18,13 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
#include "v8/include/v8.h"
+// TODO(bbudge) remove once this is declared in WebFrame.h
+namespace WebKit {
+
+ struct WebURLLoaderOptions;
+
+};
+
using WebKit::WebAnimationController;
using WebKit::WebCanvas;
using WebKit::WebConsoleMessage;
@@ -41,6 +48,7 @@ using WebKit::WebSize;
using WebKit::WebString;
using WebKit::WebURL;
using WebKit::WebURLLoader;
+using WebKit::WebURLLoaderOptions;
using WebKit::WebVector;
using WebKit::WebView;
@@ -136,7 +144,10 @@ class MockWebFrame : public WebKit::WebFrame {
// The next two methods were mocked above.
// virtual void setReferrerForRequest(WebURLRequest&, const WebURL&) {}
// virtual void dispatchWillSendRequest(WebURLRequest&) {}
+ // TODO(bbudge) remove once WebKit change lands.
virtual WebURLLoader* createAssociatedURLLoader();
+ virtual WebURLLoader* createAssociatedURLLoader(
+ const WebURLLoaderOptions& options);
virtual void commitDocumentData(const char* data, size_t length);
virtual unsigned unloadListenerCount() const;
virtual bool isProcessingUserGesture() const;