summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/mac/Misc
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/mac/Misc')
-rw-r--r--Source/WebKit/mac/Misc/WebIconDatabase.mm14
-rw-r--r--Source/WebKit/mac/Misc/WebNSControlExtras.m10
-rw-r--r--Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm5
3 files changed, 16 insertions, 13 deletions
diff --git a/Source/WebKit/mac/Misc/WebIconDatabase.mm b/Source/WebKit/mac/Misc/WebIconDatabase.mm
index 50bcd7e..f223f09 100644
--- a/Source/WebKit/mac/Misc/WebIconDatabase.mm
+++ b/Source/WebKit/mac/Misc/WebIconDatabase.mm
@@ -137,8 +137,8 @@ static WebIconDatabaseClient* defaultClient()
// FIXME - <rdar://problem/4697934> - Move the handling of FileURLs to WebCore and implement in ObjC++
if ([URL _webkit_isFileURL])
return [self _iconForFileURL:URL withSize:size];
-
- if (Image* image = iconDatabase().iconForPageURL(URL, IntSize(size)))
+
+ if (Image* image = iconDatabase().synchronousIconForPageURL(URL, IntSize(size)))
if (NSImage *icon = webGetNSImage(image, size))
return icon;
return [self defaultIconForURL:URL withSize:size];
@@ -155,7 +155,7 @@ static WebIconDatabaseClient* defaultClient()
return nil;
ASSERT_MAIN_THREAD();
- return iconDatabase().iconURLForPageURL(URL);
+ return iconDatabase().synchronousIconURLForPageURL(URL);
}
- (NSImage *)defaultIconWithSize:(NSSize)size
@@ -258,7 +258,7 @@ static WebIconDatabaseClient* defaultClient()
+ (void)_checkIntegrityBeforeOpening
{
- iconDatabase().checkIntegrityBeforeOpening();
+ IconDatabase::checkIntegrityBeforeOpening();
}
@end
@@ -296,14 +296,14 @@ static WebIconDatabaseClient* defaultClient()
NSString *legacyDB = [databaseDirectory stringByAppendingPathComponent:@"icon.db"];
NSFileManager *defaultManager = [NSFileManager defaultManager];
if ([defaultManager fileExistsAtPath:legacyDB isDirectory:&isDirectory] && !isDirectory) {
- NSString *newDB = [databaseDirectory stringByAppendingPathComponent:iconDatabase().defaultDatabaseFilename()];
+ NSString *newDB = [databaseDirectory stringByAppendingPathComponent:IconDatabase::defaultDatabaseFilename()];
if (![defaultManager fileExistsAtPath:newDB])
rename([legacyDB fileSystemRepresentation], [newDB fileSystemRepresentation]);
}
// Set the private browsing pref then open the WebCore icon database
iconDatabase().setPrivateBrowsingEnabled([[WebPreferences standardPreferences] privateBrowsingEnabled]);
- if (!iconDatabase().open(databaseDirectory))
+ if (!iconDatabase().open(databaseDirectory, IconDatabase::defaultDatabaseFilename()))
LOG_ERROR("Unable to open icon database");
// Register for important notifications
@@ -656,7 +656,7 @@ bool importToWebCoreFormat()
NSFileManager *fileManager = [NSFileManager defaultManager];
enumerator = [[fileManager contentsOfDirectoryAtPath:databaseDirectory error:NULL] objectEnumerator];
- NSString *databaseFilename = iconDatabase().defaultDatabaseFilename();
+ NSString *databaseFilename = IconDatabase::defaultDatabaseFilename();
BOOL foundIconDB = NO;
NSString *file;
diff --git a/Source/WebKit/mac/Misc/WebNSControlExtras.m b/Source/WebKit/mac/Misc/WebNSControlExtras.m
index b666131..dc91e23 100644
--- a/Source/WebKit/mac/Misc/WebNSControlExtras.m
+++ b/Source/WebKit/mac/Misc/WebNSControlExtras.m
@@ -44,7 +44,15 @@
NSWindow *window = [self window];
NSRect windowFrame = [window frame];
- windowFrame.size.height += heightDelta * [window userSpaceScaleFactor];
+
+ CGFloat userSpaceScaleFactor;
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+ userSpaceScaleFactor = [window backingScaleFactor];
+#else
+ userSpaceScaleFactor = [window userSpaceScaleFactor];
+#endif
+
+ windowFrame.size.height += heightDelta * userSpaceScaleFactor;
[window setFrame:windowFrame display:NO];
}
diff --git a/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm b/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm
index 7caa47a..f5c7436 100644
--- a/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm
+++ b/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm
@@ -47,11 +47,6 @@
#import <wtf/RetainPtr.h>
#import <wtf/StdLibExtras.h>
-@interface NSFilePromiseDragSource : NSObject
-- (id)initWithSource:(id)draggingSource;
-- (void)setTypes:(NSArray *)types onPasteboard:(NSPasteboard *)pboard;
-@end
-
using namespace WebCore;
NSString *WebURLPboardType = @"public.url";