Diff
Modified: branches/safari-534.54-branch/Source/WebKit2/ChangeLog (105099 => 105100)
--- branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-16 23:46:39 UTC (rev 105099)
+++ branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-16 23:55:21 UTC (rev 105100)
@@ -1,5 +1,40 @@
2012-01-16 Mark Rowe <[email protected]>
+ Merge r96014.
+
+ 2011-09-26 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (r95747): Activating the web inspector causes the web process to be killed
+ https://bugs.webkit.org/show_bug.cgi?id=68762
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/WebInspectorProxy.cpp: (WebKit::WebInspectorProxy::createInspectorPage):
+ Tell Web process that loading resources from WebCore resources directory is OK.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::loadHTMLString):
+ (WebKit::WebPageProxy::loadAlternateHTMLString):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::assumeReadAccessToBaseURL):
+ * UIProcess/WebProcessProxy.h:
+ Renamed willLoadHTMLStringWithBaseURL to more generic assumeReadAccessToBaseURL.
+
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/efl/WebInspectorEfl.cpp:
+ (WebKit::WebInspectorProxy::inspectorBaseURL):
+ * UIProcess/gtk/WebInspectorGtk.cpp:
+ (WebKit::WebInspectorProxy::inspectorBaseURL):
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::inspectorBaseURL):
+ * UIProcess/qt/WebInspectorProxyQt.cpp:
+ (WebKit::WebInspectorProxy::inspectorBaseURL):
+ * UIProcess/win/WebInspectorProxyWin.cpp:
+ (WebKit::WebInspectorProxy::inspectorBaseURL):
+ Report what base directory Inspector has access to.
+
+2012-01-16 Mark Rowe <[email protected]>
+
Merge r104663.
2012-01-10 Mark Rowe <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (105099 => 105100)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2012-01-16 23:46:39 UTC (rev 105099)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2012-01-16 23:55:21 UTC (rev 105100)
@@ -206,6 +206,7 @@
inspectorPageID = inspectorPage->pageID();
inspectorPageParameters = inspectorPage->creationParameters();
+ m_page->process()->assumeReadAccessToBaseURL(inspectorBaseURL());
inspectorPage->loadURL(inspectorPageURL());
}
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebInspectorProxy.h (105099 => 105100)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebInspectorProxy.h 2012-01-16 23:46:39 UTC (rev 105099)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebInspectorProxy.h 2012-01-16 23:55:21 UTC (rev 105100)
@@ -124,6 +124,7 @@
// Implemented the platform WebInspectorProxy file
String inspectorPageURL() const;
+ String inspectorBaseURL() const;
// Called by WebInspectorProxy messages
void createInspectorPage(uint64_t& inspectorPageID, WebPageCreationParameters&);
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (105099 => 105100)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-01-16 23:46:39 UTC (rev 105099)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-01-16 23:55:21 UTC (rev 105100)
@@ -420,7 +420,7 @@
if (!isValid())
reattachToWebProcess();
- process()->willLoadHTMLStringWithBaseURL(baseURL);
+ process()->assumeReadAccessToBaseURL(baseURL);
process()->send(Messages::WebPage::LoadHTMLString(htmlString, baseURL), m_pageID);
process()->responsivenessTimer()->start();
}
@@ -433,7 +433,7 @@
if (m_mainFrame)
m_mainFrame->setUnreachableURL(unreachableURL);
- process()->willLoadHTMLStringWithBaseURL(baseURL);
+ process()->assumeReadAccessToBaseURL(baseURL);
process()->send(Messages::WebPage::LoadAlternateHTMLString(htmlString, baseURL, unreachableURL), m_pageID);
process()->responsivenessTimer()->start();
}
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp (105099 => 105100)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2012-01-16 23:46:39 UTC (rev 105099)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2012-01-16 23:55:21 UTC (rev 105100)
@@ -202,7 +202,7 @@
m_backForwardListItemMap.set(item->itemID(), item);
}
-void WebProcessProxy::willLoadHTMLStringWithBaseURL(const String& urlString)
+void WebProcessProxy::assumeReadAccessToBaseURL(const String& urlString)
{
KURL url(KURL(), urlString);
if (!url.isLocalFile())
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebProcessProxy.h (105099 => 105100)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebProcessProxy.h 2012-01-16 23:46:39 UTC (rev 105099)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebProcessProxy.h 2012-01-16 23:55:21 UTC (rev 105100)
@@ -105,7 +105,7 @@
void registerNewWebBackForwardListItem(WebBackForwardListItem*);
void willAcquireUniversalFileReadSandboxExtension() { m_mayHaveUniversalFileReadSandboxExtension = true; }
- void willLoadHTMLStringWithBaseURL(const String&);
+ void assumeReadAccessToBaseURL(const String&);
bool checkURLReceivedFromWebProcess(const String&);
bool checkURLReceivedFromWebProcess(const WebCore::KURL&);
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (105099 => 105100)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2012-01-16 23:46:39 UTC (rev 105099)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2012-01-16 23:55:21 UTC (rev 105100)
@@ -245,6 +245,15 @@
return [[NSURL fileURLWithPath:path] absoluteString];
}
+String WebInspectorProxy::inspectorBaseURL() const
+{
+ // Web Inspector uses localized strings, so it's not contained within inspector directory.
+ NSString *path = [[NSBundle bundleWithIdentifier:@"com.apple.WebCore"] resourcePath];
+ ASSERT(path);
+
+ return [[NSURL fileURLWithPath:path] absoluteString];
+}
+
} // namespace WebKit
#endif // ENABLE(INSPECTOR)
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp (105099 => 105100)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp 2012-01-16 23:46:39 UTC (rev 105099)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp 2012-01-16 23:55:21 UTC (rev 105100)
@@ -74,7 +74,7 @@
notImplemented();
}
-String WebInspectorProxy::inspectorPageURL() const
+String WebInspectorProxy::inspectorBaseURL() const
{
notImplemented();
return String();
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp (105099 => 105100)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp 2012-01-16 23:46:39 UTC (rev 105099)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp 2012-01-16 23:55:21 UTC (rev 105100)
@@ -313,6 +313,16 @@
return String(CFURLGetString(htmlURLRef.get()));
}
+String WebInspectorProxy::inspectorBaseURL() const
+{
+ // Web Inspector uses localized strings, so it's not contained within inspector directory.
+ RetainPtr<CFURLRef> htmlURLRef(AdoptCF, CFBundleCopyResourcesDirectoryURL(webKitBundle()));
+ if (!htmlURLRef)
+ return String();
+
+ return String(CFURLGetString(htmlURLRef.get()));
+}
+
} // namespace WebKit
#endif // ENABLE(INSPECTOR)
