- Revision
- 141358
- Author
- [email protected]
- Date
- 2013-01-30 18:17:35 -0800 (Wed, 30 Jan 2013)
Log Message
[chromium] Build webkit with enable_web_intents set to 0.
https://bugs.webkit.org/show_bug.cgi?id=108408
Reviewed by Kentaro Hara.
I'll then make chromium build fine with that, then switch
enable_web_intents to 0, roll that into webkit, and then
actually remove the code hidden behind this flag.
Source/WebCore:
* bindings/v8/custom/V8IntentCustom.cpp:
Source/WebKit/chromium:
* WebKit.gyp:
* features.gypi:
* src/WebFrameImpl.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (141357 => 141358)
--- trunk/Source/WebCore/ChangeLog 2013-01-31 02:15:03 UTC (rev 141357)
+++ trunk/Source/WebCore/ChangeLog 2013-01-31 02:17:35 UTC (rev 141358)
@@ -1,3 +1,16 @@
+2013-01-30 Nico Weber <[email protected]>
+
+ [chromium] Build webkit with enable_web_intents set to 0.
+ https://bugs.webkit.org/show_bug.cgi?id=108408
+
+ Reviewed by Kentaro Hara.
+
+ I'll then make chromium build fine with that, then switch
+ enable_web_intents to 0, roll that into webkit, and then
+ actually remove the code hidden behind this flag.
+
+ * bindings/v8/custom/V8IntentCustom.cpp:
+
2013-01-30 Joshua Bell <[email protected]>
IndexedDB: Remove speculative dispatchEvent crash fix now that root cause is addressed
Modified: trunk/Source/WebCore/bindings/v8/custom/V8IntentCustom.cpp (141357 => 141358)
--- trunk/Source/WebCore/bindings/v8/custom/V8IntentCustom.cpp 2013-01-31 02:15:03 UTC (rev 141357)
+++ trunk/Source/WebCore/bindings/v8/custom/V8IntentCustom.cpp 2013-01-31 02:17:35 UTC (rev 141358)
@@ -39,6 +39,8 @@
#include "V8MessagePort.h"
#include <wtf/ArrayBuffer.h>
+#if ENABLE(WEB_INTENTS)
+
namespace WebCore {
v8::Handle<v8::Value> V8Intent::constructorCallbackCustom(const v8::Arguments& args)
@@ -82,5 +84,6 @@
return wrapper;
}
+} // namespace WebCore
-} // namespace WebCore
+#endif
Modified: trunk/Source/WebKit/chromium/ChangeLog (141357 => 141358)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-31 02:15:03 UTC (rev 141357)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-31 02:17:35 UTC (rev 141358)
@@ -1,3 +1,18 @@
+2013-01-30 Nico Weber <[email protected]>
+
+ [chromium] Build webkit with enable_web_intents set to 0.
+ https://bugs.webkit.org/show_bug.cgi?id=108408
+
+ Reviewed by Kentaro Hara.
+
+ I'll then make chromium build fine with that, then switch
+ enable_web_intents to 0, roll that into webkit, and then
+ actually remove the code hidden behind this flag.
+
+ * WebKit.gyp:
+ * features.gypi:
+ * src/WebFrameImpl.cpp:
+
2013-01-30 Levi Weintraub <[email protected]>
[Chromium] WebPluginContainerImpl adding imbalanced touch handler refs
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (141357 => 141358)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-31 02:15:03 UTC (rev 141357)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-31 02:17:35 UTC (rev 141358)
@@ -794,6 +794,19 @@
}],
],
}],
+ ['enable_web_intents==0', {
+ 'sources!': [
+ 'public/WebDeliveredIntentClient.h',
+ 'public/WebIntent.h',
+ 'public/WebIntentRequest.h',
+ 'public/WebIntentServiceInfo.h',
+ 'src/DeliveredIntentClientImpl.cpp',
+ 'src/DeliveredIntentClientImpl.h',
+ 'src/WebIntent.cpp',
+ 'src/WebIntentRequest.cpp',
+ 'src/WebIntentServiceInfo.cpp',
+ ],
+ }],
['use_default_render_theme==1', {
'include_dirs': [
'public/default',
Modified: trunk/Source/WebKit/chromium/features.gypi (141357 => 141358)
--- trunk/Source/WebKit/chromium/features.gypi 2013-01-31 02:15:03 UTC (rev 141357)
+++ trunk/Source/WebKit/chromium/features.gypi 2013-01-31 02:17:35 UTC (rev 141358)
@@ -130,7 +130,7 @@
'ENABLE_VIDEO_TRACK=1',
'ENABLE_VIEWPORT=1',
'ENABLE_WEBGL=1',
- 'ENABLE_WEB_INTENTS=1',
+ 'ENABLE_WEB_INTENTS=<(enable_web_intents)',
'ENABLE_WEB_SOCKETS=1',
'ENABLE_WEB_TIMING=1',
'ENABLE_WORKERS=1',
@@ -231,11 +231,6 @@
'ENABLE_OPENTYPE_VERTICAL=1',
],
}],
- ['enable_web_intents==1', {
- 'feature_defines': [
- 'ENABLE_WEB_INTENTS=1',
- ],
- }],
['enable_web_intents_tag==1', {
'feature_defines': [
'ENABLE_WEB_INTENTS_TAG=1',
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (141357 => 141358)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-01-31 02:15:03 UTC (rev 141357)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-01-31 02:17:35 UTC (rev 141358)
@@ -83,8 +83,6 @@
#include "DOMWindow.h"
#include "DOMWindowIntents.h"
#include "DOMWrapperWorld.h"
-#include "DeliveredIntent.h"
-#include "DeliveredIntentClientImpl.h"
#include "DirectoryEntry.h"
#include "Document.h"
#include "DocumentLoader.h"
@@ -197,6 +195,11 @@
#include <wtf/CurrentTime.h>
#include <wtf/HashMap.h>
+#if ENABLE(WEB_INTENTS)
+#include "DeliveredIntent.h"
+#include "DeliveredIntentClientImpl.h"
+#endif
+
using namespace WebCore;
namespace WebKit {
