Diff
Modified: trunk/Source/WebCore/ChangeLog (141370 => 141371)
--- trunk/Source/WebCore/ChangeLog 2013-01-31 04:46:43 UTC (rev 141370)
+++ trunk/Source/WebCore/ChangeLog 2013-01-31 04:57:50 UTC (rev 141371)
@@ -1,3 +1,13 @@
+2013-01-30 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r141358.
+ http://trac.webkit.org/changeset/141358
+ https://bugs.webkit.org/show_bug.cgi?id=108421
+
+ breaks android builder (Requested by morrita on #webkit).
+
+ * bindings/v8/custom/V8IntentCustom.cpp:
+
2013-01-30 Kentaro Hara <[email protected]>
[V8] Use state->isolate() when state is not 0
Modified: trunk/Source/WebCore/bindings/v8/custom/V8IntentCustom.cpp (141370 => 141371)
--- trunk/Source/WebCore/bindings/v8/custom/V8IntentCustom.cpp 2013-01-31 04:46:43 UTC (rev 141370)
+++ trunk/Source/WebCore/bindings/v8/custom/V8IntentCustom.cpp 2013-01-31 04:57:50 UTC (rev 141371)
@@ -39,8 +39,6 @@
#include "V8MessagePort.h"
#include <wtf/ArrayBuffer.h>
-#if ENABLE(WEB_INTENTS)
-
namespace WebCore {
v8::Handle<v8::Value> V8Intent::constructorCallbackCustom(const v8::Arguments& args)
@@ -84,6 +82,5 @@
return wrapper;
}
-} // namespace WebCore
-#endif
+} // namespace WebCore
Modified: trunk/Source/WebKit/chromium/ChangeLog (141370 => 141371)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-31 04:46:43 UTC (rev 141370)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-31 04:57:50 UTC (rev 141371)
@@ -1,3 +1,15 @@
+2013-01-30 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r141358.
+ http://trac.webkit.org/changeset/141358
+ https://bugs.webkit.org/show_bug.cgi?id=108421
+
+ breaks android builder (Requested by morrita on #webkit).
+
+ * WebKit.gyp:
+ * features.gypi:
+ * src/WebFrameImpl.cpp:
+
2013-01-30 Nico Weber <[email protected]>
[chromium] Build webkit with enable_web_intents set to 0.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (141370 => 141371)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-31 04:46:43 UTC (rev 141370)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-31 04:57:50 UTC (rev 141371)
@@ -794,19 +794,6 @@
}],
],
}],
- ['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 (141370 => 141371)
--- trunk/Source/WebKit/chromium/features.gypi 2013-01-31 04:46:43 UTC (rev 141370)
+++ trunk/Source/WebKit/chromium/features.gypi 2013-01-31 04:57:50 UTC (rev 141371)
@@ -130,7 +130,7 @@
'ENABLE_VIDEO_TRACK=1',
'ENABLE_VIEWPORT=1',
'ENABLE_WEBGL=1',
- 'ENABLE_WEB_INTENTS=<(enable_web_intents)',
+ 'ENABLE_WEB_INTENTS=1',
'ENABLE_WEB_SOCKETS=1',
'ENABLE_WEB_TIMING=1',
'ENABLE_WORKERS=1',
@@ -231,6 +231,11 @@
'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 (141370 => 141371)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-01-31 04:46:43 UTC (rev 141370)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-01-31 04:57:50 UTC (rev 141371)
@@ -83,6 +83,8 @@
#include "DOMWindow.h"
#include "DOMWindowIntents.h"
#include "DOMWrapperWorld.h"
+#include "DeliveredIntent.h"
+#include "DeliveredIntentClientImpl.h"
#include "DirectoryEntry.h"
#include "Document.h"
#include "DocumentLoader.h"
@@ -195,11 +197,6 @@
#include <wtf/CurrentTime.h>
#include <wtf/HashMap.h>
-#if ENABLE(WEB_INTENTS)
-#include "DeliveredIntent.h"
-#include "DeliveredIntentClientImpl.h"
-#endif
-
using namespace WebCore;
namespace WebKit {
