<!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>[178575] 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/178575">178575</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-16 00:05:12 -0800 (Fri, 16 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove ENABLE(SQL_DATABASE) guards
https://bugs.webkit.org/show_bug.cgi?id=140434
Reviewed by Darin Adler.
.:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:
Source/JavaScriptCore:
* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* DerivedSources.make:
* inspector/protocol/Database.json:
Source/WebCore:
* Configurations/FeatureDefines.xcconfig:
* Modules/webdatabase/AbstractDatabaseServer.h:
* Modules/webdatabase/ChangeVersionData.h:
* Modules/webdatabase/ChangeVersionWrapper.cpp:
* Modules/webdatabase/ChangeVersionWrapper.h:
* Modules/webdatabase/DOMWindowWebDatabase.cpp:
* Modules/webdatabase/DOMWindowWebDatabase.h:
* Modules/webdatabase/DOMWindowWebDatabase.idl:
* Modules/webdatabase/Database.cpp:
* Modules/webdatabase/Database.h:
* Modules/webdatabase/Database.idl:
* Modules/webdatabase/DatabaseBackend.cpp:
* Modules/webdatabase/DatabaseBackend.h:
* Modules/webdatabase/DatabaseBackendBase.cpp:
* Modules/webdatabase/DatabaseBackendBase.h:
* Modules/webdatabase/DatabaseBasicTypes.h:
* Modules/webdatabase/DatabaseCallback.h:
* Modules/webdatabase/DatabaseCallback.idl:
* Modules/webdatabase/DatabaseContext.cpp:
* Modules/webdatabase/DatabaseContext.h:
* Modules/webdatabase/DatabaseDetails.h:
* Modules/webdatabase/DatabaseError.h:
* Modules/webdatabase/DatabaseManager.cpp:
* Modules/webdatabase/DatabaseManager.h:
* Modules/webdatabase/DatabaseManagerClient.h:
* Modules/webdatabase/DatabaseServer.cpp:
* Modules/webdatabase/DatabaseServer.h:
* Modules/webdatabase/DatabaseTask.cpp:
* Modules/webdatabase/DatabaseTask.h:
* Modules/webdatabase/DatabaseThread.cpp:
* Modules/webdatabase/DatabaseThread.h:
* Modules/webdatabase/DatabaseTracker.cpp:
* Modules/webdatabase/DatabaseTracker.h:
* Modules/webdatabase/OriginLock.cpp:
* Modules/webdatabase/OriginLock.h:
* Modules/webdatabase/SQLCallbackWrapper.h:
* Modules/webdatabase/SQLError.h:
* Modules/webdatabase/SQLError.idl:
* Modules/webdatabase/SQLException.cpp:
* Modules/webdatabase/SQLException.h:
* Modules/webdatabase/SQLException.idl:
* Modules/webdatabase/SQLResultSet.cpp:
* Modules/webdatabase/SQLResultSet.h:
* Modules/webdatabase/SQLResultSet.idl:
* Modules/webdatabase/SQLResultSetRowList.cpp:
* Modules/webdatabase/SQLResultSetRowList.h:
* Modules/webdatabase/SQLResultSetRowList.idl:
* Modules/webdatabase/SQLStatement.cpp:
* Modules/webdatabase/SQLStatement.h:
* Modules/webdatabase/SQLStatementBackend.cpp:
* Modules/webdatabase/SQLStatementBackend.h:
* Modules/webdatabase/SQLStatementCallback.h:
* Modules/webdatabase/SQLStatementCallback.idl:
* Modules/webdatabase/SQLStatementErrorCallback.h:
* Modules/webdatabase/SQLStatementErrorCallback.idl:
* Modules/webdatabase/SQLTransaction.cpp:
* Modules/webdatabase/SQLTransaction.h:
* Modules/webdatabase/SQLTransaction.idl:
* Modules/webdatabase/SQLTransactionBackend.cpp:
* Modules/webdatabase/SQLTransactionBackend.h:
* Modules/webdatabase/SQLTransactionCallback.h:
* Modules/webdatabase/SQLTransactionCallback.idl:
* Modules/webdatabase/SQLTransactionClient.cpp:
* Modules/webdatabase/SQLTransactionClient.h:
* Modules/webdatabase/SQLTransactionCoordinator.cpp:
* Modules/webdatabase/SQLTransactionCoordinator.h:
* Modules/webdatabase/SQLTransactionErrorCallback.h:
* Modules/webdatabase/SQLTransactionErrorCallback.idl:
* Modules/webdatabase/SQLTransactionState.h:
* Modules/webdatabase/SQLTransactionStateMachine.cpp:
* Modules/webdatabase/SQLTransactionStateMachine.h:
* bindings/js/JSCommandLineAPIHostCustom.cpp:
(WebCore::JSCommandLineAPIHost::databaseId):
* bindings/js/JSCustomSQLStatementErrorCallback.cpp:
* bindings/js/JSExceptionBase.cpp:
(WebCore::toExceptionBase):
* bindings/js/JSSQLResultSetRowListCustom.cpp:
* bindings/js/JSSQLTransactionCustom.cpp:
* bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
(webkit_dom_test_callback_finalize):
(webkit_dom_test_callback_constructor):
(webkit_dom_test_callback_callback_with_no_param):
(webkit_dom_test_callback_callback_with_array_param):
(webkit_dom_test_callback_callback_with_serialized_script_value_param):
(webkit_dom_test_callback_callback_with_non_bool_return_type):
(webkit_dom_test_callback_callback_with_string_list):
(webkit_dom_test_callback_callback_with_boolean):
(webkit_dom_test_callback_callback_requires_this_to_pass):
* bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h:
* bindings/scripts/test/JS/JSTestCallback.cpp:
* bindings/scripts/test/JS/JSTestCallback.h:
* bindings/scripts/test/ObjC/DOMTestCallback.mm:
* bindings/scripts/test/TestCallback.idl:
* dom/DOMExceptions.in:
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::setDatabaseContext):
* dom/ScriptExecutionContext.h:
* history/PageCache.cpp:
(WebCore::logCanCacheFrameDecision):
(WebCore::PageCache::canCachePageContainingThisFrame):
* inspector/CommandLineAPIHost.cpp:
(WebCore::CommandLineAPIHost::CommandLineAPIHost):
(WebCore::CommandLineAPIHost::disconnect):
(WebCore::CommandLineAPIHost::databaseIdImpl):
* inspector/CommandLineAPIHost.h:
(WebCore::CommandLineAPIHost::init):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
* inspector/InspectorDatabaseAgent.cpp:
* inspector/InspectorDatabaseAgent.h:
* inspector/InspectorDatabaseInstrumentation.h:
(WebCore::InspectorInstrumentation::didOpenDatabase):
* inspector/InspectorDatabaseResource.cpp:
* inspector/InspectorDatabaseResource.h:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didCommitLoadImpl):
(WebCore::InspectorInstrumentation::didOpenDatabaseImpl):
* inspector/InspectorInstrumentation.h:
* inspector/InstrumentingAgents.cpp:
(WebCore::InstrumentingAgents::InstrumentingAgents):
(WebCore::InstrumentingAgents::reset):
* inspector/InstrumentingAgents.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
* loader/EmptyClients.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::stopLoading):
* page/ChromeClient.h:
* platform/FeatureCounterKeys.h:
Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
* Storage/WebDatabaseManager.mm:
(databasesDirectoryPath):
* Storage/WebDatabaseManagerClient.h:
* Storage/WebDatabaseManagerClient.mm:
* Storage/WebDatabaseManagerInternal.h:
* Storage/WebDatabaseManagerPrivate.h:
* Storage/WebDatabaseQuotaManager.mm:
(-[WebDatabaseQuotaManager usage]):
(-[WebDatabaseQuotaManager quota]):
(-[WebDatabaseQuotaManager setQuota:]):
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
* WebCoreSupport/WebSecurityOrigin.mm:
(-[WebSecurityOrigin usage]):
(-[WebSecurityOrigin quota]):
(-[WebSecurityOrigin setQuota:]):
* WebView/WebFrame.mm:
(-[WebFrame _cacheabilityDictionary]):
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView _preferencesChanged:]):
Source/WebKit/win:
* ForEachCoClass.h:
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::exceededDatabaseQuota):
* WebCoreSupport/WebChromeClient.h:
* WebDatabaseManager.cpp:
(WebKitInitializeWebDatabasesIfNecessary):
* WebDatabaseManager.h:
* WebSecurityOrigin.cpp:
(WebSecurityOrigin::usage):
(WebSecurityOrigin::quota):
(WebSecurityOrigin::setQuota):
* WebView.cpp:
(WebView::initWithFrame):
(WebView::notifyPreferencesChanged):
Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
* Shared/OriginAndDatabases.cpp:
* Shared/OriginAndDatabases.h:
* Shared/WebCoreArgumentCoders.cpp:
* UIProcess/API/C/WKContext.cpp:
(WKContextGetDatabaseManager):
* UIProcess/API/C/WKDatabaseManager.cpp:
(WKDatabaseManagerGetTypeID):
(WKDatabaseManagerGetOriginKey):
(WKDatabaseManagerGetOriginQuotaKey):
(WKDatabaseManagerGetOriginUsageKey):
(WKDatabaseManagerGetDatabaseDetailsKey):
(WKDatabaseManagerGetDatabaseDetailsNameKey):
(WKDatabaseManagerGetDatabaseDetailsDisplayNameKey):
(WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey):
(WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey):
(WKDatabaseManagerGetDatabaseDetailsCreationTimeKey):
(WKDatabaseManagerGetDatabaseDetailsModificationTimeKey):
(WKDatabaseManagerSetClient):
(WKDatabaseManagerGetDatabasesByOrigin):
(WKDatabaseManagerGetDatabaseOrigins):
(WKDatabaseManagerDeleteDatabasesWithNameForOrigin):
(WKDatabaseManagerDeleteDatabasesForOrigin):
(WKDatabaseManagerDeleteAllDatabases):
(WKDatabaseManagerSetQuotaForOrigin):
* UIProcess/API/efl/EwkView.cpp:
(EwkView::informDatabaseQuotaReached):
* UIProcess/WebDatabaseManagerProxy.cpp:
* UIProcess/WebDatabaseManagerProxy.h:
* UIProcess/WebDatabaseManagerProxy.messages.in:
* UIProcess/WebProcessPool.cpp:
* UIProcess/efl/PageUIClientEfl.cpp:
(WebKit::PageUIClientEfl::PageUIClientEfl):
(WebKit::PageUIClientEfl::exceededDatabaseQuota):
* UIProcess/efl/PageUIClientEfl.h:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::clearAllDatabases):
(WebKit::InjectedBundle::setDatabaseQuota):
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::exceededDatabaseQuota):
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
* WebProcess/WebCoreSupport/WebDatabaseManager.h:
* WebProcess/WebCoreSupport/WebDatabaseManager.messages.in:
* WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp:
* WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
Source/WTF:
* wtf/FeatureDefines.h:
Tools:
* Scripts/webkitperl/FeatureList.pm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</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="#trunkSourceJavaScriptCoreDerivedSourcesmake">trunk/Source/JavaScriptCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolDatabasejson">trunk/Source/JavaScriptCore/inspector/protocol/Database.json</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</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="#trunkSourceWebCoreModuleswebdatabaseAbstractDatabaseServerh">trunk/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseChangeVersionDatah">trunk/Source/WebCore/Modules/webdatabase/ChangeVersionData.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseChangeVersionWrappercpp">trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseChangeVersionWrapperh">trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDOMWindowWebDatabasecpp">trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDOMWindowWebDatabaseh">trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDOMWindowWebDatabaseidl">trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabasecpp">trunk/Source/WebCore/Modules/webdatabase/Database.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseh">trunk/Source/WebCore/Modules/webdatabase/Database.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseidl">trunk/Source/WebCore/Modules/webdatabase/Database.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendh">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBaseh">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBasicTypesh">trunk/Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseCallbackh">trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseCallbackidl">trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseContextcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseContexth">trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseDetailsh">trunk/Source/WebCore/Modules/webdatabase/DatabaseDetails.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseErrorh">trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagerh">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagerClienth">trunk/Source/WebCore/Modules/webdatabase/DatabaseManagerClient.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseServercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseServerh">trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTaskcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTaskh">trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseThreadcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseThreadh">trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTrackerh">trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseOriginLockcpp">trunk/Source/WebCore/Modules/webdatabase/OriginLock.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseOriginLockh">trunk/Source/WebCore/Modules/webdatabase/OriginLock.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLCallbackWrapperh">trunk/Source/WebCore/Modules/webdatabase/SQLCallbackWrapper.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLErrorh">trunk/Source/WebCore/Modules/webdatabase/SQLError.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLErroridl">trunk/Source/WebCore/Modules/webdatabase/SQLError.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLExceptioncpp">trunk/Source/WebCore/Modules/webdatabase/SQLException.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLExceptionh">trunk/Source/WebCore/Modules/webdatabase/SQLException.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLExceptionidl">trunk/Source/WebCore/Modules/webdatabase/SQLException.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLResultSetcpp">trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLResultSeth">trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLResultSetidl">trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLResultSetRowListcpp">trunk/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLResultSetRowListh">trunk/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLResultSetRowListidl">trunk/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementcpp">trunk/Source/WebCore/Modules/webdatabase/SQLStatement.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementh">trunk/Source/WebCore/Modules/webdatabase/SQLStatement.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementBackendcpp">trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementBackendh">trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementCallbackh">trunk/Source/WebCore/Modules/webdatabase/SQLStatementCallback.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementCallbackidl">trunk/Source/WebCore/Modules/webdatabase/SQLStatementCallback.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementErrorCallbackh">trunk/Source/WebCore/Modules/webdatabase/SQLStatementErrorCallback.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementErrorCallbackidl">trunk/Source/WebCore/Modules/webdatabase/SQLStatementErrorCallback.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionh">trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionidl">trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendcpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendh">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionCallbackh">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCallback.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionCallbackidl">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCallback.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionClientcpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionClienth">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionClient.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionCoordinatorcpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionCoordinatorh">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionErrorCallbackh">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionErrorCallback.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionErrorCallbackidl">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionErrorCallback.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionStateh">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionState.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionStateMachinecpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionStateMachineh">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCommandLineAPIHostCustomcpp">trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCustomSQLStatementErrorCallbackcpp">trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSExceptionBasecpp">trunk/Source/WebCore/bindings/js/JSExceptionBase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSQLResultSetRowListCustomcpp">trunk/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSQLTransactionCustomcpp">trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestCallbackcpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestCallbackPrivateh">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestCallbackmm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestCallbackidl">trunk/Source/WebCore/bindings/scripts/test/TestCallback.idl</a></li>
<li><a href="#trunkSourceWebCoredomDOMExceptionsin">trunk/Source/WebCore/dom/DOMExceptions.in</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorCommandLineAPIHostcpp">trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorCommandLineAPIHosth">trunk/Source/WebCore/inspector/CommandLineAPIHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseAgentcpp">trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseAgenth">trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseInstrumentationh">trunk/Source/WebCore/inspector/InspectorDatabaseInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseResourcecpp">trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseResourceh">trunk/Source/WebCore/inspector/InspectorDatabaseResource.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentscpp">trunk/Source/WebCore/inspector/InstrumentingAgents.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentsh">trunk/Source/WebCore/inspector/InstrumentingAgents.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllercpp">trunk/Source/WebCore/inspector/WorkerInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformFeatureCounterKeysh">trunk/Source/WebCore/platform/FeatureCounterKeys.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="#trunkSourceWebKitmacStorageWebDatabaseManagermm">trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebDatabaseManagerClienth">trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.h</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebDatabaseManagerClientmm">trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebDatabaseManagerInternalh">trunk/Source/WebKit/mac/Storage/WebDatabaseManagerInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebDatabaseManagerPrivateh">trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebDatabaseQuotaManagermm">trunk/Source/WebKit/mac/Storage/WebDatabaseQuotaManager.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSecurityOriginmm">trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</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="#trunkSourceWebKitwinForEachCoClassh">trunk/Source/WebKit/win/ForEachCoClass.h</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClienth">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitwinWebDatabaseManagercpp">trunk/Source/WebKit/win/WebDatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebDatabaseManagerh">trunk/Source/WebKit/win/WebDatabaseManager.h</a></li>
<li><a href="#trunkSourceWebKitwinWebSecurityOrigincpp">trunk/Source/WebKit/win/WebSecurityOrigin.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</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="#trunkSourceWebKit2SharedOriginAndDatabasescpp">trunk/Source/WebKit2/Shared/OriginAndDatabases.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedOriginAndDatabasesh">trunk/Source/WebKit2/Shared/OriginAndDatabases.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKDatabaseManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflEwkViewcpp">trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDatabaseManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDatabaseManagerProxyh">trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDatabaseManagerProxymessagesin">trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflPageUIClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflPageUIClientEflh">trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagercpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagerh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagermessagesin">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebSQLiteDatabaseTrackercpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebSQLiteDatabaseTrackerh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/ChangeLog 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmakeconfig.h.cmake:
+
</ins><span class="cx"> 2015-01-11 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove support for SharedWorkers
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -1018,6 +1018,7 @@
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/DOM.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/DOMDebugger.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/DOMStorage.json
</span><ins>+ ${JAVASCRIPTCORE_DIR}/inspector/protocol/Database.json
</ins><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Debugger.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/GenericTypes.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Inspector.json
</span><span class="lines">@@ -1029,12 +1030,6 @@
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Worker.json
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (ENABLE_SQL_DATABASE)
- list(APPEND JavaScriptCore_INSPECTOR_DOMAINS
- ${JAVASCRIPTCORE_DIR}/inspector/protocol/Database.json
- )
-endif ()
-
</del><span class="cx"> if (ENABLE_INDEXED_DATABASE)
</span><span class="cx"> list(APPEND JavaScriptCore_INSPECTOR_DOMAINS
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/IndexedDB.json
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * CMakeLists.txt:
+ * Configurations/FeatureDefines.xcconfig:
+ * DerivedSources.make:
+ * inspector/protocol/Database.json:
+
</ins><span class="cx"> 2015-01-14 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector and regular console use different source code locations for messages
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -165,7 +165,6 @@
</span><span class="cx"> ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
</span><span class="cx"> ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><del>-ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
</del><span class="cx"> ENABLE_SUBTLE_CRYPTO[sdk=iphone*] = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO[sdk=macosx*] = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
</span><span class="lines">@@ -227,4 +226,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD)
$(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVI
GATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAY
OUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD)
$(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIG
ATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE
_VIDEO_PRESENTATION_MODE);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/DerivedSources.make (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/DerivedSources.make 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/JavaScriptCore/DerivedSources.make 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -119,6 +119,7 @@
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/DOM.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/DOMDebugger.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/DOMStorage.json \
</span><ins>+ $(JavaScriptCore)/inspector/protocol/Database.json \
</ins><span class="cx"> $(JavaScriptCore)/inspector/protocol/Debugger.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/GenericTypes.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Inspector.json \
</span><span class="lines">@@ -130,10 +131,6 @@
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Worker.json \
</span><span class="cx"> #
</span><span class="cx">
</span><del>-ifeq ($(findstring ENABLE_SQL_DATABASE,$(FEATURE_DEFINES)), ENABLE_SQL_DATABASE)
- INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(JavaScriptCore)/inspector/protocol/Database.json
-endif
-
</del><span class="cx"> ifeq ($(findstring ENABLE_INDEXED_DATABASE,$(FEATURE_DEFINES)), ENABLE_INDEXED_DATABASE)
</span><span class="cx"> INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(JavaScriptCore)/inspector/protocol/IndexedDB.json
</span><span class="cx"> endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolDatabasejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Database.json (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Database.json 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Database.json 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -1,6 +1,5 @@
</span><span class="cx"> {
</span><span class="cx"> "domain": "Database",
</span><del>- "featureGuard": "ENABLE(SQL_DATABASE)",
</del><span class="cx"> "availability": "web",
</span><span class="cx"> "types": [
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WTF/ChangeLog 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2015-01-14 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed fix after r163330.
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -665,10 +665,6 @@
</span><span class="cx"> #define ENABLE_SPELLCHECK 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_SQL_DATABASE)
-#define ENABLE_SQL_DATABASE 1
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_SVG_FONTS)
</span><span class="cx"> #define ENABLE_SVG_FONTS 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/ChangeLog 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -1,3 +1,140 @@
</span><ins>+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Modules/webdatabase/AbstractDatabaseServer.h:
+ * Modules/webdatabase/ChangeVersionData.h:
+ * Modules/webdatabase/ChangeVersionWrapper.cpp:
+ * Modules/webdatabase/ChangeVersionWrapper.h:
+ * Modules/webdatabase/DOMWindowWebDatabase.cpp:
+ * Modules/webdatabase/DOMWindowWebDatabase.h:
+ * Modules/webdatabase/DOMWindowWebDatabase.idl:
+ * Modules/webdatabase/Database.cpp:
+ * Modules/webdatabase/Database.h:
+ * Modules/webdatabase/Database.idl:
+ * Modules/webdatabase/DatabaseBackend.cpp:
+ * Modules/webdatabase/DatabaseBackend.h:
+ * Modules/webdatabase/DatabaseBackendBase.cpp:
+ * Modules/webdatabase/DatabaseBackendBase.h:
+ * Modules/webdatabase/DatabaseBasicTypes.h:
+ * Modules/webdatabase/DatabaseCallback.h:
+ * Modules/webdatabase/DatabaseCallback.idl:
+ * Modules/webdatabase/DatabaseContext.cpp:
+ * Modules/webdatabase/DatabaseContext.h:
+ * Modules/webdatabase/DatabaseDetails.h:
+ * Modules/webdatabase/DatabaseError.h:
+ * Modules/webdatabase/DatabaseManager.cpp:
+ * Modules/webdatabase/DatabaseManager.h:
+ * Modules/webdatabase/DatabaseManagerClient.h:
+ * Modules/webdatabase/DatabaseServer.cpp:
+ * Modules/webdatabase/DatabaseServer.h:
+ * Modules/webdatabase/DatabaseTask.cpp:
+ * Modules/webdatabase/DatabaseTask.h:
+ * Modules/webdatabase/DatabaseThread.cpp:
+ * Modules/webdatabase/DatabaseThread.h:
+ * Modules/webdatabase/DatabaseTracker.cpp:
+ * Modules/webdatabase/DatabaseTracker.h:
+ * Modules/webdatabase/OriginLock.cpp:
+ * Modules/webdatabase/OriginLock.h:
+ * Modules/webdatabase/SQLCallbackWrapper.h:
+ * Modules/webdatabase/SQLError.h:
+ * Modules/webdatabase/SQLError.idl:
+ * Modules/webdatabase/SQLException.cpp:
+ * Modules/webdatabase/SQLException.h:
+ * Modules/webdatabase/SQLException.idl:
+ * Modules/webdatabase/SQLResultSet.cpp:
+ * Modules/webdatabase/SQLResultSet.h:
+ * Modules/webdatabase/SQLResultSet.idl:
+ * Modules/webdatabase/SQLResultSetRowList.cpp:
+ * Modules/webdatabase/SQLResultSetRowList.h:
+ * Modules/webdatabase/SQLResultSetRowList.idl:
+ * Modules/webdatabase/SQLStatement.cpp:
+ * Modules/webdatabase/SQLStatement.h:
+ * Modules/webdatabase/SQLStatementBackend.cpp:
+ * Modules/webdatabase/SQLStatementBackend.h:
+ * Modules/webdatabase/SQLStatementCallback.h:
+ * Modules/webdatabase/SQLStatementCallback.idl:
+ * Modules/webdatabase/SQLStatementErrorCallback.h:
+ * Modules/webdatabase/SQLStatementErrorCallback.idl:
+ * Modules/webdatabase/SQLTransaction.cpp:
+ * Modules/webdatabase/SQLTransaction.h:
+ * Modules/webdatabase/SQLTransaction.idl:
+ * Modules/webdatabase/SQLTransactionBackend.cpp:
+ * Modules/webdatabase/SQLTransactionBackend.h:
+ * Modules/webdatabase/SQLTransactionCallback.h:
+ * Modules/webdatabase/SQLTransactionCallback.idl:
+ * Modules/webdatabase/SQLTransactionClient.cpp:
+ * Modules/webdatabase/SQLTransactionClient.h:
+ * Modules/webdatabase/SQLTransactionCoordinator.cpp:
+ * Modules/webdatabase/SQLTransactionCoordinator.h:
+ * Modules/webdatabase/SQLTransactionErrorCallback.h:
+ * Modules/webdatabase/SQLTransactionErrorCallback.idl:
+ * Modules/webdatabase/SQLTransactionState.h:
+ * Modules/webdatabase/SQLTransactionStateMachine.cpp:
+ * Modules/webdatabase/SQLTransactionStateMachine.h:
+ * bindings/js/JSCommandLineAPIHostCustom.cpp:
+ (WebCore::JSCommandLineAPIHost::databaseId):
+ * bindings/js/JSCustomSQLStatementErrorCallback.cpp:
+ * bindings/js/JSExceptionBase.cpp:
+ (WebCore::toExceptionBase):
+ * bindings/js/JSSQLResultSetRowListCustom.cpp:
+ * bindings/js/JSSQLTransactionCustom.cpp:
+ * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
+ (webkit_dom_test_callback_finalize):
+ (webkit_dom_test_callback_constructor):
+ (webkit_dom_test_callback_callback_with_no_param):
+ (webkit_dom_test_callback_callback_with_array_param):
+ (webkit_dom_test_callback_callback_with_serialized_script_value_param):
+ (webkit_dom_test_callback_callback_with_non_bool_return_type):
+ (webkit_dom_test_callback_callback_with_string_list):
+ (webkit_dom_test_callback_callback_with_boolean):
+ (webkit_dom_test_callback_callback_requires_this_to_pass):
+ * bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h:
+ * bindings/scripts/test/JS/JSTestCallback.cpp:
+ * bindings/scripts/test/JS/JSTestCallback.h:
+ * bindings/scripts/test/ObjC/DOMTestCallback.mm:
+ * bindings/scripts/test/TestCallback.idl:
+ * dom/DOMExceptions.in:
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::setDatabaseContext):
+ * dom/ScriptExecutionContext.h:
+ * history/PageCache.cpp:
+ (WebCore::logCanCacheFrameDecision):
+ (WebCore::PageCache::canCachePageContainingThisFrame):
+ * inspector/CommandLineAPIHost.cpp:
+ (WebCore::CommandLineAPIHost::CommandLineAPIHost):
+ (WebCore::CommandLineAPIHost::disconnect):
+ (WebCore::CommandLineAPIHost::databaseIdImpl):
+ * inspector/CommandLineAPIHost.h:
+ (WebCore::CommandLineAPIHost::init):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ * inspector/InspectorDatabaseAgent.cpp:
+ * inspector/InspectorDatabaseAgent.h:
+ * inspector/InspectorDatabaseInstrumentation.h:
+ (WebCore::InspectorInstrumentation::didOpenDatabase):
+ * inspector/InspectorDatabaseResource.cpp:
+ * inspector/InspectorDatabaseResource.h:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+ (WebCore::InspectorInstrumentation::didOpenDatabaseImpl):
+ * inspector/InspectorInstrumentation.h:
+ * inspector/InstrumentingAgents.cpp:
+ (WebCore::InstrumentingAgents::InstrumentingAgents):
+ (WebCore::InstrumentingAgents::reset):
+ * inspector/InstrumentingAgents.h:
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::WorkerInspectorController):
+ * loader/EmptyClients.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::stopLoading):
+ * page/ChromeClient.h:
+ * platform/FeatureCounterKeys.h:
+
</ins><span class="cx"> 2015-01-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Element appears correctly but does not receive event with a large translation.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -165,7 +165,6 @@
</span><span class="cx"> ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
</span><span class="cx"> ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><del>-ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
</del><span class="cx"> ENABLE_SUBTLE_CRYPTO[sdk=iphone*] = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO[sdk=macosx*] = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
</span><span class="lines">@@ -227,4 +226,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD)
$(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVI
GATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAY
OUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD)
$(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIG
ATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE
_VIDEO_PRESENTATION_MODE);
</ins></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseAbstractDatabaseServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef AbstractDatabaseServer_h
</span><span class="cx"> #define AbstractDatabaseServer_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "DatabaseBasicTypes.h"
</span><span class="cx"> #include "DatabaseDetails.h"
</span><span class="cx"> #include "DatabaseError.h"
</span><span class="lines">@@ -82,6 +80,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // AbstractDatabaseServer_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseChangeVersionDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/ChangeVersionData.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/ChangeVersionData.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/ChangeVersionData.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef ChangeVersionData_h
</span><span class="cx"> #define ChangeVersionData_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -47,6 +45,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // ChangeVersionData_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseChangeVersionWrappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ChangeVersionWrapper.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "Database.h"
</span><span class="cx"> #include "SQLError.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -88,5 +86,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseChangeVersionWrapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #ifndef ChangeVersionWrapper_h
</span><span class="cx"> #define ChangeVersionWrapper_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "SQLTransactionBackend.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="lines">@@ -56,6 +54,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // ChangeVersionWrapper_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDOMWindowWebDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -25,9 +25,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "DOMWindowWebDatabase.h"
</span><span class="cx">
</span><span class="cx"> #include "DOMWindow.h"
</span><span class="lines">@@ -59,5 +56,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDOMWindowWebDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #ifndef DOMWindowWebDatabase_h
</span><span class="cx"> #define DOMWindowWebDatabase_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -52,6 +51,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // DOMWindowWebDatabase_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDOMWindowWebDatabaseidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- Conditional=SQL_DATABASE,
</del><span class="cx"> ] partial interface DOMWindow {
</span><span class="cx"> [RaisesException] Database openDatabase(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback creationCallback);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Database.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "ChangeVersionData.h"
</span><span class="cx"> #include "ChangeVersionWrapper.h"
</span><span class="cx"> #include "DatabaseCallback.h"
</span><span class="lines">@@ -364,5 +362,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #ifndef Database_h
</span><span class="cx"> #define Database_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "DatabaseBackend.h"
</span><span class="cx"> #include "DatabaseBasicTypes.h"
</span><span class="cx"> #include "DatabaseError.h"
</span><span class="lines">@@ -117,6 +115,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // Database_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> NoInterfaceObject,
</span><del>- Conditional=SQL_DATABASE,
</del><span class="cx"> ] interface Database {
</span><span class="cx"> readonly attribute DOMString version;
</span><span class="cx"> void changeVersion(DOMString oldVersion, DOMString newVersion, optional SQLTransactionCallback callback, optional SQLTransactionErrorCallback errorCallback, optional VoidCallback successCallback);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DatabaseBackend.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "ChangeVersionData.h"
</span><span class="cx"> #include "ChangeVersionWrapper.h"
</span><span class="cx"> #include "Database.h"
</span><span class="lines">@@ -55,5 +53,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef DatabaseBackend_h
</span><span class="cx"> #define DatabaseBackend_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "DatabaseBackendBase.h"
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -68,6 +66,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // DatabaseBackend_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DatabaseBackendBase.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "Database.h"
</span><span class="cx"> #include "DatabaseAuthorizer.h"
</span><span class="cx"> #include "DatabaseContext.h"
</span><span class="lines">@@ -587,5 +585,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #ifndef DatabaseBackendBase_h
</span><span class="cx"> #define DatabaseBackendBase_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "DatabaseBasicTypes.h"
</span><span class="cx"> #include "DatabaseDetails.h"
</span><span class="cx"> #include "DatabaseError.h"
</span><span class="lines">@@ -134,6 +132,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // DatabaseBackendBase_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBasicTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef DatabaseBasicTypes_h
</span><span class="cx"> #define DatabaseBasicTypes_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> typedef int DatabaseGuid;
</span><span class="lines">@@ -35,6 +33,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // DatabaseBasicTypes_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #ifndef DatabaseCallback_h
</span><span class="cx"> #define DatabaseCallback_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -48,6 +46,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // DatabaseCallback_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseCallbackidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</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>-[
- Conditional=SQL_DATABASE,
-] callback interface DatabaseCallback {
</del><ins>+callback interface DatabaseCallback {
</ins><span class="cx"> boolean handleEvent(Database database);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DatabaseContext.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="cx"> #include "Database.h"
</span><span class="lines">@@ -247,5 +245,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #ifndef DatabaseContext_h
</span><span class="cx"> #define DatabaseContext_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="lines">@@ -94,6 +92,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // DatabaseContext_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseDetailsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseDetails.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseDetails.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseDetails.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #ifndef DatabaseDetails_h
</span><span class="cx"> #define DatabaseDetails_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <thread>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -86,6 +84,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // DatabaseDetails_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef DatabaseError_h
</span><span class="cx"> #define DatabaseError_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> enum class DatabaseError {
</span><span class="lines">@@ -41,6 +39,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // DatabaseError_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DatabaseManager.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "AbstractDatabaseServer.h"
</span><span class="cx"> #include "Database.h"
</span><span class="cx"> #include "DatabaseBackend.h"
</span><span class="lines">@@ -414,5 +412,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef DatabaseManager_h
</span><span class="cx"> #define DatabaseManager_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "DatabaseBasicTypes.h"
</span><span class="cx"> #include "DatabaseDetails.h"
</span><span class="cx"> #include "DatabaseError.h"
</span><span class="lines">@@ -155,6 +153,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // DatabaseManager_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManagerClient.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManagerClient.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManagerClient.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx"> #ifndef DatabaseManagerClient_h
</span><span class="cx"> #define DatabaseManagerClient_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -48,6 +46,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // DatabaseManagerClient_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DatabaseServer.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "Database.h"
</span><span class="cx"> #include "DatabaseBackend.h"
</span><span class="cx"> #include "DatabaseContext.h"
</span><span class="lines">@@ -146,5 +144,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef DatabaseServer_h
</span><span class="cx"> #define DatabaseServer_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "AbstractDatabaseServer.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -69,6 +67,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // DatabaseServer_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DatabaseTask.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "Database.h"
</span><span class="cx"> #include "DatabaseBackend.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -217,5 +215,3 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #ifndef DatabaseTask_h
</span><span class="cx"> #define DatabaseTask_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "DatabaseBackend.h"
</span><span class="cx"> #include "DatabaseBasicTypes.h"
</span><span class="cx"> #include "DatabaseError.h"
</span><span class="lines">@@ -197,6 +195,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // DatabaseTask_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DatabaseThread.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "Database.h"
</span><span class="cx"> #include "DatabaseTask.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -271,4 +269,3 @@
</span><span class="cx"> m_queue.removeIf(predicate);
</span><span class="cx"> }
</span><span class="cx"> } // namespace WebCore
</span><del>-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #ifndef DatabaseThread_h
</span><span class="cx"> #define DatabaseThread_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -100,5 +98,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
</del><span class="cx"> #endif // DatabaseThread_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DatabaseTracker.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="cx"> #include "Database.h"
</span><span class="lines">@@ -1392,4 +1390,3 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #ifndef DatabaseTracker_h
</span><span class="cx"> #define DatabaseTracker_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "DatabaseDetails.h"
</span><span class="cx"> #include "DatabaseError.h"
</span><span class="cx"> #include "SQLiteDatabase.h"
</span><span class="lines">@@ -189,6 +187,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // DatabaseTracker_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseOriginLockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/OriginLock.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/OriginLock.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/OriginLock.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "OriginLock.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "FileSystem.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -96,5 +94,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseOriginLockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/OriginLock.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/OriginLock.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/OriginLock.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef OriginLock_h
</span><span class="cx"> #define OriginLock_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><span class="lines">@@ -58,6 +56,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // OriginLock_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLCallbackWrapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLCallbackWrapper.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLCallbackWrapper.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLCallbackWrapper.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #ifndef SQLCallbackWrapper_h
</span><span class="cx"> #define SQLCallbackWrapper_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><span class="cx">
</span><span class="lines">@@ -102,6 +100,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // SQLCallbackWrapper_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLError.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLError.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLError.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #ifndef SQLError_h
</span><span class="cx"> #define SQLError_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -70,6 +68,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // SQLError_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLErroridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLError.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLError.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLError.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> NoInterfaceObject,
</span><del>- Conditional=SQL_DATABASE,
</del><span class="cx"> ImplementationLacksVTable
</span><span class="cx"> ] interface SQLError {
</span><span class="cx"> readonly attribute unsigned long code;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLExceptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLException.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLException.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLException.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> #include "SQLException.h"
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCodeDescription.h"
</span><span class="lines">@@ -68,5 +66,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLExceptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLException.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLException.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLException.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #ifndef SQLException_h
</span><span class="cx"> #define SQLException_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "ExceptionBase.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -69,6 +67,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // SQLException_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLExceptionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLException.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLException.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLException.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- Conditional=SQL_DATABASE,
</del><span class="cx"> DoNotCheckConstants,
</span><span class="cx"> ImplementationLacksVTable
</span><span class="cx"> ] exception SQLException {
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLResultSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SQLResultSet.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -78,5 +76,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLResultSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #ifndef SQLResultSet_h
</span><span class="cx"> #define SQLResultSet_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "DatabaseBasicTypes.h"
</span><span class="cx"> #include "SQLResultSetRowList.h"
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="lines">@@ -61,6 +59,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // SQLResultSet_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLResultSetidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> NoInterfaceObject,
</span><del>- Conditional=SQL_DATABASE,
</del><span class="cx"> ImplementationLacksVTable
</span><span class="cx"> ] interface SQLResultSet {
</span><span class="cx"> readonly attribute SQLResultSetRowList rows;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLResultSetRowListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SQLResultSetRowList.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> unsigned SQLResultSetRowList::length() const
</span><span class="lines">@@ -44,5 +42,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLResultSetRowListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #ifndef SQLResultSetRowList_h
</span><span class="cx"> #define SQLResultSetRowList_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include "SQLValue.h"
</span><span class="lines">@@ -59,5 +57,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLResultSetRowListidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> NoInterfaceObject,
</span><del>- Conditional=SQL_DATABASE,
</del><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> ] interface SQLResultSetRowList {
</span><span class="cx"> readonly attribute unsigned long length;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatement.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatement.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatement.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SQLStatement.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "AbstractDatabaseServer.h"
</span><span class="cx"> #include "Database.h"
</span><span class="cx"> #include "DatabaseManager.h"
</span><span class="lines">@@ -92,5 +90,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatement.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatement.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatement.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #ifndef SQLStatement_h
</span><span class="cx"> #define SQLStatement_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "SQLCallbackWrapper.h"
</span><span class="cx"> #include "SQLResultSet.h"
</span><span class="cx"> #include "SQLValue.h"
</span><span class="lines">@@ -69,6 +67,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // SQLStatement_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SQLStatementBackend.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "DatabaseBackend.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "SQLError.h"
</span><span class="lines">@@ -241,5 +239,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #ifndef SQLStatementBackend_h
</span><span class="cx"> #define SQLStatementBackend_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "SQLValue.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -83,6 +81,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // SQLStatementBackend_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementCallback.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementCallback.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementCallback.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #ifndef SQLStatementCallback_h
</span><span class="cx"> #define SQLStatementCallback_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -45,6 +43,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // SQLStatementErrorCallback_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementCallbackidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementCallback.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementCallback.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementCallback.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</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>-[
- Conditional=SQL_DATABASE,
-] callback interface SQLStatementCallback {
</del><ins>+callback interface SQLStatementCallback {
</ins><span class="cx"> boolean handleEvent(SQLTransaction transaction, SQLResultSet resultSet);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementErrorCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementErrorCallback.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementErrorCallback.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementErrorCallback.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #ifndef SQLStatementErrorCallback_h
</span><span class="cx"> #define SQLStatementErrorCallback_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -46,6 +44,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // SQLStatementErrorCallback_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementErrorCallbackidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementErrorCallback.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementErrorCallback.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementErrorCallback.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</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>-[
- Conditional=SQL_DATABASE,
-] callback interface SQLStatementErrorCallback {
</del><ins>+callback interface SQLStatementErrorCallback {
</ins><span class="cx"> [Custom] boolean handleEvent(SQLTransaction transaction, SQLError error);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SQLTransaction.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "Database.h"
</span><span class="cx"> #include "DatabaseAuthorizer.h"
</span><span class="cx"> #include "DatabaseContext.h"
</span><span class="lines">@@ -295,5 +293,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #ifndef SQLTransaction_h
</span><span class="cx"> #define SQLTransaction_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "SQLCallbackWrapper.h"
</span><span class="cx"> #include "SQLStatement.h"
</span><span class="cx"> #include "SQLTransactionStateMachine.h"
</span><span class="lines">@@ -103,6 +101,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // SQLTransaction_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> NoInterfaceObject,
</span><del>- Conditional=SQL_DATABASE,
</del><span class="cx"> SkipVTableValidation,
</span><span class="cx"> ] interface SQLTransaction {
</span><span class="cx"> [Custom] void executeSql(DOMString sqlStatement,
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SQLTransactionBackend.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "Database.h" // FIXME: Should only be used in the frontend.
</span><span class="cx"> #include "DatabaseAuthorizer.h"
</span><span class="cx"> #include "DatabaseBackend.h"
</span><span class="lines">@@ -852,5 +850,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #ifndef SQLTransactionBackend_h
</span><span class="cx"> #define SQLTransactionBackend_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "DatabaseBasicTypes.h"
</span><span class="cx"> #include "SQLTransactionStateMachine.h"
</span><span class="cx"> #include <memory>
</span><span class="lines">@@ -139,6 +137,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // SQLTransactionBackend_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCallback.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCallback.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCallback.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #ifndef SQLTransactionCallback_h
</span><span class="cx"> #define SQLTransactionCallback_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -45,6 +43,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // SQLTransactionCallback_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionCallbackidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCallback.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCallback.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCallback.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</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>-[
- Conditional=SQL_DATABASE,
-] callback interface SQLTransactionCallback {
</del><ins>+callback interface SQLTransactionCallback {
</ins><span class="cx"> boolean handleEvent(SQLTransaction transaction);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SQLTransactionClient.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "DatabaseBackendBase.h"
</span><span class="cx"> #include "DatabaseContext.h"
</span><span class="cx"> #include "DatabaseManager.h"
</span><span class="lines">@@ -58,5 +56,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionClient.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionClient.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionClient.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #ifndef SQLTransactionClient_h
</span><span class="cx"> #define SQLTransactionClient_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="lines">@@ -52,6 +50,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // SQLTransactionClient_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SQLTransactionCoordinator.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "Database.h"
</span><span class="cx"> #include "SQLTransactionBackend.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="lines">@@ -151,5 +149,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> #ifndef SQLTransactionCoordinator_h
</span><span class="cx"> #define SQLTransactionCoordinator_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -68,6 +66,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // SQLTransactionCoordinator_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionErrorCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionErrorCallback.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionErrorCallback.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionErrorCallback.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #ifndef SQLTransactionErrorCallback_h
</span><span class="cx"> #define SQLTransactionErrorCallback_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -45,6 +43,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // SQLTransactionErrorCallback_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionErrorCallbackidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionErrorCallback.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionErrorCallback.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionErrorCallback.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</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>-[
- Conditional=SQL_DATABASE,
-] callback interface SQLTransactionErrorCallback {
</del><ins>+callback interface SQLTransactionErrorCallback {
</ins><span class="cx"> boolean handleEvent(SQLError error);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionState.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionState.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionState.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef SQLTransactionState_h
</span><span class="cx"> #define SQLTransactionState_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> enum class SQLTransactionState {
</span><span class="lines">@@ -49,6 +47,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // SQLTransactionState_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionStateMachinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SQLTransactionStateMachine.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx">
</span><span class="lines">@@ -70,5 +68,3 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionStateMachineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef SQLTransactionStateMachine_h
</span><span class="cx"> #define SQLTransactionStateMachine_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "SQLTransactionState.h"
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx">
</span><span class="lines">@@ -107,6 +105,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // SQLTransactionStateMachine_h
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCommandLineAPIHostCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -37,7 +37,9 @@
</span><span class="cx"> #include "JSCommandLineAPIHost.h"
</span><span class="cx">
</span><span class="cx"> #include "CommandLineAPIHost.h"
</span><ins>+#include "Database.h"
</ins><span class="cx"> #include "InspectorDOMAgent.h"
</span><ins>+#include "JSDatabase.h"
</ins><span class="cx"> #include "JSEventListener.h"
</span><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include "JSStorage.h"
</span><span class="lines">@@ -51,10 +53,6 @@
</span><span class="cx"> #include <runtime/JSLock.h>
</span><span class="cx"> #include <runtime/ObjectConstructor.h>
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-#include "Database.h"
-#include "JSDatabase.h"
-#endif
</del><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="lines">@@ -148,11 +146,9 @@
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> Database* database = JSDatabase::toWrapped(exec->uncheckedArgument(0));
</span><span class="cx"> if (database)
</span><span class="cx"> return jsStringWithCache(exec, impl().databaseIdImpl(database));
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCustomSQLStatementErrorCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -27,9 +27,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "JSSQLStatementErrorCallback.h"
</span><span class="cx">
</span><span class="cx"> #include "JSSQLError.h"
</span><span class="lines">@@ -69,5 +66,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSExceptionBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSExceptionBase.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSExceptionBase.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/bindings/js/JSExceptionBase.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,13 +29,11 @@
</span><span class="cx"> #include "JSDOMCoreException.h"
</span><span class="cx"> #include "JSEventException.h"
</span><span class="cx"> #include "JSRangeException.h"
</span><ins>+#include "JSSQLException.h"
</ins><span class="cx"> #include "JSSVGException.h"
</span><span class="cx"> #include "JSXMLHttpRequestException.h"
</span><span class="cx"> #include "JSXPathException.h"
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> #include "SQLException.h"
</span><del>-#include "JSSQLException.h"
-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -53,10 +51,8 @@
</span><span class="cx"> return reinterpret_cast<ExceptionBase*>(svgException);
</span><span class="cx"> if (XPathException* pathException = JSXPathException::toWrapped(value))
</span><span class="cx"> return reinterpret_cast<ExceptionBase*>(pathException);
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> if (SQLException* pathException = JSSQLException::toWrapped(value))
</span><span class="cx"> return reinterpret_cast<ExceptionBase*>(pathException);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSQLResultSetRowListCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,10 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "JSSQLResultSetRowList.h"
</span><del>-
</del><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include "SQLValue.h"
</span><span class="lines">@@ -84,5 +81,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSQLTransactionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,10 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "JSSQLTransaction.h"
</span><del>-
</del><span class="cx"> #include "DOMWindow.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSSQLStatementCallback.h"
</span><span class="lines">@@ -118,5 +115,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -40,12 +40,12 @@
</span><span class="cx"> #define WEBKIT_DOM_TEST_CALLBACK_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_CALLBACK, WebKitDOMTestCallbackPrivate)
</span><span class="cx">
</span><span class="cx"> typedef struct _WebKitDOMTestCallbackPrivate {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> RefPtr<WebCore::TestCallback> coreObject;
</span><del>-#endif // ENABLE(SQL_DATABASE)
</del><ins>+#endif // ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> } WebKitDOMTestCallbackPrivate;
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -73,16 +73,16 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
</del><ins>+#endif // ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx">
</span><span class="cx"> G_DEFINE_TYPE(WebKitDOMTestCallback, webkit_dom_test_callback, WEBKIT_DOM_TYPE_OBJECT)
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_callback_finalize(GObject* object)
</span><span class="cx"> {
</span><span class="cx"> WebKitDOMTestCallbackPrivate* priv = WEBKIT_DOM_TEST_CALLBACK_GET_PRIVATE(object);
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> WebKit::DOMObjectCache::forget(priv->coreObject.get());
</span><del>-#endif // ENABLE(SQL_DATABASE)
</del><ins>+#endif // ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> priv->~WebKitDOMTestCallbackPrivate();
</span><span class="cx"> G_OBJECT_CLASS(webkit_dom_test_callback_parent_class)->finalize(object);
</span><span class="cx"> }
</span><span class="lines">@@ -90,11 +90,11 @@
</span><span class="cx"> static GObject* webkit_dom_test_callback_constructor(GType type, guint constructPropertiesCount, GObjectConstructParam* constructProperties)
</span><span class="cx"> {
</span><span class="cx"> GObject* object = G_OBJECT_CLASS(webkit_dom_test_callback_parent_class)->constructor(type, constructPropertiesCount, constructProperties);
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> WebKitDOMTestCallbackPrivate* priv = WEBKIT_DOM_TEST_CALLBACK_GET_PRIVATE(object);
</span><span class="cx"> priv->coreObject = static_cast<WebCore::TestCallback*>(WEBKIT_DOM_OBJECT(object)->coreObject);
</span><span class="cx"> WebKit::DOMObjectCache::put(priv->coreObject.get(), object);
</span><del>-#endif // ENABLE(SQL_DATABASE)
</del><ins>+#endif // ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> return object;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">
</span><span class="cx"> gboolean webkit_dom_test_callback_callback_with_no_param(WebKitDOMTestCallback* self)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
</span><span class="cx"> WebCore::TestCallback* item = WebKit::core(self);
</span><span class="lines">@@ -122,14 +122,14 @@
</span><span class="cx"> return result;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><del>- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
</del><ins>+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
</ins><span class="cx"> return static_cast<gboolean>(0);
</span><del>-#endif /* ENABLE(SQL_DATABASE) */
</del><ins>+#endif /* ENABLE(SPEECH_SYNTHESIS) */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gboolean webkit_dom_test_callback_callback_with_array_param(WebKitDOMTestCallback* self, WebKitDOMFloat32Array* arrayParam)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_FLOAT32ARRAY(arrayParam), FALSE);
</span><span class="lines">@@ -140,14 +140,14 @@
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="cx"> UNUSED_PARAM(arrayParam);
</span><del>- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
</del><ins>+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
</ins><span class="cx"> return static_cast<gboolean>(0);
</span><del>-#endif /* ENABLE(SQL_DATABASE) */
</del><ins>+#endif /* ENABLE(SPEECH_SYNTHESIS) */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gboolean webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, const gchar* srzParam, const gchar* strArg)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
</span><span class="cx"> g_return_val_if_fail(srzParam, FALSE);
</span><span class="lines">@@ -160,14 +160,14 @@
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="cx"> UNUSED_PARAM(srzParam);
</span><span class="cx"> UNUSED_PARAM(strArg);
</span><del>- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
</del><ins>+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
</ins><span class="cx"> return static_cast<gboolean>(0);
</span><del>-#endif /* ENABLE(SQL_DATABASE) */
</del><ins>+#endif /* ENABLE(SPEECH_SYNTHESIS) */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> glong webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, const gchar* strArg)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), 0);
</span><span class="cx"> g_return_val_if_fail(strArg, 0);
</span><span class="lines">@@ -178,14 +178,14 @@
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="cx"> UNUSED_PARAM(strArg);
</span><del>- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
</del><ins>+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
</ins><span class="cx"> return static_cast<glong>(0);
</span><del>-#endif /* ENABLE(SQL_DATABASE) */
</del><ins>+#endif /* ENABLE(SPEECH_SYNTHESIS) */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gboolean webkit_dom_test_callback_callback_with_string_list(WebKitDOMTestCallback* self, WebKitDOMDOMStringList* listParam)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_DOM_STRING_LIST(listParam), FALSE);
</span><span class="lines">@@ -196,14 +196,14 @@
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="cx"> UNUSED_PARAM(listParam);
</span><del>- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
</del><ins>+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
</ins><span class="cx"> return static_cast<gboolean>(0);
</span><del>-#endif /* ENABLE(SQL_DATABASE) */
</del><ins>+#endif /* ENABLE(SPEECH_SYNTHESIS) */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gboolean webkit_dom_test_callback_callback_with_boolean(WebKitDOMTestCallback* self, gboolean boolParam)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
</span><span class="cx"> WebCore::TestCallback* item = WebKit::core(self);
</span><span class="lines">@@ -212,14 +212,14 @@
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="cx"> UNUSED_PARAM(boolParam);
</span><del>- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
</del><ins>+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
</ins><span class="cx"> return static_cast<gboolean>(0);
</span><del>-#endif /* ENABLE(SQL_DATABASE) */
</del><ins>+#endif /* ENABLE(SPEECH_SYNTHESIS) */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gboolean webkit_dom_test_callback_callback_requires_this_to_pass(WebKitDOMTestCallback* self, glong longParam, WebKitDOMTestNode* testNodeParam)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_NODE(testNodeParam), FALSE);
</span><span class="lines">@@ -231,8 +231,8 @@
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="cx"> UNUSED_PARAM(longParam);
</span><span class="cx"> UNUSED_PARAM(testNodeParam);
</span><del>- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
</del><ins>+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
</ins><span class="cx"> return static_cast<gboolean>(0);
</span><del>-#endif /* ENABLE(SQL_DATABASE) */
</del><ins>+#endif /* ENABLE(SPEECH_SYNTHESIS) */
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestCallbackPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "TestCallback.h"
</span><span class="cx"> #include <webkitdom/WebKitDOMTestCallback.h>
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback*);
</span><span class="lines">@@ -31,6 +31,6 @@
</span><span class="cx"> WebCore::TestCallback* core(WebKitDOMTestCallback*);
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif /* ENABLE(SQL_DATABASE) */
</del><ins>+#endif /* ENABLE(SPEECH_SYNTHESIS) */
</ins><span class="cx">
</span><span class="cx"> #endif /* WebKitDOMTestCallbackPrivate_h */
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx">
</span><span class="cx"> #include "JSTestCallback.h"
</span><span class="cx">
</span><span class="lines">@@ -168,4 +168,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
</del><ins>+#endif // ENABLE(SPEECH_SYNTHESIS)
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #ifndef JSTestCallback_h
</span><span class="cx"> #define JSTestCallback_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx">
</span><span class="cx"> #include "ActiveDOMCallback.h"
</span><span class="cx"> #include "JSCallbackData.h"
</span><span class="lines">@@ -59,6 +59,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
</del><ins>+#endif // ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestCallbackmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(SPEECH_SYNTHESIS)
</ins><span class="cx">
</span><span class="cx"> #import "DOMInternal.h"
</span><span class="cx">
</span><span class="lines">@@ -143,4 +143,4 @@
</span><span class="cx"> return [wrapper autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
</del><ins>+#endif // ENABLE(SPEECH_SYNTHESIS)
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestCallbackidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestCallback.idl (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestCallback.idl 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/bindings/scripts/test/TestCallback.idl 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> // This IDL file is for testing the bindings code generator with a callback
</span><span class="cx"> // interface and for tracking changes in its ouput.
</span><span class="cx"> [
</span><del>- Conditional=SQL_DATABASE,
</del><ins>+ Conditional=SPEECH_SYNTHESIS,
</ins><span class="cx"> ] callback interface TestCallback {
</span><span class="cx"> boolean callbackWithNoParam();
</span><span class="cx"> boolean callbackWithArrayParam(Float32Array arrayParam);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMExceptionsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMExceptions.in (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMExceptions.in 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/dom/DOMExceptions.in 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> EventException
</span><span class="cx"> FileException
</span><span class="cx"> RangeException
</span><del>-SQLException conditional=SQL_DATABASE
</del><ins>+SQLException
</ins><span class="cx"> SVGException
</span><span class="cx"> XMLHttpRequestException
</span><span class="cx"> XPathException
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CachedScript.h"
</span><span class="cx"> #include "DOMTimer.h"
</span><ins>+#include "DatabaseContext.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ErrorEvent.h"
</span><span class="cx"> #include "MessagePort.h"
</span><span class="lines">@@ -48,10 +49,6 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-#include "DatabaseContext.h"
-#endif
-
</del><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -459,13 +456,11 @@
</span><span class="cx"> return downcast<WorkerGlobalScope>(*this).script()->vm();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> void ScriptExecutionContext::setDatabaseContext(DatabaseContext* databaseContext)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_databaseContext);
</span><span class="cx"> m_databaseContext = databaseContext;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool ScriptExecutionContext::hasPendingActivity() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -171,9 +171,7 @@
</span><span class="cx">
</span><span class="cx"> virtual EventQueue& eventQueue() const = 0;
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> void setDatabaseContext(DatabaseContext*);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx"> virtual bool wrapCryptoKey(const Vector<uint8_t>& key, Vector<uint8_t>& wrappedKey) = 0;
</span><span class="lines">@@ -226,9 +224,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<PublicURLManager> m_publicURLManager;
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> RefPtr<DatabaseContext> m_databaseContext;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool m_activeDOMObjectAdditionForbidden;
</span><span class="cx"> int m_timerNestingLevel;
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/history/PageCache.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -139,13 +139,11 @@
</span><span class="cx"> FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHTTPSNoStoreKey);
</span><span class="cx"> rejectReasons |= 1 << IsHttpsAndCacheControlled;
</span><span class="cx"> }
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> if (DatabaseManager::manager().hasOpenDatabases(frame->document())) {
</span><span class="cx"> PCLOG(" -Frame has open database handles");
</span><span class="cx"> FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHasOpenDatabasesKey);
</span><span class="cx"> rejectReasons |= 1 << HasDatabaseHandles;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> if (!frame->loader().history().currentItem()) {
</span><span class="cx"> PCLOG(" -No current history item");
</span><span class="cx"> FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureNoCurrentHistoryItemKey);
</span><span class="lines">@@ -314,9 +312,7 @@
</span><span class="cx"> && !(documentLoader->substituteData().isValid() && !documentLoader->substituteData().failingURL().isEmpty())
</span><span class="cx"> && (!frameLoader.subframeLoader().containsPlugins() || frame->page()->settings().pageCacheSupportsPlugins())
</span><span class="cx"> && !(frame->isMainFrame() && document->url().protocolIs("https") && documentLoader->response().cacheControlContainsNoStore())
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> && !DatabaseManager::manager().hasOpenDatabases(document)
</span><del>-#endif
</del><span class="cx"> && frameLoader.history().currentItem()
</span><span class="cx"> && !frameLoader.quickRedirectComing()
</span><span class="cx"> && !documentLoader->isLoadingInAPISense()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorCommandLineAPIHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><ins>+#include "Database.h"
</ins><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="lines">@@ -52,10 +53,6 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-#include "Database.h"
-#endif
-
</del><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -70,9 +67,7 @@
</span><span class="cx"> , m_consoleAgent(nullptr)
</span><span class="cx"> , m_domAgent(nullptr)
</span><span class="cx"> , m_domStorageAgent(nullptr)
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> , m_databaseAgent(nullptr)
</span><del>-#endif
</del><span class="cx"> {
</span><span class="cx"> m_defaultInspectableObject = std::make_unique<InspectableObject>();
</span><span class="cx"> }
</span><span class="lines">@@ -87,9 +82,7 @@
</span><span class="cx"> m_consoleAgent = nullptr;
</span><span class="cx"> m_domAgent = nullptr;
</span><span class="cx"> m_domStorageAgent = nullptr;
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> m_databaseAgent = nullptr;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CommandLineAPIHost::inspectImpl(RefPtr<InspectorValue>&& object, RefPtr<InspectorValue>&& hints)
</span><span class="lines">@@ -149,14 +142,12 @@
</span><span class="cx"> return m_inspectedObjects[index].get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> String CommandLineAPIHost::databaseIdImpl(Database* database)
</span><span class="cx"> {
</span><span class="cx"> if (m_databaseAgent)
</span><span class="cx"> return m_databaseAgent->databaseId(database);
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> String CommandLineAPIHost::storageIdImpl(Storage* storage)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorCommandLineAPIHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/CommandLineAPIHost.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/CommandLineAPIHost.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/CommandLineAPIHost.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -67,18 +67,14 @@
</span><span class="cx"> , Inspector::InspectorConsoleAgent* consoleAgent
</span><span class="cx"> , InspectorDOMAgent* domAgent
</span><span class="cx"> , InspectorDOMStorageAgent* domStorageAgent
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> , InspectorDatabaseAgent* databaseAgent
</span><del>-#endif
</del><span class="cx"> )
</span><span class="cx"> {
</span><span class="cx"> m_inspectorAgent = inspectorAgent;
</span><span class="cx"> m_consoleAgent = consoleAgent;
</span><span class="cx"> m_domAgent = domAgent;
</span><span class="cx"> m_domStorageAgent = domStorageAgent;
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> m_databaseAgent = databaseAgent;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void disconnect();
</span><span class="lines">@@ -99,9 +95,7 @@
</span><span class="cx">
</span><span class="cx"> void getEventListenersImpl(Node*, Vector<EventListenerInfo>& listenersArray);
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> String databaseIdImpl(Database*);
</span><del>-#endif
</del><span class="cx"> String storageIdImpl(Storage*);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -111,9 +105,7 @@
</span><span class="cx"> Inspector::InspectorConsoleAgent* m_consoleAgent;
</span><span class="cx"> InspectorDOMAgent* m_domAgent;
</span><span class="cx"> InspectorDOMStorageAgent* m_domStorageAgent;
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> InspectorDatabaseAgent* m_databaseAgent;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> Vector<std::unique_ptr<InspectableObject>> m_inspectedObjects;
</span><span class="cx"> std::unique_ptr<InspectableObject> m_defaultInspectableObject;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -122,11 +122,9 @@
</span><span class="cx">
</span><span class="cx"> m_agents.append(std::make_unique<InspectorCSSAgent>(m_instrumentingAgents.get(), m_domAgent));
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> auto databaseAgentPtr = std::make_unique<InspectorDatabaseAgent>(m_instrumentingAgents.get());
</span><span class="cx"> InspectorDatabaseAgent* databaseAgent = databaseAgentPtr.get();
</span><span class="cx"> m_agents.append(WTF::move(databaseAgentPtr));
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> m_agents.append(std::make_unique<InspectorIndexedDBAgent>(m_instrumentingAgents.get(), m_injectedScriptManager.get(), pageAgent));
</span><span class="lines">@@ -171,9 +169,7 @@
</span><span class="cx"> , consoleAgent
</span><span class="cx"> , m_domAgent
</span><span class="cx"> , domStorageAgent
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> , databaseAgent
</span><del>-#endif
</del><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "InspectorDatabaseAgent.h"
</span><span class="cx">
</span><span class="lines">@@ -323,4 +323,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #ifndef InspectorDatabaseAgent_h
</span><span class="cx"> #define InspectorDatabaseAgent_h
</span><span class="cx">
</span><del>-#if ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "InspectorWebAgentBase.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatchers.h>
</span><span class="lines">@@ -83,6 +83,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorDatabaseAgent_h)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseInstrumentation.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseInstrumentation.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseInstrumentation.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> inline void InspectorInstrumentation::didOpenDatabase(ScriptExecutionContext* context, RefPtr<Database>&& database, const String& domain, const String& name, const String& version)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="lines">@@ -51,7 +50,6 @@
</span><span class="cx"> UNUSED_PARAM(version);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "InspectorDatabaseResource.h"
</span><span class="cx">
</span><span class="lines">@@ -70,4 +70,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseResource.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseResource.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseResource.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef InspectorDatabaseResource_h
</span><span class="cx"> #define InspectorDatabaseResource_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include <inspector/InspectorFrontendDispatchers.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -63,6 +63,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #endif // InspectorDatabaseResource_h
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -772,10 +772,8 @@
</span><span class="cx"> if (InspectorCSSAgent* cssAgent = instrumentingAgents.inspectorCSSAgent())
</span><span class="cx"> cssAgent->reset();
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> if (InspectorDatabaseAgent* databaseAgent = instrumentingAgents.inspectorDatabaseAgent())
</span><span class="cx"> databaseAgent->clearResources();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (InspectorDOMAgent* domAgent = instrumentingAgents.inspectorDOMAgent())
</span><span class="cx"> domAgent->setDocument(page->mainFrame().document());
</span><span class="lines">@@ -939,7 +937,6 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents& instrumentingAgents, RefPtr<Database>&& database, const String& domain, const String& name, const String& version)
</span><span class="cx"> {
</span><span class="cx"> if (!instrumentingAgents.inspectorEnvironment().developerExtrasEnabled())
</span><span class="lines">@@ -947,7 +944,6 @@
</span><span class="cx"> if (InspectorDatabaseAgent* dbAgent = instrumentingAgents.inspectorDatabaseAgent())
</span><span class="cx"> dbAgent->didOpenDatabase(database, domain, name, version);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didDispatchDOMStorageEventImpl(InstrumentingAgents& instrumentingAgents, const String& key, const String& oldValue, const String& newValue, StorageType storageType, SecurityOrigin* securityOrigin, Page* page)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -228,9 +228,7 @@
</span><span class="cx"> static void startProfiling(Page&, JSC::ExecState*, const String& title);
</span><span class="cx"> static RefPtr<JSC::Profile> stopProfiling(Page&, JSC::ExecState*, const String& title);
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static void didOpenDatabase(ScriptExecutionContext*, RefPtr<Database>&&, const String& domain, const String& name, const String& version);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static void didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
</span><span class="cx">
</span><span class="lines">@@ -418,9 +416,7 @@
</span><span class="cx"> static void startProfilingImpl(InstrumentingAgents&, JSC::ExecState*, const String& title);
</span><span class="cx"> static RefPtr<JSC::Profile> stopProfilingImpl(InstrumentingAgents&, JSC::ExecState*, const String& title);
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static void didOpenDatabaseImpl(InstrumentingAgents&, RefPtr<Database>&&, const String& domain, const String& name, const String& version);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static void didDispatchDOMStorageEventImpl(InstrumentingAgents&, const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -61,9 +61,7 @@
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> , m_inspectorReplayAgent(nullptr)
</span><span class="cx"> #endif
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> , m_inspectorDatabaseAgent(nullptr)
</span><del>-#endif
</del><span class="cx"> , m_inspectorApplicationCacheAgent(nullptr)
</span><span class="cx"> , m_inspectorDebuggerAgent(nullptr)
</span><span class="cx"> , m_pageDebuggerAgent(nullptr)
</span><span class="lines">@@ -89,9 +87,7 @@
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> m_inspectorReplayAgent = nullptr;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> m_inspectorDatabaseAgent = nullptr;
</span><del>-#endif
</del><span class="cx"> m_inspectorApplicationCacheAgent = nullptr;
</span><span class="cx"> m_inspectorDebuggerAgent = nullptr;
</span><span class="cx"> m_pageDebuggerAgent = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -115,10 +115,8 @@
</span><span class="cx"> void setInspectorReplayAgent(InspectorReplayAgent* agent) { m_inspectorReplayAgent = agent; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> InspectorDatabaseAgent* inspectorDatabaseAgent() const { return m_inspectorDatabaseAgent; }
</span><span class="cx"> void setInspectorDatabaseAgent(InspectorDatabaseAgent* agent) { m_inspectorDatabaseAgent = agent; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> InspectorApplicationCacheAgent* inspectorApplicationCacheAgent() const { return m_inspectorApplicationCacheAgent; }
</span><span class="cx"> void setInspectorApplicationCacheAgent(InspectorApplicationCacheAgent* agent) { m_inspectorApplicationCacheAgent = agent; }
</span><span class="lines">@@ -158,9 +156,7 @@
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> InspectorReplayAgent* m_inspectorReplayAgent;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> InspectorDatabaseAgent* m_inspectorDatabaseAgent;
</span><del>-#endif
</del><span class="cx"> InspectorApplicationCacheAgent* m_inspectorApplicationCacheAgent;
</span><span class="cx"> Inspector::InspectorDebuggerAgent* m_inspectorDebuggerAgent;
</span><span class="cx"> PageDebuggerAgent* m_pageDebuggerAgent;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -103,9 +103,7 @@
</span><span class="cx"> , nullptr
</span><span class="cx"> , nullptr
</span><span class="cx"> , nullptr
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> , nullptr
</span><del>-#endif
</del><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -155,9 +155,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void print(Frame*) override { }
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> virtual void exceededDatabaseQuota(Frame*, const String&, DatabaseDetails) override { }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> virtual void reachedMaxAppCacheSize(int64_t) override { }
</span><span class="cx"> virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t) override { }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -494,10 +494,8 @@
</span><span class="cx"> // http://www.w3.org/Bugs/Public/show_bug.cgi?id=10537
</span><span class="cx"> doc->setReadyState(Document::Complete);
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> // FIXME: Should the DatabaseManager watch for something like ActiveDOMObject::stop() rather than being special-cased here?
</span><span class="cx"> DatabaseManager::manager().stopDatabases(doc, 0);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: This will cancel redirection timer, which really needs to be restarted when restoring the frame from b/f cache.
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/page/ChromeClient.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx">
</span><span class="cx"> #include "AXObjectCache.h"
</span><span class="cx"> #include "Cursor.h"
</span><ins>+#include "DatabaseDetails.h"
</ins><span class="cx"> #include "DisplayRefreshMonitor.h"
</span><span class="cx"> #include "FocusDirection.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="lines">@@ -53,10 +54,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-#include "DatabaseDetails.h"
-#endif
-
</del><span class="cx"> OBJC_CLASS NSResponder;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -204,9 +201,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void pageExtendedBackgroundColorDidChange(Color) const { }
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> virtual void exceededDatabaseQuota(Frame*, const String& databaseName, DatabaseDetails) = 0;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Callback invoked when the application cache fails to save a cache object
</span><span class="cx"> // because storing it would grow the database file past its defined maximum
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformFeatureCounterKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FeatureCounterKeys.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -34,9 +34,7 @@
</span><span class="cx"> static const char FeatureCounterPageCacheFailureIsErrorPageKey[] = "com.apple.WebKit.pageCache.failure.isErrorPage";
</span><span class="cx"> static const char FeatureCounterPageCacheFailureHasPlugins[] = "com.apple.WebKit.pageCache.failure.hasPlugins";
</span><span class="cx"> static const char FeatureCounterPageCacheFailureHTTPSNoStoreKey[] = "com.apple.WebKit.pageCache.failure.httpsNoStore";
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static const char FeatureCounterPageCacheFailureHasOpenDatabasesKey[] = "com.apple.WebKit.pageCache.failure.hasOpenDatabases";
</span><del>-#endif
</del><span class="cx"> static const char FeatureCounterPageCacheFailureNoCurrentHistoryItemKey[] = "com.apple.WebKit.pageCache.failure.noCurrentHistoryItem";
</span><span class="cx"> static const char FeatureCounterPageCacheFailureQuirkRedirectComingKey[] = "com.apple.WebKit.pageCache.failure.quirkRedirectComing";
</span><span class="cx"> static const char FeatureCounterPageCacheFailureLoadingAPISenseKey[] = "com.apple.WebKit.pageCache.failure.loadingAPISense";
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Storage/WebDatabaseManager.mm:
+ (databasesDirectoryPath):
+ * Storage/WebDatabaseManagerClient.h:
+ * Storage/WebDatabaseManagerClient.mm:
+ * Storage/WebDatabaseManagerInternal.h:
+ * Storage/WebDatabaseManagerPrivate.h:
+ * Storage/WebDatabaseQuotaManager.mm:
+ (-[WebDatabaseQuotaManager usage]):
+ (-[WebDatabaseQuotaManager quota]):
+ (-[WebDatabaseQuotaManager setQuota:]):
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ * WebCoreSupport/WebSecurityOrigin.mm:
+ (-[WebSecurityOrigin usage]):
+ (-[WebSecurityOrigin quota]):
+ (-[WebSecurityOrigin setQuota:]):
+ * WebView/WebFrame.mm:
+ (-[WebFrame _cacheabilityDictionary]):
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2015-01-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Make 'TypeName' parameter unnecessary in CSSPropertyNames.in
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -165,7 +165,6 @@
</span><span class="cx"> ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
</span><span class="cx"> ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><del>-ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
</del><span class="cx"> ENABLE_SUBTLE_CRYPTO[sdk=iphone*] = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO[sdk=macosx*] = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
</span><span class="lines">@@ -227,4 +226,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD)
$(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVI
GATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAY
OUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD)
$(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIG
ATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE
_VIDEO_PRESENTATION_MODE);
</ins></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebDatabaseManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #import "WebDatabaseManagerPrivate.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #import "WebDatabaseManagerClient.h"
</span><span class="cx"> #import "WebPlatformStrategies.h"
</span><span class="cx"> #import "WebSecurityOriginInternal.h"
</span><span class="lines">@@ -305,5 +303,3 @@
</span><span class="cx">
</span><span class="cx"> return [databasesDirectory stringByStandardizingPath];
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebDatabaseManagerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -23,8 +23,6 @@
</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>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #import <WebCore/DatabaseManagerClient.h>
</span><span class="cx">
</span><span class="cx"> class WebDatabaseManagerClient : public WebCore::DatabaseManagerClient {
</span><span class="lines">@@ -54,5 +52,3 @@
</span><span class="cx"> bool m_isHandlingDeleteDatabaseOriginNotification;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebDatabaseManagerClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.mm (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.mm 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.mm 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #import "WebDatabaseManagerClient.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #import "WebDatabaseManagerPrivate.h"
</span><span class="cx"> #import "WebSecurityOriginInternal.h"
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="lines">@@ -232,5 +230,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebDatabaseManagerInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManagerInternal.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebDatabaseManagerInternal.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManagerInternal.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #import "WebDatabaseManagerPrivate.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> @interface WebDatabaseManager (WebDatabaseManagerInternal)
</span><span class="cx"> + (void)willBeginFirstTransaction;
</span><span class="lines">@@ -40,5 +38,3 @@
</span><span class="cx">
</span><span class="cx"> void WebKitSetWebDatabasePaused(bool);
</span><span class="cx"> #endif
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebDatabaseManagerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,12 +26,6 @@
</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>-#if !defined(ENABLE_SQL_DATABASE)
-#define ENABLE_SQL_DATABASE 1
-#endif
-
-#if ENABLE_SQL_DATABASE
-
</del><span class="cx"> extern NSString *WebDatabaseDirectoryDefaultsKey;
</span><span class="cx">
</span><span class="cx"> extern NSString *WebDatabaseDisplayNameKey;
</span><span class="lines">@@ -78,5 +72,3 @@
</span><span class="cx"> + (void)scheduleEmptyDatabaseRemoval;
</span><span class="cx"> #endif
</span><span class="cx"> @end
</span><del>-
-#endif // ENABLE_SQL_DATABASE
</del></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebDatabaseQuotaManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseQuotaManager.mm (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebDatabaseQuotaManager.mm 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseQuotaManager.mm 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -49,20 +49,12 @@
</span><span class="cx">
</span><span class="cx"> - (unsigned long long)usage
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> return DatabaseManager::manager().usageForOrigin([_origin _core]);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (unsigned long long)quota
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> return DatabaseManager::manager().quotaForOrigin([_origin _core]);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the quota is set to a value lower than the current usage, that quota will
</span><span class="lines">@@ -70,9 +62,7 @@
</span><span class="cx"> // prevent new data from being added to databases in that origin.
</span><span class="cx"> - (void)setQuota:(unsigned long long)quota
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> DatabaseManager::manager().setQuota([_origin _core], quota);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -119,9 +119,7 @@
</span><span class="cx"> virtual void setToolTip(const WTF::String&, WebCore::TextDirection) override;
</span><span class="cx">
</span><span class="cx"> virtual void print(WebCore::Frame*) override;
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName, WebCore::DatabaseDetails) override;
</span><del>-#endif
</del><span class="cx"> virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) override;
</span><span class="cx"> virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -676,8 +676,6 @@
</span><span class="cx"> CallUIDelegate(m_webView, @selector(webView:printFrameView:), [webFrame frameView]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseName, DatabaseDetails)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="lines">@@ -689,8 +687,6 @@
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> void WebChromeClient::reachedMaxAppCacheSize(int64_t spaceNeeded)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Free some space.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSecurityOriginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -179,27 +179,17 @@
</span><span class="cx">
</span><span class="cx"> - (unsigned long long)usage
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> return DatabaseManager::manager().usageForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (unsigned long long)quota
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> return DatabaseManager::manager().quotaForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setQuota:(unsigned long long)quota
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> DatabaseManager::manager().setQuota(reinterpret_cast<SecurityOrigin*>(_private), quota);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -2092,10 +2092,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Document* document = _private->coreFrame->document()) {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> if (DatabaseManager::manager().hasOpenDatabases(document))
</span><span class="cx"> [result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameUsesDatabases];
</span><del>-#endif
</del><span class="cx"> if (!document->canSuspendActiveDOMObjects())
</span><span class="cx"> [result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameCanSuspendActiveDOMObjects];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -917,7 +917,6 @@
</span><span class="cx"> // of the initialization code which may depend on the strategies.
</span><span class="cx"> WebPlatformStrategies::initializeIfNecessary();
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // Set the WebSQLiteDatabaseTrackerClient.
</span><span class="cx"> SQLiteDatabaseTracker::setClient(WebSQLiteDatabaseTrackerClient::sharedWebSQLiteDatabaseTrackerClient());
</span><span class="lines">@@ -925,7 +924,6 @@
</span><span class="cx"> if ([standardPreferences databasesEnabled])
</span><span class="cx"> #endif
</span><span class="cx"> [WebDatabaseManager sharedWebDatabaseManager];
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if ([standardPreferences storageTrackerEnabled])
</span><span class="lines">@@ -2392,9 +2390,7 @@
</span><span class="cx"> settings.setQTKitEnabled([preferences isQTKitEnabled]);
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> DatabaseManager::manager().setIsAvailable([preferences databasesEnabled]);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> settings.setMediaSourceEnabled([preferences mediaSourceEnabled]);
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/win/ChangeLog 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * ForEachCoClass.h:
+ * WebCoreSupport/WebChromeClient.cpp:
+ (WebChromeClient::exceededDatabaseQuota):
+ * WebCoreSupport/WebChromeClient.h:
+ * WebDatabaseManager.cpp:
+ (WebKitInitializeWebDatabasesIfNecessary):
+ * WebDatabaseManager.h:
+ * WebSecurityOrigin.cpp:
+ (WebSecurityOrigin::usage):
+ (WebSecurityOrigin::quota):
+ (WebSecurityOrigin::setQuota):
+ * WebView.cpp:
+ (WebView::initWithFrame):
+ (WebView::notifyPreferencesChanged):
+
</ins><span class="cx"> 2015-01-15 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix after r178510
</span></span></pre></div>
<a id="trunkSourceWebKitwinForEachCoClassh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ForEachCoClass.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ForEachCoClass.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/win/ForEachCoClass.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -31,11 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ProgIDMacros.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> #define WEB_DATABASE_MANAGER(macro) macro(WebDatabaseManager)
</span><del>-#else
-#define WEB_DATABASE_MANAGER(macro)
-#endif
</del><span class="cx">
</span><span class="cx"> // Items may only be added to the end of this macro. No items may be removed from it.
</span><span class="cx"> #define FOR_EACH_COCLASS(macro) \
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -582,7 +582,6 @@
</span><span class="cx"> uiDelegate->printFrame(m_webView, kit(frame));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseIdentifier, DatabaseDetails)
</span><span class="cx"> {
</span><span class="cx"> COMPtr<WebSecurityOrigin> origin(AdoptCOM, WebSecurityOrigin::createInstance(frame->document()->securityOrigin()));
</span><span class="lines">@@ -618,7 +617,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // FIXME: Move this include to the top of the file with the other includes.
</span><span class="cx"> #include "ApplicationCacheStorage.h"
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -112,9 +112,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void print(WebCore::Frame*);
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String&, WebCore::DatabaseDetails);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
</span><span class="cx"> virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded);
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDatabaseManager.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDatabaseManager.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/win/WebDatabaseManager.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #include "WebDatabaseManager.h"
</span><span class="cx"> #include "WebKitDLL.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "COMEnumVariant.h"
</span><span class="cx"> #include "COMPropertyBag.h"
</span><span class="cx"> #include "MarshallingHelpers.h"
</span><span class="lines">@@ -427,5 +425,3 @@
</span><span class="cx">
</span><span class="cx"> initialized = true;
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitwinWebDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDatabaseManager.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDatabaseManager.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/win/WebDatabaseManager.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #ifndef WebDatabaseManager_h
</span><span class="cx"> #define WebDatabaseManager_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "WebKit.h"
</span><span class="cx"> #include <WebCore/DatabaseManagerClient.h>
</span><span class="cx">
</span><span class="lines">@@ -90,5 +88,3 @@
</span><span class="cx"> void WebKitInitializeWebDatabasesIfNecessary();
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitwinWebSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebSecurityOrigin.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebSecurityOrigin.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/win/WebSecurityOrigin.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -123,43 +123,28 @@
</span><span class="cx">
</span><span class="cx"> HRESULT WebSecurityOrigin::usage(/* [retval][out] */ unsigned long long* result)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> if (!result)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> *result = DatabaseManager::manager().usageForOrigin(m_securityOrigin.get());
</span><span class="cx">
</span><span class="cx"> return S_OK;
</span><del>-#else
- UNUSED_PARAM(result);
- return E_NOTIMPL;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebSecurityOrigin::quota(/* [retval][out] */ unsigned long long* result)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> if (!result)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> *result = DatabaseManager::manager().quotaForOrigin(m_securityOrigin.get());
</span><span class="cx"> return S_OK;
</span><del>-#else
- UNUSED_PARAM(result);
- return E_NOTIMPL;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebSecurityOrigin::setQuota(/* [in] */ unsigned long long quota)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> DatabaseManager::manager().setQuota(m_securityOrigin.get(), quota);
</span><span class="cx">
</span><span class="cx"> return S_OK;
</span><del>-#else
- UNUSED_PARAM(quota);
- return E_NOTIMPL;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebSecurityOrigin::initWithURL(/* [in] */ BSTR urlBstr)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -2783,9 +2783,7 @@
</span><span class="cx"> // of the initialization code which may depend on the strategies.
</span><span class="cx"> WebPlatformStrategies::initialize();
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> WebKitInitializeWebDatabasesIfNecessary();
</span><del>-#endif
</del><span class="cx"> WebKitSetApplicationCachePathIfNecessary();
</span><span class="cx"> Settings::setDefaultMinDOMTimerInterval(0.004);
</span><span class="cx">
</span><span class="lines">@@ -4956,12 +4954,10 @@
</span><span class="cx"> return hr;
</span><span class="cx"> settings.setOfflineWebApplicationCacheEnabled(enabled);
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> hr = prefsPrivate->databasesEnabled(&enabled);
</span><span class="cx"> if (FAILED(hr))
</span><span class="cx"> return hr;
</span><span class="cx"> DatabaseManager::manager().setIsAvailable(enabled);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> hr = prefsPrivate->localStorageEnabled(&enabled);
</span><span class="cx"> if (FAILED(hr))
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -1,3 +1,61 @@
</span><ins>+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Shared/OriginAndDatabases.cpp:
+ * Shared/OriginAndDatabases.h:
+ * Shared/WebCoreArgumentCoders.cpp:
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextGetDatabaseManager):
+ * UIProcess/API/C/WKDatabaseManager.cpp:
+ (WKDatabaseManagerGetTypeID):
+ (WKDatabaseManagerGetOriginKey):
+ (WKDatabaseManagerGetOriginQuotaKey):
+ (WKDatabaseManagerGetOriginUsageKey):
+ (WKDatabaseManagerGetDatabaseDetailsKey):
+ (WKDatabaseManagerGetDatabaseDetailsNameKey):
+ (WKDatabaseManagerGetDatabaseDetailsDisplayNameKey):
+ (WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey):
+ (WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey):
+ (WKDatabaseManagerGetDatabaseDetailsCreationTimeKey):
+ (WKDatabaseManagerGetDatabaseDetailsModificationTimeKey):
+ (WKDatabaseManagerSetClient):
+ (WKDatabaseManagerGetDatabasesByOrigin):
+ (WKDatabaseManagerGetDatabaseOrigins):
+ (WKDatabaseManagerDeleteDatabasesWithNameForOrigin):
+ (WKDatabaseManagerDeleteDatabasesForOrigin):
+ (WKDatabaseManagerDeleteAllDatabases):
+ (WKDatabaseManagerSetQuotaForOrigin):
+ * UIProcess/API/efl/EwkView.cpp:
+ (EwkView::informDatabaseQuotaReached):
+ * UIProcess/WebDatabaseManagerProxy.cpp:
+ * UIProcess/WebDatabaseManagerProxy.h:
+ * UIProcess/WebDatabaseManagerProxy.messages.in:
+ * UIProcess/WebProcessPool.cpp:
+ * UIProcess/efl/PageUIClientEfl.cpp:
+ (WebKit::PageUIClientEfl::PageUIClientEfl):
+ (WebKit::PageUIClientEfl::exceededDatabaseQuota):
+ * UIProcess/efl/PageUIClientEfl.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::clearAllDatabases):
+ (WebKit::InjectedBundle::setDatabaseQuota):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::exceededDatabaseQuota):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
+ * WebProcess/WebCoreSupport/WebDatabaseManager.h:
+ * WebProcess/WebCoreSupport/WebDatabaseManager.messages.in:
+ * WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp:
+ * WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess):
+
</ins><span class="cx"> 2015-01-15 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a connection parameter to StorageManager willOpen/didClose functions
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -165,7 +165,6 @@
</span><span class="cx"> ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
</span><span class="cx"> ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><del>-ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
</del><span class="cx"> ENABLE_SUBTLE_CRYPTO[sdk=iphone*] = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO[sdk=macosx*] = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
</span><span class="lines">@@ -227,4 +226,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD)
$(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVI
GATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAY
OUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD)
$(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIG
ATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE
_VIDEO_PRESENTATION_MODE);
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedOriginAndDatabasescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/OriginAndDatabases.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/OriginAndDatabases.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/Shared/OriginAndDatabases.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "OriginAndDatabases.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -57,5 +55,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedOriginAndDatabasesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/OriginAndDatabases.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/OriginAndDatabases.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/Shared/OriginAndDatabases.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef OriginAndDatabases_h
</span><span class="cx"> #define OriginAndDatabases_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include <WebCore/DatabaseDetails.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -51,6 +49,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // OriginAndDatabases_h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -957,8 +957,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> void ArgumentCoder<DatabaseDetails>::encode(ArgumentEncoder& encoder, const DatabaseDetails& details)
</span><span class="cx"> {
</span><span class="cx"> encoder << details.name();
</span><span class="lines">@@ -999,8 +997,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<Highlight>::encode(ArgumentEncoder& encoder, const Highlight& highlight)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -48,15 +48,13 @@
</span><span class="cx"> // Supplements
</span><span class="cx"> #include "WebApplicationCacheManagerProxy.h"
</span><span class="cx"> #include "WebCookieManagerProxy.h"
</span><ins>+#include "WebDatabaseManagerProxy.h"
</ins><span class="cx"> #include "WebGeolocationManagerProxy.h"
</span><span class="cx"> #include "WebKeyValueStorageManager.h"
</span><span class="cx"> #include "WebMediaCacheManagerProxy.h"
</span><span class="cx"> #include "WebNotificationManagerProxy.h"
</span><span class="cx"> #include "WebOriginDataManagerProxy.h"
</span><span class="cx"> #include "WebResourceCacheManagerProxy.h"
</span><del>-#if ENABLE(SQL_DATABASE)
-#include "WebDatabaseManagerProxy.h"
-#endif
</del><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> #include "WebBatteryManagerProxy.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -422,12 +420,7 @@
</span><span class="cx">
</span><span class="cx"> WKDatabaseManagerRef WKContextGetDatabaseManager(WKContextRef contextRef)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> return toAPI(toImpl(contextRef)->supplement<WebDatabaseManagerProxy>());
</span><del>-#else
- UNUSED_PARAM(contextRef);
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef contextRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -33,184 +33,102 @@
</span><span class="cx">
</span><span class="cx"> WKTypeID WKDatabaseManagerGetTypeID()
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> return toAPI(WebDatabaseManagerProxy::APIType);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetOriginKey()
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static API::String* key = API::String::create(WebDatabaseManagerProxy::originKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetOriginQuotaKey()
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static API::String* key = API::String::create(WebDatabaseManagerProxy::originQuotaKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetOriginUsageKey()
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static API::String* key = API::String::create(WebDatabaseManagerProxy::originUsageKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsKey()
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsNameKey()
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsNameKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsDisplayNameKey()
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsDisplayNameKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey()
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsExpectedUsageKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey()
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsCurrentUsageKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsCreationTimeKey()
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsCreationTimeKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsModificationTimeKey()
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsModificationTimeKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManagerRef, const WKDatabaseManagerClientBase* wkClient)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> if (wkClient && wkClient->version)
</span><span class="cx"> return;
</span><span class="cx"> toImpl(databaseManagerRef)->initializeClient(wkClient);
</span><del>-#else
- UNUSED_PARAM(databaseManagerRef);
- UNUSED_PARAM(wkClient);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKDatabaseManagerGetDatabasesByOrigin(WKDatabaseManagerRef databaseManagerRef, void* context, WKDatabaseManagerGetDatabasesByOriginFunction callback)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> toImpl(databaseManagerRef)->getDatabasesByOrigin(toGenericCallbackFunction(context, callback));
</span><del>-#else
- UNUSED_PARAM(databaseManagerRef);
- UNUSED_PARAM(context);
- UNUSED_PARAM(callback);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKDatabaseManagerGetDatabaseOrigins(WKDatabaseManagerRef databaseManagerRef, void* context, WKDatabaseManagerGetDatabaseOriginsFunction callback)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> toImpl(databaseManagerRef)->getDatabaseOrigins(toGenericCallbackFunction(context, callback));
</span><del>-#else
- UNUSED_PARAM(databaseManagerRef);
- UNUSED_PARAM(context);
- UNUSED_PARAM(callback);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKDatabaseManagerDeleteDatabasesWithNameForOrigin(WKDatabaseManagerRef databaseManagerRef, WKStringRef databaseNameRef, WKSecurityOriginRef originRef)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> toImpl(databaseManagerRef)->deleteDatabaseWithNameForOrigin(toWTFString(databaseNameRef), toImpl(originRef));
</span><del>-#else
- UNUSED_PARAM(databaseManagerRef);
- UNUSED_PARAM(databaseNameRef);
- UNUSED_PARAM(originRef);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKDatabaseManagerDeleteDatabasesForOrigin(WKDatabaseManagerRef databaseManagerRef, WKSecurityOriginRef originRef)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> toImpl(databaseManagerRef)->deleteDatabasesForOrigin(toImpl(originRef));
</span><del>-#else
- UNUSED_PARAM(databaseManagerRef);
- UNUSED_PARAM(originRef);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKDatabaseManagerDeleteAllDatabases(WKDatabaseManagerRef databaseManagerRef)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> toImpl(databaseManagerRef)->deleteAllDatabases();
</span><del>-#else
- UNUSED_PARAM(databaseManagerRef);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKDatabaseManagerSetQuotaForOrigin(WKDatabaseManagerRef databaseManagerRef, WKSecurityOriginRef originRef, uint64_t quota)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> toImpl(databaseManagerRef)->setQuotaForOrigin(toImpl(originRef), quota);
</span><del>-#else
- UNUSED_PARAM(databaseManagerRef);
- UNUSED_PARAM(originRef);
- UNUSED_PARAM(quota);
-#endif
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflEwkViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -1033,7 +1033,6 @@
</span><span class="cx"> return WKEinaSharedString::adopt(sd->api->run_javascript_prompt(sd, message, defaultValue));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> /**
</span><span class="cx"> * @internal
</span><span class="cx"> * Calls exceeded_database_quota callback or falls back to default behavior returns default database quota.
</span><span class="lines">@@ -1049,7 +1048,6 @@
</span><span class="cx">
</span><span class="cx"> return defaultQuota;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> WebView* EwkView::webView()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDatabaseManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebDatabaseManagerProxy.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIDictionary.h"
</span><span class="cx"> #include "APISecurityOrigin.h"
</span><span class="lines">@@ -264,5 +262,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDatabaseManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef WebDatabaseManagerProxy_h
</span><span class="cx"> #define WebDatabaseManagerProxy_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "Arguments.h"
</span><span class="cx"> #include "GenericCallback.h"
</span><span class="lines">@@ -100,6 +98,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // DatabaseManagerProxy_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDatabaseManagerProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.messages.in (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.messages.in 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.messages.in 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -20,13 +20,9 @@
</span><span class="cx"> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> messages -> WebDatabaseManagerProxy {
</span><span class="cx"> DidGetDatabasesByOrigin(Vector<WebKit::OriginAndDatabases> originAndDatabases, uint64_t callbackID);
</span><span class="cx"> DidGetDatabaseOrigins(Vector<String> originIdentifiers, uint64_t callbackID)
</span><span class="cx"> DidModifyOrigin(String originIdentifier)
</span><span class="cx"> DidModifyDatabase(String originIdentifier, String databaseIdentifier)
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -214,9 +214,7 @@
</span><span class="cx"> addSupplement<WebMediaCacheManagerProxy>();
</span><span class="cx"> addSupplement<WebNotificationManagerProxy>();
</span><span class="cx"> addSupplement<WebResourceCacheManagerProxy>();
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> addSupplement<WebDatabaseManagerProxy>();
</span><del>-#endif
</del><span class="cx"> #if USE(SOUP)
</span><span class="cx"> addSupplement<WebSoupCustomProtocolRequestManager>();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflPageUIClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -74,9 +74,7 @@
</span><span class="cx"> uiClient.getWindowFrame = getWindowFrame;
</span><span class="cx"> uiClient.setWindowFrame = setWindowFrame;
</span><span class="cx"> uiClient.runBeforeUnloadConfirmPanel = runBeforeUnloadConfirmPanel;
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> uiClient.exceededDatabaseQuota = exceededDatabaseQuota;
</span><del>-#endif
</del><span class="cx"> uiClient.runOpenPanel = runOpenPanel;
</span><span class="cx"> uiClient.createNewPage = createNewPage;
</span><span class="cx">
</span><span class="lines">@@ -200,13 +198,11 @@
</span><span class="cx"> return toPageUIClientEfl(clientInfo)->m_view->requestJSConfirmPopup(WKEinaSharedString(message));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> unsigned long long PageUIClientEfl::exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef databaseName, WKStringRef displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> EwkView* view = toPageUIClientEfl(clientInfo)->m_view;
</span><span class="cx"> return view->informDatabaseQuotaReached(toImpl(databaseName)->string(), toImpl(displayName)->string(), currentQuota, currentOriginUsage, currentDatabaseUsage, expectedUsage);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void PageUIClientEfl::runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef parameters, WKOpenPanelResultListenerRef listener, const void* clientInfo)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflPageUIClientEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -58,9 +58,7 @@
</span><span class="cx"> static WKRect getWindowFrame(WKPageRef, const void*);
</span><span class="cx"> static void setWindowFrame(WKPageRef, WKRect, const void*);
</span><span class="cx"> static bool runBeforeUnloadConfirmPanel(WKPageRef, WKStringRef, WKFrameRef, const void*);
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> static unsigned long long exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef, WKStringRef, unsigned long long currentQuota, unsigned long long, unsigned long long, unsigned long long, const void*);
</span><del>-#endif
</del><span class="cx"> static void runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef, WKOpenPanelResultListenerRef, const void*);
</span><span class="cx"> static WKPageRef createNewPage(WKPageRef, WKURLRequestRef, WKDictionaryRef, WKEventModifiers, WKEventMouseButton, const void*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -342,20 +342,14 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::clearAllDatabases()
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> WebProcess::shared().supplement<WebDatabaseManager>()->deleteAllDatabases();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::setDatabaseQuota(uint64_t quota)
</span><span class="cx"> {
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> // Historically, we've used the following (somewhat non-sensical) string
</span><span class="cx"> // for the databaseIdentifier of local files.
</span><span class="cx"> WebProcess::shared().supplement<WebDatabaseManager>()->setQuotaForOrigin("file__0", quota);
</span><del>-#else
- UNUSED_PARAM(quota);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::clearApplicationCache()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -671,7 +671,6 @@
</span><span class="cx"> m_page->sendSync(Messages::WebPageProxy::PrintFrame(webFrame->frameID()), Messages::WebPageProxy::PrintFrame::Reply(), std::chrono::milliseconds::max(), syncSendFlags);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseName, DatabaseDetails details)
</span><span class="cx"> {
</span><span class="cx"> WebFrame* webFrame = WebFrame::fromCoreFrame(*frame);
</span><span class="lines">@@ -698,9 +697,7 @@
</span><span class="cx">
</span><span class="cx"> dbManager.setQuota(origin, newQuota);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-
</del><span class="cx"> void WebChromeClient::reachedMaxAppCacheSize(int64_t)
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -138,10 +138,8 @@
</span><span class="cx"> virtual void setToolTip(const String&, WebCore::TextDirection) override;
</span><span class="cx">
</span><span class="cx"> virtual void print(WebCore::Frame*) override;
</span><del>-
-#if ENABLE(SQL_DATABASE)
</del><ins>+
</ins><span class="cx"> virtual void exceededDatabaseQuota(WebCore::Frame*, const String& databaseName, WebCore::DatabaseDetails) override;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) override;
</span><span class="cx"> virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t spaceNeeded) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebDatabaseManager.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "OriginAndDatabases.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebDatabaseManagerMessages.h"
</span><span class="lines">@@ -163,5 +161,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef WebDatabaseManager_h
</span><span class="cx"> #define WebDatabaseManager_h
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include "WebProcessSupplement.h"
</span><span class="cx"> #include <WebCore/DatabaseManagerClient.h>
</span><span class="lines">@@ -75,6 +73,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // WebDatabaseManager_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.messages.in (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.messages.in 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.messages.in 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> messages -> WebDatabaseManager {
</span><span class="cx"> void GetDatabasesByOrigin(uint64_t callbackID)
</span><span class="cx"> void GetDatabaseOrigins(uint64_t callbackID)
</span><span class="lines">@@ -30,5 +28,3 @@
</span><span class="cx"> void DeleteAllDatabases()
</span><span class="cx"> void SetQuotaForOrigin(String originIdentifier, uint64_t quota)
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebSQLiteDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebSQLiteDatabaseTracker.h"
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><span class="cx"> #include <WebCore/SQLiteDatabaseTracker.h>
</span><span class="lines">@@ -73,5 +71,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebSQLiteDatabaseTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #include <WebCore/SQLiteDatabaseTrackerClient.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class WebProcess;
</span><span class="lines">@@ -60,6 +58,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> #endif // WebSQLiteDatabaseTracker_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -2780,9 +2780,7 @@
</span><span class="cx"> settings.setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
</span><span class="cx"> settings.setSpatialNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::spatialNavigationEnabledKey()));
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> DatabaseManager::manager().setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey()));
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> settings.setFullScreenEnabled(store.getBoolValueForKey(WebPreferencesKey::fullScreenEnabledKey()));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "WebConnectionToUIProcess.h"
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><ins>+#include "WebDatabaseManager.h"
</ins><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include "WebFrameNetworkingContext.h"
</span><span class="cx"> #include "WebGeolocationManager.h"
</span><span class="lines">@@ -119,12 +120,9 @@
</span><span class="cx"> #include "WebNotificationManager.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-#include "WebDatabaseManager.h"
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "WebSQLiteDatabaseTracker.h"
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> #include "WebBatteryManager.h"
</span><span class="lines">@@ -198,13 +196,10 @@
</span><span class="cx"> addSupplement<WebCookieManager>();
</span><span class="cx"> addSupplement<WebMediaCacheManager>();
</span><span class="cx"> addSupplement<AuthenticationManager>();
</span><del>-
-#if ENABLE(SQL_DATABASE)
</del><span class="cx"> addSupplement<WebDatabaseManager>();
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> addSupplement<WebSQLiteDatabaseTracker>();
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> addSupplement<WebNotificationManager>();
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/cmake/OptionsMac.cmake 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -150,7 +150,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SATURATED_LAYOUT_ARITHMETIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SQL_DATABASE ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO_macosx ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO_macosx_1080 OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -123,7 +123,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_CONTROLS "Toggle service controls support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" OFF)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_SQL_DATABASE "Toggle SQL Database Support" ON)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SUBTLE_CRYPTO "Toggle subtle crypto support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG fonts support (imples SVG support)" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_TELEPHONE_NUMBER_DETECTION "Toggle telephone number detection support" OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Source/cmakeconfig.h.cmake 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -111,7 +111,6 @@
</span><span class="cx"> #cmakedefine01 ENABLE_SATURATED_LAYOUT_ARITHMETIC
</span><span class="cx"> #cmakedefine01 ENABLE_SMOOTH_SCROLLING
</span><span class="cx"> #cmakedefine01 ENABLE_SPELLCHECK
</span><del>-#cmakedefine01 ENABLE_SQL_DATABASE
</del><span class="cx"> #cmakedefine01 ENABLE_SUBTLE_CRYPTO
</span><span class="cx"> #cmakedefine01 ENABLE_SVG_FONTS
</span><span class="cx"> #cmakedefine01 ENABLE_TELEPHONE_NUMBER_DETECTION
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Tools/ChangeLog 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
</ins><span class="cx"> 2015-01-15 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] REGRESSION (r174642): DumpRenderTree.app test may dump result twice
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (178574 => 178575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2015-01-16 06:13:45 UTC (rev 178574)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2015-01-16 08:05:12 UTC (rev 178575)
</span><span class="lines">@@ -117,7 +117,6 @@
</span><span class="cx"> $resourceTimingSupport,
</span><span class="cx"> $scriptedSpeechSupport,
</span><span class="cx"> $seccompFiltersSupport,
</span><del>- $sqlDatabaseSupport,
</del><span class="cx"> $styleScopedSupport,
</span><span class="cx"> $subtleCrypto,
</span><span class="cx"> $suidLinuxSandbox,
</span><span class="lines">@@ -361,9 +360,6 @@
</span><span class="cx"> { option => "scripted-speech", desc => "Toggle Scripted Speech support",
</span><span class="cx"> define => "ENABLE_SCRIPTED_SPEECH", default => 0, value => \$scriptedSpeechSupport },
</span><span class="cx">
</span><del>- { option => "sql-database", desc => "Toggle SQL Database support",
- define => "ENABLE_SQL_DATABASE", default => 1, value => \$sqlDatabaseSupport },
-
</del><span class="cx"> { option => "subtle-crypto", desc => "Toggle WebCrypto Subtle-Crypto support",
</span><span class="cx"> define => "ENABLE_SUBTLE_CRYPTO", default => (isGtk() || isEfl() || isAppleMacWebKit() || isIOSWebKit()), value => \$subtleCrypto },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>