Merge 97087 - ScriptController::executeIfJavaScriptURL gets confused by synchronous frame loads

Source/WebCore/loader/DocumentWriter.h

Index: Source/WebCore/loader/DocumentWriter.h
===================================================================
--- Source/WebCore/loader/DocumentWriter.h	(revision 97088)
+++ Source/WebCore/loader/DocumentWriter.h	(working copy)
@@ -47,12 +47,10 @@
 
     // This is only called by ScriptController::executeIfJavaScriptURL
     // and always contains the result of evaluating a javascript: url.
-    void replaceDocument(const String&);
+    void replaceDocument(const String&, Document* ownerDocument);
 
-    enum SecurityOriginSource { CreateNewSecurityOrigin, InheritSecurityOrigin };
-
     void begin();
-    void begin(const KURL&, bool dispatchWindowObjectAvailable = true, SecurityOriginSource = CreateNewSecurityOrigin);
+    void begin(const KURL&, bool dispatchWindowObjectAvailable = true, Document* ownerDocument = 0);
     void addData(const char* bytes, size_t length);
     void end();
     void endIfNotLoadingMainResource();