From 5598ff9e01d5600a1b5d2fcde780d91e9afc4bfe Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Wed, 10 Dec 2014 00:22:15 +0000 Subject: [PATCH] Unreviewed, rolling out r177037. https://bugs.webkit.org/show_bug.cgi?id=139464 broke ~50 API tests (Requested by thorton on #webkit). Reverted changeset: "Use the new storage namespace provider in WebKit1" https://bugs.webkit.org/show_bug.cgi?id=139425 http://trac.webkit.org/changeset/177037 git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177044 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/ChangeLog | 13 +++++++++++++ Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj | 2 +- Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props | 2 +- Source/WebKit/mac/ChangeLog | 13 +++++++++++++ Source/WebKit/mac/WebView/WebView.mm | 3 --- Source/WebKit/win/ChangeLog | 13 +++++++++++++ Source/WebKit/win/WebView.cpp | 16 ++++------------ 7 files changed, 45 insertions(+), 17 deletions(-) diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog index 0bef307..a8c49ff1 100644 --- a/Source/WebKit/ChangeLog +++ b/Source/WebKit/ChangeLog @@ -1,3 +1,16 @@ +2014-12-09 Commit Queue + + Unreviewed, rolling out r177037. + https://bugs.webkit.org/show_bug.cgi?id=139464 + + broke ~50 API tests (Requested by thorton on #webkit). + + Reverted changeset: + + "Use the new storage namespace provider in WebKit1" + https://bugs.webkit.org/show_bug.cgi?id=139425 + http://trac.webkit.org/changeset/177037 + 2014-12-08 Anders Carlsson WebStorageNamespaceProvider should create StorageNamespaceImpls diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj b/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj index 7fe55a2..deb0dd1 100644 --- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj +++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj @@ -419,7 +419,6 @@ - @@ -499,6 +498,7 @@ + diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props index d1c7a41..0e3b475 100644 --- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props +++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props @@ -5,7 +5,7 @@ - $(ProjectDir);$(ProjectDir)\..\..\win;$(ProjectDir)\..\..\win\WebCoreSupport;$(ProjectDir)\..\..\Storage;$(ConfigurationBuildDir)\include\WebKit;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\WebCore;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\Include\JavaScriptCore;$(ConfigurationBuildDir)\Include\private\JavaScriptCore;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKit\DerivedSources;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;$(WebKit_Libraries)\Include\WebCore;$(WebKit_Libraries)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\Include\JavaScriptCore;$(WebKit_Libraries)\Include\private\JavaScriptCore;$(IntDir)include;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)\..\..\win;$(ProjectDir)\..\..\win\WebCoreSupport;$(ConfigurationBuildDir)\include\WebKit;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\WebCore;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\Include\JavaScriptCore;$(ConfigurationBuildDir)\Include\private\JavaScriptCore;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKit\DerivedSources;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;$(WebKit_Libraries)\Include\WebCore;$(WebKit_Libraries)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\Include\JavaScriptCore;$(WebKit_Libraries)\Include\private\JavaScriptCore;$(IntDir)include;%(AdditionalIncludeDirectories) WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit;%(PreprocessorDefinitions) Use WebKitPrefix.h diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog index d7d810a..e7663ea 100644 --- a/Source/WebKit/mac/ChangeLog +++ b/Source/WebKit/mac/ChangeLog @@ -1,3 +1,16 @@ +2014-12-09 Commit Queue + + Unreviewed, rolling out r177037. + https://bugs.webkit.org/show_bug.cgi?id=139464 + + broke ~50 API tests (Requested by thorton on #webkit). + + Reverted changeset: + + "Use the new storage namespace provider in WebKit1" + https://bugs.webkit.org/show_bug.cgi?id=139425 + http://trac.webkit.org/changeset/177037 + 2014-12-08 Anders Carlsson Use the new storage namespace provider in WebKit1 diff --git a/Source/WebKit/mac/WebView/WebView.mm b/Source/WebKit/mac/WebView/WebView.mm index 9d89ed9..d17e221 100644 --- a/Source/WebKit/mac/WebView/WebView.mm +++ b/Source/WebKit/mac/WebView/WebView.mm @@ -100,7 +100,6 @@ #import "WebScriptWorldInternal.h" #import "WebSelectionServiceController.h" #import "WebStorageManagerInternal.h" -#import "WebStorageNamespaceProvider.h" #import "WebSystemInterface.h" #import "WebTextCompletionController.h" #import "WebTextIterator.h" @@ -954,7 +953,6 @@ static void WebKitInitializeGamepadProviderIfNecessary() pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(self); pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient; pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self); - pageConfiguration.storageNamespaceProvider = &_private->group->storageNamespaceProvider(); pageConfiguration.userContentController = &_private->group->userContentController(); pageConfiguration.visitedLinkStore = &_private->group->visitedLinkStore(); _private->page = new Page(pageConfiguration); @@ -1190,7 +1188,6 @@ static void WebKitInitializeGamepadProviderIfNecessary() pageConfiguration.inspectorClient = new WebInspectorClient(self); pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient; pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self); - pageConfiguration.storageNamespaceProvider = &_private->group->storageNamespaceProvider(); pageConfiguration.userContentController = &_private->group->userContentController(); pageConfiguration.visitedLinkStore = &_private->group->visitedLinkStore(); diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog index 0b2e9d6..eaed79c 100644 --- a/Source/WebKit/win/ChangeLog +++ b/Source/WebKit/win/ChangeLog @@ -1,3 +1,16 @@ +2014-12-09 Commit Queue + + Unreviewed, rolling out r177037. + https://bugs.webkit.org/show_bug.cgi?id=139464 + + broke ~50 API tests (Requested by thorton on #webkit). + + Reverted changeset: + + "Use the new storage namespace provider in WebKit1" + https://bugs.webkit.org/show_bug.cgi?id=139425 + http://trac.webkit.org/changeset/177037 + 2014-12-08 Anders Carlsson Use the new storage namespace provider in WebKit1 diff --git a/Source/WebKit/win/WebView.cpp b/Source/WebKit/win/WebView.cpp index c804c3c..ce1d2fd 100644 --- a/Source/WebKit/win/WebView.cpp +++ b/Source/WebKit/win/WebView.cpp @@ -64,7 +64,6 @@ #include "WebPlatformStrategies.h" #include "WebPreferences.h" #include "WebScriptWorld.h" -#include "WebStorageNamespaceProvider.h" #include "WebVisitedLinkStore.h" #include "resource.h" #include @@ -2727,16 +2726,7 @@ bool WebView::shouldInitializeTrackPointHack() return shouldCreateScrollbars; } - -static String localStorageDatabasePath(WebPreferences* preferences) -{ - BString localStorageDatabasePath; - if (FAILED(preferences->localStorageDatabasePath(&localStorageDatabasePath))) - return String(); - - return toString(localStorageDatabasePath); -} - + HRESULT STDMETHODCALLTYPE WebView::initWithFrame( /* [in] */ RECT frame, /* [in] */ BSTR frameName, @@ -2811,7 +2801,6 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame( configuration.inspectorClient = m_inspectorClient; #endif // ENABLE(INSPECTOR) configuration.loaderClientForMainFrame = new WebFrameLoaderClient; - configuration.storageNamespaceProvider = WebStorageNamespaceProvider::create(localStorageDatabasePath(m_preferences.get())); configuration.progressTrackerClient = static_cast(configuration.loaderClientForMainFrame); configuration.visitedLinkStore = &WebVisitedLinkStore::shared(); @@ -2821,6 +2810,9 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame( unsigned layoutMilestones = DidFirstLayout | DidFirstVisuallyNonEmptyLayout; m_page->addLayoutMilestones(static_cast(layoutMilestones)); + BString localStoragePath; + if (SUCCEEDED(m_preferences->localStorageDatabasePath(&localStoragePath))) + m_page->settings().setLocalStorageDatabasePath(toString(localStoragePath)); if (m_uiDelegate) { BString path; -- 1.8.3.1