Diff
Modified: branches/safari-534.54-branch/Source/WebKit2/ChangeLog (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-02-13 22:01:29 UTC (rev 107604)
@@ -1,3 +1,7 @@
+2011-02-13 Lucas Forschler <[email protected]>
+
+ Rollout r105100 and r104070.
+
2011-02-06 Lucas Forschler <[email protected]>
Merge 106678
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-02-13 22:01:29 UTC (rev 107604)
@@ -1612,26 +1612,25 @@
// FIXME: This code is more or less copied from Pasteboard::getBestURL.
// It would be nice to be able to share the code somehow.
-static bool maybeCreateSandboxExtensionFromPasteboard(NSPasteboard *pasteboard, SandboxExtension::Handle& sandboxExtensionHandle)
+static void maybeCreateSandboxExtensionFromPasteboard(NSPasteboard *pasteboard, SandboxExtension::Handle& sandboxExtensionHandle)
{
NSArray *types = [pasteboard types];
if (![types containsObject:NSFilenamesPboardType])
- return false;
+ return;
NSArray *files = [pasteboard propertyListForType:NSFilenamesPboardType];
if ([files count] != 1)
- return false;
+ return;
NSString *file = [files objectAtIndex:0];
BOOL isDirectory;
if (![[NSFileManager defaultManager] fileExistsAtPath:file isDirectory:&isDirectory])
- return false;
+ return;
if (isDirectory)
- return false;
+ return;
SandboxExtension::createHandle("/", SandboxExtension::ReadOnly, sandboxExtensionHandle);
- return true;
}
- (BOOL)performDragOperation:(id <NSDraggingInfo>)draggingInfo
@@ -1641,9 +1640,7 @@
DragData dragData(draggingInfo, client, global, static_cast<DragOperation>([draggingInfo draggingSourceOperationMask]), [self applicationFlags:draggingInfo]);
SandboxExtension::Handle sandboxExtensionHandle;
- bool createdExtension = maybeCreateSandboxExtensionFromPasteboard([draggingInfo draggingPasteboard], sandboxExtensionHandle);
- if (createdExtension)
- _data->_page->process()->willAcquireUniversalFileReadSandboxExtension();
+ maybeCreateSandboxExtensionFromPasteboard([draggingInfo draggingPasteboard], sandboxExtensionHandle);
_data->_page->performDrag(&dragData, [[draggingInfo draggingPasteboard] name], sandboxExtensionHandle);
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebContext.cpp (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebContext.cpp 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebContext.cpp 2012-02-13 22:01:29 UTC (rev 107604)
@@ -67,8 +67,7 @@
#include <wtf/RefCountedLeakCounter.h>
#endif
-#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, m_process->connection())
-#define MESSAGE_CHECK_URL(url) MESSAGE_CHECK_BASE(m_process->checkURLReceivedFromWebProcess(url), m_process->connection())
+#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, process()->connection())
using namespace WebCore;
@@ -435,9 +434,7 @@
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
MESSAGE_CHECK(frame->page() == page);
- MESSAGE_CHECK_URL(sourceURLString);
- MESSAGE_CHECK_URL(destinationURLString);
-
+
m_historyClient.didPerformClientRedirect(this, page, sourceURLString, destinationURLString, frame);
}
@@ -450,9 +447,7 @@
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
MESSAGE_CHECK(frame->page() == page);
- MESSAGE_CHECK_URL(sourceURLString);
- MESSAGE_CHECK_URL(destinationURLString);
-
+
m_historyClient.didPerformServerRedirect(this, page, sourceURLString, destinationURLString, frame);
}
@@ -465,7 +460,6 @@
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
MESSAGE_CHECK(frame->page() == page);
- MESSAGE_CHECK_URL(url);
m_historyClient.didUpdateHistoryTitle(this, frame->page(), title, url, frame);
}
@@ -557,11 +551,9 @@
void WebContext::getPluginPath(const String& mimeType, const String& urlString, String& pluginPath)
{
- MESSAGE_CHECK_URL(urlString);
-
String newMimeType = mimeType.lower();
- PluginInfoStore::Plugin plugin = pluginInfoStore().findPlugin(newMimeType, KURL(KURL(), urlString));
+ PluginInfoStore::Plugin plugin = pluginInfoStore().findPlugin(newMimeType, KURL(ParsedURLString, urlString));
if (!plugin.path)
return;
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2012-02-13 22:01:29 UTC (rev 107604)
@@ -206,7 +206,6 @@
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 (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebInspectorProxy.h 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebInspectorProxy.h 2012-02-13 22:01:29 UTC (rev 107604)
@@ -124,7 +124,6 @@
// 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 (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-02-13 22:01:29 UTC (rev 107604)
@@ -93,8 +93,7 @@
// This controls what strategy we use for mouse wheel coalesing.
#define MERGE_WHEEL_EVENTS 1
-#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, m_process->connection())
-#define MESSAGE_CHECK_URL(url) MESSAGE_CHECK_BASE(m_process->checkURLReceivedFromWebProcess(url), m_process->connection())
+#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, process()->connection())
using namespace WebCore;
@@ -270,9 +269,7 @@
return;
SandboxExtension::Handle sandboxExtensionHandle;
- bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), item->url()), sandboxExtensionHandle);
- if (createdExtension)
- process()->willAcquireUniversalFileReadSandboxExtension();
+ initializeSandboxExtensionHandle(KURL(KURL(), item->url()), sandboxExtensionHandle);
process()->send(Messages::WebPage::GoToBackForwardItem(item->itemID(), sandboxExtensionHandle), m_pageID);
process()->responsivenessTimer()->start();
}
@@ -372,17 +369,16 @@
return false;
}
-bool WebPageProxy::maybeInitializeSandboxExtensionHandle(const KURL& url, SandboxExtension::Handle& sandboxExtensionHandle)
+void WebPageProxy::initializeSandboxExtensionHandle(const KURL& url, SandboxExtension::Handle& sandboxExtensionHandle)
{
if (!url.isLocalFile())
- return false;
+ return;
// Don't give the inspector full access to the file system.
if (WebInspectorProxy::isInspectorPage(this))
- return false;
+ return;
SandboxExtension::createHandle("/", SandboxExtension::ReadOnly, sandboxExtensionHandle);
- return true;
}
void WebPageProxy::loadURL(const String& url)
@@ -393,9 +389,7 @@
reattachToWebProcess();
SandboxExtension::Handle sandboxExtensionHandle;
- bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), url), sandboxExtensionHandle);
- if (createdExtension)
- process()->willAcquireUniversalFileReadSandboxExtension();
+ initializeSandboxExtensionHandle(KURL(KURL(), url), sandboxExtensionHandle);
process()->send(Messages::WebPage::LoadURL(url, sandboxExtensionHandle), m_pageID);
process()->responsivenessTimer()->start();
}
@@ -408,9 +402,7 @@
reattachToWebProcess();
SandboxExtension::Handle sandboxExtensionHandle;
- bool createdExtension = maybeInitializeSandboxExtensionHandle(urlRequest->resourceRequest().url(), sandboxExtensionHandle);
- if (createdExtension)
- process()->willAcquireUniversalFileReadSandboxExtension();
+ initializeSandboxExtensionHandle(urlRequest->resourceRequest().url(), sandboxExtensionHandle);
process()->send(Messages::WebPage::LoadURLRequest(urlRequest->resourceRequest(), sandboxExtensionHandle), m_pageID);
process()->responsivenessTimer()->start();
}
@@ -420,7 +412,6 @@
if (!isValid())
reattachToWebProcess();
- process()->assumeReadAccessToBaseURL(baseURL);
process()->send(Messages::WebPage::LoadHTMLString(htmlString, baseURL), m_pageID);
process()->responsivenessTimer()->start();
}
@@ -433,7 +424,6 @@
if (m_mainFrame)
m_mainFrame->setUnreachableURL(unreachableURL);
- process()->assumeReadAccessToBaseURL(baseURL);
process()->send(Messages::WebPage::LoadAlternateHTMLString(htmlString, baseURL, unreachableURL), m_pageID);
process()->responsivenessTimer()->start();
}
@@ -485,9 +475,7 @@
}
SandboxExtension::Handle sandboxExtensionHandle;
- bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), forwardItem->url()), sandboxExtensionHandle);
- if (createdExtension)
- process()->willAcquireUniversalFileReadSandboxExtension();
+ initializeSandboxExtensionHandle(KURL(KURL(), forwardItem->url()), sandboxExtensionHandle);
process()->send(Messages::WebPage::GoForward(forwardItem->itemID(), sandboxExtensionHandle), m_pageID);
process()->responsivenessTimer()->start();
}
@@ -512,9 +500,7 @@
}
SandboxExtension::Handle sandboxExtensionHandle;
- bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), backItem->url()), sandboxExtensionHandle);
- if (createdExtension)
- process()->willAcquireUniversalFileReadSandboxExtension();
+ initializeSandboxExtensionHandle(KURL(KURL(), backItem->url()), sandboxExtensionHandle);
process()->send(Messages::WebPage::GoBack(backItem->itemID(), sandboxExtensionHandle), m_pageID);
process()->responsivenessTimer()->start();
}
@@ -534,9 +520,7 @@
setPendingAPIRequestURL(item->url());
SandboxExtension::Handle sandboxExtensionHandle;
- bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), item->url()), sandboxExtensionHandle);
- if (createdExtension)
- process()->willAcquireUniversalFileReadSandboxExtension();
+ initializeSandboxExtensionHandle(KURL(KURL(), item->url()), sandboxExtensionHandle);
process()->send(Messages::WebPage::GoToBackForwardItem(item->itemID(), sandboxExtensionHandle), m_pageID);
process()->responsivenessTimer()->start();
}
@@ -1567,7 +1551,6 @@
WebFrameProxy* frame = process()->webFrame(frameID);
MESSAGE_CHECK(frame);
- MESSAGE_CHECK_URL(url);
frame->setUnreachableURL(unreachableURL);
@@ -1584,7 +1567,6 @@
WebFrameProxy* frame = process()->webFrame(frameID);
MESSAGE_CHECK(frame);
- MESSAGE_CHECK_URL(url);
frame->didReceiveServerRedirectForProvisionalLoad(url);
@@ -1706,7 +1688,6 @@
WebFrameProxy* frame = process()->webFrame(frameID);
MESSAGE_CHECK(frame);
- MESSAGE_CHECK_URL(url);
clearPendingAPIRequestURL();
frame->didSameDocumentNavigation(url);
@@ -1819,7 +1800,6 @@
WebFrameProxy* frame = process()->webFrame(frameID);
MESSAGE_CHECK(frame);
- MESSAGE_CHECK_URL(request.url());
NavigationType navigationType = static_cast<NavigationType>(opaqueNavigationType);
WebEvent::Modifiers modifiers = static_cast<WebEvent::Modifiers>(opaqueModifiers);
@@ -1854,7 +1834,6 @@
WebFrameProxy* frame = process()->webFrame(frameID);
MESSAGE_CHECK(frame);
- MESSAGE_CHECK_URL(request.url());
NavigationType navigationType = static_cast<NavigationType>(opaqueNavigationType);
WebEvent::Modifiers modifiers = static_cast<WebEvent::Modifiers>(opaqueModifiers);
@@ -1874,9 +1853,7 @@
WebFrameProxy* frame = process()->webFrame(frameID);
MESSAGE_CHECK(frame);
- MESSAGE_CHECK_URL(request.url());
- MESSAGE_CHECK_URL(response.url());
-
+
RefPtr<WebFramePolicyListenerProxy> listener = frame->setUpPolicyListenerProxy(listenerID);
ASSERT(!m_inDecidePolicyForMIMEType);
@@ -1936,7 +1913,6 @@
{
WebFrameProxy* frame = process()->webFrame(frameID);
MESSAGE_CHECK(frame);
- MESSAGE_CHECK_URL(request.url());
m_resourceLoadClient.didInitiateLoadForResource(this, frame, resourceIdentifier, request, pageIsProvisionallyLoading);
}
@@ -1945,7 +1921,6 @@
{
WebFrameProxy* frame = process()->webFrame(frameID);
MESSAGE_CHECK(frame);
- MESSAGE_CHECK_URL(request.url());
m_resourceLoadClient.didSendRequestForResource(this, frame, resourceIdentifier, request, redirectResponse);
}
@@ -1954,7 +1929,6 @@
{
WebFrameProxy* frame = process()->webFrame(frameID);
MESSAGE_CHECK(frame);
- MESSAGE_CHECK_URL(response.url());
m_resourceLoadClient.didReceiveResponseForResource(this, frame, resourceIdentifier, response);
}
@@ -2069,9 +2043,6 @@
void WebPageProxy::missingPluginButtonClicked(const String& mimeType, const String& url, const String& pluginsPageURL)
{
- MESSAGE_CHECK_URL(url);
- MESSAGE_CHECK_URL(pluginsPageURL);
-
m_uiClient.missingPluginButtonClicked(this, mimeType, url, pluginsPageURL);
}
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebPageProxy.h (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2012-02-13 22:01:29 UTC (rev 107604)
@@ -742,7 +742,7 @@
void clearPendingAPIRequestURL() { m_pendingAPIRequestURL = String(); }
void setPendingAPIRequestURL(const String& pendingAPIRequestURL) { m_pendingAPIRequestURL = pendingAPIRequestURL; }
- bool maybeInitializeSandboxExtensionHandle(const WebCore::KURL&, SandboxExtension::Handle&);
+ void initializeSandboxExtensionHandle(const WebCore::KURL&, SandboxExtension::Handle&);
#if PLATFORM(MAC)
void substitutionsPanelIsShowing(bool&);
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2012-02-13 22:01:29 UTC (rev 107604)
@@ -44,8 +44,6 @@
using namespace WebCore;
using namespace std;
-#define MESSAGE_CHECK_URL(url) MESSAGE_CHECK_BASE(checkURLReceivedFromWebProcess(url), connection())
-
namespace WebKit {
template<typename HashMap>
@@ -68,7 +66,6 @@
WebProcessProxy::WebProcessProxy(PassRefPtr<WebContext> context)
: m_responsivenessTimer(this)
, m_context(context)
- , m_mayHaveUniversalFileReadSandboxExtension(false)
{
connect();
}
@@ -202,51 +199,8 @@
m_backForwardListItemMap.set(item->itemID(), item);
}
-void WebProcessProxy::assumeReadAccessToBaseURL(const String& urlString)
-{
- KURL url(KURL(), urlString);
- if (!url.isLocalFile())
- return;
-
- // Client loads an alternate string. This doesn't grant universal file read, but the web process is assumed
- // to have read access to this directory already.
- m_localPathsWithAssumedReadAccess.add(url.fileSystemPath());
-}
-
-bool WebProcessProxy::checkURLReceivedFromWebProcess(const String& urlString)
-{
- return checkURLReceivedFromWebProcess(KURL(KURL(), urlString));
-}
-
-bool WebProcessProxy::checkURLReceivedFromWebProcess(const KURL& url)
-{
- // FIXME: Consider checking that the URL is valid. Currently, WebProcess sends invalid URLs in many cases, but it probably doesn't have good reasons to do that.
-
- // Any other non-file URL is OK.
- if (!url.isLocalFile())
- return true;
-
- // Any file URL is also OK if we've loaded a file URL through API before, granting universal read access.
- if (m_mayHaveUniversalFileReadSandboxExtension)
- return true;
-
- // If we loaded a string with a file base URL before, loading resources from that subdirectory is fine.
- // There are no ".." components, because all URLs received from WebProcess are parsed with KURL, which removes those.
- String path = url.fileSystemPath();
- for (HashSet<String>::const_iterator iter = m_localPathsWithAssumedReadAccess.begin(); iter != m_localPathsWithAssumedReadAccess.end(); ++iter) {
- if (path.startsWith(*iter))
- return true;
- }
-
- // A Web process that was never asked to load a file URL should not ever ask us to do anything with a file URL.
- return false;
-}
-
void WebProcessProxy::addBackForwardItem(uint64_t itemID, const String& originalURL, const String& url, const String& title, const CoreIPC::DataReference& backForwardData)
{
- MESSAGE_CHECK_URL(originalURL);
- MESSAGE_CHECK_URL(url);
-
std::pair<WebBackForwardListItemMap::iterator, bool> result = m_backForwardListItemMap.add(itemID, 0);
if (result.second) {
// New item.
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebProcessProxy.h (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebProcessProxy.h 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebProcessProxy.h 2012-02-13 22:01:29 UTC (rev 107604)
@@ -104,12 +104,6 @@
void registerNewWebBackForwardListItem(WebBackForwardListItem*);
- void willAcquireUniversalFileReadSandboxExtension() { m_mayHaveUniversalFileReadSandboxExtension = true; }
- void assumeReadAccessToBaseURL(const String&);
-
- bool checkURLReceivedFromWebProcess(const String&);
- bool checkURLReceivedFromWebProcess(const WebCore::KURL&);
-
// FIXME: This variant of send is deprecated. All clients should move to an overload that take a message type.
template<typename E, typename T> bool deprecatedSend(E messageID, uint64_t destinationID, const T& arguments);
@@ -181,9 +175,6 @@
RefPtr<WebContext> m_context;
- bool m_mayHaveUniversalFileReadSandboxExtension; // True if a read extension for "/" was ever granted - we don't track whether WebProcess still has it.
- HashSet<String> m_localPathsWithAssumedReadAccess;
-
HashMap<uint64_t, WebPageProxy*> m_pageMap;
WebFrameProxyMap m_frameMap;
WebBackForwardListItemMap m_backForwardListItemMap;
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2012-02-13 22:01:29 UTC (rev 107604)
@@ -166,9 +166,7 @@
else {
SandboxExtension::Handle sandboxExtensionHandle;
if (WebBackForwardListItem* item = m_backForwardList->currentItem()) {
- bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), item->url()), sandboxExtensionHandle);
- if (createdExtension)
- process()->willAcquireUniversalFileReadSandboxExtension();
+ initializeSandboxExtensionHandle(KURL(KURL(), item->url()), sandboxExtensionHandle);
setPendingAPIRequestURL(item->url());
}
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2012-02-13 22:01:29 UTC (rev 107604)
@@ -245,15 +245,6 @@
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 (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp 2012-02-13 22:01:29 UTC (rev 107604)
@@ -74,7 +74,7 @@
notImplemented();
}
-String WebInspectorProxy::inspectorBaseURL() const
+String WebInspectorProxy::inspectorPageURL() const
{
notImplemented();
return String();
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp (107603 => 107604)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp 2012-02-13 21:59:17 UTC (rev 107603)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp 2012-02-13 22:01:29 UTC (rev 107604)
@@ -313,16 +313,6 @@
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)
