summaryrefslogtreecommitdiffstats
path: root/webkit/mocks
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 06:03:53 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 06:03:53 +0000
commit85338cf3c9ef539d7219b4e4c2148f985de798b6 (patch)
treee6161096826fc5b5c7153b33ede53c574975c65f /webkit/mocks
parent093a6182dda58ba68c131d676c9e3ed4c39d11c3 (diff)
downloadchromium_src-85338cf3c9ef539d7219b4e4c2148f985de798b6.zip
chromium_src-85338cf3c9ef539d7219b4e4c2148f985de798b6.tar.gz
chromium_src-85338cf3c9ef539d7219b4e4c2148f985de798b6.tar.bz2
Revert 77108 - Revert 77101 - Definition for new API method in WebKit::WebFrame.
Start failing InstantTest.NonSearchToSearchDoesntSupportInstant on Builder Linux Builder (ChromiumOS) The new method (pageDismissalEventBeingDispatched) has not yet been added to the API (see https://bugs.webkit.org/show_bug.cgi?id=55844). When it is, it will be a pure virtual method; clients will break unless they already have a concrete implementation for it. BUG=68780 TEST=none Review URL: http://codereview.chromium.org/6626047 Patch from Sreeram Ramachandran <sreeram@chromium.org>. TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/6625051 TBR=ukai@chromium.org Review URL: http://codereview.chromium.org/6624049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/mocks')
-rw-r--r--webkit/mocks/mock_webframe.cc4
-rw-r--r--webkit/mocks/mock_webframe.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/webkit/mocks/mock_webframe.cc b/webkit/mocks/mock_webframe.cc
index a230cc0..1423039 100644
--- a/webkit/mocks/mock_webframe.cc
+++ b/webkit/mocks/mock_webframe.cc
@@ -235,6 +235,10 @@ bool MockWebFrame::willSuppressOpenerInNewFrame() const {
return false;
}
+bool MockWebFrame::pageDismissalEventBeingDispatched() const {
+ return false;
+}
+
void MockWebFrame::replaceSelection(const WebString& text) {}
void MockWebFrame::insertText(const WebString& text) {}
diff --git a/webkit/mocks/mock_webframe.h b/webkit/mocks/mock_webframe.h
index 830b0d6..adbf515 100644
--- a/webkit/mocks/mock_webframe.h
+++ b/webkit/mocks/mock_webframe.h
@@ -141,6 +141,7 @@ class MockWebFrame : public WebKit::WebFrame {
virtual unsigned unloadListenerCount() const;
virtual bool isProcessingUserGesture() const;
virtual bool willSuppressOpenerInNewFrame() const;
+ virtual bool pageDismissalEventBeingDispatched() const;
virtual void replaceSelection(const WebString& text);
virtual void insertText(const WebString& text);
virtual void setMarkedText(const WebString& text,