Title: [115770] trunk/Source/WebKit2
- Revision
- 115770
- Author
- [email protected]
- Date
- 2012-05-01 17:36:31 -0700 (Tue, 01 May 2012)
Log Message
inspectorReallyUsesWebKitUserInterface should be more robust against missing files
https://bugs.webkit.org/show_bug.cgi?id=85327
<rdar://problem/11332864>
Reviewed by Timothy Hatcher.
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::inspectorReallyUsesWebKitUserInterface):
* WebProcess/WebPage/mac/WebInspectorMac.mm:
(WebKit::inspectorReallyUsesWebKitUserInterface):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (115769 => 115770)
--- trunk/Source/WebKit2/ChangeLog 2012-05-02 00:33:43 UTC (rev 115769)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-02 00:36:31 UTC (rev 115770)
@@ -1,3 +1,16 @@
+2012-05-01 Anders Carlsson <[email protected]>
+
+ inspectorReallyUsesWebKitUserInterface should be more robust against missing files
+ https://bugs.webkit.org/show_bug.cgi?id=85327
+ <rdar://problem/11332864>
+
+ Reviewed by Timothy Hatcher.
+
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::inspectorReallyUsesWebKitUserInterface):
+ * WebProcess/WebPage/mac/WebInspectorMac.mm:
+ (WebKit::inspectorReallyUsesWebKitUserInterface):
+
2012-05-01 Jeffrey Pfau <[email protected]>
<rdar://problem/10422318> Support for web content filter delegate for filtering https content
Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (115769 => 115770)
--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2012-05-02 00:33:43 UTC (rev 115769)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2012-05-02 00:36:31 UTC (rev 115770)
@@ -114,6 +114,9 @@
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 preferences->inspectorUsesWebKitUserInterface();
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm (115769 => 115770)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm 2012-05-02 00:33:43 UTC (rev 115769)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm 2012-05-02 00:36:31 UTC (rev 115770)
@@ -42,6 +42,9 @@
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 preference;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
