Changeset 142549 in webkit


Ignore:
Timestamp:
Feb 11, 2013 4:39:54 PM (11 years ago)
Author:
thakis@chromium.org
Message:

Remove web intents code
​https://bugs.webkit.org/show_bug.cgi?id=109501

Reviewed by Eric Seidel.

See thread "Removing ENABLE(WEB_INTENTS) code" on webkit-dev.

Source/WebCore:

  • DerivedSources.make:
  • Modules/intents/DOMWindowIntents.cpp: Removed.
  • Modules/intents/DOMWindowIntents.h: Removed.
  • Modules/intents/DOMWindowIntents.idl: Removed.
  • Modules/intents/DeliveredIntent.cpp: Removed.
  • Modules/intents/DeliveredIntent.h: Removed.
  • Modules/intents/DeliveredIntent.idl: Removed.
  • Modules/intents/Intent.cpp: Removed.
  • Modules/intents/Intent.h: Removed.
  • Modules/intents/Intent.idl: Removed.
  • Modules/intents/IntentRequest.cpp: Removed.
  • Modules/intents/IntentRequest.h: Removed.
  • Modules/intents/IntentResultCallback.h: Removed.
  • Modules/intents/IntentResultCallback.idl: Removed.
  • Modules/intents/NavigatorIntents.cpp: Removed.
  • Modules/intents/NavigatorIntents.h: Removed.
  • Modules/intents/NavigatorIntents.idl: Removed.
  • WebCore.gyp/WebCore.gyp:
  • WebCore.gypi:
  • bindings/generic/RuntimeEnabledFeatures.cpp:

(WebCore):

  • bindings/generic/RuntimeEnabledFeatures.h:

(RuntimeEnabledFeatures):

  • bindings/v8/custom/V8IntentCustom.cpp: Removed.
  • html/HTMLElementsAllInOne.cpp:
  • html/HTMLIntentElement.cpp: Removed.
  • html/HTMLIntentElement.h: Removed.
  • html/HTMLIntentElement.idl: Removed.
  • loader/EmptyClients.cpp:
  • loader/EmptyClients.h:

(EmptyFrameLoaderClient):

  • loader/FrameLoaderClient.h:

(WebCore):

  • page/DOMWindow.idl:

Source/WebKit/chromium:

  • WebKit.gyp:
  • features.gypi:
  • public/WebDeliveredIntentClient.h: Removed.
  • public/WebFrame.h:

(WebKit):
(WebFrame):

  • public/WebFrameClient.h:

(WebKit):

  • public/WebIntent.h: Removed.
  • public/WebIntentRequest.h: Removed.
  • public/WebIntentServiceInfo.h: Removed.
  • public/WebRuntimeFeatures.h:

(WebRuntimeFeatures):

  • src/DeliveredIntentClientImpl.cpp: Removed.
  • src/DeliveredIntentClientImpl.h: Removed.
  • src/FrameLoaderClientImpl.cpp:
  • src/FrameLoaderClientImpl.h:

(FrameLoaderClientImpl):

  • src/WebFrameImpl.cpp:
  • src/WebFrameImpl.h:

(WebKit):
(WebFrameImpl):

  • src/WebIntent.cpp: Removed.
  • src/WebIntentRequest.cpp: Removed.
  • src/WebIntentServiceInfo.cpp: Removed.
  • src/WebRuntimeFeatures.cpp:

Tools:

  • DumpRenderTree/TestRunner.cpp:

(TestRunner::staticFunctions):

  • DumpRenderTree/TestRunner.h:

(TestRunner):

  • DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
  • DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:

(WebKit):

  • DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h:

(WebKit):
(WebTestRunner::WebTestProxy::didEndEditing):

  • DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:

(WebTestRunner::TestRunner::TestRunner):

  • DumpRenderTree/chromium/TestRunner/src/TestRunner.h:

(TestRunner):

  • DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
  • DumpRenderTree/chromium/WebViewHost.cpp:
  • DumpRenderTree/chromium/WebViewHost.h:

(WebViewHost):

  • DumpRenderTree/efl/TestRunnerEfl.cpp:
  • DumpRenderTree/gtk/TestRunnerGtk.cpp:
  • DumpRenderTree/mac/TestRunnerMac.mm:
  • DumpRenderTree/win/TestRunnerWin.cpp:
  • DumpRenderTree/wx/TestRunnerWx.cpp:
  • Scripts/webkitperl/FeatureList.pm:

LayoutTests:

  • webintents/intent-tag-expected.txt: Removed.
  • webintents/intent-tag.html: Removed.
  • webintents/resources/pass.html: Removed.
  • webintents/resources/web-intents-reload-orig.html: Removed.
  • webintents/resources/web-intents-testing.js: Removed.
  • webintents/web-intents-api-expected.txt: Removed.
  • webintents/web-intents-api.html: Removed.
  • webintents/web-intents-delivery-expected.txt: Removed.
  • webintents/web-intents-delivery-reuse-expected.txt: Removed.
  • webintents/web-intents-delivery-reuse.html: Removed.
  • webintents/web-intents-delivery.html: Removed.
  • webintents/web-intents-failure-expected.txt: Removed.
  • webintents/web-intents-failure.html: Removed.
  • webintents/web-intents-invoke-expected.txt: Removed.
  • webintents/web-intents-invoke-port-expected.txt: Removed.
  • webintents/web-intents-invoke-port.html: Removed.
  • webintents/web-intents-invoke.html: Removed.
  • webintents/web-intents-obj-constructor-expected.txt: Removed.
  • webintents/web-intents-obj-constructor.html: Removed.
  • webintents/web-intents-reload-expected.txt: Removed.
  • webintents/web-intents-reload.html: Removed.
  • webintents/web-intents-reply-expected.txt: Removed.
  • webintents/web-intents-reply.html: Removed.
Location:
trunk
Files:
52 deleted
40 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r142548 r142549  
     12013-02-11  Nico Weber  <thakis@chromium.org>
     2
     3        Remove web intents code
     4        https://bugs.webkit.org/show_bug.cgi?id=109501
     5
     6        Reviewed by Eric Seidel.
     7
     8        See thread "Removing ENABLE(WEB_INTENTS) code" on webkit-dev.
     9
     10        * webintents/intent-tag-expected.txt: Removed.
     11        * webintents/intent-tag.html: Removed.
     12        * webintents/resources/pass.html: Removed.
     13        * webintents/resources/web-intents-reload-orig.html: Removed.
     14        * webintents/resources/web-intents-testing.js: Removed.
     15        * webintents/web-intents-api-expected.txt: Removed.
     16        * webintents/web-intents-api.html: Removed.
     17        * webintents/web-intents-delivery-expected.txt: Removed.
     18        * webintents/web-intents-delivery-reuse-expected.txt: Removed.
     19        * webintents/web-intents-delivery-reuse.html: Removed.
     20        * webintents/web-intents-delivery.html: Removed.
     21        * webintents/web-intents-failure-expected.txt: Removed.
     22        * webintents/web-intents-failure.html: Removed.
     23        * webintents/web-intents-invoke-expected.txt: Removed.
     24        * webintents/web-intents-invoke-port-expected.txt: Removed.
     25        * webintents/web-intents-invoke-port.html: Removed.
     26        * webintents/web-intents-invoke.html: Removed.
     27        * webintents/web-intents-obj-constructor-expected.txt: Removed.
     28        * webintents/web-intents-obj-constructor.html: Removed.
     29        * webintents/web-intents-reload-expected.txt: Removed.
     30        * webintents/web-intents-reload.html: Removed.
     31        * webintents/web-intents-reply-expected.txt: Removed.
     32        * webintents/web-intents-reply.html: Removed.
     33
    1342013-02-11  Stephen Chenney  <schenney@chromium.org>
    235

  • trunk/Source/WebCore/ChangeLog

    r142547 r142549  
     12013-02-11  Nico Weber  <thakis@chromium.org>
     2
     3        Remove web intents code
     4        https://bugs.webkit.org/show_bug.cgi?id=109501
     5
     6        Reviewed by Eric Seidel.
     7
     8        See thread "Removing ENABLE(WEB_INTENTS) code" on webkit-dev.
     9
     10        * DerivedSources.make:
     11        * Modules/intents/DOMWindowIntents.cpp: Removed.
     12        * Modules/intents/DOMWindowIntents.h: Removed.
     13        * Modules/intents/DOMWindowIntents.idl: Removed.
     14        * Modules/intents/DeliveredIntent.cpp: Removed.
     15        * Modules/intents/DeliveredIntent.h: Removed.
     16        * Modules/intents/DeliveredIntent.idl: Removed.
     17        * Modules/intents/Intent.cpp: Removed.
     18        * Modules/intents/Intent.h: Removed.
     19        * Modules/intents/Intent.idl: Removed.
     20        * Modules/intents/IntentRequest.cpp: Removed.
     21        * Modules/intents/IntentRequest.h: Removed.
     22        * Modules/intents/IntentResultCallback.h: Removed.
     23        * Modules/intents/IntentResultCallback.idl: Removed.
     24        * Modules/intents/NavigatorIntents.cpp: Removed.
     25        * Modules/intents/NavigatorIntents.h: Removed.
     26        * Modules/intents/NavigatorIntents.idl: Removed.
     27        * WebCore.gyp/WebCore.gyp:
     28        * WebCore.gypi:
     29        * bindings/generic/RuntimeEnabledFeatures.cpp:
     30        (WebCore):
     31        * bindings/generic/RuntimeEnabledFeatures.h:
     32        (RuntimeEnabledFeatures):
     33        * bindings/v8/custom/V8IntentCustom.cpp: Removed.
     34        * html/HTMLElementsAllInOne.cpp:
     35        * html/HTMLIntentElement.cpp: Removed.
     36        * html/HTMLIntentElement.h: Removed.
     37        * html/HTMLIntentElement.idl: Removed.
     38        * loader/EmptyClients.cpp:
     39        * loader/EmptyClients.h:
     40        (EmptyFrameLoaderClient):
     41        * loader/FrameLoaderClient.h:
     42        (WebCore):
     43        * page/DOMWindow.idl:
     44
    1452013-02-11  Eric Seidel  <eric@webkit.org>
    246

  • trunk/Source/WebCore/DerivedSources.make

    r142327 r142549  
    978978    $(WebCore)/Modules/geolocation \
    979979    $(WebCore)/Modules/indexeddb \
    980     $(WebCore)/Modules/intents \
    981980    $(WebCore)/Modules/mediasource \
    982981    $(WebCore)/Modules/mediastream \

  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r141818 r142549  
    5757      '../Modules/gamepad',
    5858      '../Modules/geolocation',
    59       '../Modules/intents',
    6059      '../Modules/indexeddb',
    6160      '../Modules/indexeddb/chromium',
    … …  
    11811180              '--include', '../Modules/filesystem',
    11821181              '--include', '../Modules/indexeddb',
    1183               '--include', '../Modules/intents',
    11841182              '--include', '../Modules/mediasource',
    11851183              '--include', '../Modules/mediastream',

  • trunk/Source/WebCore/WebCore.gypi

    r142535 r142549  
    5454            'Modules/indexeddb/IDBVersionChangeEvent.idl',
    5555            'Modules/indexeddb/WorkerContextIndexedDatabase.idl',
    56             'Modules/intents/DeliveredIntent.idl',
    57             'Modules/intents/DOMWindowIntents.idl',
    58             'Modules/intents/Intent.idl',
    59             'Modules/intents/IntentResultCallback.idl',
    60             'Modules/intents/NavigatorIntents.idl',
    6156            'Modules/mediasource/MediaSource.idl',
    6257            'Modules/mediasource/SourceBuffer.idl',
    … …  
    311306            'html/HTMLImageElement.idl',
    312307            'html/HTMLInputElement.idl',
    313             'html/HTMLIntentElement.idl',
    314308            'html/HTMLKeygenElement.idl',
    315309            'html/HTMLLIElement.idl',
    … …  
    783777            'Modules/indexeddb/chromium/IDBFactoryBackendInterfaceChromium.cpp',
    784778            'Modules/indexeddb/chromium/IDBFactoryBackendInterfaceChromium.h',
    785             'Modules/intents/DeliveredIntent.cpp',
    786             'Modules/intents/DeliveredIntent.h',
    787             'Modules/intents/DOMWindowIntents.cpp',
    788             'Modules/intents/DOMWindowIntents.h',
    789             'Modules/intents/Intent.cpp',
    790             'Modules/intents/Intent.h',
    791             'Modules/intents/IntentRequest.cpp',
    792             'Modules/intents/IntentRequest.h',
    793             'Modules/intents/IntentResultCallback.h',
    794             'Modules/intents/NavigatorIntents.cpp',
    795             'Modules/intents/NavigatorIntents.h',
    796779            'Modules/mediasource/MediaSource.cpp',
    797780            'Modules/mediasource/MediaSource.h',
    … …  
    13921375            'bindings/v8/custom/V8InjectedScriptManager.cpp',
    13931376            'bindings/v8/custom/V8InspectorFrontendHostCustom.cpp',
    1394             'bindings/v8/custom/V8IntentCustom.cpp',
    13951377            'bindings/v8/custom/V8JavaScriptCallFrameCustom.cpp',
    13961378            'bindings/v8/custom/V8LocationCustom.cpp',
    … …  
    31283110            'html/HTMLImageLoader.h',
    31293111            'html/HTMLInputElement.cpp',
    3130             'html/HTMLIntentElement.cpp',
    3131             'html/HTMLIntentElement.h',
    31323112            'html/HTMLKeygenElement.cpp',
    31333113            'html/HTMLKeygenElement.h',

  • trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp

    r138983 r142549  
    238238#endif
    239239
    240 #if ENABLE(WEB_INTENTS)
    241 bool RuntimeEnabledFeatures::isWebIntentsEnabled = true;
    242 #endif
    243 
    244240} // namespace WebCore

  • trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h

    r138983 r142549  
    270270#endif
    271271
    272 #if ENABLE(WEB_INTENTS)
    273     static bool webkitStartActivityEnabled() { return isWebIntentsEnabled; }
    274     static bool webkitIntentEnabled() { return isWebIntentsEnabled; }
    275     static bool webKitIntentEnabled() { return isWebIntentsEnabled; }
    276     static void setWebIntentsEnabled(bool isEnabled) { isWebIntentsEnabled = isEnabled; }
    277 #endif
    278 
    279272private:
    280273    // Never instantiate.
    … …  
    386379#endif
    387380
    388 #if ENABLE(WEB_INTENTS)
    389     static bool isWebIntentsEnabled;
    390 #endif
    391 
    392381};
    393382

  • trunk/Source/WebCore/html/HTMLElementsAllInOne.cpp

    r137507 r142549  
    7070#include "HTMLImageElement.cpp"
    7171#include "HTMLInputElement.cpp"
    72 #include "HTMLIntentElement.cpp"
    7372#include "HTMLKeygenElement.cpp"
    7473#include "HTMLLIElement.cpp"

  • trunk/Source/WebCore/loader/EmptyClients.cpp

    r133396 r142549  
    4040#include "ColorChooser.h"
    4141#endif
    42 
    43 #if ENABLE(WEB_INTENTS)
    44 #include "IntentRequest.h"
    45 #endif
    4642
    4743namespace WebCore {
    … …  
    168164}
    169165
    170 #if ENABLE(WEB_INTENTS)
    171 void EmptyFrameLoaderClient::dispatchIntent(PassRefPtr<IntentRequest>)
    172 {
    173 }
    174 #endif
    175 
    176166void EmptyTextCheckerClient::requestCheckingOfString(PassRefPtr<TextCheckingRequest>)
    177167{

  • trunk/Source/WebCore/loader/EmptyClients.h

    r141473 r142549  
    382382    virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext() OVERRIDE;
    383383
    384 #if ENABLE(WEB_INTENTS)
    385     virtual void dispatchIntent(PassRefPtr<IntentRequest>) OVERRIDE;
    386 #endif
    387 
    388384#if ENABLE(REQUEST_AUTOCOMPLETE)
    389385    virtual void didRequestAutocomplete(PassRefPtr<FormState>) OVERRIDE;

  • trunk/Source/WebCore/loader/FrameLoaderClient.h

    r141850 r142549  
    8383    class HTMLPlugInElement;
    8484    class IntSize;
    85 #if ENABLE(WEB_INTENTS)
    86     class IntentRequest;
    87 #endif
    8885    class KURL;
    8986    class MainResourceLoader;
    … …  
    344341        virtual void didChangeName(const String&) { }
    345342
    346 #if ENABLE(WEB_INTENTS)
    347         virtual void dispatchIntent(PassRefPtr<IntentRequest>) = 0;
    348 #endif
    349 #if ENABLE(WEB_INTENTS_TAG)
    350         virtual void registerIntentService(const String&, const String&, const KURL&, const String&, const String&) { }
    351 #endif
    352 
    353343        virtual void dispatchWillOpenSocketStream(SocketStreamHandle*) { }
    354344

  • trunk/Source/WebCore/page/DOMWindow.idl

    r142327 r142549  
    508508    [Conditional=VIDEO, V8EnabledAtRuntime] attribute HTMLSourceElementConstructor HTMLSourceElement;
    509509    [Conditional=VIDEO, V8EnabledAtRuntime] attribute MediaControllerConstructor MediaController;
    510 
    511     [Conditional=WEB_INTENTS_TAG] attribute HTMLIntentElementConstructor HTMLIntentElement;
    512510
    513511    attribute CanvasPatternConstructor CanvasPattern;

  • trunk/Source/WebKit/chromium/ChangeLog

    r142516 r142549  
     12013-02-11  Nico Weber  <thakis@chromium.org>
     2
     3        Remove web intents code
     4        https://bugs.webkit.org/show_bug.cgi?id=109501
     5
     6        Reviewed by Eric Seidel.
     7
     8        See thread "Removing ENABLE(WEB_INTENTS) code" on webkit-dev.
     9
     10        * WebKit.gyp:
     11        * features.gypi:
     12        * public/WebDeliveredIntentClient.h: Removed.
     13        * public/WebFrame.h:
     14        (WebKit):
     15        (WebFrame):
     16        * public/WebFrameClient.h:
     17        (WebKit):
     18        * public/WebIntent.h: Removed.
     19        * public/WebIntentRequest.h: Removed.
     20        * public/WebIntentServiceInfo.h: Removed.
     21        * public/WebRuntimeFeatures.h:
     22        (WebRuntimeFeatures):
     23        * src/DeliveredIntentClientImpl.cpp: Removed.
     24        * src/DeliveredIntentClientImpl.h: Removed.
     25        * src/FrameLoaderClientImpl.cpp:
     26        * src/FrameLoaderClientImpl.h:
     27        (FrameLoaderClientImpl):
     28        * src/WebFrameImpl.cpp:
     29        * src/WebFrameImpl.h:
     30        (WebKit):
     31        (WebFrameImpl):
     32        * src/WebIntent.cpp: Removed.
     33        * src/WebIntentRequest.cpp: Removed.
     34        * src/WebIntentServiceInfo.cpp: Removed.
     35        * src/WebRuntimeFeatures.cpp:
     36
    1372013-02-11  Florin Malita  <fmalita@chromium.org>
    238

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

    r142422 r142549  
    136136                'public/WebDateTimeChooserCompletion.h',
    137137                'public/WebDateTimeChooserParams.h',
    138                 'public/WebDeliveredIntentClient.h',
    139138                'public/WebDevToolsAgent.h',
    140139                'public/WebDevToolsAgentClient.h',
    … …  
    194193                'public/WebInputElement.h',
    195194                'public/WebInputEvent.h',
    196                 'public/WebIntent.h',
    197                 'public/WebIntentRequest.h',
    198                 'public/WebIntentServiceInfo.h',
    199195                'public/WebKit.h',
    200196                'public/WebLabelElement.h',
    … …  
    334330                'src/ContextMenuClientImpl.h',
    335331                'src/DatabaseObserver.cpp',
    336                 'src/DeliveredIntentClientImpl.cpp',
    337                 'src/DeliveredIntentClientImpl.h',
    338332                'src/DeviceOrientationClientProxy.cpp',
    339333                'src/DeviceOrientationClientProxy.h',
    … …  
    514508                'src/WebInputEventConversion.cpp',
    515509                'src/WebInputEventConversion.h',
    516                 'src/WebIntent.cpp',
    517                 'src/WebIntentRequest.cpp',
    518                 'src/WebIntentServiceInfo.cpp',
    519510                'src/WebKit.cpp',
    520511                'src/WebLabelElement.cpp',
    … …  
    760751                    ],
    761752                }],
    762                 ['enable_web_intents==0', {
    763                   'sources!': [
    764                     'public/WebDeliveredIntentClient.h',
    765                     'public/WebIntent.h',
    766                     'public/WebIntentRequest.h',
    767                     'public/WebIntentServiceInfo.h',
    768                     'src/DeliveredIntentClientImpl.cpp',
    769                     'src/DeliveredIntentClientImpl.h',
    770                     'src/WebIntent.cpp',
    771                     'src/WebIntentRequest.cpp',
    772                     'src/WebIntentServiceInfo.cpp',
    773                   ],
    774                 }],
    775753                ['use_default_render_theme==1', {
    776754                    'include_dirs': [

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

    r142290 r142549  
    229229        ],
    230230      }],
    231       ['enable_web_intents==1', {
    232         'feature_defines': [
    233           'ENABLE_WEB_INTENTS=1',
    234         ],
    235       }],
    236       ['enable_web_intents_tag==1', {
    237         'feature_defines': [
    238           'ENABLE_WEB_INTENTS_TAG=1',
    239         ],
    240       }],
    241231      ['OS=="mac"', {
    242232        'feature_defines': [

  • trunk/Source/WebKit/chromium/public/WebFrame.h

    r141352 r142549  
    5959class WebData;
    6060class WebDataSource;
    61 class WebDeliveredIntentClient;
    6261class WebDocument;
    6362class WebElement;
    … …  
    6564class WebHistoryItem;
    6665class WebInputElement;
    67 class WebIntent;
    6866class WebPerformance;
    6967class WebRange;
    … …  
    635633
    636634
    637     // Web Intents ---------------------------------------------------------
    638 
    639     // Called on a target service page to deliver an intent to the window.
    640     // The ports are any transferred ports that accompany the intent as a result
    641     // of MessagePort transfer.
    642     virtual void deliverIntent(const WebIntent&, WebMessagePortChannelArray* ports, WebDeliveredIntentClient*) = 0;
    643 
    644 
    645635    // Utility -------------------------------------------------------------
    646636

  • trunk/Source/WebKit/chromium/public/WebFrameClient.h

    r141850 r142549  
    5757class WebFormElement;
    5858class WebFrame;
    59 class WebIntent;
    60 class WebIntentRequest;
    61 class WebIntentServiceInfo;
    6259class WebMediaPlayer;
    6360class WebMediaPlayerClient;
    … …  
    400397        WebStorageQuotaCallbacks*) { }
    401398
    402     // Web Intents ---------------------------------------------------
    403 
    404     // Register a service to handle Web Intents.
    405     virtual void registerIntentService(WebFrame*, const WebIntentServiceInfo&) { }
    406 
    407     // Start a Web Intents activity. The callee uses the |WebIntentRequest|
    408     // object to coordinate replies to the intent invocation.
    409     virtual void dispatchIntent(WebFrame*, const WebIntentRequest&) { }
    410 
    411399    // WebSocket -----------------------------------------------------
    412400

  • trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h

    r142192 r142549  
    165165    WEBKIT_EXPORT static bool areSeamlessIFramesEnabled();
    166166
    167     WEBKIT_EXPORT static void enableWebIntents(bool);
    168     WEBKIT_EXPORT static bool isWebIntentsEnabled();
    169 
    170167    // If the flag is set, we use WebViewClient::showValidationMessage and
    171168    // hideVlidationMessage for interactive form validation.

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

    r141850 r142549  
    4848#include "HistoryItem.h"
    4949#include "HitTestResult.h"
    50 #include "IntentRequest.h"
    5150#include "MIMETypeRegistry.h"
    5251#include "MessageEvent.h"
    … …  
    7473#include "WebFrameClient.h"
    7574#include "WebFrameImpl.h"
    76 #include "WebIntentRequest.h"
    77 #include "WebIntentServiceInfo.h"
    7875#include "WebNode.h"
    7976#include "WebPermissionClient.h"
    … …  
    16431640}
    16441641
    1645 #if ENABLE(WEB_INTENTS_TAG)
    1646 void FrameLoaderClientImpl::registerIntentService(
    1647         const String& action,
    1648         const String& type,
    1649         const KURL& href,
    1650         const String& title,
    1651         const String& disposition) {
    1652     if (!m_webFrame->client())
    1653         return;
    1654 
    1655     WebIntentServiceInfo service(action, type, href, title, disposition);
    1656     m_webFrame->client()->registerIntentService(m_webFrame, service);
    1657 }
    1658 #endif
    1659 
    1660 #if ENABLE(WEB_INTENTS)
    1661 void FrameLoaderClientImpl::dispatchIntent(PassRefPtr<WebCore::IntentRequest> intentRequest)
    1662 {
    1663     m_webFrame->client()->dispatchIntent(webFrame(), intentRequest);
    1664 }
    1665 #endif
    1666 
    16671642void FrameLoaderClientImpl::dispatchWillOpenSocketStream(SocketStreamHandle* handle)
    16681643{

  • trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h

    r141850 r142549  
    212212    virtual void didChangeName(const String&);
    213213
    214 #if ENABLE(WEB_INTENTS_TAG)
    215     virtual void registerIntentService(const String& action,
    216                                        const String& type,
    217                                        const WebCore::KURL& href,
    218                                        const String& title,
    219                                        const String& disposition);
    220 #endif
    221 #if ENABLE(WEB_INTENTS)
    222     virtual void dispatchIntent(PassRefPtr<WebCore::IntentRequest>) OVERRIDE;
    223 #endif
    224 
    225214    virtual void dispatchWillOpenSocketStream(WebCore::SocketStreamHandle*) OVERRIDE;
    226215

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

    r142494 r142549  
    8282#include "DOMUtilitiesPrivate.h"
    8383#include "DOMWindow.h"
    84 #include "DOMWindowIntents.h"
    8584#include "DOMWrapperWorld.h"
    8685#include "DirectoryEntry.h"
    … …  
    159158#include "WebDOMEventListener.h"
    160159#include "WebDataSourceImpl.h"
    161 #include "WebDeliveredIntentClient.h"
    162160#include "WebDevToolsAgentPrivate.h"
    163161#include "WebDocument.h"
    … …  
    168166#include "WebIconURL.h"
    169167#include "WebInputElement.h"
    170 #include "WebIntent.h"
    171168#include "WebNode.h"
    172169#include "WebPerformance.h"
    … …  
    196193#include <wtf/HashMap.h>
    197194
    198 #if ENABLE(WEB_INTENTS)
    199 #include "DeliveredIntent.h"
    200 #include "DeliveredIntentClientImpl.h"
    201 #endif
    202 
    203195using namespace WebCore;
    204196
    … …  
    20892081}
    20902082
    2091 void WebFrameImpl::deliverIntent(const WebIntent& intent, WebMessagePortChannelArray* ports, WebDeliveredIntentClient* intentClient)
    2092 {
    2093 #if ENABLE(WEB_INTENTS)
    2094     OwnPtr<WebCore::DeliveredIntentClient> client(adoptPtr(new DeliveredIntentClientImpl(intentClient)));
    2095 
    2096     WebSerializedScriptValue intentData = WebSerializedScriptValue::fromString(intent.data());
    2097     const WebCore::Intent* webcoreIntent = intent;
    2098 
    2099     // See PlatformMessagePortChannel.cpp
    2100     OwnPtr<MessagePortChannelArray> channels;
    2101     if (ports && ports->size()) {
    2102         channels = adoptPtr(new MessagePortChannelArray(ports->size()));
    2103         for (size_t i = 0; i < ports->size(); ++i) {
    2104             RefPtr<PlatformMessagePortChannel> platformChannel = PlatformMessagePortChannel::create((*ports)[i]);
    2105             (*ports)[i]->setClient(platformChannel.get());
    2106             (*channels)[i] = MessagePortChannel::create(platformChannel);
    2107         }
    2108     }
    2109     OwnPtr<MessagePortArray> portArray = WebCore::MessagePort::entanglePorts(*(frame()->document()), channels.release());
    2110 
    2111     RefPtr<DeliveredIntent> deliveredIntent = DeliveredIntent::create(frame(), client.release(), intent.action(), intent.type(), intentData, portArray.release(), webcoreIntent->extras());
    2112 
    2113     DOMWindowIntents::from(frame()->document()->domWindow())->deliver(deliveredIntent.release());
    2114 #endif
    2115 }
    2116 
    21172083WebString WebFrameImpl::contentAsText(size_t maxChars) const
    21182084{

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

    r141352 r142549  
    5858class ChromePrintContext;
    5959class WebDataSourceImpl;
    60 class WebDeliveredIntentClient;
    6160class WebInputElement;
    62 class WebIntent;
    6361class WebFrameClient;
    6462class WebPerformance;
    … …  
    236234        const WebDOMEvent&);
    237235
    238     virtual void deliverIntent(const WebIntent&, WebMessagePortChannelArray*, WebDeliveredIntentClient*);
    239 
    240236    virtual WebString contentAsText(size_t maxChars) const;
    241237    virtual WebString contentAsMarkup() const;

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

    r142192 r142549  
    700700}
    701701
    702 void WebRuntimeFeatures::enableWebIntents(bool enable)
    703 {
    704 #if ENABLE(WEB_INTENTS)
    705     RuntimeEnabledFeatures::setWebIntentsEnabled(enable);
    706 #else
    707     UNUSED_PARAM(enable);
    708 #endif
    709 }
    710 
    711 bool WebRuntimeFeatures::isWebIntentsEnabled()
    712 {
    713 #if ENABLE(WEB_INTENTS)
    714     return RuntimeEnabledFeatures::webkitStartActivityEnabled();
    715 #else
    716     return false;
    717 #endif
    718 }
    719 
    720702} // namespace WebKit

  • trunk/Tools/ChangeLog

    r142509 r142549  
     12013-02-11  Nico Weber  <thakis@chromium.org>
     2
     3        Remove web intents code
     4        https://bugs.webkit.org/show_bug.cgi?id=109501
     5
     6        Reviewed by Eric Seidel.
     7
     8        See thread "Removing ENABLE(WEB_INTENTS) code" on webkit-dev.
     9
     10        * DumpRenderTree/TestRunner.cpp:
     11        (TestRunner::staticFunctions):
     12        * DumpRenderTree/TestRunner.h:
     13        (TestRunner):
     14        * DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
     15        * DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:
     16        (WebKit):
     17        * DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h:
     18        (WebKit):
     19        (WebTestRunner::WebTestProxy::didEndEditing):
     20        * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
     21        (WebTestRunner::TestRunner::TestRunner):
     22        * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
     23        (TestRunner):
     24        * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
     25        * DumpRenderTree/chromium/WebViewHost.cpp:
     26        * DumpRenderTree/chromium/WebViewHost.h:
     27        (WebViewHost):
     28        * DumpRenderTree/efl/TestRunnerEfl.cpp:
     29        * DumpRenderTree/gtk/TestRunnerGtk.cpp:
     30        * DumpRenderTree/mac/TestRunnerMac.mm:
     31        * DumpRenderTree/win/TestRunnerWin.cpp:
     32        * DumpRenderTree/wx/TestRunnerWx.cpp:
     33        * Scripts/webkitperl/FeatureList.pm:
     34
    1352013-02-11  Benjamin Poulain  <benjamin@webkit.org>
    236

  • trunk/Tools/DumpRenderTree/TestRunner.cpp

    r142509 r142549  
    17701770}
    17711771
    1772 static JSValueRef sendWebIntentResponseCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    1773 {
    1774     JSRetainPtr<JSStringRef> response;
    1775     if (argumentCount == 1) {
    1776         response.adopt(JSValueToStringCopy(context, arguments[0], exception));
    1777         ASSERT(!*exception);
    1778     } else
    1779         response.adopt(JSStringCreateWithUTF8CString(0));
    1780 
    1781     TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
    1782     controller->sendWebIntentResponse(response.get());
    1783 
    1784     return JSValueMakeUndefined(context);
    1785 }
    1786 
    1787 static JSValueRef deliverWebIntentCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    1788 {
    1789     if (argumentCount < 3)
    1790         return JSValueMakeUndefined(context);
    1791 
    1792     JSRetainPtr<JSStringRef> action(Adopt, JSValueToStringCopy(context, arguments[0], exception));
    1793     ASSERT(!*exception);
    1794     JSRetainPtr<JSStringRef> type(Adopt, JSValueToStringCopy(context, arguments[1], exception));
    1795     ASSERT(!*exception);
    1796     JSRetainPtr<JSStringRef> data(Adopt, JSValueToStringCopy(context, arguments[2], exception));
    1797     ASSERT(!*exception);
    1798 
    1799     TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
    1800     controller->deliverWebIntent(action.get(), type.get(), data.get());
    1801 
    1802     return JSValueMakeUndefined(context);
    1803 }
    1804 
    18051772static JSValueRef abortModalCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    18061773{
    … …  
    21252092        { "computedStyleIncludingVisitedInfo", computedStyleIncludingVisitedInfoCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    21262093        { "decodeHostName", decodeHostNameCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    2127         { "deliverWebIntent", deliverWebIntentCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    21282094        { "disallowIncreaseForApplicationCacheQuota", disallowIncreaseForApplicationCacheQuotaCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    21292095        { "dispatchPendingLoadRequests", dispatchPendingLoadRequestsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    … …  
    21782144        { "repaintSweepHorizontally", repaintSweepHorizontallyCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    21792145        { "resetPageVisibility", resetPageVisibilityCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    2180         { "sendWebIntentResponse", sendWebIntentResponseCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    21812146        { "setAcceptsEditing", setAcceptsEditingCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    21822147        { "setAllowUniversalAccessFromFileURLs", setAllowUniversalAccessFromFileURLsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

  • trunk/Tools/DumpRenderTree/TestRunner.h

    r142509 r142549  
    5757    JSStringRef copyDecodedHostName(JSStringRef name);
    5858    JSStringRef copyEncodedHostName(JSStringRef name);
    59     void deliverWebIntent(JSStringRef action, JSStringRef type, JSStringRef data);
    6059    void dispatchPendingLoadRequests();
    6160    void display();
    … …  
    8281    void queueReload();
    8382    void removeAllVisitedLinks();
    84     void sendWebIntentResponse(JSStringRef response);
    8583    void setAcceptsEditing(bool);
    8684    void setAllowUniversalAccessFromFileURLs(bool);

  • trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp

    r142509 r142549  
    760760}
    761761
    762 void TestRunner::sendWebIntentResponse(JSStringRef)
    763 {
    764     notImplemented();
    765 }
    766 
    767 void TestRunner::deliverWebIntent(JSStringRef, JSStringRef, JSStringRef)
    768 {
    769     notImplemented();
    770 }
    771 
    772762void TestRunner::setStorageDatabaseIdleInterval(double)
    773763{

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h

    r142371 r142549  
    4040class WebDeviceOrientation;
    4141class WebGamepads;
    42 class WebIntentRequest;
    4342struct WebRect;
    4443struct WebURLError;
    … …  
    7372    virtual WebPreferences* preferences() { return 0; }
    7473    virtual void applyPreferences() { };
    75     virtual void setCurrentWebIntentRequest(const WebKit::WebIntentRequest&) { };
    76     virtual WebKit::WebIntentRequest* currentWebIntentRequest() { return 0; }
    7774    virtual std::string makeURLErrorDescription(const WebKit::WebURLError&) { return std::string(); }
    7875    virtual void setClientWindowRect(const WebKit::WebRect&) { }

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h

    r142371 r142549  
    5555class WebFrame;
    5656class WebImage;
    57 class WebIntentRequest;
    58 class WebIntentServiceInfo;
    5957class WebNode;
    6058class WebPlugin;
    … …  
    121119    void didChangeContents();
    122120    void didEndEditing();
    123     void registerIntentService(WebKit::WebFrame*, const WebKit::WebIntentServiceInfo&);
    124     void dispatchIntent(WebKit::WebFrame* source, const WebKit::WebIntentRequest&);
    125121    bool createView(WebKit::WebFrame* creator, const WebKit::WebURLRequest&, const WebKit::WebWindowFeatures&, const WebKit::WebString& frameName, WebKit::WebNavigationPolicy);
    126122    WebKit::WebPlugin* createPlugin(WebKit::WebFrame*, const WebKit::WebPluginParams&);
    … …  
    291287        Base::didEndEditing();
    292288    }
    293     virtual void registerIntentService(WebKit::WebFrame* frame, const WebKit::WebIntentServiceInfo& service)
    294     {
    295         WebTestProxyBase::registerIntentService(frame, service);
    296         Base::registerIntentService(frame, service);
    297     }
    298     virtual void dispatchIntent(WebKit::WebFrame* source, const WebKit::WebIntentRequest& request)
    299     {
    300         WebTestProxyBase::dispatchIntent(source, request);
    301         Base::dispatchIntent(source, request);
    302     }
    303289    virtual WebKit::WebView* createView(WebKit::WebFrame* creator, const WebKit::WebURLRequest& request, const WebKit::WebWindowFeatures& features, const WebKit::WebString& frameName, WebKit::WebNavigationPolicy policy)
    304290    {

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

    r142509 r142549  
    4242#include "WebFrame.h"
    4343#include "WebInputElement.h"
    44 #include "WebIntent.h"
    45 #include "WebIntentRequest.h"
    4644#include "WebPermissions.h"
    4745#include "WebPreferences.h"
    … …  
    7169namespace {
    7270
    73 class EmptyWebDeliveredIntentClient : public WebDeliveredIntentClient {
    74 public:
    75     EmptyWebDeliveredIntentClient() { }
    76     ~EmptyWebDeliveredIntentClient() { }
    77 
    78     virtual void postResult(const WebSerializedScriptValue& data) const { }
    79     virtual void postFailure(const WebSerializedScriptValue& data) const { }
    80     virtual void destroy() { }
    81 };
    82 
    8371class InvokeCallbackTask : public WebMethodTask<TestRunner> {
    8472public:
    … …  
    157145    , m_delegate(0)
    158146    , m_webView(0)
    159     , m_intentClient(new EmptyWebDeliveredIntentClient)
    160147    , m_webPermissions(new WebPermissions)
    161148{
    … …  
    270257
    271258    // The following methods interact with the WebTestProxy.
    272 #if ENABLE_WEB_INTENTS
    273     bindMethod("sendWebIntentResponse", &TestRunner::sendWebIntentResponse);
    274     bindMethod("deliverWebIntent", &TestRunner::deliverWebIntent);
    275 #endif
    276 
    277259    // The following methods interact with the WebTestDelegate.
    278260    bindMethod("showWebInspector", &TestRunner::showWebInspector);
    … …  
    16541636}
    16551637
    1656 #if ENABLE_WEB_INTENTS
    1657 void TestRunner::sendWebIntentResponse(const CppArgumentList& arguments, CppVariant* result)
    1658 {
    1659     v8::HandleScope scope;
    1660     v8::Local<v8::Context> ctx = m_webView->mainFrame()->mainWorldScriptContext();
    1661     result->set(m_webView->mainFrame()->selectionAsMarkup().utf8());
    1662     v8::Context::Scope cscope(ctx);
    1663 
    1664     WebIntentRequest* request = m_delegate->currentWebIntentRequest();
    1665     if (request->isNull())
    1666         return;
    1667 
    1668     if (arguments.size() == 1) {
    1669         WebCString reply = cppVariantToWebString(arguments[0]).utf8();
    1670         v8::Handle<v8::Value> v8value = v8::String::New(reply.data(), reply.length());
    1671         request->postResult(WebSerializedScriptValue::serialize(v8value));
    1672     } else {
    1673         v8::Handle<v8::Value> v8value = v8::String::New("ERROR");
    1674         request->postFailure(WebSerializedScriptValue::serialize(v8value));
    1675     }
    1676     result->setNull();
    1677 }
    1678 
    1679 void TestRunner::deliverWebIntent(const CppArgumentList& arguments, CppVariant* result)
    1680 {
    1681     if (arguments.size() <  3)
    1682         return;
    1683 
    1684     v8::HandleScope scope;
    1685     v8::Local<v8::Context> ctx = m_webView->mainFrame()->mainWorldScriptContext();
    1686     result->set(m_webView->mainFrame()->selectionAsMarkup().utf8());
    1687     v8::Context::Scope cscope(ctx);
    1688 
    1689     WebString action = cppVariantToWebString(arguments[0]);
    1690     WebString type = cppVariantToWebString(arguments[1]);
    1691     WebCString data = cppVariantToWebString(arguments[2]).utf8();
    1692     WebSerializedScriptValue serializedData = WebSerializedScriptValue::serialize(v8::String::New(data.data(), data.length()));
    1693 
    1694     WebIntent intent = WebIntent::create(action, type, serializedData.toString(), WebVector<WebString>(), WebVector<WebString>());
    1695 
    1696     m_webView->mainFrame()->deliverIntent(intent, 0, m_intentClient.get());
    1697 }
    1698 #endif
    1699 
    17001638void TestRunner::showWebInspector(const CppArgumentList&, CppVariant* result)
    17011639{

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

    r142509 r142549  
    3737#include "TestCommon.h"
    3838#include "WebArrayBufferView.h"
    39 #include "WebDeliveredIntentClient.h"
    4039#include "WebTask.h"
    4140#include "WebTestRunner.h"
    … …  
    419418    // Methods interacting with the WebTestProxy
    420419
    421 #if ENABLE_WEB_INTENTS
    422     // Expects one string argument for sending successful result, zero
    423     // arguments for sending a failure result.
    424     void sendWebIntentResponse(const CppArgumentList&, CppVariant*);
    425 
    426     // Cause the web intent to be delivered to this context.
    427     void deliverWebIntent(const CppArgumentList&, CppVariant*);
    428 #endif
    429 
    430420    ///////////////////////////////////////////////////////////////////////////
    431421    // Methods forwarding to the WebTestDelegate
    … …  
    668658    WebKit::WebFrame* m_topLoadingFrame;
    669659
    670     // Mock object for testing delivering web intents.
    671     std::auto_ptr<WebKit::WebDeliveredIntentClient> m_intentClient;
    672 
    673660    // WebPermissionClient mock object.
    674661    std::auto_ptr<WebPermissions> m_webPermissions;

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

    r142371 r142549  
    4646#include "WebElement.h"
    4747#include "WebFrame.h"
    48 #include "WebIntent.h"
    49 #include "WebIntentRequest.h"
    50 #include "WebIntentServiceInfo.h"
    5148#include "WebNode.h"
    5249#include "WebPluginParams.h"
    … …  
    552549    if (m_testInterfaces->testRunner()->shouldDumpEditingCallbacks())
    553550        m_delegate->printMessage("EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification\n");
    554 }
    555 
    556 void WebTestProxyBase::registerIntentService(WebFrame*, const WebIntentServiceInfo& service)
    557 {
    558 #if ENABLE_WEB_INTENTS
    559     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
    561 }
    562 
    563 void WebTestProxyBase::dispatchIntent(WebFrame* source, const WebIntentRequest& request)
    564 {
    565 #if ENABLE_WEB_INTENTS
    566     m_delegate->printMessage(string("Received Web Intent: action=") + request.intent().action().utf8().data() + " type=" + request.intent().type().utf8().data() + "\n");
    567     WebMessagePortChannelArray* ports = request.intent().messagePortChannelsRelease();
    568     m_delegate->setCurrentWebIntentRequest(request);
    569     if (ports) {
    570         char data[100];
    571         snprintf(data, sizeof(data), "Have %d ports\n", static_cast<int>(ports->size()));
    572         m_delegate->printMessage(data);
    573         for (size_t i = 0; i < ports->size(); ++i)
    574             (*ports)[i]->destroy();
    575         delete ports;
    576     }
    577 
    578     if (!request.intent().service().isEmpty())
    579         m_delegate->printMessage(string("Explicit intent service: ") + request.intent().service().spec().data() + "\n");
    580 
    581     WebVector<WebString> extras = request.intent().extrasNames();
    582     for (size_t i = 0; i < extras.size(); ++i)
    583         m_delegate->printMessage(string("Extras[") + extras[i].utf8().data() + "] = " + request.intent().extrasValue(extras[i]).utf8().data() + "\n");
    584 
    585     WebVector<WebURL> suggestions = request.intent().suggestions();
    586     for (size_t i = 0; i < suggestions.size(); ++i)
    587         m_delegate->printMessage(string("Have suggestion ") + suggestions[i].spec().data() + "\n");
    588 #endif
    589551}
    590552

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

    r142509 r142549  
    705705}
    706706
    707 #if ENABLE(WEB_INTENTS)
    708 void WebViewHost::setCurrentWebIntentRequest(const WebIntentRequest& request)
    709 {
    710     m_currentRequest = request;
    711 }
    712 
    713 WebIntentRequest* WebViewHost::currentWebIntentRequest()
    714 {
    715     return &m_currentRequest;
    716 }
    717 #endif
    718 
    719707std::string WebViewHost::makeURLErrorDescription(const WebKit::WebURLError& error)
    720708{

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

    r142371 r142549  
    3535#include "WebCursorInfo.h"
    3636#include "WebFrameClient.h"
    37 #include "WebIntentRequest.h"
    3837#include "WebPrerendererClient.h"
    3938#include "WebTask.h"
    … …  
    123122    virtual WebTestRunner::WebPreferences* preferences() OVERRIDE;
    124123    virtual void applyPreferences() OVERRIDE;
    125 #if ENABLE(WEB_INTENTS)
    126     virtual void setCurrentWebIntentRequest(const WebKit::WebIntentRequest&) OVERRIDE;
    127     virtual WebKit::WebIntentRequest* currentWebIntentRequest() OVERRIDE;
    128 #endif
    129124    virtual std::string makeURLErrorDescription(const WebKit::WebURLError&) OVERRIDE;
    130125    virtual void setClientWindowRect(const WebKit::WebRect&) OVERRIDE;
    … …  
    389384#endif
    390385
    391 #if ENABLE(WEB_INTENTS)
    392     // For web intents: holds the current request, if any.
    393     WebKit::WebIntentRequest m_currentRequest;
    394 #endif
    395 
    396386    OwnPtr<WebKit::WebLayerTreeView> m_layerTreeView;
    397387};

  • trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp

    r142509 r142549  
    872872}
    873873
    874 void TestRunner::sendWebIntentResponse(JSStringRef)
    875 {
    876     // No plan to support Web Intents. The feature will likely
    877     // be removed from WebKit.
    878     notImplemented();
    879 }
    880 
    881 void TestRunner::deliverWebIntent(JSStringRef, JSStringRef, JSStringRef)
    882 {
    883     // No plan to support Web Intents. The feature will likely
    884     // be removed from WebKit.
    885     notImplemented();
    886 }
    887 
    888874void TestRunner::setStorageDatabaseIdleInterval(double)
    889875{

  • trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp

    r142509 r142549  
    961961}
    962962
    963 void TestRunner::sendWebIntentResponse(JSStringRef)
     963void TestRunner::setStorageDatabaseIdleInterval(double)
    964964{
    965965    // FIXME: Implement this.
    966966}
    967967
    968 void TestRunner::deliverWebIntent(JSStringRef, JSStringRef, JSStringRef)
    969 {
    970     // FIXME: Implement this.
    971 }
    972 
    973 void TestRunner::setStorageDatabaseIdleInterval(double)
    974 {
    975     // FIXME: Implement this.
    976 }
    977 
    978968void TestRunner::closeIdleLocalStorageDatabases()
    979969{

  • trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm

    r142509 r142549  
    11351135}
    11361136
    1137 void TestRunner::sendWebIntentResponse(JSStringRef)
    1138 {
    1139     // FIXME: Implement.
    1140 }
    1141 
    1142 void TestRunner::deliverWebIntent(JSStringRef, JSStringRef, JSStringRef)
    1143 {
    1144     // FIXME: Implement.
    1145 }
    1146 
    11471137void TestRunner::grantWebNotificationPermission(JSStringRef jsOrigin)
    11481138{

  • trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp

    r142509 r142549  
    13151315}
    13161316
    1317 void TestRunner::sendWebIntentResponse(JSStringRef)
     1317void TestRunner::setStorageDatabaseIdleInterval(double)
    13181318{
    13191319    // FIXME: Implement this.
    13201320}
    13211321
    1322 void TestRunner::deliverWebIntent(JSStringRef, JSStringRef, JSStringRef)
     1322void TestRunner::closeIdleLocalStorageDatabases()
    13231323{
    13241324    // FIXME: Implement this.
    13251325}
    1326 
    1327 void TestRunner::setStorageDatabaseIdleInterval(double)
    1328 {
    1329     // FIXME: Implement this.
    1330 }
    1331 
    1332 void TestRunner::closeIdleLocalStorageDatabases()
    1333 {
    1334     // FIXME: Implement this.
    1335 }

  • trunk/Tools/DumpRenderTree/wx/TestRunnerWx.cpp

    r142509 r142549  
    565565}
    566566
    567 void TestRunner::sendWebIntentResponse(JSStringRef)
    568 {
    569     // FIXME: Implement this.
    570 }
    571 
    572 void TestRunner::deliverWebIntent(JSStringRef, JSStringRef, JSStringRef)
    573 {
    574     // FIXME: Implement this.
    575 }
    576 
    577567void TestRunner::setStorageDatabaseIdleInterval(double)
    578568{

  • trunk/Tools/Scripts/webkitperl/FeatureList.pm

    r141985 r142549  
    148148    $webglSupport,
    149149    $webAudioSupport,
    150     $webIntentsSupport,
    151     $webIntentsTagSupport,
    152150    $webSocketsSupport,
    153151    $webTimingSupport,
    … …  
    462460      define => "ENABLE_WEB_AUDIO", default => (isEfl()), value => \$webAudioSupport },
    463461
    464     { option => "web-intents", desc => "Toggle Web Intents support",
    465       define => "ENABLE_WEB_INTENTS", default => 0, value => \$webIntentsSupport },
    466 
    467     { option => "web-intents-tag", desc => "Toggle Web Intents Tag support",
    468       define => "ENABLE_WEB_INTENTS_TAG", default => 0, value => \$webIntentsTagSupport },
    469 
    470462    { option => "web-sockets", desc => "Toggle Web Sockets support",
    471463      define => "ENABLE_WEB_SOCKETS", default => 1, value => \$webSocketsSupport },
Note: See TracChangeset for help on using the changeset viewer.