Attachment 185833 Details for Bug 108408 – Patch

[patch] Patch

bug-108408-20130131120325.patch (text/plain), 10.89 KB, created by Nico Weber on 2013-01-31 12:06:41 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Nico Weber

Created: 2013-01-31 12:06:41 PST

Size: 10.89 KB

patch

obsolete

>Subversion Revision: 141241
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index b3b7b309266b700e29c4d152ab0ecbb8fbb26e57..f3207c12d747fcc6f510608ff8bd9b2c7ed5b9ec 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2013-01-31  Nico Weber  <thakis@chromium.org>
>+
>+        [chromium] Build webkit with enable_web_intents set to 0.
>+        https://bugs.webkit.org/show_bug.cgi?id=108408
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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  Dominik RÃ¶ttsches  <dominik.rottsches@intel.com>
> 
>         [HarfBuzz] Remove the HarfBuzz-old code
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 0f3286612b845d852cf66ead99f9249a9453f2f9..63972c908985cba70d0f555fd31c613df4da1cee 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,18 @@
>+2013-01-31  Nico Weber  <thakis@chromium.org>
>+
>+        [chromium] Build webkit with enable_web_intents set to 0.
>+        https://bugs.webkit.org/show_bug.cgi?id=108408
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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  Dominik RÃ¶ttsches  <dominik.rottsches@intel.com>
> 
>         [HarfBuzz] Remove the HarfBuzz-old code
>diff --git a/Source/WebCore/bindings/v8/custom/V8IntentCustom.cpp b/Source/WebCore/bindings/v8/custom/V8IntentCustom.cpp
>index 7f9554d2cfdd0c5720323d3309041901b03f19e5..ab6467ecd19881a6d85d922db79b78fb548eb3a4 100644
>--- a/Source/WebCore/bindings/v8/custom/V8IntentCustom.cpp
>+++ b/Source/WebCore/bindings/v8/custom/V8IntentCustom.cpp
>@@ -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 @@ v8::Handle<v8::Value> V8Intent::constructorCallbackCustom(const v8::Arguments& a
>     return wrapper;
> }
> 
>-
> } // namespace WebCore
>+
>+#endif
>diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp
>index 353d7945b31950cf0e993351819f09914ea34333..b18fc8252533ed7775f3753f169e396cc9a96511 100644
>--- a/Source/WebKit/chromium/WebKit.gyp
>+++ b/Source/WebKit/chromium/WebKit.gyp
>@@ -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',
>diff --git a/Source/WebKit/chromium/features.gypi b/Source/WebKit/chromium/features.gypi
>index 1df4db176e1499a715b326958d8f9a925491f4eb..4bbed656e649171281dc0f297f2db8433d1e8c08 100644
>--- a/Source/WebKit/chromium/features.gypi
>+++ b/Source/WebKit/chromium/features.gypi
>@@ -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',
>diff --git a/Source/WebKit/chromium/src/WebFrameImpl.cpp b/Source/WebKit/chromium/src/WebFrameImpl.cpp
>index 5baf08ec277dff1ddbd0f5ea2e14edbbb767e64c..ce34c208e04e0136897eb6bbf34f6774f5ef1588 100644
>--- a/Source/WebKit/chromium/src/WebFrameImpl.cpp
>+++ b/Source/WebKit/chromium/src/WebFrameImpl.cpp
>@@ -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 {
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 52feba2181b9ac3a9162e9ef8ad2fb37eed0e49f..6409c0db92e05379a6d0dc15ccbf423a4ab79223 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,23 @@
>+2013-01-31  Nico Weber  <thakis@chromium.org>
>+
>+        [chromium] Build webkit with enable_web_intents set to 0.
>+        https://bugs.webkit.org/show_bug.cgi?id=108408
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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.
>+
>+        * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
>+        (WebTestRunner::TestRunner::TestRunner):
>+        * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
>+        (WebTestRunner::WebTestProxyBase::registerIntentService):
>+        (WebTestRunner::WebTestProxyBase::dispatchIntent):
>+        * DumpRenderTree/chromium/WebViewHost.cpp:
>+        * DumpRenderTree/chromium/WebViewHost.h:
>+        (WebViewHost):
>+
> 2013-01-30  Jochen Eisinger  <jochen@chromium.org>
> 
>         [chromium] move methods from WebTestDelegate to WebTestRunner
>diff --git a/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp b/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
>index 2961b79f49cdef500078cea999d5bf10a77563c7..e1bcbf0f29c144329c63917942f11f778a927842 100644
>--- a/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
>+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
>@@ -276,9 +276,11 @@ TestRunner::TestRunner()
>     bindMethod("setWillSendRequestReturnsNull", &TestRunner::setWillSendRequestReturnsNull);
>     bindMethod("setWillSendRequestReturnsNullOnRedirect", &TestRunner::setWillSendRequestReturnsNullOnRedirect);
> 
>+#if ENABLE(WEB_INTENTS)
>     // The following methods interact with the WebTestProxy.
>     bindMethod("sendWebIntentResponse", &TestRunner::sendWebIntentResponse);
>     bindMethod("deliverWebIntent", &TestRunner::deliverWebIntent);
>+#endif
> 
>     // The following methods interact with the WebTestDelegate.
>     bindMethod("showWebInspector", &TestRunner::showWebInspector);
>diff --git a/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp b/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp
>index 6c366baa4de5ed44b41950b24b36916a137cb932..0769680999f257dfcf3e976dab82908c2b127703 100644
>--- a/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp
>+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp
>@@ -515,11 +515,14 @@ void WebTestProxyBase::didEndEditing()
> 
> void WebTestProxyBase::registerIntentService(WebFrame*, const WebIntentServiceInfo& service)
> {
>+#if ENABLE(WEB_INTENTS)
>     m_delegate->printMessage(string("Registered Web Intent Service: action=") + service.action().utf8().data() + " type=" + service.type().utf8().data() + " title=" + service.title().utf8().data() + " url=" + service.url().spec().data() + " disposition=" + service.disposition().utf8().data() + "\n");
>+#endif
> }
> 
> void WebTestProxyBase::dispatchIntent(WebFrame* source, const WebIntentRequest& request)
> {
>+#if ENABLE(WEB_INTENTS)
>     m_delegate->printMessage(string("Received Web Intent: action=") + request.intent().action().utf8().data() + " type=" + request.intent().type().utf8().data() + "\n");
>     WebMessagePortChannelArray* ports = request.intent().messagePortChannelsRelease();
>     m_delegate->setCurrentWebIntentRequest(request);
>@@ -542,6 +545,7 @@ void WebTestProxyBase::dispatchIntent(WebFrame* source, const WebIntentRequest&
>     WebVector<WebURL> suggestions = request.intent().suggestions();
>     for (size_t i = 0; i < suggestions.size(); ++i)
>         m_delegate->printMessage(string("Have suggestion ") + suggestions[i].spec().data() + "\n");
>+#endif
> }
> 
> bool WebTestProxyBase::createView(WebFrame*, const WebURLRequest& request, const WebWindowFeatures&, const WebString&, WebNavigationPolicy)
>diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.cpp b/Tools/DumpRenderTree/chromium/WebViewHost.cpp
>index 06dfefaaa9814ca5157375aa504720e297df00c9..82072983622adbd7901310afeea6cc9f7f7c1c5e 100644
>--- a/Tools/DumpRenderTree/chromium/WebViewHost.cpp
>+++ b/Tools/DumpRenderTree/chromium/WebViewHost.cpp
>@@ -851,6 +851,7 @@ void WebViewHost::applyPreferences()
>     m_shell->applyPreferences();
> }
> 
>+#if ENABLE(WEB_INTENTS)
> void WebViewHost::setCurrentWebIntentRequest(const WebIntentRequest& request)
> {
>     m_currentRequest = request;
>@@ -860,6 +861,7 @@ WebIntentRequest* WebViewHost::currentWebIntentRequest()
> {
>     return &m_currentRequest;
> }
>+#endif
> 
> std::string WebViewHost::makeURLErrorDescription(const WebKit::WebURLError& error)
> {
>diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.h b/Tools/DumpRenderTree/chromium/WebViewHost.h
>index 497ce478b439bef795130696fce00a28f16bfaf6..246b617f42b1cff73ec201f4ec82750b7367d945 100644
>--- a/Tools/DumpRenderTree/chromium/WebViewHost.h
>+++ b/Tools/DumpRenderTree/chromium/WebViewHost.h
>@@ -125,8 +125,10 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient,
>     virtual WebKit::WebURL rewriteLayoutTestsURL(const std::string&) OVERRIDE;
>     virtual WebTestRunner::WebPreferences* preferences() OVERRIDE;
>     virtual void applyPreferences() OVERRIDE;
>+#if ENABLE(WEB_INTENTS)
>     virtual void setCurrentWebIntentRequest(const WebKit::WebIntentRequest&) OVERRIDE;
>     virtual WebKit::WebIntentRequest* currentWebIntentRequest() OVERRIDE;
>+#endif
>     virtual std::string makeURLErrorDescription(const WebKit::WebURLError&) OVERRIDE;
>     virtual std::string normalizeLayoutTestURL(const std::string&) OVERRIDE;
>     virtual void setClientWindowRect(const WebKit::WebRect&) OVERRIDE;
>@@ -407,8 +409,10 @@ private:
>     } m_pointerLockPlannedResult;
> #endif
> 
>+#if ENABLE(WEB_INTENTS)
>     // For web intents: holds the current request, if any.
>     WebKit::WebIntentRequest m_currentRequest;
>+#endif
> 
>     OwnPtr<WebKit::WebLayerTreeView> m_layerTreeView;
> };

Actions: View | Formatted Diff | Diff

Attachments on bug 108408: 185634 | 185833 | 185862