Changeset 64151 in webkit
- Timestamp:
- Jul 27, 2010 1:07:42 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r64149 r64151 1 2010-07-27 Dumitru Daniliuc <dumi@chromium.org> 2 3 Reviewed by David Levin. 4 5 Move all WebSQLDatabases-specific code behind #if ENABLE(DATABASE). 6 https://bugs.webkit.org/show_bug.cgi?id=43035 7 8 Make Chromium compile with ENABLE_DATABASE=0. The #ifdefs in 9 DatabaseAuthorizer and ChromiumBridge are removed, because they're 10 used by non-HTML5 DBs too (the classes in WebCore/platform/sql/), 11 which are used by other features too. So they need to be compiled 12 in even if HTML5 DBs are disabled. 13 14 * bindings/v8/custom/V8DOMWindowCustom.cpp: 15 * page/DOMWindow.idl: 16 * platform/chromium/ChromiumBridge.h: 17 * storage/DatabaseAuthorizer.cpp: 18 * storage/chromium/DatabaseObserver.h: 19 * storage/chromium/DatabaseTrackerChromium.cpp: 20 * storage/chromium/QuotaTracker.cpp: 21 * storage/chromium/QuotaTracker.h: 22 * storage/chromium/SQLTransactionClientChromium.cpp: 23 1 24 2010-07-27 Chris Fleizach <cfleizach@apple.com> 2 25 -
trunk/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
r62380 r64151 791 791 } 792 792 793 #if ENABLE(DATABASE) 793 794 v8::Handle<v8::Value> V8DOMWindow::openDatabaseCallback(const v8::Arguments& args) 794 795 { … … 820 821 return result; 821 822 } 823 #endif // ENABLE(DATABASE) 822 824 823 825 bool V8DOMWindow::namedSecurityCheck(v8::Local<v8::Object> host, v8::Local<v8::Value> key, v8::AccessType type, v8::Local<v8::Value>) -
trunk/WebCore/page/DOMWindow.idl
r64141 r64151 742 742 #endif 743 743 744 #if defined(ENABLE_DATABASE) 745 attribute SQLExceptionConstructor SQLException; 746 #endif 744 attribute [Conditional=DATABASE] SQLExceptionConstructor SQLException; 747 745 748 746 attribute [Conditional=TOUCH_EVENTS] TouchEventConstructor TouchEvent; -
trunk/WebCore/platform/chromium/ChromiumBridge.h
r63589 r64151 156 156 static GeolocationServiceBridge* createGeolocationServiceBridge(GeolocationServiceChromium*); 157 157 158 // HTML5 DB ----------------------------------------------------------- 159 #if ENABLE(DATABASE) 158 // Databases ---------------------------------------------------------- 160 159 // Returns a handle to the DB file and ooptionally a handle to its containing directory 161 160 static PlatformFileHandle databaseOpenFile(const String& vfsFleName, int desiredFlags); … … 166 165 // Returns the size of the DB file 167 166 static long long databaseGetFileSize(const String& vfsFileName); 168 #endif169 167 170 168 // IndexedDB ---------------------------------------------------------- -
trunk/WebCore/storage/DatabaseAuthorizer.cpp
r63278 r64151 30 30 #include "DatabaseAuthorizer.h" 31 31 32 #if ENABLE(DATABASE)33 32 #include "PlatformString.h" 34 33 #include <wtf/PassRefPtr.h> … … 421 420 422 421 } // namespace WebCore 423 424 #endif // ENABLE(DATABASE) -
trunk/WebCore/storage/chromium/DatabaseObserver.h
r61154 r64151 32 32 #define DatabaseObserver_h 33 33 34 #if ENABLE(DATABASE) 35 34 36 namespace WebCore { 35 37 … … 50 52 } 51 53 54 #endif // ENABLE(DATABASE) 55 52 56 #endif // DatabaseObserver_h -
trunk/WebCore/storage/chromium/DatabaseTrackerChromium.cpp
r63479 r64151 31 31 #include "config.h" 32 32 #include "DatabaseTracker.h" 33 34 #if ENABLE(DATABASE) 33 35 34 36 #include "AbstractDatabase.h" … … 174 176 175 177 } 178 179 #endif // ENABLE(DATABASE) -
trunk/WebCore/storage/chromium/QuotaTracker.cpp
r56825 r64151 32 32 #include "QuotaTracker.h" 33 33 34 #if ENABLE(DATABASE) 35 34 36 #include <wtf/StdLibExtras.h> 35 #include <wtf/text/CString.h>36 37 37 38 namespace WebCore { … … 68 69 69 70 } 71 72 #endif // ENABLE(DATABASE) -
trunk/WebCore/storage/chromium/QuotaTracker.h
r56825 r64151 32 32 #define QuotaTracker_h 33 33 34 #if ENABLE(DATABASE) 35 36 #include "PlatformString.h" 34 37 #include "SecurityOrigin.h" 35 38 #include "StringHash.h" 36 39 #include <wtf/HashMap.h> 37 #include <wtf/text/CString.h>38 40 39 41 namespace WebCore { … … 61 63 } 62 64 65 #endif // ENABLE(DATABASE) 66 63 67 #endif // QuotaTracker_h -
trunk/WebCore/storage/chromium/SQLTransactionClientChromium.cpp
r63278 r64151 31 31 #include "config.h" 32 32 #include "SQLTransactionClient.h" 33 34 #if ENABLE(DATABASE) 33 35 34 36 #include "AbstractDatabase.h" … … 84 86 85 87 } 88 89 #endif // ENABLE(DATABASE) -
trunk/WebKit/chromium/ChangeLog
r64133 r64151 1 2010-07-27 Dumitru Daniliuc <dumi@chromium.org> 2 3 Reviewed by David Levin. 4 5 Move all WebSQLDatabases-specific code behind #if ENABLE(DATABASE). 6 https://bugs.webkit.org/show_bug.cgi?id=43035 7 8 Make Chromium compile with ENABLE_DATABASE=0. 9 10 * src/ChromiumBridge.cpp: 11 (WebCore::ChromiumBridge::databaseGetFileSize): 12 * src/DatabaseObserver.cpp: 13 * src/WebDatabase.cpp: 14 (WebCore::AbstractDatabase::stringIdentifier): 15 (WebCore::AbstractDatabase::displayName): 16 (WebCore::AbstractDatabase::estimatedSize): 17 (WebCore::AbstractDatabase::securityOrigin): 18 (WebKit::WebDatabase::updateDatabaseSize): 19 (WebKit::WebDatabase::closeDatabaseImmediately): 20 1 21 2010-07-27 Pavel Podivilov <podivilov@chromium.org> 2 22 -
trunk/WebKit/chromium/src/ChromiumBridge.cpp
r63589 r64151 470 470 } 471 471 472 // HTML5 DB ------------------------------------------------------------------- 473 474 #if ENABLE(DATABASE) 472 // Databases ------------------------------------------------------------------ 473 475 474 PlatformFileHandle ChromiumBridge::databaseOpenFile(const String& vfsFileName, int desiredFlags) 476 475 { … … 492 491 return webKitClient()->databaseGetFileSize(WebString(vfsFileName)); 493 492 } 494 #endif495 493 496 494 // Indexed Database ----------------------------------------------------------- -
trunk/WebKit/chromium/src/DatabaseObserver.cpp
r61154 r64151 31 31 #include "config.h" 32 32 #include "DatabaseObserver.h" 33 34 #if ENABLE(DATABASE) 33 35 34 36 #include "AbstractDatabase.h" … … 85 87 86 88 } // namespace WebCore 89 90 #endif // ENABLE(DATABASE) -
trunk/WebKit/chromium/src/WebDatabase.cpp
r62153 r64151 40 40 #include <wtf/PassRefPtr.h> 41 41 #include <wtf/RefPtr.h> 42 43 #if !ENABLE(DATABASE) 44 namespace WebCore { 45 class AbstractDatabase { 46 public: 47 String stringIdentifier() const { return String(); } 48 String displayName() const { return String(); } 49 unsigned long long estimatedSize() const { return 0; } 50 SecurityOrigin* securityOrigin() const { return 0; } 51 }; 52 } 53 #endif // !ENABLE(DATABASE) 42 54 43 55 using namespace WebCore; … … 85 97 unsigned long long databaseSize, unsigned long long spaceAvailable) 86 98 { 99 #if ENABLE(DATABASE) 87 100 WebCore::QuotaTracker::instance().updateDatabaseSizeAndSpaceAvailableToOrigin( 88 101 originIdentifier, databaseName, databaseSize, spaceAvailable); 102 #endif // ENABLE(DATABASE) 89 103 } 90 104 91 105 void WebDatabase::closeDatabaseImmediately(const WebString& originIdentifier, const WebString& databaseName) 92 106 { 107 #if ENABLE(DATABASE) 93 108 HashSet<RefPtr<AbstractDatabase> > databaseHandles; 94 109 RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier); … … 96 111 for (HashSet<RefPtr<AbstractDatabase> >::iterator it = databaseHandles.begin(); it != databaseHandles.end(); ++it) 97 112 it->get()->closeImmediately(); 113 #endif // ENABLE(DATABASE) 98 114 } 99 115
Note: See TracChangeset
for help on using the changeset viewer.