Changeset 141614 in webkit


Ignore:
Timestamp:
Feb 1, 2013 11:14:03 AM (11 years ago)
Author:
thakis@chromium.org
Message:

[chromium] Build webkit with enable_web_intents set to 0.
​https://bugs.webkit.org/show_bug.cgi?id=108408

Reviewed by Tony Chang.

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:

The features.gypi bit depends on ​https://codereview.chromium.org/12143002/
and will disable web intents support on android. Since common.gypi
sets enable_web_intents to 0 explicitly, it seems this is currently on
by accident anyway.

While it looks like this CL just removes ENABLE_WEB_INTENTS=1 from
features.gypi completely, it's still set further down the file if
enable_web_intents is on.

  • WebKit.gyp:
  • features.gypi:
  • src/WebFrameImpl.cpp:

Tools:

  • 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):

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r141613 r141614  
     12013-02-01  Nico Weber  <thakis@chromium.org>
     2
     3        [chromium] Build webkit with enable_web_intents set to 0.
     4        https://bugs.webkit.org/show_bug.cgi?id=108408
     5
     6        Reviewed by Tony Chang.
     7
     8        I'll then make chromium build fine with that, then switch
     9        enable_web_intents to 0, roll that into webkit, and then
     10        actually remove the code hidden behind this flag.
     11
     12        * bindings/v8/custom/V8IntentCustom.cpp:
     13
    1142013-02-01  Pavel Feldman  <pfeldman@chromium.org>
    215

  • trunk/Source/WebCore/bindings/v8/custom/V8IntentCustom.cpp

    r141371 r141614  
    3939#include "V8MessagePort.h"
    4040#include <wtf/ArrayBuffer.h>
     41
     42#if ENABLE(WEB_INTENTS)
    4143
    4244namespace WebCore {
    … …  
    8385}
    8486
     87} // namespace WebCore
    8588
    86 } // namespace WebCore
     89#endif

  • trunk/Source/WebKit/chromium/ChangeLog

    r141608 r141614  
     12013-02-01  Nico Weber  <thakis@chromium.org>
     2
     3        [chromium] Build webkit with enable_web_intents set to 0.
     4        https://bugs.webkit.org/show_bug.cgi?id=108408
     5
     6        Reviewed by Tony Chang.
     7
     8        I'll then make chromium build fine with that, then switch
     9        enable_web_intents to 0, roll that into webkit, and then
     10        actually remove the code hidden behind this flag.
     11
     12        The features.gypi bit depends on https://codereview.chromium.org/12143002/
     13        and will disable web intents support on android. Since common.gypi
     14        sets enable_web_intents to 0 explicitly, it seems this is currently on
     15        by accident anyway.
     16
     17        While it looks like this CL just removes ENABLE_WEB_INTENTS=1 from
     18        features.gypi completely, it's still set further down the file if
     19        enable_web_intents is on.
     20
     21        * WebKit.gyp:
     22        * features.gypi:
     23        * src/WebFrameImpl.cpp:
     24
    1252013-02-01  Rouslan Solomakhin  <rouslan@chromium.org>
    226

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r141523 r141614  
    783783                    ],
    784784                }],
     785                ['enable_web_intents==0', {
     786                  'sources!': [
     787                    'public/WebDeliveredIntentClient.h',
     788                    'public/WebIntent.h',
     789                    'public/WebIntentRequest.h',
     790                    'public/WebIntentServiceInfo.h',
     791                    'src/DeliveredIntentClientImpl.cpp',
     792                    'src/DeliveredIntentClientImpl.h',
     793                    'src/WebIntent.cpp',
     794                    'src/WebIntentRequest.cpp',
     795                    'src/WebIntentServiceInfo.cpp',
     796                  ],
     797                }],
    785798                ['use_default_render_theme==1', {
    786799                    'include_dirs': [

  • trunk/Source/WebKit/chromium/features.gypi

    r141578 r141614  
    131131      'ENABLE_VIEWPORT=1',
    132132      'ENABLE_WEBGL=1',
    133       'ENABLE_WEB_INTENTS=1',
    134133      'ENABLE_WEB_SOCKETS=1',
    135134      'ENABLE_WEB_TIMING=1',

  • trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

    r141470 r141614  
    8484#include "DOMWindowIntents.h"
    8585#include "DOMWrapperWorld.h"
    86 #include "DeliveredIntent.h"
    87 #include "DeliveredIntentClientImpl.h"
    8886#include "DirectoryEntry.h"
    8987#include "Document.h"
    … …  
    198196#include <wtf/HashMap.h>
    199197
     198#if ENABLE(WEB_INTENTS)
     199#include "DeliveredIntent.h"
     200#include "DeliveredIntentClientImpl.h"
     201#endif
     202
    200203using namespace WebCore;
    201204

  • trunk/Tools/ChangeLog

    r141602 r141614  
     12013-02-01  Nico Weber  <thakis@chromium.org>
     2
     3        [chromium] Build webkit with enable_web_intents set to 0.
     4        https://bugs.webkit.org/show_bug.cgi?id=108408
     5
     6        Reviewed by Tony Chang.
     7
     8        I'll then make chromium build fine with that, then switch
     9        enable_web_intents to 0, roll that into webkit, and then
     10        actually remove the code hidden behind this flag.
     11
     12        * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
     13        (WebTestRunner::TestRunner::TestRunner):
     14        * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
     15        (WebTestRunner::WebTestProxyBase::registerIntentService):
     16        (WebTestRunner::WebTestProxyBase::dispatchIntent):
     17        * DumpRenderTree/chromium/WebViewHost.cpp:
     18        * DumpRenderTree/chromium/WebViewHost.h:
     19        (WebViewHost):
     20
    1212013-02-01  Zan Dobersek  <zdobersek@igalia.com>
    222

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp

    r141596 r141614  
    275275    bindMethod("setWillSendRequestReturnsNullOnRedirect", &TestRunner::setWillSendRequestReturnsNullOnRedirect);
    276276
     277#if ENABLE(WEB_INTENTS)
    277278    // The following methods interact with the WebTestProxy.
    278279    bindMethod("sendWebIntentResponse", &TestRunner::sendWebIntentResponse);
    279280    bindMethod("deliverWebIntent", &TestRunner::deliverWebIntent);
     281#endif
    280282
    281283    // The following methods interact with the WebTestDelegate.

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp

    r141392 r141614  
    556556void WebTestProxyBase::registerIntentService(WebFrame*, const WebIntentServiceInfo& service)
    557557{
     558#if ENABLE(WEB_INTENTS)
    558559    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");
     560#endif
    559561}
    560562
    561563void WebTestProxyBase::dispatchIntent(WebFrame* source, const WebIntentRequest& request)
    562564{
     565#if ENABLE(WEB_INTENTS)
    563566    m_delegate->printMessage(string("Received Web Intent: action=") + request.intent().action().utf8().data() + " type=" + request.intent().type().utf8().data() + "\n");
    564567    WebMessagePortChannelArray* ports = request.intent().messagePortChannelsRelease();
    … …  
    583586    for (size_t i = 0; i < suggestions.size(); ++i)
    584587        m_delegate->printMessage(string("Have suggestion ") + suggestions[i].spec().data() + "\n");
     588#endif
    585589}
    586590

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

    r141596 r141614  
    721721}
    722722
     723#if ENABLE(WEB_INTENTS)
    723724void WebViewHost::setCurrentWebIntentRequest(const WebIntentRequest& request)
    724725{
    … …  
    730731    return &m_currentRequest;
    731732}
     733#endif
    732734
    733735std::string WebViewHost::makeURLErrorDescription(const WebKit::WebURLError& error)

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

    r141392 r141614  
    126126    virtual WebTestRunner::WebPreferences* preferences() OVERRIDE;
    127127    virtual void applyPreferences() OVERRIDE;
     128#if ENABLE(WEB_INTENTS)
    128129    virtual void setCurrentWebIntentRequest(const WebKit::WebIntentRequest&) OVERRIDE;
    129130    virtual WebKit::WebIntentRequest* currentWebIntentRequest() OVERRIDE;
     131#endif
    130132    virtual std::string makeURLErrorDescription(const WebKit::WebURLError&) OVERRIDE;
    131133    virtual std::string normalizeLayoutTestURL(const std::string&) OVERRIDE;
    … …  
    391393#endif
    392394
     395#if ENABLE(WEB_INTENTS)
    393396    // For web intents: holds the current request, if any.
    394397    WebKit::WebIntentRequest m_currentRequest;
     398#endif
    395399
    396400    OwnPtr<WebKit::WebLayerTreeView> m_layerTreeView;
Note: See TracChangeset for help on using the changeset viewer.