Changeset 141439 in webkit


Ignore:
Timestamp:
Jan 31, 2013 10:43:41 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL] Disable Web Intents
​https://bugs.webkit.org/show_bug.cgi?id=108457

Patch by Christophe Dumez <​dchris@gmail.com> on 2013-01-31
Reviewed by Alexey Proskuryakov.

.:

Turn off WEB_INTENTS flag in EFL CMake project.

  • Source/cmake/OptionsEfl.cmake:

Source/WebKit:

Remove intents files from EFL CMake project.

  • PlatformEfl.cmake:

Source/WebKit/efl:

Remove code related to Web Intents from EFL
WebKit.

  • WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
  • WebCoreSupport/DumpRenderTreeSupportEfl.h:
  • WebCoreSupport/FrameLoaderClientEfl.cpp:
  • WebCoreSupport/FrameLoaderClientEfl.h:

(FrameLoaderClientEfl):

  • ewk/EWebKit.h:
  • ewk/ewk_frame.cpp:
  • ewk/ewk_frame.h:
  • ewk/ewk_frame_private.h:
  • ewk/ewk_intent.cpp: Removed.
  • ewk/ewk_intent.h: Removed.
  • ewk/ewk_intent_private.h: Removed.
  • ewk/ewk_intent_request.cpp: Removed.
  • ewk/ewk_intent_request.h: Removed.

Source/WebKit2:

Remove code related to Web Intents from EFL
WebKit2.

  • CMakeLists.txt:
  • PlatformEfl.cmake:
  • UIProcess/API/efl/EWebKit2.h:
  • UIProcess/API/efl/EwkViewCallbacks.h:
  • UIProcess/API/efl/ewk_intent.cpp: Removed.
  • UIProcess/API/efl/ewk_intent.h: Removed.
  • UIProcess/API/efl/ewk_intent_private.h: Removed.
  • UIProcess/API/efl/ewk_intent_service.cpp: Removed.
  • UIProcess/API/efl/ewk_intent_service.h: Removed.
  • UIProcess/API/efl/ewk_intent_service_private.h: Removed.
  • UIProcess/API/efl/ewk_view.cpp:
  • UIProcess/API/efl/ewk_view.h:
  • UIProcess/API/efl/tests/resources/intent-request.html: Removed.
  • UIProcess/API/efl/tests/resources/intent-service.html: Removed.
  • UIProcess/API/efl/tests/test_ewk2_intents.cpp: Removed.
  • UIProcess/efl/PageLoadClientEfl.cpp:

(WebKit::PageLoadClientEfl::PageLoadClientEfl):

  • UIProcess/efl/PageLoadClientEfl.h:

(PageLoadClientEfl):

Tools:

Remove EFL DRT code related to Web intents.

  • DumpRenderTree/efl/DumpRenderTreeChrome.cpp:

(DumpRenderTreeChrome::createView):
(DumpRenderTreeChrome::resetDefaultsToConsistentValues):
(DumpRenderTreeChrome::onFrameCreated):

  • DumpRenderTree/efl/DumpRenderTreeChrome.h:

(DumpRenderTreeChrome):

  • DumpRenderTree/efl/TestRunnerEfl.cpp:

(TestRunner::sendWebIntentResponse):
(TestRunner::deliverWebIntent):

  • Scripts/webkitperl/FeatureList.pm: Turn off WEB_INTENTS flag

for EFL port.

LayoutTests:

Skip webintents/ test cases for EFL port now that
the feature is disabled.

  • platform/efl/TestExpectations:
Location:
trunk
Files:
14 deleted
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r141430 r141439  
     12013-01-31  Christophe Dumez  <dchris@gmail.com>
     2
     3        [EFL] Disable Web Intents
     4        https://bugs.webkit.org/show_bug.cgi?id=108457
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Turn off WEB_INTENTS flag in EFL CMake project.
     9
     10        * Source/cmake/OptionsEfl.cmake:
     11
    1122013-01-31  Simon Hausmann  <simon.hausmann@digia.com>
    213

  • trunk/LayoutTests/ChangeLog

    r141437 r141439  
     12013-01-31  Christophe Dumez  <dchris@gmail.com>
     2
     3        [EFL] Disable Web Intents
     4        https://bugs.webkit.org/show_bug.cgi?id=108457
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Skip webintents/ test cases for EFL port now that
     9        the feature is disabled.
     10
     11        * platform/efl/TestExpectations:
     12
    1132013-01-31  Tony Chang  <tony@chromium.org>
    214

  • trunk/LayoutTests/platform/efl/TestExpectations

    r141418 r141439  
    369369webkit.org/b/85465 css3/filters [ Skip ]
    370370webkit.org/b/85465 compositing/filters [ Skip ]
     371
     372# Web Intents are no longer supported.
     373Bug(EFL) webintents [ WontFix ]
    371374
    372375# CSS image-resolution is not yet enabled.

  • trunk/Source/WebKit/ChangeLog

    r140900 r141439  
     12013-01-31  Christophe Dumez  <dchris@gmail.com>
     2
     3        [EFL] Disable Web Intents
     4        https://bugs.webkit.org/show_bug.cgi?id=108457
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Remove intents files from EFL CMake project.
     9
     10        * PlatformEfl.cmake:
     11
    1122013-01-25  Roger Fong  <roger_fong@apple.com>
    213

  • trunk/Source/WebKit/PlatformEfl.cmake

    r140389 r141439  
    136136    efl/ewk/ewk_frame.cpp
    137137    efl/ewk/ewk_history.cpp
    138     efl/ewk/ewk_intent.cpp
    139     efl/ewk/ewk_intent_request.cpp
    140138    efl/ewk/ewk_js.cpp
    141139    efl/ewk/ewk_main.cpp
    … …  
    200198    ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_frame.h
    201199    ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_history.h
    202     ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_intent.h
    203     ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_intent_request.h
    204200    ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_js.h
    205201    ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_main.h

  • trunk/Source/WebKit/efl/ChangeLog

    r141387 r141439  
     12013-01-31  Christophe Dumez  <dchris@gmail.com>
     2
     3        [EFL] Disable Web Intents
     4        https://bugs.webkit.org/show_bug.cgi?id=108457
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Remove code related to Web Intents from EFL
     9        WebKit.
     10
     11        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
     12        * WebCoreSupport/DumpRenderTreeSupportEfl.h:
     13        * WebCoreSupport/FrameLoaderClientEfl.cpp:
     14        * WebCoreSupport/FrameLoaderClientEfl.h:
     15        (FrameLoaderClientEfl):
     16        * ewk/EWebKit.h:
     17        * ewk/ewk_frame.cpp:
     18        * ewk/ewk_frame.h:
     19        * ewk/ewk_frame_private.h:
     20        * ewk/ewk_intent.cpp: Removed.
     21        * ewk/ewk_intent.h: Removed.
     22        * ewk/ewk_intent_private.h: Removed.
     23        * ewk/ewk_intent_request.cpp: Removed.
     24        * ewk/ewk_intent_request.h: Removed.
     25
    1262013-01-31  Sheriff Bot  <webkit.review.bot@gmail.com>
    227

  • trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp

    r140389 r141439  
    2626#include "ewk_frame_private.h"
    2727#include "ewk_history_private.h"
    28 #include "ewk_intent_private.h"
    2928#include "ewk_private.h"
    3029#include "ewk_view_private.h"
    … …  
    4443#include <InspectorController.h>
    4544#include <IntRect.h>
    46 #include <Intent.h>
    4745#include <JSCSSStyleDeclaration.h>
    4846#include <JSElement.h>
    … …  
    660658}
    661659
    662 void DumpRenderTreeSupportEfl::sendWebIntentResponse(Ewk_Intent_Request* request, JSStringRef response)
    663 {
    664 #if ENABLE(WEB_INTENTS)
    665     String responseString = response->string();
    666     if (responseString.isEmpty())
    667         ewk_intent_request_failure_post(request, WebCore::SerializedScriptValue::create(String::fromUTF8("ERROR")));
    668     else
    669         ewk_intent_request_result_post(request, WebCore::SerializedScriptValue::create(String(responseString.impl())));
    670 #endif
    671 }
    672 
    673 WebCore::MessagePortChannelArray* DumpRenderTreeSupportEfl::intentMessagePorts(const Ewk_Intent* intent)
    674 {
    675 #if ENABLE(WEB_INTENTS)
    676     const WebCore::Intent* coreIntent = EWKPrivate::coreIntent(intent);
    677     return coreIntent ? coreIntent->messagePorts() : 0;
    678 #else
    679     UNUSED_PARAM(intent);
    680     return 0;
    681 #endif
    682 }
    683 
    684 void DumpRenderTreeSupportEfl::deliverWebIntent(Evas_Object* ewkFrame, JSStringRef action, JSStringRef type, JSStringRef data)
    685 {
    686 #if ENABLE(WEB_INTENTS)
    687     RefPtr<WebCore::SerializedScriptValue> serializedData = WebCore::SerializedScriptValue::create(data->string());
    688     WebCore::ExceptionCode ec = 0;
    689     WebCore::MessagePortArray ports;
    690     RefPtr<WebCore::Intent> coreIntent = WebCore::Intent::create(action->string(), type->string(), serializedData.get(), ports, ec);
    691     if (ec)
    692         return;
    693     Ewk_Intent* ewkIntent = ewk_intent_new(coreIntent.get());
    694     ewk_frame_intent_deliver(ewkFrame, ewkIntent);
    695     ewk_intent_free(ewkIntent);
    696 #endif
    697 }
    698 
    699660void DumpRenderTreeSupportEfl::setComposition(Evas_Object* ewkView, const char* text, int start, int length)
    700661{

  • trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h

    r140389 r141439  
    3636
    3737typedef struct _Ewk_History_Item Ewk_History_Item;
    38 typedef struct _Ewk_Intent Ewk_Intent;
    39 typedef struct _Ewk_Intent_Request Ewk_Intent_Request;
    4038
    4139typedef Vector<Ewk_History_Item*> HistoryItemChildrenVector;
    … …  
    124122    static void setShouldTrackVisitedLinks(bool);
    125123   
    126     // Web Intents
    127     static void sendWebIntentResponse(Ewk_Intent_Request*, JSStringRef response);
    128     static WebCore::MessagePortChannelArray* intentMessagePorts(const Ewk_Intent*);
    129     static void deliverWebIntent(Evas_Object* ewkFrame, JSStringRef action, JSStringRef type, JSStringRef data);
    130 
    131124    // TextInputController
    132125    static void setComposition(Evas_Object*, const char*, int, int);

  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

    r137845 r141439  
    4747#include "HTMLFormElement.h"
    4848#include "HTTPStatusCodes.h"
    49 #include "IntentRequest.h"
    5049#include "MIMETypeRegistry.h"
    5150#include "NotImplemented.h"
    … …  
    5958#include "WebKitVersion.h"
    6059#include "ewk_frame_private.h"
    61 #include "ewk_intent_private.h"
    6260#include "ewk_private.h"
    6361#include "ewk_settings_private.h"
    … …  
    10251023}
    10261024
    1027 #if ENABLE(WEB_INTENTS)
    1028 void FrameLoaderClientEfl::dispatchIntent(PassRefPtr<WebCore::IntentRequest> intentRequest)
    1029 {
    1030     Ewk_Intent_Request* ewkRequest = ewk_intent_request_new(intentRequest);
    1031     ewk_frame_intent_new(m_frame, ewkRequest);
    1032     ewk_intent_request_unref(ewkRequest);
    1033 }
    1034 #endif
    1035 
    1036 #if ENABLE(WEB_INTENTS_TAG)
    1037 void FrameLoaderClientEfl::registerIntentService(const String& action, const String& type, const KURL& href, const String& title, const String& disposition)
    1038 {
    1039     CString actionStr = action.utf8();
    1040     CString typeStr = type.utf8();
    1041     CString hrefStr = href.string().utf8();
    1042     CString titleStr = title.utf8();
    1043     CString dispositionStr = disposition.utf8();
    1044 
    1045     Ewk_Intent_Service_Info serviceInfo = { actionStr.data(), typeStr.data(), hrefStr.data(), titleStr.data(), dispositionStr.data() };
    1046 
    1047     ewk_frame_intent_service_register(m_frame, &serviceInfo);
    1048 }
    1049 #endif
    1050 
    10511025PassRefPtr<FrameNetworkingContext> FrameLoaderClientEfl::createNetworkingContext()
    10521026{

  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h

    r137845 r141439  
    186186    virtual void didFinishLoad();
    187187    virtual void prepareForDataSourceReplacement();
    188 #if ENABLE(WEB_INTENTS)
    189     virtual void dispatchIntent(PassRefPtr<WebCore::IntentRequest>);
    190 #endif
    191 #if ENABLE(WEB_INTENTS_TAG)
    192     virtual void registerIntentService(const String& action, const String& type, const KURL& href, const String& title, const String& disposition);
    193 #endif
    194188
    195189    virtual WTF::PassRefPtr<DocumentLoader> createDocumentLoader(const ResourceRequest&, const SubstituteData&);

  • trunk/Source/WebKit/efl/ewk/EWebKit.h

    r139541 r141439  
    3636#include "ewk_frame.h"
    3737#include "ewk_history.h"
    38 #include "ewk_intent.h"
    39 #include "ewk_intent_request.h"
    4038#include "ewk_js.h"
    4139#include "ewk_main.h"

  • trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

    r139816 r141439  
    2525#include "ewk_frame.h"
    2626
    27 #include "DOMWindowIntents.h"
    28 #include "DeliveredIntent.h"
    2927#include "DocumentLoader.h"
    3028#include "DocumentMarkerController.h"
    … …  
    5654#include "WindowsKeyboardCodes.h"
    5755#include "ewk_frame_private.h"
    58 #include "ewk_intent_private.h"
    5956#include "ewk_private.h"
    6057#include "ewk_security_origin_private.h"
    … …  
    752749
    753750    return hitTest;
    754 }
    755 
    756 void ewk_frame_intent_deliver(const Evas_Object* ewkFrame, Ewk_Intent* ewk_intent)
    757 {
    758 #if ENABLE(WEB_INTENTS)
    759     EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData);
    760     EINA_SAFETY_ON_NULL_RETURN(smartData->frame);
    761 
    762     WebCore::Intent* intent = EWKPrivate::coreIntent(ewk_intent);
    763 
    764     OwnPtr<WebCore::MessagePortChannelArray> channels;
    765     WebCore::MessagePortChannelArray* origChannels = intent->messagePorts();
    766     if (origChannels && origChannels->size()) {
    767         channels = adoptPtr(new WebCore::MessagePortChannelArray(origChannels->size()));
    768         for (size_t i = 0; i < origChannels->size(); ++i)
    769             (*channels)[i] = origChannels->at(i).release();
    770     }
    771     OwnPtr<WebCore::MessagePortArray> ports = WebCore::MessagePort::entanglePorts(*(smartData->frame->document()), channels.release());
    772 
    773     OwnPtr<WebCore::DeliveredIntentClient> dummyClient;
    774     RefPtr<WebCore::DeliveredIntent> deliveredIntent = WebCore::DeliveredIntent::create(smartData->frame, dummyClient.release(), intent->action(), intent->type(), intent->data(), ports.release(), intent->extras());
    775 
    776     WebCore::DOMWindowIntents::from(smartData->frame->document()->domWindow())->deliver(deliveredIntent.release());
    777 #endif
    778751}
    779752
    … …  
    15521525/**
    15531526 * @internal
    1554  * Reports new intent.
    1555  *
    1556  * Emits signal: "intent,new" with pointer to a Ewk_Intent_Request.
    1557  */
    1558 void ewk_frame_intent_new(Evas_Object* ewkFrame, Ewk_Intent_Request* request)
    1559 {
    1560 #if ENABLE(WEB_INTENTS)
    1561     evas_object_smart_callback_call(ewkFrame, "intent,new", request);
    1562 #endif
    1563 }
    1564 
    1565 /**
    1566  * @internal
    1567  * Reports an intent service registration.
    1568  *
    1569  * Emits signal: "intent,service,register" with pointer to a Ewk_Intent_Service_Info.
    1570  */
    1571 void ewk_frame_intent_service_register(Evas_Object* ewkFrame, Ewk_Intent_Service_Info* info)
    1572 {
    1573 #if ENABLE(WEB_INTENTS_TAG)
    1574     evas_object_smart_callback_call(ewkFrame, "intent,service,register", info);
    1575 #endif
    1576 }
    1577 
    1578 /**
    1579  * @internal
    15801527 *
    15811528 * Reports contents size changed.

  • trunk/Source/WebKit/efl/ewk/ewk_frame.h

    r123604 r141439  
    4141 *    contents were changed
    4242 *  - "icon,changed", void: frame favicon changed.
    43  *  - "intent,new", Ewk_Intent_Request*: reports new intent.
    44  *  - "intent,service,register", Ewk_Intent_Service_Info*: reports new intent service registration.
    4543 *  - "load,committed", void: reports load committed.
    4644 *  - "load,document,finished", void: frame finished loading the document.
    … …  
    8381#define ewk_frame_h
    8482
    85 #include "ewk_intent.h"
    8683#include "ewk_security_origin.h"
    8784
    … …  
    183180    const char *insecure_url; /**< insecure url of the document */
    184181    Eina_Bool is_entire_page_blocked; /** < indicates if the entire page was blocked by XSSAuditor */
    185 };
    186 
    187 /// Creates a type name for Ewk_Intent_Service_Info.
    188 typedef struct _Ewk_Intent_Service_Info Ewk_Intent_Service_Info;
    189 
    190 struct _Ewk_Intent_Service_Info {
    191     const char *action; /**< an opaque string indicating the behavior class the service supports. */
    192     const char *type; /**< a string specifying the type of payload data the service can accept. */
    193     const char *href; /**< service URI. */
    194     const char *title; /**< A human-readable title for the service. */
    195     const char *disposition; /**< A hint about whether the service can be run "inline" or in a new "window". */
    196182};
    197183
    … …  
    716702
    717703/**
    718  * Delivers an intent to a target service page in the frame.
    719  *
    720  * @param o frame object to deliver the intent to.
    721  * @param ewkIntent intent object to deliver.
    722  */
    723 EAPI void ewk_frame_intent_deliver(const Evas_Object *o, Ewk_Intent *ewk_intent);
    724 
    725 /**
    726704 * Sets a relative scroll of the given frame.
    727705 *

  • trunk/Source/WebKit/efl/ewk/ewk_frame_private.h

    r134757 r141439  
    2323
    2424#include "ewk_frame.h"
    25 #include "ewk_intent_request.h"
    2625#include <Evas.h>
    2726#include <wtf/PassRefPtr.h>
    … …  
    7574void ewk_frame_force_layout(Evas_Object* ewkFrame);
    7675void ewk_frame_icon_changed(Evas_Object* ewkFrame);
    77 void ewk_frame_intent_new(Evas_Object* ewkFrame, Ewk_Intent_Request* request);
    78 void ewk_frame_intent_service_register(Evas_Object* ewkFrame, Ewk_Intent_Service_Info* info);
    7976
    8077WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* ewkFrame, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually);

  • trunk/Source/WebKit2/CMakeLists.txt

    r141384 r141439  
    5151    "${WEBCORE_DIR}"
    5252    "${WEBCORE_DIR}/Modules/battery"
    53     "${WEBCORE_DIR}/Modules/intents"
    5453    "${WEBCORE_DIR}/Modules/networkinfo"
    5554    "${WEBCORE_DIR}/Modules/notifications"
    … …  
    152151    Shared/ImmutableArray.cpp
    153152    Shared/ImmutableDictionary.cpp
    154     Shared/IntentData.cpp
    155     Shared/IntentServiceInfo.cpp
    156153    Shared/MutableArray.cpp
    157154    Shared/MutableDictionary.cpp
    … …  
    180177    Shared/WebHitTestResult.cpp
    181178    Shared/WebImage.cpp
    182     Shared/WebIntentServiceInfo.cpp
    183179    Shared/WebKeyboardEvent.cpp
    184180    Shared/WebKit2Initialize.cpp
    … …  
    282278    UIProcess/WebIconDatabaseClient.cpp
    283279    UIProcess/WebInspectorProxy.cpp
    284     UIProcess/WebIntentData.cpp
    285280    UIProcess/WebKeyValueStorageManagerProxy.cpp
    286281
    … …  
    327322    UIProcess/API/C/WKIconDatabase.cpp
    328323    UIProcess/API/C/WKInspector.cpp
    329     UIProcess/API/C/WKIntentData.cpp
    330     UIProcess/API/C/WKIntentServiceInfo.cpp
    331324    UIProcess/API/C/WKKeyValueStorageManager.cpp
    332325    UIProcess/API/C/WKMediaCacheManager.cpp
    … …  
    406399    WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp
    407400    WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
    408     WebProcess/InjectedBundle/InjectedBundleIntent.cpp
    409     WebProcess/InjectedBundle/InjectedBundleIntentRequest.cpp
    410401    WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp
    411402    WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp
    … …  
    427418    WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp
    428419    WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp
    429     WebProcess/InjectedBundle/API/c/WKBundleIntent.cpp
    430     WebProcess/InjectedBundle/API/c/WKBundleIntentRequest.cpp
    431420    WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp
    432421    WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp

  • trunk/Source/WebKit2/ChangeLog

    r141433 r141439  
     12013-01-31  Christophe Dumez  <dchris@gmail.com>
     2
     3        [EFL] Disable Web Intents
     4        https://bugs.webkit.org/show_bug.cgi?id=108457
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Remove code related to Web Intents from EFL
     9        WebKit2.
     10
     11        * CMakeLists.txt:
     12        * PlatformEfl.cmake:
     13        * UIProcess/API/efl/EWebKit2.h:
     14        * UIProcess/API/efl/EwkViewCallbacks.h:
     15        * UIProcess/API/efl/ewk_intent.cpp: Removed.
     16        * UIProcess/API/efl/ewk_intent.h: Removed.
     17        * UIProcess/API/efl/ewk_intent_private.h: Removed.
     18        * UIProcess/API/efl/ewk_intent_service.cpp: Removed.
     19        * UIProcess/API/efl/ewk_intent_service.h: Removed.
     20        * UIProcess/API/efl/ewk_intent_service_private.h: Removed.
     21        * UIProcess/API/efl/ewk_view.cpp:
     22        * UIProcess/API/efl/ewk_view.h:
     23        * UIProcess/API/efl/tests/resources/intent-request.html: Removed.
     24        * UIProcess/API/efl/tests/resources/intent-service.html: Removed.
     25        * UIProcess/API/efl/tests/test_ewk2_intents.cpp: Removed.
     26        * UIProcess/efl/PageLoadClientEfl.cpp:
     27        (WebKit::PageLoadClientEfl::PageLoadClientEfl):
     28        * UIProcess/efl/PageLoadClientEfl.h:
     29        (PageLoadClientEfl):
     30
    1312013-01-31  Alexey Proskuryakov  <ap@apple.com>
    232

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r141032 r141439  
    6464    UIProcess/API/efl/ewk_file_chooser_request.cpp
    6565    UIProcess/API/efl/ewk_form_submission_request.cpp
    66     UIProcess/API/efl/ewk_intent.cpp
    67     UIProcess/API/efl/ewk_intent_service.cpp
    6866    UIProcess/API/efl/ewk_main.cpp
    6967    UIProcess/API/efl/ewk_navigation_data.cpp
    … …  
    281279    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_file_chooser_request.h"
    282280    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_form_submission_request.h"
    283     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_intent.h"
    284     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_intent_service.h"
    285281    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_main.h"
    286282    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_navigation_data.h"
    … …  
    382378    test_ewk2_favicon_database
    383379    test_ewk2_file_chooser_request
    384     test_ewk2_intents
    385380    test_ewk2_object
    386381    test_ewk2_popup_menu

  • trunk/Source/WebKit2/UIProcess/API/efl/EWebKit2.h

    r140309 r141439  
    4343#include "ewk_file_chooser_request.h"
    4444#include "ewk_form_submission_request.h"
    45 #include "ewk_intent.h"
    46 #include "ewk_intent_service.h"
    4745#include "ewk_main.h"
    4846#include "ewk_navigation_data.h"

  • trunk/Source/WebKit2/UIProcess/API/efl/EwkViewCallbacks.h

    r140309 r141439  
    3939typedef struct EwkObject Ewk_Form_Submission_Request;
    4040typedef struct EwkObject Ewk_Navigation_Policy_Decision;
    41 #if ENABLE(WEB_INTENTS)
    42 typedef struct EwkObject Ewk_Intent;
    43 #endif
    44 #if ENABLE(WEB_INTENTS_TAG)
    45 typedef struct EwkObject Ewk_Intent_Service;
    46 #endif
    4741typedef struct EwkError Ewk_Error;
    4842
    … …  
    8276    Vibrate,
    8377    WebProcessCrashed,
    84     WindowResizable,
    85 #if ENABLE(WEB_INTENTS)
    86     IntentRequest,
    87 #endif
    88 #if ENABLE(WEB_INTENTS_TAG)
    89     IntentServiceRegistration,
    90 #endif
     78    WindowResizable
    9179};
    9280
    … …  
    199187DECLARE_EWK_VIEW_CALLBACK(WebProcessCrashed, "webprocess,crashed", bool*);
    200188DECLARE_EWK_VIEW_CALLBACK(WindowResizable, "window,resizable", bool*);
    201 #if ENABLE(WEB_INTENTS)
    202 DECLARE_EWK_VIEW_CALLBACK(IntentRequest, "intent,request,new", Ewk_Intent*);
    203 #endif
    204 #if ENABLE(WEB_INTENTS_TAG)
    205 DECLARE_EWK_VIEW_CALLBACK(IntentServiceRegistration, "intent,service,register", Ewk_Intent_Service*);
    206 #endif
    207189
    208190}

  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp

    r140686 r141439  
    4949#include "ewk_context_private.h"
    5050#include "ewk_favicon_database_private.h"
    51 #include "ewk_intent_private.h"
    5251#include "ewk_private.h"
    5352#include "ewk_settings_private.h"
    … …  
    707706}
    708707
    709 Eina_Bool ewk_view_intent_deliver(Evas_Object* ewkView, Ewk_Intent* intent)
    710 {
    711 #if ENABLE(WEB_INTENTS)
    712     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    713     EwkIntent* intentImpl = ewk_object_cast<EwkIntent*>(intent);
    714     EINA_SAFETY_ON_NULL_RETURN_VAL(intentImpl, false);
    715 
    716     WebPageProxy* page = impl->page();
    717     page->deliverIntentToFrame(page->mainFrame(), intentImpl->webIntentData());
    718 
    719     return true;
    720 #else
    721     UNUSED_PARAM(ewkView);
    722     UNUSED_PARAM(intent);
    723     return false;
    724 #endif
    725 }
    726 
    727708Eina_Bool ewk_view_back_possible(Evas_Object* ewkView)
    728709{

  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.h

    r140686 r141439  
    5050 *   ewk_form_submission_request_submit() will be called automatically.
    5151 * - "icon,changed", void: reports that the view's favicon has changed.
    52  * - "intent,request,new", Ewk_Intent*: reports new Web intent request.
    53  * - "intent,service,register", Ewk_Intent_Service*: reports new Web intent service registration.
    5452 * - "load,error", const Ewk_Error*: reports main frame load failed.
    5553 * - "load,finished", void: reports load finished.
    … …  
    8280#include "ewk_download_job.h"
    8381#include "ewk_error.h"
    84 #include "ewk_intent.h"
    8582#include "ewk_popup_menu.h"
    8683#include "ewk_security_origin.h"
    … …  
    426423
    427424/**
    428  * Delivers a Web intent to the view's main frame.
    429  *
    430  * @param o view object to deliver the intent to
    431  *
    432  * @return @c EINA_TRUE on success or @c EINA_FALSE otherwise.
    433  */
    434 EAPI Eina_Bool    ewk_view_intent_deliver(Evas_Object *o, Ewk_Intent *intent);
    435 
    436 /**
    437425 * Asks the main frame to navigate back in the history.
    438426 *

  • trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp

    r140686 r141439  
    3535#include "ewk_back_forward_list_private.h"
    3636#include "ewk_error_private.h"
    37 #include "ewk_intent_private.h"
    38 #include "ewk_intent_service_private.h"
    3937#include "ewk_view.h"
    4038
    … …  
    5654    view->smartCallback<TitleChange>().call(toImpl(title)->string());
    5755}
    58 
    59 #if ENABLE(WEB_INTENTS)
    60 void PageLoadClientEfl::didReceiveIntentForFrame(WKPageRef, WKFrameRef, WKIntentDataRef intent, WKTypeRef, const void* clientInfo)
    61 {
    62     EwkView* view = toPageLoadClientEfl(clientInfo)->view();
    63     RefPtr<EwkIntent> ewkIntent = EwkIntent::create(intent);
    64     view->smartCallback<IntentRequest>().call(ewkIntent.get());
    65 }
    66 #endif
    67 
    68 #if ENABLE(WEB_INTENTS_TAG)
    69 void PageLoadClientEfl::registerIntentServiceForFrame(WKPageRef, WKFrameRef, WKIntentServiceInfoRef serviceInfo, WKTypeRef, const void* clientInfo)
    70 {
    71     EwkView* view = toPageLoadClientEfl(clientInfo)->view();
    72     RefPtr<EwkIntentService> ewkIntentService = EwkIntentService::create(serviceInfo);
    73     view->smartCallback<IntentServiceRegistration>().call(ewkIntentService.get());
    74 }
    75 #endif
    7656
    7757void PageLoadClientEfl::didChangeProgress(WKPageRef page, const void* clientInfo)
    … …  
    183163    loadClient.clientInfo = this;
    184164    loadClient.didReceiveTitleForFrame = didReceiveTitleForFrame;
    185 #if ENABLE(WEB_INTENTS)
    186     loadClient.didReceiveIntentForFrame = didReceiveIntentForFrame;
    187 #endif
    188 #if ENABLE(WEB_INTENTS_TAG)
    189     loadClient.registerIntentServiceForFrame = registerIntentServiceForFrame;
    190 #endif
    191165    loadClient.didStartProgress = didChangeProgress;
    192166    loadClient.didChangeProgress = didChangeProgress;

  • trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.h

    r140686 r141439  
    4848
    4949    static void didReceiveTitleForFrame(WKPageRef, WKStringRef title, WKFrameRef, WKTypeRef, const void* clientInfo);
    50 #if ENABLE(WEB_INTENTS)
    51     static void didReceiveIntentForFrame(WKPageRef, WKFrameRef, WKIntentDataRef, WKTypeRef, const void* clientInfo);
    52 #endif
    53 #if ENABLE(WEB_INTENTS_TAG)
    54     static void registerIntentServiceForFrame(WKPageRef, WKFrameRef, WKIntentServiceInfoRef, WKTypeRef, const void* clientInfo);
    55 #endif
    5650    static void didChangeProgress(WKPageRef, const void* clientInfo);
    5751    static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef userData, const void* clientInfo);

  • trunk/Source/cmake/OptionsEfl.cmake

    r141241 r141439  
    9292WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK ON)
    9393WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO ON)
    94 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_INTENTS ON)
    95 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_INTENTS_TAG ON)
    9694WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING ON)
    9795WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON)

  • trunk/Tools/ChangeLog

    r141435 r141439  
     12013-01-31  Christophe Dumez  <dchris@gmail.com>
     2
     3        [EFL] Disable Web Intents
     4        https://bugs.webkit.org/show_bug.cgi?id=108457
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Remove EFL DRT code related to Web intents.
     9
     10        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
     11        (DumpRenderTreeChrome::createView):
     12        (DumpRenderTreeChrome::resetDefaultsToConsistentValues):
     13        (DumpRenderTreeChrome::onFrameCreated):
     14        * DumpRenderTree/efl/DumpRenderTreeChrome.h:
     15        (DumpRenderTreeChrome):
     16        * DumpRenderTree/efl/TestRunnerEfl.cpp:
     17        (TestRunner::sendWebIntentResponse):
     18        (TestRunner::deliverWebIntent):
     19        * Scripts/webkitperl/FeatureList.pm: Turn off WEB_INTENTS flag
     20        for EFL port.
     21
    1222013-01-31  Simon Hausmann  <simon.hausmann@digia.com>
    223

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

    r138983 r141439  
    5555HashMap<unsigned long, CString> DumpRenderTreeChrome::m_dumpAssignedUrls;
    5656Evas_Object* DumpRenderTreeChrome::m_provisionalLoadFailedFrame = 0;
    57 Ewk_Intent_Request* DumpRenderTreeChrome::m_currentIntentRequest = 0;
    5857
    5958PassOwnPtr<DumpRenderTreeChrome> DumpRenderTreeChrome::create(Evas* evas)
    … …  
    124123    Evas_Object* mainFrame = ewk_view_frame_main_get(view);
    125124    evas_object_smart_callback_add(mainFrame, "icon,changed", onFrameIconChanged, 0);
    126     evas_object_smart_callback_add(mainFrame, "intent,new", onFrameIntentNew, 0);
    127     evas_object_smart_callback_add(mainFrame, "intent,service,register", onFrameIntentServiceRegistration, 0);
    128125    evas_object_smart_callback_add(mainFrame, "load,provisional", onFrameProvisionalLoad, 0);
    129126    evas_object_smart_callback_add(mainFrame, "load,provisional,failed", onFrameProvisionalLoadFailed, 0);
    … …  
    240237{
    241238    return m_mainView;
    242 }
    243 
    244 Ewk_Intent_Request* DumpRenderTreeChrome::currentIntentRequest() const
    245 {
    246     return m_currentIntentRequest;
    247239}
    248240
    … …  
    333325    ewk_settings_page_cache_capacity_set(3);
    334326
    335     if (m_currentIntentRequest) {
    336         ewk_intent_request_unref(m_currentIntentRequest);
    337         m_currentIntentRequest = 0;
    338     }
    339 
    340327    policyDelegateEnabled = false;
    341328    policyDelegatePermissive = false;
    … …  
    617604
    618605    evas_object_smart_callback_add(frame, "icon,changed", onFrameIconChanged, 0);
    619     evas_object_smart_callback_add(frame, "intent,new", onFrameIntentNew, 0);
    620     evas_object_smart_callback_add(frame, "intent,service,register", onFrameIntentServiceRegistration, 0);
    621606    evas_object_smart_callback_add(frame, "load,provisional", onFrameProvisionalLoad, 0);
    622607    evas_object_smart_callback_add(frame, "load,provisional,failed", onFrameProvisionalLoadFailed, 0);
    … …  
    852837}
    853838
    854 void DumpRenderTreeChrome::onFrameIntentNew(void*, Evas_Object*, void* eventInfo)
    855 {
    856     Ewk_Intent_Request* request = static_cast<Ewk_Intent_Request*>(eventInfo);
    857     Ewk_Intent* intent = ewk_intent_request_intent_get(request);
    858     if (!intent)
    859         return;
    860 
    861     ewk_intent_request_ref(request);
    862     if (m_currentIntentRequest)
    863         ewk_intent_request_unref(m_currentIntentRequest);
    864     m_currentIntentRequest = request;
    865 
    866     printf("Received Web Intent: action=%s type=%s\n",
    867            ewk_intent_action_get(intent),
    868            ewk_intent_type_get(intent));
    869 
    870     const MessagePortChannelArray* messagePorts = DumpRenderTreeSupportEfl::intentMessagePorts(intent);
    871     if (messagePorts)
    872         printf("Have %d ports\n", static_cast<int>(messagePorts->size()));
    873 
    874     const char* service = ewk_intent_service_get(intent);
    875     if (service && strcmp(service, ""))
    876         printf("Explicit intent service: %s\n", service);
    877 
    878     void* data = 0;
    879     Eina_List* extraNames = ewk_intent_extra_names_get(intent);
    880     EINA_LIST_FREE(extraNames, data) {
    881         const char* name = static_cast<char*>(data);
    882         const char* value = ewk_intent_extra_get(intent, name);
    883         if (value) {
    884             printf("Extras[%s] = %s\n", name, value);
    885             eina_stringshare_del(value);
    886         }
    887         eina_stringshare_del(name);
    888     }
    889 
    890     Eina_List* suggestions = ewk_intent_suggestions_get(intent);
    891     EINA_LIST_FREE(suggestions, data) {
    892         const char* suggestion = static_cast<char*>(data);
    893         printf("Have suggestion %s\n", suggestion);
    894         eina_stringshare_del(suggestion);
    895     }
    896 }
    897 
    898 void DumpRenderTreeChrome::onFrameIntentServiceRegistration(void*, Evas_Object*, void* eventInfo)
    899 {
    900     Ewk_Intent_Service_Info* serviceInfo = static_cast<Ewk_Intent_Service_Info*>(eventInfo);
    901     printf("Registered Web Intent Service: action=%s type=%s title=%s url=%s disposition=%s\n",
    902            serviceInfo->action,
    903            serviceInfo->type,
    904            serviceInfo->title,
    905            serviceInfo->href,
    906            serviceInfo->disposition);
    907 }
    908 
    909839void DumpRenderTreeChrome::onDownloadRequest(void*, Evas_Object*, void* eventInfo)
    910840{

  • trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h

    r131119 r141439  
    3333#include <Eina.h>
    3434#include <Evas.h>
    35 #include <ewk_intent_request.h>
    3635#include <wtf/HashMap.h>
    3736#include <wtf/OwnPtr.h>
    … …  
    5958    Evas_Object* mainView() const;
    6059
    61     Ewk_Intent_Request* currentIntentRequest() const;
    62 
    6360    void resetDefaultsToConsistentValues();
    6461
    … …  
    7673    static HashMap<unsigned long, CString> m_dumpAssignedUrls;
    7774    static Evas_Object* m_provisionalLoadFailedFrame;
    78     static Ewk_Intent_Request* m_currentIntentRequest;
    7975
    8076    // Smart callbacks
    … …  
    140136    static void onNewResourceRequest(void*, Evas_Object*, void*);
    141137
    142     static void onFrameIntentNew(void*, Evas_Object*, void*);
    143     static void onFrameIntentServiceRegistration(void*, Evas_Object*, void*);
    144 
    145138    static void onDownloadRequest(void*, Evas_Object*, void*);
    146139};

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

    r137080 r141439  
    902902}
    903903
    904 void TestRunner::sendWebIntentResponse(JSStringRef response)
    905 {
    906     Ewk_Intent_Request* request = browser->currentIntentRequest();
    907     if (!request)
    908         return;
    909 
    910     DumpRenderTreeSupportEfl::sendWebIntentResponse(request, response);
    911 }
    912 
    913 void TestRunner::deliverWebIntent(JSStringRef action, JSStringRef type, JSStringRef data)
    914 {
    915     DumpRenderTreeSupportEfl::deliverWebIntent(browser->mainFrame(), action, type, data);
     904void TestRunner::sendWebIntentResponse(JSStringRef)
     905{
     906    // No plan to support Web Intents. The feature will likely
     907    // be removed from WebKit.
     908    notImplemented();
     909}
     910
     911void TestRunner::deliverWebIntent(JSStringRef, JSStringRef, JSStringRef)
     912{
     913    // No plan to support Web Intents. The feature will likely
     914    // be removed from WebKit.
     915    notImplemented();
    916916}
    917917

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

    r140957 r141439  
    459459
    460460    { option => "web-intents", desc => "Toggle Web Intents support",
    461       define => "ENABLE_WEB_INTENTS", default => isEfl(), value => \$webIntentsSupport },
     461      define => "ENABLE_WEB_INTENTS", default => 0, value => \$webIntentsSupport },
    462462
    463463    { option => "web-intents-tag", desc => "Toggle Web Intents Tag support",
    464       define => "ENABLE_WEB_INTENTS_TAG", default => isEfl(), value => \$webIntentsTagSupport },
     464      define => "ENABLE_WEB_INTENTS_TAG", default => 0, value => \$webIntentsTagSupport },
    465465
    466466    { option => "web-sockets", desc => "Toggle Web Sockets support",
Note: See TracChangeset for help on using the changeset viewer.