Title: [98038] trunk/Source/WebKit/mac
- Revision
- 98038
- Author
- commit-qu...@webkit.org
- Date
- 2011-10-20 16:34:13 -0700 (Thu, 20 Oct 2011)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=70541
There are two WebFrameLoadDelegatePrivate categories on NSObject
Patch by Ian Henderson <i...@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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (98037 => 98038)
--- trunk/Source/WebKit/mac/ChangeLog 2011-10-20 23:30:54 UTC (rev 98037)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-10-20 23:34:13 UTC (rev 98038)
@@ -1,3 +1,13 @@
+2011-10-20 Ian Henderson <i...@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 <a...@apple.com>
REGRESSION (r96823): Contextual menu closes immediately when control-clicking in Flash plug-in
Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (98037 => 98038)
--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2011-10-20 23:30:54 UTC (rev 98037)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2011-10-20 23:34:13 UTC (rev 98038)
@@ -700,7 +700,7 @@
- (JSValueRef)_nodesFromRect:(JSContextRef)context forDocument:(JSValueRef)value x:(int)x y:(int)y top:(unsigned)top right:(unsigned)right bottom:(unsigned)bottom left:(unsigned)left ignoreClipping:(BOOL)ignoreClipping;
@end
-@interface NSObject (WebFrameLoadDelegatePrivate)
+@interface NSObject (WebViewFrameLoadDelegatePrivate)
- (void)webView:(WebView *)sender didFirstLayoutInFrame:(WebFrame *)frame;
// didFinishDocumentLoadForFrame is sent when the document has finished loading, though not necessarily all
@@ -718,7 +718,7 @@
@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;
@end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
