Changeset 128112 in webkit

Timestamp:

Sep 10, 2012 2:52:24 PM (12 years ago)

Author:

jer.noble@apple.com

Message:

NSInvalidArgumentException in WebFrameLoaderClient::shouldSendDoNotTrackHTTPHeader()
​https://bugs.webkit.org/show_bug.cgi?id=96320

Reviewed by Geoffrey Garen.

Client was being cached as the FrameLoaderClient, but requests were sent to the ResourceLoadClient.

• WebCoreSupport/WebFrameLoaderClient.mm:

(WebFrameLoaderClient::shouldSendDoNotTrackHTTPHeader): Send the request to the FrameLoadDelegate.

• WebView/WebDelegateImplementationCaching.h:
• WebView/WebDelegateImplementationCaching.mm:

(CallFrameLoadDelegateReturningBoolean): Added.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebFrameLoaderClient.mm (modified) (1 diff)
• WebView/WebDelegateImplementationCaching.h (modified) (1 diff)
• WebView/WebDelegateImplementationCaching.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2012-09-10  Jer Noble  <jer.noble@apple.com>
+
+        NSInvalidArgumentException in WebFrameLoaderClient::shouldSendDoNotTrackHTTPHeader()
+        https://bugs.webkit.org/show_bug.cgi?id=96320
+
+        Reviewed by Geoffrey Garen.
+
+        Client was being cached as the FrameLoaderClient, but requests were sent to the ResourceLoadClient.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::shouldSendDoNotTrackHTTPHeader): Send the request to the FrameLoadDelegate.
+        * WebView/WebDelegateImplementationCaching.h:
+        * WebView/WebDelegateImplementationCaching.mm:
+        (CallFrameLoadDelegateReturningBoolean): Added.
+
 2012-09-07  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -1987 +1987 @@
 
     if (implementations->shouldSendDoNotTrackHTTPHeaderFunc)
-        return CallResourceLoadDelegateReturningBoolean(YES, implementations->shouldSendDoNotTrackHTTPHeaderFunc, webView, @selector(webViewShouldSendDoNotTrackHTTPHeader:));
+        return CallFrameLoadDelegateReturningBoolean(YES, implementations->shouldSendDoNotTrackHTTPHeaderFunc, webView, @selector(webViewShouldSendDoNotTrackHTTPHeader:));
     return false;
 }

trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h

@@ -131 +131 @@
 id CallFrameLoadDelegate(IMP, WebView *, SEL, id, NSTimeInterval, id, id);
 
+BOOL CallFrameLoadDelegateReturningBoolean(BOOL, IMP, WebView *, SEL);
+
 id CallResourceLoadDelegate(IMP, WebView *, SEL, id, id);
 id CallResourceLoadDelegate(IMP, WebView *, SEL, id, id, id);

trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm

@@ -476 +476 @@
 }
 
+BOOL CallFrameLoadDelegateReturningBoolean(BOOL result, IMP implementation, WebView *self, SEL selector)
+{
+    @try {
+        return reinterpret_cast<BOOL (*)(id, SEL, WebView *)>(objc_msgSend)(self->_private->frameLoadDelegate, selector, self);
+    } @catch(id exception) {
+        ReportDiscardedDelegateException(selector, exception);
+    }
+    return result;
+}
+
 id CallResourceLoadDelegate(IMP implementation, WebView *self, SEL selector, id object1, id object2)
 {