<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[177983] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/177983">177983</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-06 11:43:33 -0800 (Tue, 06 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/177963">r177963</a>.
https://bugs.webkit.org/show_bug.cgi?id=140136

Caused lots of crashes (Requested by smfr on #webkit).

Reverted changeset:

&quot;Add a WebKit1 database provider&quot;
https://bugs.webkit.org/show_bug.cgi?id=140126
http://trac.webkit.org/changeset/177963</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbDOMWindowIndexedDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxprojfilters">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitStorageWebDatabaseProvidercpp">trunk/Source/WebKit/Storage/WebDatabaseProvider.cpp</a></li>
<li><a href="#trunkSourceWebKitStorageWebDatabaseProviderh">trunk/Source/WebKit/Storage/WebDatabaseProvider.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebCore/ChangeLog        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-01-06  Commit Queue  &lt;commit-queue@webkit.org&gt;
+
+        Unreviewed, rolling out r177963.
+        https://bugs.webkit.org/show_bug.cgi?id=140136
+
+        Caused lots of crashes (Requested by smfr on #webkit).
+
+        Reverted changeset:
+
+        &quot;Add a WebKit1 database provider&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=140126
+        http://trac.webkit.org/changeset/177963
+
</ins><span class="cx"> 2015-01-06  Antti Koivisto  &lt;antti@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r177876): 35% regression in Parser/html5-full-render
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbDOMWindowIndexedDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -102,17 +102,19 @@
</span><span class="cx"> {
</span><span class="cx">     Document* document = m_window-&gt;document();
</span><span class="cx">     if (!document)
</span><del>-        return nullptr;
</del><ins>+        return 0;
</ins><span class="cx"> 
</span><span class="cx">     Page* page = document-&gt;page();
</span><span class="cx">     if (!page)
</span><del>-        return nullptr;
</del><ins>+        return 0;
</ins><span class="cx"> 
</span><span class="cx">     if (!m_window-&gt;isCurrentlyDisplayedInFrame())
</span><del>-        return nullptr;
</del><ins>+        return 0;
</ins><span class="cx"> 
</span><del>-    if (!m_idbFactory)
-        m_idbFactory = IDBFactory::create(page-&gt;databaseProvider().idbFactoryBackend());
</del><ins>+    if (!m_idbFactory) {
+        if (DatabaseProvider* databaseProvider = page-&gt;databaseProvider())
+            m_idbFactory = IDBFactory::create(databaseProvider-&gt;idbFactoryBackend());
+    }
</ins><span class="cx"> 
</span><span class="cx">     return m_idbFactory.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebCore/page/Page.cpp        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> #endif
</span><span class="cx">     , m_lastSpatialNavigationCandidatesCount(0) // NOTE: Only called from Internals for Spatial Navigation testing.
</span><span class="cx">     , m_framesHandlingBeforeUnloadEvent(0)
</span><del>-    , m_databaseProvider(*WTF::move(pageConfiguration.databaseProvider))
</del><ins>+    , m_databaseProvider(WTF::move(pageConfiguration.databaseProvider))
</ins><span class="cx">     , m_storageNamespaceProvider(*WTF::move(pageConfiguration.storageNamespaceProvider))
</span><span class="cx">     , m_userContentController(WTF::move(pageConfiguration.userContentController))
</span><span class="cx">     , m_visitedLinkStore(*WTF::move(pageConfiguration.visitedLinkStore))
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebCore/page/Page.h        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx">     void setLastSpatialNavigationCandidateCount(unsigned count) { m_lastSpatialNavigationCandidatesCount = count; }
</span><span class="cx">     unsigned lastSpatialNavigationCandidateCount() const { return m_lastSpatialNavigationCandidatesCount; }
</span><span class="cx"> 
</span><del>-    DatabaseProvider&amp; databaseProvider() { return m_databaseProvider; }
</del><ins>+    DatabaseProvider* databaseProvider() { return m_databaseProvider.get(); }
</ins><span class="cx"> 
</span><span class="cx">     StorageNamespaceProvider&amp; storageNamespaceProvider() { return m_storageNamespaceProvider.get(); }
</span><span class="cx">     void setStorageNamespaceProvider(Ref&lt;StorageNamespaceProvider&gt;&amp;&amp;);
</span><span class="lines">@@ -576,7 +576,7 @@
</span><span class="cx">     unsigned m_lastSpatialNavigationCandidatesCount;
</span><span class="cx">     unsigned m_framesHandlingBeforeUnloadEvent;
</span><span class="cx"> 
</span><del>-    Ref&lt;DatabaseProvider&gt; m_databaseProvider;
</del><ins>+    RefPtr&lt;DatabaseProvider&gt; m_databaseProvider;
</ins><span class="cx">     Ref&lt;StorageNamespaceProvider&gt; m_storageNamespaceProvider;
</span><span class="cx">     RefPtr&lt;UserContentController&gt; m_userContentController;
</span><span class="cx">     Ref&lt;VisitedLinkStore&gt; m_visitedLinkStore;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebKit/ChangeLog        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-01-06  Commit Queue  &lt;commit-queue@webkit.org&gt;
+
+        Unreviewed, rolling out r177963.
+        https://bugs.webkit.org/show_bug.cgi?id=140136
+
+        Caused lots of crashes (Requested by smfr on #webkit).
+
+        Reverted changeset:
+
+        &quot;Add a WebKit1 database provider&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=140126
+        http://trac.webkit.org/changeset/177963
+
</ins><span class="cx"> 2015-01-06  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add a WebKit1 database provider
</span></span></pre></div>
<a id="trunkSourceWebKitStorageWebDatabaseProvidercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/Storage/WebDatabaseProvider.cpp (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebDatabaseProvider.cpp        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebKit/Storage/WebDatabaseProvider.cpp        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include &quot;WebDatabaseProvider.h&quot;
-
-#include &lt;WebCore/IDBFactoryBackendInterface.h&gt;
-
-WebDatabaseProvider&amp; WebDatabaseProvider::shared()
-{
-    static WebDatabaseProvider&amp; databaseProvider = adoptRef(*new WebDatabaseProvider).leakRef();
-
-    return databaseProvider;
-}
-
-WebDatabaseProvider::WebDatabaseProvider()
-{
-}
-
-WebDatabaseProvider::~WebDatabaseProvider()
-{
-}
-
-#if ENABLE(INDEXED_DATABASE)
-RefPtr&lt;WebCore::IDBFactoryBackendInterface&gt; WebDatabaseProvider::createIDBFactoryBackend()
-{
-    return nullptr;
-}
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitStorageWebDatabaseProviderh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/Storage/WebDatabaseProvider.h (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebDatabaseProvider.h        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebKit/Storage/WebDatabaseProvider.h        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebDatabaseProvider_h
-#define WebDatabaseProvider_h
-
-#include &lt;WebCore/DatabaseProvider.h&gt;
-
-class WebDatabaseProvider final : public WebCore::DatabaseProvider {
-public:
-    static WebDatabaseProvider&amp; shared();
-    virtual ~WebDatabaseProvider();
-
-private:
-    explicit WebDatabaseProvider();
-
-#if ENABLE(INDEXED_DATABASE)
-    virtual RefPtr&lt;WebCore::IDBFactoryBackendInterface&gt; createIDBFactoryBackend() override;
-#endif
-};
-
-#endif // WebDatabaseProvider_h
</del></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -291,7 +291,6 @@
</span><span class="cx">     &lt;ClCompile Include=&quot;..\..\Storage\StorageSyncManager.cpp&quot; /&gt;
</span><span class="cx">     &lt;ClCompile Include=&quot;..\..\Storage\StorageThread.cpp&quot; /&gt;
</span><span class="cx">     &lt;ClCompile Include=&quot;..\..\Storage\StorageTracker.cpp&quot; /&gt;
</span><del>-    &lt;ClCompile Include=&quot;..\..\Storage\WebDatabaseProvider.cpp&quot; /&gt;
</del><span class="cx">     &lt;ClCompile Include=&quot;..\..\Storage\WebStorageNamespaceProvider.cpp&quot; /&gt;
</span><span class="cx">     &lt;ClCompile Include=&quot;..\..\cf\WebCoreSupport\WebInspectorClientCF.cpp&quot; /&gt;
</span><span class="cx">     &lt;ClCompile Include=&quot;..\..\win\AccessibleBase.cpp&quot; /&gt;
</span><span class="lines">@@ -434,7 +433,6 @@
</span><span class="cx">     &lt;ClInclude Include=&quot;..\..\Storage\StorageThread.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\..\Storage\StorageTracker.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\..\Storage\StorageTrackerClient.h&quot; /&gt;
</span><del>-    &lt;ClInclude Include=&quot;..\..\Storage\WebDatabaseProvider.h&quot; /&gt;
</del><span class="cx">     &lt;ClInclude Include=&quot;..\..\Storage\WebStorageNamespaceProvider.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\..\win\AccessibleBase.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\..\win\AccessibleDocument.h&quot; /&gt;
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -235,9 +235,6 @@
</span><span class="cx">     &lt;ClCompile Include=&quot;..\..\Storage\StorageTracker.cpp&quot;&gt;
</span><span class="cx">       &lt;Filter&gt;Sources&lt;/Filter&gt;
</span><span class="cx">     &lt;/ClCompile&gt;
</span><del>-    &lt;ClCompile Include=&quot;..\..\Storage\WebDatabaseProvider.cpp&quot;&gt;
-      &lt;Filter&gt;Sources&lt;/Filter&gt;
-    &lt;/ClCompile&gt;
</del><span class="cx">     &lt;ClCompile Include=&quot;..\..\Storage\WebStorageNamespaceProvider.cpp&quot;&gt;
</span><span class="cx">       &lt;Filter&gt;Sources&lt;/Filter&gt;
</span><span class="cx">     &lt;/ClCompile&gt;
</span><span class="lines">@@ -579,9 +576,6 @@
</span><span class="cx">     &lt;ClInclude Include=&quot;..\..\Storage\StorageTrackerClient.h&quot;&gt;
</span><span class="cx">       &lt;Filter&gt;Sources&lt;/Filter&gt;
</span><span class="cx">     &lt;/ClInclude&gt;
</span><del>-    &lt;ClInclude Include=&quot;..\..\Storage\WebDatabaseProvider.h&quot;&gt;
-      &lt;Filter&gt;Header Files&lt;/Filter&gt;
-    &lt;/ClInclude&gt;
</del><span class="cx">     &lt;ClInclude Include=&quot;..\..\Storage\WebStorageNamespaceProvider.h&quot;&gt;
</span><span class="cx">       &lt;Filter&gt;Header Files&lt;/Filter&gt;
</span><span class="cx">     &lt;/ClInclude&gt;
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -52,8 +52,6 @@
</span><span class="cx">                 1A77B02F0EE7730500C8A1F9 /* WebPluginRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */; };
</span><span class="cx">                 1A8DED500EE88B8A00F25022 /* HostedNetscapePluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */; };
</span><span class="cx">                 1A8DED510EE88B8A00F25022 /* HostedNetscapePluginStream.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A8DED4F0EE88B8A00F25022 /* HostedNetscapePluginStream.mm */; };
</span><del>-                1AA83F831A5C4AE400026EC6 /* WebDatabaseProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA83F811A5C4AE400026EC6 /* WebDatabaseProvider.cpp */; };
-                1AA83F841A5C4AE400026EC6 /* WebDatabaseProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA83F821A5C4AE400026EC6 /* WebDatabaseProvider.h */; };
</del><span class="cx">                 1AA879B611CBE9BF003C664F /* WebPlatformStrategies.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA879B411CBE9BF003C664F /* WebPlatformStrategies.h */; };
</span><span class="cx">                 1AA879B711CBE9BF003C664F /* WebPlatformStrategies.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AA879B511CBE9BF003C664F /* WebPlatformStrategies.mm */; };
</span><span class="cx">                 1AAF58940EDCCF15008D883D /* WebKitPluginAgent.defs in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588A0EDCCEA3008D883D /* WebKitPluginAgent.defs */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -517,8 +515,6 @@
</span><span class="cx">                 1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebPluginRequest.m; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HostedNetscapePluginStream.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1A8DED4F0EE88B8A00F25022 /* HostedNetscapePluginStream.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HostedNetscapePluginStream.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                1AA83F811A5C4AE400026EC6 /* WebDatabaseProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebDatabaseProvider.cpp; path = ../../Storage/WebDatabaseProvider.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                1AA83F821A5C4AE400026EC6 /* WebDatabaseProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebDatabaseProvider.h; path = ../../Storage/WebDatabaseProvider.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 1AA879B411CBE9BF003C664F /* WebPlatformStrategies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlatformStrategies.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1AA879B511CBE9BF003C664F /* WebPlatformStrategies.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPlatformStrategies.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1AAF588A0EDCCEA3008D883D /* WebKitPluginAgent.defs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.mig; path = WebKitPluginAgent.defs; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -1243,8 +1239,6 @@
</span><span class="cx">                                 511F3FD40CECC88F00852565 /* WebDatabaseManagerClient.mm */,
</span><span class="cx">                                 51AEDEF00CECF45700854328 /* WebDatabaseManagerInternal.h */,
</span><span class="cx">                                 511F3FD20CECC88F00852565 /* WebDatabaseManagerPrivate.h */,
</span><del>-                                1AA83F811A5C4AE400026EC6 /* WebDatabaseProvider.cpp */,
-                                1AA83F821A5C4AE400026EC6 /* WebDatabaseProvider.h */,
</del><span class="cx">                                 A5DEFC0D11D5343E00885273 /* WebDatabaseQuotaManager.h */,
</span><span class="cx">                                 A5DEFC0E11D5343E00885273 /* WebDatabaseQuotaManager.mm */,
</span><span class="cx">                                 1A591D431A2E91BB000907C4 /* WebStorageNamespaceProvider.cpp */,
</span><span class="lines">@@ -1858,7 +1852,6 @@
</span><span class="cx">                                 5D7BF8140C2A1D90008CE06D /* WebInspector.h in Headers */,
</span><span class="cx">                                 06693DDC0BFBA85200216072 /* WebInspectorClient.h in Headers */,
</span><span class="cx">                                 B804176F1217A83100466BAE /* WebInspectorFrontend.h in Headers */,
</span><del>-                                1AA83F841A5C4AE400026EC6 /* WebDatabaseProvider.h in Headers */,
</del><span class="cx">                                 7A8FF0D11075024A00A80A08 /* WebInspectorPrivate.h in Headers */,
</span><span class="cx">                                 939810420824BF01008DF038 /* WebJavaScriptTextInputPanel.h in Headers */,
</span><span class="cx">                                 37D1DCA81065928C0068F7EF /* WebJSPDFDoc.h in Headers */,
</span><span class="lines">@@ -2334,7 +2327,6 @@
</span><span class="cx">                                 65E0F88508500917007E5CB9 /* WebNSURLRequestExtras.m in Sources */,
</span><span class="cx">                                 65E0F9E708500F23007E5CB9 /* WebNSUserDefaultsExtras.mm in Sources */,
</span><span class="cx">                                 939810C90824BF01008DF038 /* WebNSViewExtras.m in Sources */,
</span><del>-                                1AA83F831A5C4AE400026EC6 /* WebDatabaseProvider.cpp in Sources */,
</del><span class="cx">                                 939810CA0824BF01008DF038 /* WebNSWindowExtras.m in Sources */,
</span><span class="cx">                                 A58A579A143E727000125F50 /* WebOpenPanelResultListener.mm in Sources */,
</span><span class="cx">                                 939810D00824BF01008DF038 /* WebPanelAuthenticationHandler.m in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebKit/mac/ChangeLog        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-01-06  Commit Queue  &lt;commit-queue@webkit.org&gt;
+
+        Unreviewed, rolling out r177963.
+        https://bugs.webkit.org/show_bug.cgi?id=140136
+
+        Caused lots of crashes (Requested by smfr on #webkit).
+
+        Reverted changeset:
+
+        &quot;Add a WebKit1 database provider&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=140126
+        http://trac.webkit.org/changeset/177963
+
</ins><span class="cx"> 2015-01-06  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add a WebKit1 database provider
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> #import &quot;WebDOMOperationsPrivate.h&quot;
</span><span class="cx"> #import &quot;WebDataSourceInternal.h&quot;
</span><span class="cx"> #import &quot;WebDatabaseManagerPrivate.h&quot;
</span><del>-#import &quot;WebDatabaseProvider.h&quot;
</del><span class="cx"> #import &quot;WebDefaultEditingDelegate.h&quot;
</span><span class="cx"> #import &quot;WebDefaultPolicyDelegate.h&quot;
</span><span class="cx"> #import &quot;WebDefaultUIDelegate.h&quot;
</span><span class="lines">@@ -967,7 +966,6 @@
</span><span class="cx">     pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(self);
</span><span class="cx">     pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><span class="cx">     pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self);
</span><del>-    pageConfiguration.databaseProvider = &amp;WebDatabaseProvider::shared();
</del><span class="cx">     pageConfiguration.storageNamespaceProvider = &amp;_private-&gt;group-&gt;storageNamespaceProvider();
</span><span class="cx">     pageConfiguration.userContentController = &amp;_private-&gt;group-&gt;userContentController();
</span><span class="cx">     pageConfiguration.visitedLinkStore = &amp;_private-&gt;group-&gt;visitedLinkStore();
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebKit/win/ChangeLog        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-01-06  Commit Queue  &lt;commit-queue@webkit.org&gt;
+
+        Unreviewed, rolling out r177963.
+        https://bugs.webkit.org/show_bug.cgi?id=140136
+
+        Caused lots of crashes (Requested by smfr on #webkit).
+
+        Reverted changeset:
+
+        &quot;Add a WebKit1 database provider&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=140126
+        http://trac.webkit.org/changeset/177963
+
</ins><span class="cx"> 2015-01-06  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add a WebKit1 database provider
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (177982 => 177983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp        2015-01-06 19:42:36 UTC (rev 177982)
+++ trunk/Source/WebKit/win/WebView.cpp        2015-01-06 19:43:33 UTC (rev 177983)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #include &quot;WebContextMenuClient.h&quot;
</span><span class="cx"> #include &quot;WebCoreTextRenderer.h&quot;
</span><span class="cx"> #include &quot;WebDatabaseManager.h&quot;
</span><del>-#include &quot;WebDatabaseProvider.h&quot;
</del><span class="cx"> #include &quot;WebDocumentLoader.h&quot;
</span><span class="cx"> #include &quot;WebDownload.h&quot;
</span><span class="cx"> #include &quot;WebDragClient.h&quot;
</span><span class="lines">@@ -2813,7 +2812,6 @@
</span><span class="cx">     configuration.inspectorClient = m_inspectorClient;
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">     configuration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><del>-    configuration.databaseProvider = &amp;WebDatabaseProvider::shared();
</del><span class="cx">     configuration.storageNamespaceProvider = WebStorageNamespaceProvider::create(localStorageDatabasePath(m_preferences.get()));
</span><span class="cx">     configuration.progressTrackerClient = static_cast&lt;WebFrameLoaderClient*&gt;(configuration.loaderClientForMainFrame);
</span><span class="cx">     configuration.visitedLinkStore = &amp;WebVisitedLinkStore::shared();
</span></span></pre>
</div>
</div>

</body>
</html>