summaryrefslogtreecommitdiffstats
path: root/WebCore/wml/WMLDocument.h
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-08-13 05:20:16 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-13 05:20:16 -0700
commitf4958a7d95cd5fbc1c74905e229b02c95cd5ee78 (patch)
tree14a0f1b07a19948c2ed93d0d8547caa7fe10aa0e /WebCore/wml/WMLDocument.h
parentd074a7997da8ce379434eb6e208b97cde8a0841c (diff)
parentf964bc1fd59a545a80a0cc2529ad8830be514871 (diff)
downloadexternal_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.zip
external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.gz
external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.bz2
Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849
* changes: Merge WebKit at r65072 : Update WebKit revision number. Merge WebKit at r65072 : Update test_expectations. Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient Merge WebKit at r65072 : Implement DeviceMotionClientAndroid Merge WebKit at r65072: JSC build fix in InspectorController.h Merge WebKit at r65072: Fix V8 code generator. Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock. Merge WebKit at r65072: String class has moved to the WTF namespace. Merge Webkit at r65072 : Fix conflicts. Merge Webkit at r65072 : Fix Makefiles. Merge WebKit at r65072 : Initial merge by git.
Diffstat (limited to 'WebCore/wml/WMLDocument.h')
-rw-r--r--WebCore/wml/WMLDocument.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/wml/WMLDocument.h b/WebCore/wml/WMLDocument.h
index 9053518..3057d9b 100644
--- a/WebCore/wml/WMLDocument.h
+++ b/WebCore/wml/WMLDocument.h
@@ -32,9 +32,9 @@ class WMLCardElement;
class WMLDocument : public Document {
public:
- static PassRefPtr<WMLDocument> create(Frame* frame)
+ static PassRefPtr<WMLDocument> create(Frame* frame, const KURL& url)
{
- return adoptRef(new WMLDocument(frame));
+ return adoptRef(new WMLDocument(frame, url));
}
virtual ~WMLDocument();
@@ -47,7 +47,7 @@ public:
WMLCardElement* activeCard() const { return m_activeCard; }
private:
- WMLDocument(Frame*);
+ WMLDocument(Frame*, const KURL&);
WMLCardElement* m_activeCard;
};