Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (151453 => 151454)
--- trunk/Source/WebKit/mac/ChangeLog 2013-06-11 19:16:26 UTC (rev 151453)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-06-11 19:16:51 UTC (rev 151454)
@@ -1,3 +1,14 @@
+2013-06-06 Timothy Hatcher <timo...@apple.com>
+
+ Update the framework bundle identifier for the Web Inspector.
+
+ Reviewed by Mark Rowe.
+
+ * WebCoreSupport/WebInspectorClient.mm:
+ (useWebKitWebInspector):
+ (WebInspectorFrontendClient::localizedStringsURL):
+ (-[WebInspectorWindowController inspectorPagePath]):
+
2013-06-05 Bear Travis <betra...@adobe.com>
[CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (151453 => 151454)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2013-06-11 19:16:26 UTC (rev 151453)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2013-06-11 19:16:51 UTC (rev 151454)
@@ -54,7 +54,7 @@
#import <WebKitSystemInterface.h>
#import <wtf/PassOwnPtr.h>
-SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(WebInspector, PrivateFrameworks, A)
+SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(WebInspectorUI, PrivateFrameworks, A)
// The margin from the top and right of the dock button (same as the full screen button).
static const CGFloat dockButtonMargin = 3;
@@ -221,9 +221,9 @@
static bool useWebKitWebInspector()
{
// Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
- WebInspectorLibrary();
+ WebInspectorUILibrary();
- if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspector"] pathForResource:@"Main" ofType:@"html"])
+ if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"])
return true;
if (![[NSBundle bundleWithIdentifier:@"com.apple.WebCore"] pathForResource:@"inspector" ofType:@"html" inDirectory:@"inspector"])
@@ -234,7 +234,7 @@
String WebInspectorFrontendClient::localizedStringsURL()
{
- NSBundle *bundle = useWebKitWebInspector() ? [NSBundle bundleWithIdentifier:@"com.apple.WebCore"] : [NSBundle bundleWithIdentifier:@"com.apple.WebInspector"];
+ NSBundle *bundle = useWebKitWebInspector() ? [NSBundle bundleWithIdentifier:@"com.apple.WebCore"] : [NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"];
NSString *path = [bundle pathForResource:@"localizedStrings" ofType:@"js"];
if ([path length])
return [[NSURL fileURLWithPath:path] absoluteString];
@@ -430,7 +430,7 @@
if (useWebKitWebInspector())
path = [[NSBundle bundleWithIdentifier:@"com.apple.WebCore"] pathForResource:@"inspector" ofType:@"html" inDirectory:@"inspector"];
else
- path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspector"] pathForResource:@"Main" ofType:@"html"];
+ path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"];
ASSERT([path length]);
return path;
Modified: trunk/Source/WebKit2/ChangeLog (151453 => 151454)
--- trunk/Source/WebKit2/ChangeLog 2013-06-11 19:16:26 UTC (rev 151453)
+++ trunk/Source/WebKit2/ChangeLog 2013-06-11 19:16:51 UTC (rev 151454)
@@ -1,3 +1,17 @@
+2013-06-06 Timothy Hatcher <timo...@apple.com>
+
+ Update the framework bundle identifier for the Web Inspector.
+
+ Reviewed by Mark Rowe.
+
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::inspectorReallyUsesWebKitUserInterface):
+ (WebKit::WebInspectorProxy::inspectorPageURL):
+ (WebKit::WebInspectorProxy::inspectorBaseURL):
+ * WebProcess/WebPage/mac/WebInspectorMac.mm:
+ (WebKit::inspectorReallyUsesWebKitUserInterface):
+ (WebKit::WebInspector::localizedStringsURL):
+
2013-06-11 Jer Noble <jer.no...@apple.com>
Do not filter cookies requested through the CookieStorageShim.
Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (151453 => 151454)
--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2013-06-11 19:16:26 UTC (rev 151453)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2013-06-11 19:16:51 UTC (rev 151454)
@@ -50,7 +50,7 @@
#import <WebCore/SoftLinking.h>
#import <wtf/text/WTFString.h>
-SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(WebInspector, PrivateFrameworks, A)
+SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(WebInspectorUI, PrivateFrameworks, A)
using namespace WebCore;
using namespace WebKit;
@@ -195,9 +195,9 @@
// This matches a similar check in WebInspectorMac.mm. Keep them in sync.
// Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
- WebInspectorLibrary();
+ WebInspectorUILibrary();
- if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspector"] pathForResource:@"Main" ofType:@"html"])
+ if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"])
return true;
if (![[NSBundle bundleWithIdentifier:@"com.apple.WebCore"] pathForResource:@"inspector" ofType:@"html" inDirectory:@"inspector"])
@@ -759,7 +759,7 @@
if (inspectorReallyUsesWebKitUserInterface(page()->pageGroup()->preferences()))
path = [[NSBundle bundleWithIdentifier:@"com.apple.WebCore"] pathForResource:@"inspector" ofType:@"html" inDirectory:@"inspector"];
else
- path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspector"] pathForResource:@"Main" ofType:@"html"];
+ path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"];
ASSERT([path length]);
@@ -772,7 +772,7 @@
if (inspectorReallyUsesWebKitUserInterface(page()->pageGroup()->preferences()))
path = [[NSBundle bundleWithIdentifier:@"com.apple.WebCore"] resourcePath];
else
- path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspector"] resourcePath];
+ path = [[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] resourcePath];
ASSERT([path length]);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm (151453 => 151454)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm 2013-06-11 19:16:26 UTC (rev 151453)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm 2013-06-11 19:16:51 UTC (rev 151454)
@@ -28,7 +28,7 @@
#import <WebCore/SoftLinking.h>
-SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(WebInspector, PrivateFrameworks, A)
+SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(WebInspectorUI, PrivateFrameworks, A)
namespace WebKit {
@@ -37,9 +37,9 @@
// This matches a similar check in WebInspectorProxyMac.mm. Keep them in sync.
// Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
- WebInspectorLibrary();
+ WebInspectorUILibrary();
- if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspector"] pathForResource:@"Main" ofType:@"html"])
+ if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"])
return true;
if (![[NSBundle bundleWithIdentifier:@"com.apple.WebCore"] pathForResource:@"inspector" ofType:@"html" inDirectory:@"inspector"])
@@ -65,7 +65,7 @@
String WebInspector::localizedStringsURL() const
{
if (!m_hasLocalizedStringsURL) {
- NSString *bundleIdentifier = inspectorReallyUsesWebKitUserInterface(m_usesWebKitUserInterface) ? @"com.apple.WebCore" : @"com.apple.WebInspector";
+ NSString *bundleIdentifier = inspectorReallyUsesWebKitUserInterface(m_usesWebKitUserInterface) ? @"com.apple.WebCore" : @"com.apple.WebInspectorUI";
NSString *path = [[NSBundle bundleWithIdentifier:bundleIdentifier] pathForResource:@"localizedStrings" ofType:@"js"];
if ([path length])
m_localizedStringsURL = [[NSURL fileURLWithPath:path] absoluteString];
