Reviewed by Maciej
Tiny changes to help reorganize WebFrameLoader code in WebKit
* bridge/mac/WebCoreIconDatabaseBridge.h: Added "createInstance"
* bridge/mac/WebCoreIconDatabaseBridge.mm:
(+[WebCoreIconDatabaseBridge sharedInstance]): Added, uses createInstance from WebKit side
WebKit:
Reviewed by Maciej
Fix to elminate WebIconDatabaseBridge.h from WebFrameLoader
* Loader/WebFrameLoader.m:
(-[WebFrameLoader _notifyIconChanged:]):
* WebCoreSupport/WebIconDatabaseBridge.m:
(+[WebIconDatabaseBridge createInstance]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16941
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2006-10-09 Brady Eidson <beidson@apple.com>
+
+ Reviewed by Maciej
+
+ Tiny changes to help reorganize WebFrameLoader code in WebKit
+
+ * bridge/mac/WebCoreIconDatabaseBridge.h: Added "createInstance"
+ * bridge/mac/WebCoreIconDatabaseBridge.mm:
+ (+[WebCoreIconDatabaseBridge sharedInstance]): Added, uses createInstance from WebKit side
+
2006-10-09 Adam Roben <aroben@apple.com>
Reviewed by Adele.
@interface WebCoreIconDatabaseBridge : NSObject
{
}
++ (WebCoreIconDatabaseBridge *)sharedInstance;
+
- (BOOL)openSharedDatabaseWithPath:(NSString *)path;
- (void)closeSharedDatabase;
- (BOOL)isOpen;
// The WebCoreIconDatabaseBridge protocol contains methods for use by the WebCore side of the bridge.
@protocol WebCoreIconDatabaseBridge
-+ (WebCoreIconDatabaseBridge *)sharedInstance;
++ (WebCoreIconDatabaseBridge *)createInstance;
@end
// This interface definition allows those who hold a WebCoreIconDatabaseBridge * to call all the methods
return IconDatabase::sharedIconDatabase()->enabled();
}
++ (WebCoreIconDatabaseBridge *)sharedInstance
+{
+ static WebCoreIconDatabaseBridge* bridge = nil;
+
+ if (bridge == nil) {
+ bridge = [self createInstance];
+ // Need to CFRetain something that's in a global variable, since we want it to
+ // hang around forever, even when running under GC.
+ CFRetain(bridge);
+ [bridge release];
+ }
+ return bridge;
+}
@end
+2006-10-09 Brady Eidson <beidson@apple.com>
+
+ Reviewed by Maciej
+
+ Fix to elminate WebIconDatabaseBridge.h from WebFrameLoader
+
+ * Loader/WebFrameLoader.m:
+ (-[WebFrameLoader _notifyIconChanged:]):
+ * WebCoreSupport/WebIconDatabaseBridge.m:
+ (+[WebIconDatabaseBridge createInstance]):
+
2006-10-09 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
#import <JavaScriptCore/Assertions.h>
#import <WebKit/DOMHTML.h>
#import <WebCore/WebCoreFrameBridge.h>
-#import "WebIconDatabaseBridge.h"
-//#import <WebCore/WebCoreIconDatabaseBridge.h>
+#import <WebCore/WebCoreIconDatabaseBridge.h>
#import <WebCore/WebCoreSystemInterface.h>
#import "WebFrameInternal.h"
- (void)_notifyIconChanged:(NSURL *)iconURL
{
- ASSERT([[WebIconDatabaseBridge sharedInstance] _isEnabled]);
- NSImage *icon = [[WebIconDatabaseBridge sharedInstance]
+ ASSERT([[WebCoreIconDatabaseBridge sharedInstance] _isEnabled]);
+ NSImage *icon = [[WebCoreIconDatabaseBridge sharedInstance]
iconForPageURL:[[[self activeDocumentLoader] URL] _web_originalDataAsString]
withSize:NSMakeSize(16, 16)];
[client _dispatchDidReceiveIcon:icon];
[super _setHaveNoIconForIconURL:iconURL];
}
-+ (WebCoreIconDatabaseBridge *)sharedInstance
-{
- static WebCoreIconDatabaseBridge* bridge = nil;
- if (!bridge) {
- // Need to CFRetain something that's in a global variable, since we want it to
- // hang around forever, even when running under GC.
- bridge = [[WebIconDatabaseBridge alloc] _init];
- CFRetain(bridge);
- [bridge release];
- }
- return bridge;
++ (WebCoreIconDatabaseBridge *)createInstance
+{
+ return [[WebIconDatabaseBridge alloc] _init];
}
- (void)dealloc