summaryrefslogtreecommitdiffstats
path: root/webkit/mocks
diff options
context:
space:
mode:
authorsievers@google.com <sievers@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-19 01:28:54 +0000
committersievers@google.com <sievers@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-19 01:28:54 +0000
commitfbb3a477ed0ac694782f8bcae540f0550812ca65 (patch)
treee8955db3b8341c8734a48dc335f13e36c6580b2e /webkit/mocks
parent7aeaeec73aad288157a2ca883fe7a180762fcb3b (diff)
downloadchromium_src-fbb3a477ed0ac694782f8bcae540f0550812ca65.zip
chromium_src-fbb3a477ed0ac694782f8bcae540f0550812ca65.tar.gz
chromium_src-fbb3a477ed0ac694782f8bcae540f0550812ca65.tar.bz2
Provisional fix for WebFrame API change upstream (webkit bug 56139).
This is somewhat hackish.. the new version of the function upstream has a default initializer. I think it's better though to add it this way to remove ambiguity - for the overloading the default initializer should not matter. Either way, I expect to remove the obsolete definition within a day or so. Review URL: http://codereview.chromium.org/6677069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/mocks')
-rw-r--r--webkit/mocks/mock_webframe.cc8
-rw-r--r--webkit/mocks/mock_webframe.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/webkit/mocks/mock_webframe.cc b/webkit/mocks/mock_webframe.cc
index a230cc0..25b236c 100644
--- a/webkit/mocks/mock_webframe.cc
+++ b/webkit/mocks/mock_webframe.cc
@@ -363,6 +363,10 @@ WebString MockWebFrame::contentAsMarkup() const {
return WebString();
}
+WebString MockWebFrame::renderTreeAsText(bool showDebugInfo) const {
+ return WebString();
+}
+
WebString MockWebFrame::renderTreeAsText() const {
return WebString();
}
@@ -396,6 +400,10 @@ bool MockWebFrame::pauseSVGAnimation(const WebString& animationId,
return false;
}
+WebString MockWebFrame::layerTreeAsText(bool showDebugInfo) const {
+ return WebString();
+}
+
WebString MockWebFrame::layerTreeAsText() const {
return WebString();
}
diff --git a/webkit/mocks/mock_webframe.h b/webkit/mocks/mock_webframe.h
index 830b0d6..581c551 100644
--- a/webkit/mocks/mock_webframe.h
+++ b/webkit/mocks/mock_webframe.h
@@ -196,6 +196,7 @@ class MockWebFrame : public WebKit::WebFrame {
const WebInputElement&);
virtual WebString contentAsText(size_t maxChars) const;
virtual WebString contentAsMarkup() const;
+ virtual WebString renderTreeAsText(bool showDebugInfo) const;
virtual WebString renderTreeAsText() const;
virtual WebString counterValueForElementById(const WebString& id) const;
virtual WebString markerTextForListItem(const WebElement&) const;
@@ -207,6 +208,7 @@ class MockWebFrame : public WebKit::WebFrame {
virtual bool pauseSVGAnimation(const WebString& animationId,
double time,
const WebString& elementId);
+ virtual WebString layerTreeAsText(bool showDebugInfo) const;
virtual WebString layerTreeAsText() const;
private: