Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Side by Side Diff: Source/WebCore/dom/ScriptExecutionContext.cpp

Issue 13774005: Remove the ENABLE_SQL_DATABASE compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: python Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/WebCore/dom/ScriptExecutionContext.h ('k') | Source/WebCore/history/PageCache.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2012 Google Inc. All Rights Reserved. 3 * Copyright (C) 2012 Google Inc. All Rights Reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 13 matching lines...) Expand all
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 * 25 *
26 */ 26 */
27 27
28 #include "config.h" 28 #include "config.h"
29 #include "ScriptExecutionContext.h" 29 #include "ScriptExecutionContext.h"
30 30
31 #include "CachedScript.h" 31 #include "CachedScript.h"
32 #include "ContentSecurityPolicy.h" 32 #include "ContentSecurityPolicy.h"
33 #include "DOMTimer.h" 33 #include "DOMTimer.h"
34 #include "DatabaseContext.h"
34 #include "ErrorEvent.h" 35 #include "ErrorEvent.h"
35 #include "EventListener.h" 36 #include "EventListener.h"
36 #include "EventTarget.h" 37 #include "EventTarget.h"
37 #include "MessagePort.h" 38 #include "MessagePort.h"
38 #include "PublicURLManager.h" 39 #include "PublicURLManager.h"
39 #include "Settings.h" 40 #include "Settings.h"
40 #include "WebCoreMemoryInstrumentation.h" 41 #include "WebCoreMemoryInstrumentation.h"
41 #include "WorkerContext.h" 42 #include "WorkerContext.h"
42 #include "WorkerThread.h" 43 #include "WorkerThread.h"
43 #include <wtf/MainThread.h> 44 #include <wtf/MainThread.h>
44 #include <wtf/MemoryInstrumentationHashMap.h> 45 #include <wtf/MemoryInstrumentationHashMap.h>
45 #include <wtf/MemoryInstrumentationHashSet.h> 46 #include <wtf/MemoryInstrumentationHashSet.h>
46 #include <wtf/MemoryInstrumentationVector.h> 47 #include <wtf/MemoryInstrumentationVector.h>
47 #include <wtf/PassRefPtr.h> 48 #include <wtf/PassRefPtr.h>
48 #include <wtf/Vector.h> 49 #include <wtf/Vector.h>
49 50
50 #if ENABLE(SQL_DATABASE)
51 #include "DatabaseContext.h"
52 #endif
53
54 namespace WTF { 51 namespace WTF {
55 52
56 template<> struct SequenceMemoryInstrumentationTraits<WebCore::ContextDestructio nObserver*> { 53 template<> struct SequenceMemoryInstrumentationTraits<WebCore::ContextDestructio nObserver*> {
57 template <typename I> static void reportMemoryUsage(I, I, MemoryClassInfo&) { } 54 template <typename I> static void reportMemoryUsage(I, I, MemoryClassInfo&) { }
58 }; 55 };
59 56
60 } 57 }
61 namespace WebCore { 58 namespace WebCore {
62 59
63 class ProcessMessagesSoonTask : public ScriptExecutionContext::Task { 60 class ProcessMessagesSoonTask : public ScriptExecutionContext::Task {
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 info.addMember(m_pendingExceptions, "pendingExceptions"); 396 info.addMember(m_pendingExceptions, "pendingExceptions");
400 #if ENABLE(BLOB) 397 #if ENABLE(BLOB)
401 info.addMember(m_publicURLManager, "publicURLManager"); 398 info.addMember(m_publicURLManager, "publicURLManager");
402 #endif 399 #endif
403 } 400 }
404 401
405 ScriptExecutionContext::Task::~Task() 402 ScriptExecutionContext::Task::~Task()
406 { 403 {
407 } 404 }
408 405
409 #if ENABLE(SQL_DATABASE)
410 void ScriptExecutionContext::setDatabaseContext(DatabaseContext* databaseContext ) 406 void ScriptExecutionContext::setDatabaseContext(DatabaseContext* databaseContext )
411 { 407 {
412 ASSERT(!m_databaseContext); 408 ASSERT(!m_databaseContext);
413 m_databaseContext = databaseContext; 409 m_databaseContext = databaseContext;
414 } 410 }
415 #endif
416 411
417 } // namespace WebCore 412 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/dom/ScriptExecutionContext.h ('k') | Source/WebCore/history/PageCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698