Title: [143511] trunk/Source/WebKit/chromium
- Revision
- 143511
- Author
- commit-qu...@webkit.org
- Date
- 2013-02-20 14:56:54 -0800 (Wed, 20 Feb 2013)
Log 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...@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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (143510 => 143511)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-02-20 22:54:24 UTC (rev 143510)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-02-20 22:56:54 UTC (rev 143511)
@@ -1,3 +1,19 @@
+2013-02-20 Paweł Hajdan, Jr. <phajdan...@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 <k...@webkit.org>
Enable CANVAS_PATH flag
Modified: trunk/Source/WebKit/chromium/features.gypi (143510 => 143511)
--- trunk/Source/WebKit/chromium/features.gypi 2013-02-20 22:54:24 UTC (rev 143510)
+++ trunk/Source/WebKit/chromium/features.gypi 2013-02-20 22:56:54 UTC (rev 143511)
@@ -112,7 +112,7 @@
'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)',
@@ -152,12 +152,14 @@
'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': [
Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp (143510 => 143511)
--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2013-02-20 22:54:24 UTC (rev 143510)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2013-02-20 22:56:54 UTC (rev 143511)
@@ -684,10 +684,12 @@
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)
{
Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.h (143510 => 143511)
--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.h 2013-02-20 22:54:24 UTC (rev 143510)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.h 2013-02-20 22:56:54 UTC (rev 143511)
@@ -137,8 +137,10 @@
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)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
