Changeset 21480 in webkit

Timestamp:

May 15, 2007, 1:27:42 AM (18 years ago)

Author:

andersca

Message:

Reviewed by Geoff.

<rdar://problem/5200816>
REGRESSION: With Shiira 1.2.2 , I can't open embedded link in flash object by clicking (http:/www.adobe.com )

Shiira under some circumstances passes nil as the request to -[WebFrame loadRequest:]. ToT WebKit doesn't call any policy
delegate methods in this case, which means that the page is actually being loaded.

This patch makes ToT WebKit behave in the same way as Tiger WebKit when the request is nil.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::checkNavigationPolicy): Don't continue without calling the navigation policy method if the request is null.

(WebCore::FrameLoader::continueAfterNavigationPolicy):
If the request can't be handled, don't continue the load.

• platform/network/mac/ResourceRequestMac.mm: (WebCore::ResourceRequest::doUpdatePlatformRequest): Don't create an NSURLRequest object if the request is null.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (4 diffs)
• platform/network/mac/ResourceRequestMac.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-14  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Geoff.
+
+        <rdar://problem/5200816>
+        REGRESSION: With Shiira 1.2.2 , I can't open embedded link in flash object by clicking (http:/www.adobe.com )
+        
+        Shiira under some circumstances passes nil as the request to -[WebFrame loadRequest:]. ToT WebKit doesn't call any policy
+        delegate methods in this case, which means that the page is actually being loaded. 
+        
+        This patch makes ToT WebKit behave in the same way as Tiger WebKit when the request is nil.
+        
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkNavigationPolicy):
+        Don't continue without calling the navigation policy method if the request is null.
+        
+        (WebCore::FrameLoader::continueAfterNavigationPolicy):
+        If the request can't be handled, don't continue the load.
+        
+        * platform/network/mac/ResourceRequestMac.mm:
+        (WebCore::ResourceRequest::doUpdatePlatformRequest):
+        Don't create an NSURLRequest object if the request is null.
+
 2007-05-15  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -3315 +3315 @@
     // Don't ask more than once for the same request or if we are loading an empty URL.
     // This avoids confusion on the part of the client.
-    if (request == loader->lastCheckedRequest() || request.url().isEmpty()) {
+    if (request == loader->lastCheckedRequest() || (!request.isNull() && request.url().isEmpty())) {
         function(argument, request, 0, true);
         return;
@@ -3344 +3344 @@
     m_policyCheck.clear();
 
+    bool shouldContinue = policy == PolicyUse;
+    
     switch (policy) {
         case PolicyIgnore:
@@ -3358 +3360 @@
                 handleUnimplementablePolicy(m_client->cannotShowURLError(check.request()));
                 check.clearRequest();
+                shouldContinue = false;
             }
             break;
@@ -3363 +3366 @@
     }
 
-    check.call(policy == PolicyUse);
+    check.call(shouldContinue);
 }
 

trunk/WebCore/platform/network/mac/ResourceRequestMac.mm

@@ -68 +68 @@
 void ResourceRequest::doUpdatePlatformRequest()
 {
+    if (isNull()) {
+        m_nsRequest = nil;
+        return;
+    }
+    
     NSMutableURLRequest* nsRequest = [m_nsRequest.get() mutableCopy];