From 06ea8e899e48f1f2f396b70e63fae369f2f23232 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Mon, 28 Jun 2010 16:42:48 +0100
Subject: Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
---
 WebCore/loader/PlaceholderDocument.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'WebCore/loader/PlaceholderDocument.h')

diff --git a/WebCore/loader/PlaceholderDocument.h b/WebCore/loader/PlaceholderDocument.h
index 5b76a9c..3d40a6e 100644
--- a/WebCore/loader/PlaceholderDocument.h
+++ b/WebCore/loader/PlaceholderDocument.h
@@ -32,15 +32,15 @@ namespace WebCore {
 
 class PlaceholderDocument : public Document {
 public:
-    static PassRefPtr<PlaceholderDocument> create(Frame* frame)
+    static PassRefPtr<PlaceholderDocument> create(Frame* frame, const KURL& url)
     {
-        return adoptRef(new PlaceholderDocument(frame));
+        return adoptRef(new PlaceholderDocument(frame, url));
     }
 
     virtual void attach();
 
 private:
-    PlaceholderDocument(Frame* frame) : Document(frame, false, false) { }
+    PlaceholderDocument(Frame* frame, const KURL& url) : Document(frame, url, false, false) { }
 };
 
 } // namespace WebCore
-- 
cgit v1.1