Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

8 files changed, 26 insertions, 6 deletions

diff --git a/WebKitTools/MiniBrowser/mac/BrowserStatisticsWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserStatisticsWindowController.m
index bb5fc7d..872fb55 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserStatisticsWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserStatisticsWindowController.m
@@ -14,7 +14,7 @@
 
 - (id)initWithThreadedWKContextRef:(WKContextRef)threadContext processWKContextRef:(WKContextRef)processContext
 {
-    if (self = [super initWithWindowNibName:@"BrowserStatisticsWindow"]) {
+    if ((self = [super initWithWindowNibName:@"BrowserStatisticsWindow"])) {
         _threadContext = WKContextRetain(threadContext);
         _processContext = WKContextRetain(processContext);
     }
diff --git a/WebKitTools/MiniBrowser/mac/English.lproj/BrowserWindow.xib b/WebKitTools/MiniBrowser/mac/BrowserWindow.xib
index 64c4999..64c4999 100644
--- a/WebKitTools/MiniBrowser/mac/English.lproj/BrowserWindow.xib
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindow.xib
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
index 11e51a0..9d2f8a6 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
@@ -39,7 +39,7 @@
 
 - (id)initWithPageNamespace:(WKPageNamespaceRef)pageNamespace
 {
-    if (self = [super initWithWindowNibName:@"BrowserWindow"])
+    if ((self = [super initWithWindowNibName:@"BrowserWindow"]))
         _pageNamespace = WKPageNamespaceRetain(pageNamespace);
     
     return self;
diff --git a/WebKitTools/MiniBrowser/mac/English.lproj/InfoPlist.strings b/WebKitTools/MiniBrowser/mac/English.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28f..0000000
--- a/WebKitTools/MiniBrowser/mac/English.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/WebKitTools/MiniBrowser/mac/MiniBrowser-Info.plist b/WebKitTools/MiniBrowser/mac/Info.plist
index 7564a7e..7564a7e 100644
--- a/WebKitTools/MiniBrowser/mac/MiniBrowser-Info.plist
+++ b/WebKitTools/MiniBrowser/mac/Info.plist
diff --git a/WebKitTools/MiniBrowser/mac/English.lproj/MainMenu.xib b/WebKitTools/MiniBrowser/mac/MainMenu.xib
index 229611c..229611c 100644
--- a/WebKitTools/MiniBrowser/mac/English.lproj/MainMenu.xib
+++ b/WebKitTools/MiniBrowser/mac/MainMenu.xib
diff --git a/WebKitTools/MiniBrowser/mac/WebBundle/Info.plist b/WebKitTools/MiniBrowser/mac/WebBundle/Info.plist
new file mode 100644
index 0000000..c285a47
--- /dev/null
+++ b/WebKitTools/MiniBrowser/mac/WebBundle/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m b/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m
index d7f2e36..f36aaae 100644
--- a/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m
+++ b/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m
@@ -83,7 +83,7 @@ void _didCreatePage(WKBundleRef bundle, WKBundlePageRef page, const void* client
 {
     LOG(@"WKBundleClient - didCreatePage\n");
 
-    WKBundlePageClient client = {
+    WKBundlePageLoaderClient client = {
         0,
         0,
         _didStartProvisionalLoadForFrame,
@@ -95,7 +95,7 @@ void _didCreatePage(WKBundleRef bundle, WKBundlePageRef page, const void* client
         _didReceiveTitleForFrame,
         _didClearWindowForFrame
     };
-    WKBundlePageSetClient(page, &client);
+    WKBundlePageSetLoaderClient(page, &client);
 }
 
 void _willDestroyPage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo)