Add gyp option to switch ENABLE(SQL_DATABASE)
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Feb 2013 22:56:54 +0000 (22:56 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Feb 2013 22:56:54 +0000 (22:56 +0000)
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@143511 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/features.gypi
Source/WebKit/chromium/src/ChromeClientImpl.cpp
Source/WebKit/chromium/src/ChromeClientImpl.h

index 03c5127..08c93d3 100644 (file)
@@ -1,3 +1,19 @@
+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>
 
         Enable CANVAS_PATH flag
index bd6a2ad..77b2c76 100644 (file)
       'ENABLE_SHADOW_DOM=1',
       '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',
       'ENABLE_SVG=<(enable_svg)',
     'variables': {
       'use_accelerated_compositing%': 1,
       'enable_skia_text%': 1,
+      'enable_sql_database%': 1,
       'enable_svg%': 1,
       'enable_touch_events%': 1,
       'enable_touch_icon_loading%' : 0,
     },
     '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)',
     'conditions': [
index e5276ff..cb67f79 100644 (file)
@@ -684,10 +684,12 @@ void ChromeClientImpl::print(Frame* frame)
         m_webView->client()->printPage(WebFrameImpl::fromFrame(frame));
 }
 
+#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)
 {
index d5e9aff..2c89d8e 100644 (file)
@@ -137,8 +137,10 @@ public:
     virtual void setToolTip(const WTF::String& tooltipText, WebCore::TextDirection);
     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);
 #if ENABLE(DRAGGABLE_REGION)