Changeset 98038 in webkit

Timestamp:

Oct 20, 2011, 4:34:13 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

​https://bugs.webkit.org/show_bug.cgi?id=70541
There are two WebFrameLoadDelegatePrivate categories on NSObject

Patch by Ian Henderson <​ianh@apple.com> on 2011-10-20
Reviewed by David Kilzer.

• WebView/WebViewPrivate.h: Rename the private delegate categories in

WebViewPrivate.h with a "WebView" prefix to avoid collision.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebViewPrivate.h (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-10-20  Ian Henderson  <ianh@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=70541
+        There are two WebFrameLoadDelegatePrivate categories on NSObject
+
+        Reviewed by David Kilzer.
+
+        * WebView/WebViewPrivate.h: Rename the private delegate categories in
+        WebViewPrivate.h with a "WebView" prefix to avoid collision.
+
 2011-10-20  Alexey Proskuryakov  <ap@apple.com>
 

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

@@ -701 +701 @@
 @end
 
-@interface NSObject (WebFrameLoadDelegatePrivate)
+@interface NSObject (WebViewFrameLoadDelegatePrivate)
 - (void)webView:(WebView *)sender didFirstLayoutInFrame:(WebFrame *)frame;
 
@@ -719 +719 @@
 @end
 
-@interface NSObject (WebResourceLoadDelegatePrivate)
+@interface NSObject (WebViewResourceLoadDelegatePrivate)
 // Addresses <rdar://problem/5008925> - SPI for now
 - (NSCachedURLResponse *)webView:(WebView *)sender resource:(id)identifier willCacheResponse:(NSCachedURLResponse *)response fromDataSource:(WebDataSource *)dataSource;