Changeset 51967 in webkit

Timestamp:

Dec 10, 2009 3:33:23 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-10 Mike Belshe <​mike@belshe.com>

Reviewed by Darin Fisher.

Fix FrameLoader to use the new ResourceTypes properly.

​https://bugs.webkit.org/show_bug.cgi?id=32336

• public/WebURLRequest.h: (WebKit::WebURLRequest::):
• src/FrameLoaderClientImpl.cpp: (WebKit::setTargetTypeFromLoader): (WebKit::FrameLoaderClientImpl::dispatchWillSendRequest):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebURLRequest.h (modified) (1 diff)
• src/FrameLoaderClientImpl.cpp (modified) (3 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2009-12-10  Mike Belshe  <mike@belshe.com>
+
+        Reviewed by Darin Fisher.
+
+        Fix FrameLoader to use the new ResourceTypes properly.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32336
+
+        * public/WebURLRequest.h:
+        (WebKit::WebURLRequest::):
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::setTargetTypeFromLoader):
+        (WebKit::FrameLoaderClientImpl::dispatchWillSendRequest):
+
 2009-12-10  Ilya Tikhonovsky <loislo@google.com>
 

trunk/WebKit/chromium/public/WebURLRequest.h

@@ -58 +58 @@
 
     enum TargetType {
-        TargetIsMainFrame,
-        TargetIsSubFrame,
-        TargetIsSubResource,
-        TargetIsObject,
-        TargetIsMedia
+        TargetIsMainFrame = 0,
+        TargetIsSubFrame = 1,   // Temporary for backward compatibility.
+        TargetIsSubframe = 1,
+        TargetIsSubResource = 2,  // Temporary for backward comptibility.
+        TargetIsSubresource = 2,
+        TargetIsStyleSheet = 3,
+        TargetIsScript = 4,
+        TargetIsFontResource = 5,
+        TargetIsImage = 6,
+        TargetIsObject = 7,
+        TargetIsMedia = 8
     };
 

trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp

@@ -238 +238 @@
 }
 
-// Determines whether the request being loaded by |loader| is a frame or a
-// subresource. A subresource in this context is anything other than a frame --
+// If the request being loaded by |loader| is a frame, update the ResourceType.
+// A subresource in this context is anything other than a frame --
 // this includes images and xmlhttp requests.  It is important to note that a
 // subresource is NOT limited to stuff loaded through the frame's subresource
@@ -247 +247 @@
 // The important edge cases to consider when modifying this function are
 // how synchronous resource loads are treated during load/unload threshold.
-static ResourceRequest::TargetType determineTargetTypeFromLoader(DocumentLoader* loader)
+static void setTargetTypeFromLoader(ResourceRequest& request, DocumentLoader* loader)
 {
     if (loader == loader->frameLoader()->provisionalDocumentLoader()) {
+        ResourceRequest::TargetType type;
         if (loader->frameLoader()->isLoadingMainFrame())
-            return ResourceRequest::TargetIsMainFrame;
-        return ResourceRequest::TargetIsSubframe;
-    }
-    return ResourceRequest::TargetIsSubresource;
+            type = ResourceRequest::TargetIsMainFrame;
+        else
+            type = ResourceRequest::TargetIsSubframe;
+        request.setTargetType(type);
+    }
 }
 
@@ -264 +266 @@
         // We want to distinguish between a request for a document to be loaded into
         // the main frame, a sub-frame, or the sub-objects in that document.
-        request.setTargetType(determineTargetTypeFromLoader(loader));
+        setTargetTypeFromLoader(request, loader));
 
         // Avoid repeating a form submission when navigating back or forward.