From cfd86b747d32ac22246a1aa908eaa720c63a88c1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 7 Nov 2012 11:22:47 +0100 Subject: Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733) New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes. --- Source/WebKit/win/WebView.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'Source/WebKit/win/WebView.cpp') diff --git a/Source/WebKit/win/WebView.cpp b/Source/WebKit/win/WebView.cpp index 6b1bade4a..dd7008eb3 100644 --- a/Source/WebKit/win/WebView.cpp +++ b/Source/WebKit/win/WebView.cpp @@ -471,7 +471,7 @@ void WebView::setCacheModel(WebCacheModel cacheModel) RetainPtr cfurlCache(AdoptCF, CFURLCacheCopySharedURLCache()); RetainPtr cfurlCacheDirectory(AdoptCF, wkCopyFoundationCacheDirectory(0)); if (!cfurlCacheDirectory) - cfurlCacheDirectory.adoptCF(WebCore::localUserSpecificStorageDirectory().createCFString()); + cfurlCacheDirectory = WebCore::localUserSpecificStorageDirectory().createCFString(); // As a fudge factor, use 1000 instead of 1024, in case the reported byte // count doesn't align exactly to a megabyte boundary. @@ -4712,8 +4712,7 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification) if (FAILED(hr)) return hr; - RetainPtr urlString(AdoptCF, toString(str).createCFString()); - RetainPtr url(AdoptCF, CFURLCreateWithString(kCFAllocatorDefault, urlString.get(), 0)); + RetainPtr url(AdoptCF, CFURLCreateWithString(kCFAllocatorDefault, toString(str).createCFString().get(), 0)); // Check if the passed in string is a path and convert it to a URL. // FIXME: This is a workaround for nightly builds until we can get Safari to pass @@ -6646,16 +6645,6 @@ void WebView::paintContents(const GraphicsLayer*, GraphicsContext& context, Grap context.restore(); } -bool WebView::showDebugBorders(const GraphicsLayer*) const -{ - return m_page->settings()->showDebugBorders(); -} - -bool WebView::showRepaintCounter(const GraphicsLayer*) const -{ - return m_page->settings()->showRepaintCounter(); -} - void WebView::flushPendingGraphicsLayerChanges() { Frame* coreFrame = core(m_mainFrame); -- cgit v1.2.1