<!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>[199779] trunk</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/199779">199779</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-04-20 11:59:45 -0700 (Wed, 20 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB (Workers): Enable INDEXED_DATABASE_IN_WORKERS compile time flag, but disabled in RuntimeEnabledFeatures.
https://bugs.webkit.org/show_bug.cgi?id=156782
Reviewed by Alex Christensen.
Source/JavaScriptCore:
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
Test: storage/indexeddb/modern/workers-disabled.html
storage/indexeddb/modern/workers-enable.html
* Configurations/FeatureDefines.xcconfig:
ScriptExecutionContext shouldn't really be supplementable:
* dom/ScriptExecutionContext.h:
WorkerGlobalScope should be supplementable.
Also modernize this archaic header (pragma once, and re-indent):
* workers/WorkerGlobalScope.h:
Update for WorkerGlobalScope now being directly supplementable:
* Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp:
(WebCore::WorkerGlobalScopeIndexedDatabase::WorkerGlobalScopeIndexedDatabase):
(WebCore::WorkerGlobalScopeIndexedDatabase::from):
(WebCore::WorkerGlobalScopeIndexedDatabase::indexedDB):
* Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h:
* Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl:
* Modules/notifications/WorkerGlobalScopeNotifications.cpp:
(WebCore::WorkerGlobalScopeNotifications::WorkerGlobalScopeNotifications):
(WebCore::WorkerGlobalScopeNotifications::from):
(WebCore::WorkerGlobalScopeNotifications::webkitNotifications):
* Modules/notifications/WorkerGlobalScopeNotifications.h:
Expose IndexedDBWorkers to RuntimeEnabledFeatures:
* bindings/generic/RuntimeEnabledFeatures.cpp:
(WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
* bindings/generic/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::setIndexedDBWorkersEnabled):
(WebCore::RuntimeEnabledFeatures::indexedDBWorkersEnabled):
Expose IndexedDBWorkers to InternalSettings:
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setIndexedDBWorkersEnabled):
* testing/InternalSettings.h:
* testing/InternalSettings.idl:
Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
Tools:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
LayoutTests:
Note: One test has some "FAIL" lines in the expected results, which is intentional.
As work on this progresses, those FAILs will become PASSes and the expectations will be updated.
* storage/indexeddb/modern/resources/workers-disabled.js: Added.
* storage/indexeddb/modern/resources/workers-enable.js: Added.
* storage/indexeddb/modern/workers-disabled-expected.txt: Added.
* storage/indexeddb/modern/workers-disabled.html: Added.
* storage/indexeddb/modern/workers-enable-expected.txt: Added.
* storage/indexeddb/modern/workers-enable.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbWorkerGlobalScopeIndexedDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbWorkerGlobalScopeIndexedDatabaseh">trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbWorkerGlobalScopeIndexedDatabaseidl">trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsWorkerGlobalScopeNotificationscpp">trunk/Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsWorkerGlobalScopeNotificationsh">trunk/Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturescpp">trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturesh">trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingscpp">trunk/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsh">trunk/Source/WebCore/testing/InternalSettings.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsidl">trunk/Source/WebCore/testing/InternalSettings.idl</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeh">trunk/Source/WebCore/workers/WorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig">trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesworkersdisabledjs">trunk/LayoutTests/storage/indexeddb/modern/resources/workers-disabled.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesworkersenablejs">trunk/LayoutTests/storage/indexeddb/modern/resources/workers-enable.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernworkersdisabledexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/workers-disabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernworkersdisabledhtml">trunk/LayoutTests/storage/indexeddb/modern/workers-disabled.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernworkersenableexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/workers-enable-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernworkersenablehtml">trunk/LayoutTests/storage/indexeddb/modern/workers-enable.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/LayoutTests/ChangeLog        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-20 Brady Eidson <beidson@apple.com>
+
+ Modern IDB (Workers): Enable INDEXED_DATABASE_IN_WORKERS compile time flag, but disabled in RuntimeEnabledFeatures.
+ https://bugs.webkit.org/show_bug.cgi?id=156782
+
+ Reviewed by Alex Christensen.
+
+ Note: One test has some "FAIL" lines in the expected results, which is intentional.
+ As work on this progresses, those FAILs will become PASSes and the expectations will be updated.
+
+ * storage/indexeddb/modern/resources/workers-disabled.js: Added.
+ * storage/indexeddb/modern/resources/workers-enable.js: Added.
+ * storage/indexeddb/modern/workers-disabled-expected.txt: Added.
+ * storage/indexeddb/modern/workers-disabled.html: Added.
+ * storage/indexeddb/modern/workers-enable-expected.txt: Added.
+ * storage/indexeddb/modern/workers-enable.html: Added.
+
</ins><span class="cx"> 2016-04-20 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][Mac][iOS] WebContent crash when using special file:// URI scheme @ WebKit::resolveSymlinksInPath(WTF::CString const&) + 159
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesworkersdisabledjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/workers-disabled.js (0 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/workers-disabled.js         (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/workers-disabled.js        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+if (this.importScripts) {
+ importScripts('../../../../resources/js-test.js');
+ importScripts('../../resources/shared.js');
+}
+
+description("Check to make sure IndexedDB in workers can be disabled at runtime");
+
+shouldBeUndefined("self.indexedDB");
+
+finishJSTest();
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesworkersenablejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/workers-enable.js (0 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/workers-enable.js         (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/workers-enable.js        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+if (this.importScripts) {
+ importScripts('../../../../resources/js-test.js');
+ importScripts('../../resources/shared.js');
+}
+
+description("Check to make sure we can enable IndexedDB in workers via a runtime setting");
+
+shouldBeDefined("self.indexedDB");
+shouldBeNonNull("self.indexedDB");
+shouldBeTrue("self.indexedDB instanceof IDBFactory");
+
+finishJSTest();
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernworkersdisabledexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/workers-disabled-expected.txt (0 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/workers-disabled-expected.txt         (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/workers-disabled-expected.txt        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+[Worker] Check to make sure IndexedDB in workers can be disabled at runtime
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting worker: resources/workers-disabled.js
+PASS [Worker] self.indexedDB is undefined.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernworkersdisabledhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/workers-disabled.html (0 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/workers-disabled.html         (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/workers-disabled.html        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script>
+
+/*
+IndexedDB for workers is currently disabled by default.
+Once that changes, we'll need the following code to keep this test passing.
+if (window.internals)
+ window.internals.settings.setIndexedDBWorkersEnabled(false);
+*/
+worker = startWorker('resources/workers-disabled.js');</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernworkersenableexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/workers-enable-expected.txt (0 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/workers-enable-expected.txt         (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/workers-enable-expected.txt        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+[Worker] Check to make sure we can enable IndexedDB in workers via a runtime setting
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting worker: resources/workers-enable.js
+PASS [Worker] self.indexedDB is defined.
+FAIL [Worker] self.indexedDB should be non-null. Was null
+FAIL [Worker] self.indexedDB instanceof IDBFactory should be true. Was false.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernworkersenablehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/workers-enable.html (0 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/workers-enable.html         (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/workers-enable.html        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script>
+if (window.internals)
+ window.internals.settings.setIndexedDBWorkersEnabled(true);
+worker = startWorker('resources/workers-enable.js');</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-20 Brady Eidson <beidson@apple.com>
+
+ Modern IDB (Workers): Enable INDEXED_DATABASE_IN_WORKERS compile time flag, but disabled in RuntimeEnabledFeatures.
+ https://bugs.webkit.org/show_bug.cgi?id=156782
+
+ Reviewed by Alex Christensen.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-04-20 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused m_writtenVariables from the parser and related bits
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><span class="cx"> ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><del>-ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</del><ins>+ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
</ins><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="cx"> ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
</span><span class="cx"> ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/ChangeLog        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2016-04-20 Brady Eidson <beidson@apple.com>
+
+ Modern IDB (Workers): Enable INDEXED_DATABASE_IN_WORKERS compile time flag, but disabled in RuntimeEnabledFeatures.
+ https://bugs.webkit.org/show_bug.cgi?id=156782
+
+ Reviewed by Alex Christensen.
+
+ Test: storage/indexeddb/modern/workers-disabled.html
+ storage/indexeddb/modern/workers-enable.html
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ ScriptExecutionContext shouldn't really be supplementable:
+ * dom/ScriptExecutionContext.h:
+
+ WorkerGlobalScope should be supplementable.
+ Also modernize this archaic header (pragma once, and re-indent):
+ * workers/WorkerGlobalScope.h:
+
+ Update for WorkerGlobalScope now being directly supplementable:
+ * Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp:
+ (WebCore::WorkerGlobalScopeIndexedDatabase::WorkerGlobalScopeIndexedDatabase):
+ (WebCore::WorkerGlobalScopeIndexedDatabase::from):
+ (WebCore::WorkerGlobalScopeIndexedDatabase::indexedDB):
+ * Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h:
+ * Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl:
+ * Modules/notifications/WorkerGlobalScopeNotifications.cpp:
+ (WebCore::WorkerGlobalScopeNotifications::WorkerGlobalScopeNotifications):
+ (WebCore::WorkerGlobalScopeNotifications::from):
+ (WebCore::WorkerGlobalScopeNotifications::webkitNotifications):
+ * Modules/notifications/WorkerGlobalScopeNotifications.h:
+
+ Expose IndexedDBWorkers to RuntimeEnabledFeatures:
+ * bindings/generic/RuntimeEnabledFeatures.cpp:
+ (WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ (WebCore::RuntimeEnabledFeatures::setIndexedDBWorkersEnabled):
+ (WebCore::RuntimeEnabledFeatures::indexedDBWorkersEnabled):
+
+ Expose IndexedDBWorkers to InternalSettings:
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup):
+ (WebCore::InternalSettings::Backup::restoreTo):
+ (WebCore::InternalSettings::setIndexedDBWorkersEnabled):
+ * testing/InternalSettings.h:
+ * testing/InternalSettings.idl:
+
</ins><span class="cx"> 2016-04-20 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Hangable punctuation measurement using the wrong indices.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><span class="cx"> ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><del>-ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</del><ins>+ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
</ins><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="cx"> ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
</span><span class="cx"> ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbWorkerGlobalScopeIndexedDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -34,10 +34,11 @@
</span><span class="cx"> #include "IDBFactory.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><ins>+#include "WorkerGlobalScope.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WorkerGlobalScopeIndexedDatabase::WorkerGlobalScopeIndexedDatabase()
</del><ins>+WorkerGlobalScopeIndexedDatabase::WorkerGlobalScopeIndexedDatabase(WorkerGlobalScope&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -50,20 +51,20 @@
</span><span class="cx"> return "WorkerGlobalScopeIndexedDatabase";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WorkerGlobalScopeIndexedDatabase* WorkerGlobalScopeIndexedDatabase::from(ScriptExecutionContext* context)
</del><ins>+WorkerGlobalScopeIndexedDatabase* WorkerGlobalScopeIndexedDatabase::from(WorkerGlobalScope& scope)
</ins><span class="cx"> {
</span><del>- WorkerGlobalScopeIndexedDatabase* supplement = static_cast<WorkerGlobalScopeIndexedDatabase*>(Supplement<ScriptExecutionContext>::from(context, supplementName()));
</del><ins>+ WorkerGlobalScopeIndexedDatabase* supplement = static_cast<WorkerGlobalScopeIndexedDatabase*>(Supplement<WorkerGlobalScope>::from(&scope, supplementName()));
</ins><span class="cx"> if (!supplement) {
</span><del>- auto newSupplement = std::make_unique<WorkerGlobalScopeIndexedDatabase>();
</del><ins>+ auto newSupplement = std::make_unique<WorkerGlobalScopeIndexedDatabase>(scope);
</ins><span class="cx"> supplement = newSupplement.get();
</span><del>- provideTo(context, supplementName(), WTFMove(newSupplement));
</del><ins>+ provideTo(&scope, supplementName(), WTFMove(newSupplement));
</ins><span class="cx"> }
</span><span class="cx"> return supplement;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IDBFactory* WorkerGlobalScopeIndexedDatabase::indexedDB(ScriptExecutionContext* context)
</del><ins>+IDBFactory* WorkerGlobalScopeIndexedDatabase::indexedDB(WorkerGlobalScope& scope)
</ins><span class="cx"> {
</span><del>- return from(context)->indexedDB();
</del><ins>+ return from(scope)->indexedDB();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBFactory* WorkerGlobalScopeIndexedDatabase::indexedDB()
</span><span class="lines">@@ -73,4 +74,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(INDEXED_DATABASE)
</del><ins>+#endif // ENABLE(INDEXED_DATABASE_IN_WORKERS)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbWorkerGlobalScopeIndexedDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008, 2009, 2013, 2014, 2015, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerGlobalScopeIndexedDatabase_h
-#define WorkerGlobalScopeIndexedDatabase_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
</span><span class="cx">
</span><span class="lines">@@ -35,15 +34,15 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class IDBFactory;
</span><del>-class ScriptExecutionContext;
</del><ins>+class WorkerGlobalScope;
</ins><span class="cx">
</span><del>-class WorkerGlobalScopeIndexedDatabase : public Supplement<ScriptExecutionContext> {
</del><ins>+class WorkerGlobalScopeIndexedDatabase : public Supplement<WorkerGlobalScope> {
</ins><span class="cx"> public:
</span><del>- explicit WorkerGlobalScopeIndexedDatabase();
</del><ins>+ explicit WorkerGlobalScopeIndexedDatabase(WorkerGlobalScope&);
</ins><span class="cx"> virtual ~WorkerGlobalScopeIndexedDatabase();
</span><del>- static WorkerGlobalScopeIndexedDatabase* from(ScriptExecutionContext*);
</del><span class="cx">
</span><del>- static IDBFactory* indexedDB(ScriptExecutionContext*);
</del><ins>+ static WorkerGlobalScopeIndexedDatabase* from(WorkerGlobalScope&);
+ static IDBFactory* indexedDB(WorkerGlobalScope&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> IDBFactory* indexedDB();
</span><span class="lines">@@ -54,6 +53,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(INDEXED_DATABASE)
-
-#endif // WorkerGlobalScopeIndexedDatabase_h
</del><ins>+#endif // ENABLE(INDEXED_DATABASE_IN_WORKERS)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbWorkerGlobalScopeIndexedDatabaseidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -27,6 +27,6 @@
</span><span class="cx"> [
</span><span class="cx"> Conditional=INDEXED_DATABASE_IN_WORKERS,
</span><span class="cx"> ] partial interface WorkerGlobalScope {
</span><del>- [EnabledAtRuntime=IndexedDB] readonly attribute IDBFactory indexedDB;
</del><ins>+ [EnabledAtRuntime=IndexedDBWorkers] readonly attribute IDBFactory indexedDB;
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsWorkerGlobalScopeNotificationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.cpp (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.cpp        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.cpp        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WorkerGlobalScopeNotifications::WorkerGlobalScopeNotifications(WorkerGlobalScope* context)
- : m_context(context)
</del><ins>+WorkerGlobalScopeNotifications::WorkerGlobalScopeNotifications(WorkerGlobalScope& scope)
+ : m_context(&scope)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -50,20 +50,20 @@
</span><span class="cx"> return "WorkerGlobalScopeNotifications";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WorkerGlobalScopeNotifications* WorkerGlobalScopeNotifications::from(WorkerGlobalScope* context)
</del><ins>+WorkerGlobalScopeNotifications* WorkerGlobalScopeNotifications::from(WorkerGlobalScope& scope)
</ins><span class="cx"> {
</span><del>- WorkerGlobalScopeNotifications* supplement = static_cast<WorkerGlobalScopeNotifications*>(Supplement<ScriptExecutionContext>::from(context, supplementName()));
</del><ins>+ WorkerGlobalScopeNotifications* supplement = static_cast<WorkerGlobalScopeNotifications*>(Supplement<WorkerGlobalScope>::from(&scope, supplementName()));
</ins><span class="cx"> if (!supplement) {
</span><del>- auto newSupplement = std::make_unique<WorkerGlobalScopeNotifications>(context);
</del><ins>+ auto newSupplement = std::make_unique<WorkerGlobalScopeNotifications>(scope);
</ins><span class="cx"> supplement = newSupplement.get();
</span><del>- provideTo(context, supplementName(), WTFMove(newSupplement));
</del><ins>+ provideTo(&scope, supplementName(), WTFMove(newSupplement));
</ins><span class="cx"> }
</span><span class="cx"> return supplement;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NotificationCenter* WorkerGlobalScopeNotifications::webkitNotifications(WorkerGlobalScope& context)
</del><ins>+NotificationCenter* WorkerGlobalScopeNotifications::webkitNotifications(WorkerGlobalScope& scope)
</ins><span class="cx"> {
</span><del>- return WorkerGlobalScopeNotifications::from(&context)->webkitNotifications();
</del><ins>+ return WorkerGlobalScopeNotifications::from(scope)->webkitNotifications();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NotificationCenter* WorkerGlobalScopeNotifications::webkitNotifications()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsWorkerGlobalScopeNotificationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.h (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.h        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.h        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008, 2009, 2013, 2014, 2015, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerGlobalScopeNotifications_h
-#define WorkerGlobalScopeNotifications_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx">
</span><span class="lines">@@ -37,13 +36,13 @@
</span><span class="cx"> class ScriptExecutionContext;
</span><span class="cx"> class WorkerGlobalScope;
</span><span class="cx">
</span><del>-class WorkerGlobalScopeNotifications : public Supplement<ScriptExecutionContext> {
</del><ins>+class WorkerGlobalScopeNotifications : public Supplement<WorkerGlobalScope> {
</ins><span class="cx"> public:
</span><del>- explicit WorkerGlobalScopeNotifications(WorkerGlobalScope*);
</del><ins>+ explicit WorkerGlobalScopeNotifications(WorkerGlobalScope&);
</ins><span class="cx"> virtual ~WorkerGlobalScopeNotifications();
</span><span class="cx">
</span><span class="cx"> static NotificationCenter* webkitNotifications(WorkerGlobalScope&);
</span><del>- static WorkerGlobalScopeNotifications* from(WorkerGlobalScope*);
</del><ins>+ static WorkerGlobalScopeNotifications* from(WorkerGlobalScope&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NotificationCenter* webkitNotifications();
</span><span class="lines">@@ -56,5 +55,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><del>-
-#endif // WorkerGlobalScopeNotifications_h
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> , m_isApplicationCacheEnabled(true)
</span><span class="cx"> , m_isDataTransferItemsEnabled(true)
</span><span class="cx"> , m_isGeolocationEnabled(true)
</span><del>- , m_isIndexedDBEnabled(false)
</del><span class="cx"> , m_isTouchEnabled(true)
</span><span class="cx"> , m_isDeviceMotionEnabled(true)
</span><span class="cx"> , m_isDeviceOrientationEnabled(true)
</span><span class="lines">@@ -60,6 +59,12 @@
</span><span class="cx"> #else
</span><span class="cx"> , m_isPluginReplacementEnabled(false)
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(INDEXED_DATABASE)
+ , m_isIndexedDBEnabled(false)
+#endif
+#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
+ , m_isIndexedDBWorkersEnabled(false)
+#endif
</ins><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> , m_isMediaStreamEnabled(true)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -29,8 +29,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RuntimeEnabledFeatures_h
-#define RuntimeEnabledFeatures_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "PlatformExportMacros.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -62,10 +61,17 @@
</span><span class="cx"> void setGeolocationEnabled(bool isEnabled) { m_isGeolocationEnabled = isEnabled; }
</span><span class="cx"> bool geolocationEnabled() const { return m_isGeolocationEnabled; }
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> void setWebkitIndexedDBEnabled(bool isEnabled) { m_isIndexedDBEnabled = isEnabled; }
</span><span class="cx"> bool webkitIndexedDBEnabled() const { return m_isIndexedDBEnabled; }
</span><span class="cx"> bool indexedDBEnabled() const { return m_isIndexedDBEnabled; }
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
+ void setIndexedDBWorkersEnabled(bool isEnabled) { m_isIndexedDBWorkersEnabled = isEnabled; }
+ bool indexedDBWorkersEnabled() const { return m_isIndexedDBWorkersEnabled; }
+#endif
+
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> void setCSSShapesEnabled(bool isEnabled) { m_isCSSShapesEnabled = isEnabled; }
</span><span class="cx"> bool cssShapesEnabled() const { return m_isCSSShapesEnabled; }
</span><span class="lines">@@ -247,7 +253,6 @@
</span><span class="cx"> bool m_isApplicationCacheEnabled;
</span><span class="cx"> bool m_isDataTransferItemsEnabled;
</span><span class="cx"> bool m_isGeolocationEnabled;
</span><del>- bool m_isIndexedDBEnabled;
</del><span class="cx"> bool m_isTouchEnabled;
</span><span class="cx"> bool m_isDeviceMotionEnabled;
</span><span class="cx"> bool m_isDeviceOrientationEnabled;
</span><span class="lines">@@ -258,6 +263,14 @@
</span><span class="cx"> bool m_isLangAttributeAwareFormControlUIEnabled;
</span><span class="cx"> bool m_isPluginReplacementEnabled;
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
+ bool m_isIndexedDBEnabled;
+#endif
+
+#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
+ bool m_isIndexedDBWorkersEnabled;
+#endif
+
</ins><span class="cx"> #if ENABLE(JAVASCRIPT_I18N_API)
</span><span class="cx"> bool m_isJavaScriptI18NAPIEnabled;
</span><span class="cx"> #endif
</span><span class="lines">@@ -345,5 +358,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // RuntimeEnabledFeatures_h
</del></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016 Apple Inc. All Rights Reserved.
</ins><span class="cx"> * Copyright (C) 2012 Google Inc. All Rights Reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -25,8 +25,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef ScriptExecutionContext_h
-#define ScriptExecutionContext_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "DOMTimer.h"
</span><span class="lines">@@ -56,7 +55,7 @@
</span><span class="cx"> class SecurityOrigin;
</span><span class="cx"> class URL;
</span><span class="cx">
</span><del>-class ScriptExecutionContext : public SecurityContext, public Supplementable<ScriptExecutionContext> {
</del><ins>+class ScriptExecutionContext : public SecurityContext {
</ins><span class="cx"> public:
</span><span class="cx"> ScriptExecutionContext();
</span><span class="cx"> virtual ~ScriptExecutionContext();
</span><span class="lines">@@ -247,5 +246,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ScriptExecutionContext_h
</del></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.cpp        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_allowsInlineMediaPlayback(settings.allowsInlineMediaPlayback())
</span><span class="cx"> , m_inlineMediaPlaybackRequiresPlaysInlineAttribute(settings.inlineMediaPlaybackRequiresPlaysInlineAttribute())
</span><ins>+ , m_indexedDBWorkersEnabled(RuntimeEnabledFeatures::sharedFeatures().indexedDBWorkersEnabled())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -170,6 +171,7 @@
</span><span class="cx"> settings.setAllowsInlineMediaPlayback(m_allowsInlineMediaPlayback);
</span><span class="cx"> settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(m_inlineMediaPlaybackRequiresPlaysInlineAttribute);
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
</span><ins>+ RuntimeEnabledFeatures::sharedFeatures().setIndexedDBWorkersEnabled(m_indexedDBWorkersEnabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class InternalSettingsWrapper : public Supplement<Page> {
</span><span class="lines">@@ -540,6 +542,14 @@
</span><span class="cx"> settings()->setInlineMediaPlaybackRequiresPlaysInlineAttribute(requires);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InternalSettings::setIndexedDBWorkersEnabled(bool enabled, ExceptionCode&)
+{
+#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
+ RuntimeEnabledFeatures::sharedFeatures().setIndexedDBWorkersEnabled(enabled);
+#endif
+}
+
+
</ins><span class="cx"> // If you add to this list, make sure that you update the Backup class for test reproducability!
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.h (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.h        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/testing/InternalSettings.h        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014, 2015, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef InternalSettings_h
-#define InternalSettings_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> // FIXME (121927): This include should not be needed.
</span><span class="cx"> #include <wtf/text/AtomicStringHash.h>
</span><span class="lines">@@ -100,6 +99,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> bool m_allowsInlineMediaPlayback;
</span><span class="cx"> bool m_inlineMediaPlaybackRequiresPlaysInlineAttribute;
</span><ins>+ bool m_indexedDBWorkersEnabled;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static Ref<InternalSettings> create(Page* page)
</span><span class="lines">@@ -147,6 +147,7 @@
</span><span class="cx"> void setScrollingTreeIncludesFrames(bool, ExceptionCode&);
</span><span class="cx"> void setAllowsInlineMediaPlayback(bool, ExceptionCode&);
</span><span class="cx"> void setInlineMediaPlaybackRequiresPlaysInlineAttribute(bool, ExceptionCode&);
</span><ins>+ void setIndexedDBWorkersEnabled(bool, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit InternalSettings(Page*);
</span><span class="lines">@@ -160,5 +161,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.idl (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.idl        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/testing/InternalSettings.idl        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -77,5 +77,7 @@
</span><span class="cx"> [RaisesException] void setMinimumTimerInterval(unrestricted double intervalInSeconds);
</span><span class="cx"> [RaisesException] void setAllowsInlineMediaPlayback(boolean allows);
</span><span class="cx"> [RaisesException] void setInlineMediaPlaybackRequiresPlaysInlineAttribute(boolean requires);
</span><ins>+
+ [RaisesException] void setIndexedDBWorkersEnabled(boolean requires);
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WorkerGlobalScope_h
-#define WorkerGlobalScope_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "EventListener.h"
</span><span class="cx"> #include "EventTarget.h"
</span><span class="lines">@@ -47,139 +46,137 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class Blob;
- class ContentSecurityPolicyResponseHeaders;
- class ScheduledAction;
- class WorkerLocation;
- class WorkerNavigator;
- class WorkerThread;
</del><ins>+class Blob;
+class ContentSecurityPolicyResponseHeaders;
+class ScheduledAction;
+class WorkerLocation;
+class WorkerNavigator;
+class WorkerThread;
</ins><span class="cx">
</span><del>- class WorkerGlobalScope : public RefCounted<WorkerGlobalScope>, public ScriptExecutionContext, public EventTargetWithInlineData {
- public:
- virtual ~WorkerGlobalScope();
</del><ins>+class WorkerGlobalScope : public RefCounted<WorkerGlobalScope>, public Supplementable<WorkerGlobalScope>, public ScriptExecutionContext, public EventTargetWithInlineData {
+public:
+ virtual ~WorkerGlobalScope();
</ins><span class="cx">
</span><del>- bool isWorkerGlobalScope() const override { return true; }
</del><ins>+ bool isWorkerGlobalScope() const override { return true; }
</ins><span class="cx">
</span><del>- ScriptExecutionContext* scriptExecutionContext() const final { return const_cast<WorkerGlobalScope*>(this); }
</del><ins>+ ScriptExecutionContext* scriptExecutionContext() const final { return const_cast<WorkerGlobalScope*>(this); }
</ins><span class="cx">
</span><del>- virtual bool isDedicatedWorkerGlobalScope() const { return false; }
</del><ins>+ virtual bool isDedicatedWorkerGlobalScope() const { return false; }
</ins><span class="cx">
</span><del>- const URL& url() const final { return m_url; }
- URL completeURL(const String&) const final;
</del><ins>+ const URL& url() const final { return m_url; }
+ URL completeURL(const String&) const final;
</ins><span class="cx">
</span><del>- String userAgent(const URL&) const override;
</del><ins>+ String userAgent(const URL&) const override;
</ins><span class="cx">
</span><del>- void disableEval(const String& errorMessage) override;
</del><ins>+ void disableEval(const String& errorMessage) override;
</ins><span class="cx">
</span><del>- bool shouldBypassMainWorldContentSecurityPolicy() const final { return m_shouldBypassMainWorldContentSecurityPolicy; }
</del><ins>+ bool shouldBypassMainWorldContentSecurityPolicy() const final { return m_shouldBypassMainWorldContentSecurityPolicy; }
</ins><span class="cx">
</span><del>- WorkerScriptController* script() { return m_script.get(); }
- void clearScript() { m_script = nullptr; }
</del><ins>+ WorkerScriptController* script() { return m_script.get(); }
+ void clearScript() { m_script = nullptr; }
</ins><span class="cx">
</span><del>- WorkerThread& thread() const { return m_thread; }
</del><ins>+ WorkerThread& thread() const { return m_thread; }
</ins><span class="cx">
</span><del>- using ScriptExecutionContext::hasPendingActivity;
</del><ins>+ using ScriptExecutionContext::hasPendingActivity;
</ins><span class="cx">
</span><del>- void postTask(Task) override; // Executes the task on context's thread asynchronously.
</del><ins>+ void postTask(Task) override; // Executes the task on context's thread asynchronously.
</ins><span class="cx">
</span><del>- // WorkerGlobalScope
- WorkerGlobalScope* self() { return this; }
- WorkerLocation* location() const;
- void close();
</del><ins>+ // WorkerGlobalScope
+ WorkerGlobalScope* self() { return this; }
+ WorkerLocation* location() const;
+ void close();
</ins><span class="cx">
</span><del>- // WorkerUtils
- virtual void importScripts(const Vector<String>& urls, ExceptionCode&);
- WorkerNavigator* navigator() const;
</del><ins>+ // WorkerUtils
+ virtual void importScripts(const Vector<String>& urls, ExceptionCode&);
+ WorkerNavigator* navigator() const;
</ins><span class="cx">
</span><del>- // Timers
- int setTimeout(std::unique_ptr<ScheduledAction>, int timeout);
- void clearTimeout(int timeoutId);
- int setInterval(std::unique_ptr<ScheduledAction>, int timeout);
- void clearInterval(int timeoutId);
</del><ins>+ // Timers
+ int setTimeout(std::unique_ptr<ScheduledAction>, int timeout);
+ void clearTimeout(int timeoutId);
+ int setInterval(std::unique_ptr<ScheduledAction>, int timeout);
+ void clearInterval(int timeoutId);
</ins><span class="cx">
</span><del>- bool isContextThread() const override;
- bool isJSExecutionForbidden() const override;
</del><ins>+ bool isContextThread() const override;
+ bool isJSExecutionForbidden() const override;
</ins><span class="cx">
</span><del>- // These methods are used for GC marking. See JSWorkerGlobalScope::visitChildrenVirtual(SlotVisitor&) in
- // JSWorkerGlobalScopeCustom.cpp.
- WorkerNavigator* optionalNavigator() const { return m_navigator.get(); }
- WorkerLocation* optionalLocation() const { return m_location.get(); }
</del><ins>+ // These methods are used for GC marking. See JSWorkerGlobalScope::visitChildrenVirtual(SlotVisitor&) in
+ // JSWorkerGlobalScopeCustom.cpp.
+ WorkerNavigator* optionalNavigator() const { return m_navigator.get(); }
+ WorkerLocation* optionalLocation() const { return m_location.get(); }
</ins><span class="cx">
</span><del>- using RefCounted<WorkerGlobalScope>::ref;
- using RefCounted<WorkerGlobalScope>::deref;
</del><ins>+ using RefCounted<WorkerGlobalScope>::ref;
+ using RefCounted<WorkerGlobalScope>::deref;
</ins><span class="cx">
</span><del>- bool isClosing() { return m_closing; }
</del><ins>+ bool isClosing() { return m_closing; }
</ins><span class="cx">
</span><del>- // An observer interface to be notified when the worker thread is getting stopped.
- class Observer {
- WTF_MAKE_NONCOPYABLE(Observer);
- public:
- Observer(WorkerGlobalScope*);
- virtual ~Observer();
- virtual void notifyStop() = 0;
- void stopObserving();
- private:
- WorkerGlobalScope* m_context;
- };
- friend class Observer;
- void registerObserver(Observer*);
- void unregisterObserver(Observer*);
- void notifyObserversOfStop();
</del><ins>+ // An observer interface to be notified when the worker thread is getting stopped.
+ class Observer {
+ WTF_MAKE_NONCOPYABLE(Observer);
+ public:
+ Observer(WorkerGlobalScope*);
+ virtual ~Observer();
+ virtual void notifyStop() = 0;
+ void stopObserving();
+ private:
+ WorkerGlobalScope* m_context;
+ };
+ friend class Observer;
+ void registerObserver(Observer*);
+ void unregisterObserver(Observer*);
+ void notifyObserversOfStop();
</ins><span class="cx">
</span><del>- SecurityOrigin* topOrigin() const override { return m_topOrigin.get(); }
</del><ins>+ SecurityOrigin* topOrigin() const override { return m_topOrigin.get(); }
</ins><span class="cx">
</span><del>- void addConsoleMessage(std::unique_ptr<Inspector::ConsoleMessage>);
- void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0) override;
</del><ins>+ void addConsoleMessage(std::unique_ptr<Inspector::ConsoleMessage>);
+ void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0) override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><del>- bool wrapCryptoKey(const Vector<uint8_t>& key, Vector<uint8_t>& wrappedKey) override;
- bool unwrapCryptoKey(const Vector<uint8_t>& wrappedKey, Vector<uint8_t>& key) override;
</del><ins>+ bool wrapCryptoKey(const Vector<uint8_t>& key, Vector<uint8_t>& wrappedKey) override;
+ bool unwrapCryptoKey(const Vector<uint8_t>& wrappedKey, Vector<uint8_t>& key) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- protected:
- WorkerGlobalScope(const URL&, const String& userAgent, WorkerThread&, bool shouldBypassMainWorldContentSecurityPolicy, PassRefPtr<SecurityOrigin> topOrigin);
- void applyContentSecurityPolicyResponseHeaders(const ContentSecurityPolicyResponseHeaders&);
</del><ins>+protected:
+ WorkerGlobalScope(const URL&, const String& userAgent, WorkerThread&, bool shouldBypassMainWorldContentSecurityPolicy, PassRefPtr<SecurityOrigin> topOrigin);
+ void applyContentSecurityPolicyResponseHeaders(const ContentSecurityPolicyResponseHeaders&);
</ins><span class="cx">
</span><del>- void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, RefPtr<Inspector::ScriptCallStack>&&) override;
- void addMessageToWorkerConsole(std::unique_ptr<Inspector::ConsoleMessage>);
- void addMessageToWorkerConsole(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
</del><ins>+ void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, RefPtr<Inspector::ScriptCallStack>&&) override;
+ void addMessageToWorkerConsole(std::unique_ptr<Inspector::ConsoleMessage>);
+ void addMessageToWorkerConsole(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
</ins><span class="cx">
</span><del>- private:
- void refScriptExecutionContext() override { ref(); }
- void derefScriptExecutionContext() override { deref(); }
</del><ins>+private:
+ void refScriptExecutionContext() override { ref(); }
+ void derefScriptExecutionContext() override { deref(); }
</ins><span class="cx">
</span><del>- void refEventTarget() final { ref(); }
- void derefEventTarget() final { deref(); }
</del><ins>+ void refEventTarget() final { ref(); }
+ void derefEventTarget() final { deref(); }
</ins><span class="cx">
</span><del>- void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) override;
</del><ins>+ void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) override;
</ins><span class="cx">
</span><del>- EventTarget* errorEventTarget() override;
</del><ins>+ EventTarget* errorEventTarget() override;
</ins><span class="cx">
</span><del>- WorkerEventQueue& eventQueue() const final;
</del><ins>+ WorkerEventQueue& eventQueue() const final;
</ins><span class="cx">
</span><del>- URL m_url;
- String m_userAgent;
</del><ins>+ URL m_url;
+ String m_userAgent;
</ins><span class="cx">
</span><del>- mutable RefPtr<WorkerLocation> m_location;
- mutable RefPtr<WorkerNavigator> m_navigator;
</del><ins>+ mutable RefPtr<WorkerLocation> m_location;
+ mutable RefPtr<WorkerNavigator> m_navigator;
</ins><span class="cx">
</span><del>- std::unique_ptr<WorkerScriptController> m_script;
- WorkerThread& m_thread;
</del><ins>+ std::unique_ptr<WorkerScriptController> m_script;
+ WorkerThread& m_thread;
</ins><span class="cx">
</span><del>- bool m_closing;
- bool m_shouldBypassMainWorldContentSecurityPolicy;
</del><ins>+ bool m_closing;
+ bool m_shouldBypassMainWorldContentSecurityPolicy;
</ins><span class="cx">
</span><del>- HashSet<Observer*> m_workerObservers;
</del><ins>+ HashSet<Observer*> m_workerObservers;
</ins><span class="cx">
</span><del>- mutable WorkerEventQueue m_eventQueue;
</del><ins>+ mutable WorkerEventQueue m_eventQueue;
</ins><span class="cx">
</span><del>- RefPtr<SecurityOrigin> m_topOrigin;
- };
</del><ins>+ RefPtr<SecurityOrigin> m_topOrigin;
+};
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::WorkerGlobalScope)
</span><span class="cx"> static bool isType(const WebCore::ScriptExecutionContext& context) { return context.isWorkerGlobalScope(); }
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><del>-
-#endif // WorkerGlobalScope_h
</del></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebKit/mac/ChangeLog        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-20 Brady Eidson <beidson@apple.com>
+
+ Modern IDB (Workers): Enable INDEXED_DATABASE_IN_WORKERS compile time flag, but disabled in RuntimeEnabledFeatures.
+ https://bugs.webkit.org/show_bug.cgi?id=156782
+
+ Reviewed by Alex Christensen.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-04-18 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix build with newer versions of clang.
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><span class="cx"> ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><del>-ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</del><ins>+ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
</ins><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="cx"> ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
</span><span class="cx"> ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebKit2/ChangeLog        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-20 Brady Eidson <beidson@apple.com>
+
+ Modern IDB (Workers): Enable INDEXED_DATABASE_IN_WORKERS compile time flag, but disabled in RuntimeEnabledFeatures.
+ https://bugs.webkit.org/show_bug.cgi?id=156782
+
+ Reviewed by Alex Christensen.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-04-20 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][Mac][iOS] WebContent crash when using special file:// URI scheme @ WebKit::resolveSymlinksInPath(WTF::CString const&) + 159
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><span class="cx"> ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><del>-ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</del><ins>+ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
</ins><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="cx"> ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
</span><span class="cx"> ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Tools/ChangeLog        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-20 Brady Eidson <beidson@apple.com>
+
+ Modern IDB (Workers): Enable INDEXED_DATABASE_IN_WORKERS compile time flag, but disabled in RuntimeEnabledFeatures.
+ https://bugs.webkit.org/show_bug.cgi?id=156782
+
+ Reviewed by Alex Christensen.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-04-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix after r199752.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (199778 => 199779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig        2016-04-20 18:26:20 UTC (rev 199778)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig        2016-04-20 18:59:45 UTC (rev 199779)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><span class="cx"> ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><del>-ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</del><ins>+ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
</ins><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="cx"> ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
</span><span class="cx"> ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
</span></span></pre>
</div>
</div>
</body>
</html>