Title: [116053] trunk/Source/WebKit/mac
- Revision
- 116053
- Author
- ander...@apple.com
- Date
- 2012-05-03 18:00:02 -0700 (Thu, 03 May 2012)
Log Message
useWebKitWebInspector should be more robust against missing files
https://bugs.webkit.org/show_bug.cgi?id=85563
<rdar://problem/11373948>
Reviewed by Dan Bernstein.
* WebCoreSupport/WebInspectorClient.mm:
(useWebKitWebInspector):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (116052 => 116053)
--- trunk/Source/WebKit/mac/ChangeLog 2012-05-04 00:53:16 UTC (rev 116052)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-05-04 01:00:02 UTC (rev 116053)
@@ -1,3 +1,14 @@
+2012-05-03 Anders Carlsson <ander...@apple.com>
+
+ useWebKitWebInspector should be more robust against missing files
+ https://bugs.webkit.org/show_bug.cgi?id=85563
+ <rdar://problem/11373948>
+
+ Reviewed by Dan Bernstein.
+
+ * WebCoreSupport/WebInspectorClient.mm:
+ (useWebKitWebInspector):
+
2012-05-03 Tobias Netzel <tobias.net...@googlemail.com>
Bugs in WebFullScreenController
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (116052 => 116053)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2012-05-04 00:53:16 UTC (rev 116052)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2012-05-04 01:00:02 UTC (rev 116053)
@@ -170,8 +170,13 @@
// Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
WebInspectorLibrary();
- return [[NSUserDefaults standardUserDefaults] boolForKey:@"UseWebKitWebInspector"] ||
- ![[NSBundle bundleWithIdentifier:@"com.apple.WebInspector"] pathForResource:@"Main" ofType:@"html"];
+ if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspector"] pathForResource:@"Main" ofType:@"html"])
+ return true;
+
+ if (![[NSBundle bundleWithIdentifier:@"com.apple.WebCore"] pathForResource:@"inspector" ofType:@"html" inDirectory:@"inspector"])
+ return false;
+
+ return [[NSUserDefaults standardUserDefaults] boolForKey:@"UseWebKitWebInspector"];
}
String WebInspectorFrontendClient::localizedStringsURL()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
