Changeset 150766 in webkit

Timestamp:

May 27, 2013 11:04:02 AM (11 years ago)

Author:

efidler@rim.com

Message:

[BlackBerry] Fix subframe target added to new requests
​https://bugs.webkit.org/show_bug.cgi?id=116602

Reviewed by Rob Buis.

In some cases we might be adding TargetIsMainFrame to a subframe
request causing an isMainFrame assert.

• WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::dispatchWillSendRequest):
Check we are actually loading the main frame before setting
ResourceRequest::TargetIsMainFrame target.

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-27  Eli Fidler  <efidler@rim.com>
+
+        [BlackBerry] Fix subframe target added to new requests
+        https://bugs.webkit.org/show_bug.cgi?id=116602
+
+        Reviewed by Rob Buis.
+
+        In some cases we might be adding TargetIsMainFrame to a subframe
+        request causing an isMainFrame assert.
+
+        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+        (WebCore::FrameLoaderClientBlackBerry::dispatchWillSendRequest):
+        Check we are actually loading the main frame before setting
+        ResourceRequest::TargetIsMainFrame target.
+
 2013-05-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

@@ -966 +966 @@
 
     // TargetType for subresource loads should have been set in CachedResource::load().
-    if (isMainResourceLoad && request.targetType() == ResourceRequest::TargetIsUnspecified)
-        request.setTargetType(isMainFrame() ? ResourceRequest::TargetIsMainFrame : ResourceRequest::TargetIsSubframe);
+    if (isMainResourceLoad)
+        request.setTargetType(docLoader->frameLoader()->isLoadingMainFrame() ? ResourceRequest::TargetIsMainFrame : ResourceRequest::TargetIsSubframe);
 
     // Any processing which is done for all loads (both main and subresource) should go here.