Changeset 29432 in webkit

Timestamp:

Jan 12, 2008, 4:03:28 AM (17 years ago)

Author:

mjs@apple.com

Message:

Reviewed by Maciej (and also tweaked a little bit).

• more thorough fix for some crashing tests ​http://bugs.webkit.org/show_bug.cgi?id=16782

• loader/FrameLoader.cpp: (WebCore::FrameLoader::urlSelected): (WebCore::FrameLoader::submitForm): (WebCore::FrameLoader::executeIfJavaScriptURL):
• loader/FrameLoader.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (5 diffs)
• loader/FrameLoader.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-12  Adam Barth  <hk9565@gmail.com>
+
+        Reviewed by Maciej (and also tweaked a little bit).
+
+        - more thorough fix for some crashing tests
+          http://bugs.webkit.org/show_bug.cgi?id=16782
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::urlSelected):
+        (WebCore::FrameLoader::submitForm):
+        (WebCore::FrameLoader::executeIfJavaScriptURL):
+        * loader/FrameLoader.h:
+
 2008-01-12  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -377 +377 @@
     ResourceRequest request(url, referrer, policy);
     
+    if (executeIfJavaScriptURL(request.url(), userGesture))
+        return;
+
     urlSelected(request, "_self", 0, lockHistory, userGesture);
 }
@@ -382 +385 @@
 void FrameLoader::urlSelected(const ResourceRequest& request, const String& _target, Event* triggeringEvent, bool lockHistory, bool userGesture)
 {
-    if (executeIfJavaScriptURL(request.url(), userGesture))
+    if (executeIfJavaScriptURL(request.url(), userGesture, false))
         return;
 
@@ -502 +505 @@
     if (urlString.startsWith("javascript:", false)) {
         m_isExecutingJavaScriptFormAction = true;
-        executeIfJavaScriptURL(u);
+        executeIfJavaScriptURL(u, false, false);
         m_isExecutingJavaScriptFormAction = false;
         return;
@@ -711 +714 @@
 }
 
-bool FrameLoader::executeIfJavaScriptURL(const KURL& url, bool userGesture)
+bool FrameLoader::executeIfJavaScriptURL(const KURL& url, bool userGesture, bool replaceDocument)
 {
     if (!url.deprecatedString().startsWith("javascript:", false))
@@ -727 +730 @@
         currentSecurityOrigin = m_frame->document()->securityOrigin();
 
-    begin(m_URL, true, currentSecurityOrigin);
-    write(scriptResult);
-    end();
+    // FIXME: We should always replace the document, but doing so
+    //        synchronously can cause crashes:
+    //        http://bugs.webkit.org/show_bug.cgi?id=16782
+    if (replaceDocument) {
+        begin(m_URL, true, currentSecurityOrigin);
+        write(scriptResult);
+        end();
+    }
 
     return true;

trunk/WebCore/loader/FrameLoader.h

@@ -321 +321 @@
 
         // Returns true if url is a JavaScript URL.
-        bool executeIfJavaScriptURL(const KURL& url, bool userGesture = false);
+        bool executeIfJavaScriptURL(const KURL& url, bool userGesture = false, bool replaceDocument = true);
 
         KJS::JSValue* executeScript(const String& url, int baseLine, const String& script);