From bec39347bb3bb5bf1187ccaf471d26247f28b585 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Thu, 30 Sep 2010 15:42:16 +0100
Subject: Merge WebKit at r68651 : Initial merge by git.

Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
---
 WebKit/mac/Misc/WebKitVersionChecks.h    |  1 +
 WebKit/mac/Misc/WebNSFileManagerExtras.m | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'WebKit/mac/Misc')

diff --git a/WebKit/mac/Misc/WebKitVersionChecks.h b/WebKit/mac/Misc/WebKitVersionChecks.h
index 94286d6..4bf2c83 100644
--- a/WebKit/mac/Misc/WebKitVersionChecks.h
+++ b/WebKit/mac/Misc/WebKitVersionChecks.h
@@ -54,6 +54,7 @@
 #define WEBKIT_FIRST_VERSION_WITHOUT_BUMPERCAR_BACK_FORWARD_QUIRK 0x02120700 // 530.7.0
 #define WEBKIT_FIRST_VERSION_WITHOUT_CONTENT_SNIFFING_FOR_FILE_URLS 0x02120A00 // 530.10.0
 #define WEBKIT_FIRST_VERSION_WITHOUT_LINK_ELEMENT_TEXT_CSS_QUIRK 0x02130200 // 531.2.0
+#define WEBKIT_FIRST_VERSION_WITH_HTML5_PARSER 0x02160900 // 534.9.0
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/WebKit/mac/Misc/WebNSFileManagerExtras.m b/WebKit/mac/Misc/WebNSFileManagerExtras.m
index f10781b..ad48fb8 100644
--- a/WebKit/mac/Misc/WebNSFileManagerExtras.m
+++ b/WebKit/mac/Misc/WebNSFileManagerExtras.m
@@ -31,7 +31,6 @@
 #import "WebKitNSStringExtras.h"
 #import "WebNSURLExtras.h"
 #import <JavaScriptCore/Assertions.h>
-#import <WebCore/FoundationExtras.h>
 #import <WebKitSystemInterface.h>
 #import <sys/stat.h>
 
@@ -87,19 +86,22 @@
 
 typedef struct MetaDataInfo
 {
-    NSString *URLString;
-    NSString *referrer;
-    NSString *path;
+    CFStringRef URLString;
+    CFStringRef referrer;
+    CFStringRef path;
 } MetaDataInfo;
 
 static void *setMetaData(void* context)
 {
     MetaDataInfo *info = (MetaDataInfo *)context;
-    WKSetMetadataURL(info->URLString, info->referrer, info->path);
-    
-    HardRelease(info->URLString);
-    HardRelease(info->referrer);
-    HardRelease(info->path);
+    WKSetMetadataURL((NSString *)info->URLString, (NSString *)info->referrer, (NSString *)info->path);
+
+    if (info->URLString)
+        CFRelease(info->URLString);
+    if (info->referrer)
+        CFRelease(info->referrer);
+    if (info->path)
+        CFRelease(info->path);
     
     free(info);
     return 0;
@@ -124,9 +126,9 @@ static void *setMetaData(void* context)
 
     MetaDataInfo *info = malloc(sizeof(MetaDataInfo));
     
-    info->URLString = HardRetainWithNSRelease([URLString copy]);
-    info->referrer = HardRetainWithNSRelease([referrer copy]);
-    info->path = HardRetainWithNSRelease([path copy]);
+    info->URLString = URLString ? CFStringCreateCopy(0, (CFStringRef)URLString) : 0;
+    info->referrer = referrer ? CFStringCreateCopy(0, (CFStringRef)referrer) : 0;
+    info->path = path ? CFStringCreateCopy(0, (CFStringRef)path) : 0;
 
     pthread_create(&tid, &attr, setMetaData, info);
     pthread_attr_destroy(&attr);
-- 
cgit v1.1