Changeset 143511 in webkit

Timestamp:

Feb 20, 2013 2:56:54 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Add gyp option to switch ENABLE(SQL_DATABASE)
​https://bugs.webkit.org/show_bug.cgi?id=109303
​http://code.google.com/p/chromium/issues/detail?id=22208

Patch by Paweł Hajdan, Jr. <​phajdan.jr@chromium.org> on 2013-02-20
Reviewed by Tony Chang.

This will be useful to implement build with system sqlite.

• features.gypi:
• src/ChromeClientImpl.cpp:

(WebKit):

• src/ChromeClientImpl.h:

(ChromeClientImpl):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• features.gypi (modified) (3 diffs)
• src/ChromeClientImpl.cpp (modified) (1 diff)
• src/ChromeClientImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-02-20  Paweł Hajdan, Jr.  <phajdan.jr@chromium.org>
+
+        Add gyp option to switch ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=109303
+        http://code.google.com/p/chromium/issues/detail?id=22208
+
+        Reviewed by Tony Chang.
+
+        This will be useful to implement build with system sqlite.
+
+        * features.gypi:
+        * src/ChromeClientImpl.cpp:
+        (WebKit):
+        * src/ChromeClientImpl.h:
+        (ChromeClientImpl):
+
 2013-02-20  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebKit/chromium/features.gypi

@@ -113 +113 @@
       'ENABLE_SMOOTH_SCROLLING=1',
       'ENABLE_SPEECH_SYNTHESIS=0',
-      'ENABLE_SQL_DATABASE=1',
+      'ENABLE_SQL_DATABASE=<(enable_sql_database)',
       'ENABLE_STYLE_SCOPED=1',
       'ENABLE_SUBPIXEL_LAYOUT=1',
@@ -153 +153 @@
       'use_accelerated_compositing%': 1,
       'enable_skia_text%': 1,
+      'enable_sql_database%': 1,
       'enable_svg%': 1,
       'enable_touch_events%': 1,
@@ -159 +160 @@
     'use_accelerated_compositing%': '<(use_accelerated_compositing)',
     'enable_skia_text%': '<(enable_skia_text)',
+    'enable_sql_database%': '<(enable_sql_database)',
     'enable_svg%': '<(enable_svg)',
     'enable_touch_events%': '<(enable_touch_events)',

trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -685 +685 @@
 }
 
+#if ENABLE(SQL_DATABASE)
 void ChromeClientImpl::exceededDatabaseQuota(Frame* frame, const String& databaseName, DatabaseDetails)
 {
     // Chromium users cannot currently change the default quota
 }
+#endif
 
 void ChromeClientImpl::reachedMaxAppCacheSize(int64_t spaceNeeded)

trunk/Source/WebKit/chromium/src/ChromeClientImpl.h

@@ -138 +138 @@
     virtual void dispatchViewportPropertiesDidChange(const WebCore::ViewportArguments&) const;
     virtual void print(WebCore::Frame*);
+#if ENABLE(SQL_DATABASE)
     virtual void exceededDatabaseQuota(
         WebCore::Frame*, const WTF::String& databaseName, WebCore::DatabaseDetails);
+#endif
     virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
     virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded);