Changeset 140309 in webkit


Ignore:
Timestamp:
Jan 21, 2013 12:18:18 AM (11 years ago)
Author:
thiago.santos@intel.com
Message:

REGRESSION (r140285): EFL uses WKPageResourceLoadClient which was removed
​https://bugs.webkit.org/show_bug.cgi?id=107417

Reviewed by Gyuyoung Kim.

We had no choice but remove the ResourceLoadClientEfl after r140285
and thus our public API signals depending on it. The test_ewk2_auth_request
unit test was skipped because it depends these signals and will be fixed in a
different patch.

  • PlatformEfl.cmake:
  • UIProcess/API/efl/EWebKit2.h:
  • UIProcess/API/efl/EwkViewCallbacks.h:
  • UIProcess/API/efl/EwkViewImpl.cpp:

(EwkViewImpl::EwkViewImpl):

  • UIProcess/API/efl/EwkViewImpl.h:

(WebKit):
(EwkViewImpl):

  • UIProcess/API/efl/ewk_resource.cpp: Removed.
  • UIProcess/API/efl/ewk_resource.h: Removed.
  • UIProcess/API/efl/ewk_resource_private.h: Removed.
  • UIProcess/API/efl/ewk_view.cpp:
  • UIProcess/API/efl/ewk_view.h:
  • UIProcess/efl/ResourceLoadClientEfl.cpp: Removed.
  • UIProcess/efl/ResourceLoadClientEfl.h: Removed.
Location:
trunk/Source/WebKit2
Files:
5 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r140294 r140309  
     12013-01-21  Thiago Marcos P. Santos  <thiago.santos@intel.com>
     2
     3        REGRESSION (r140285): EFL uses WKPageResourceLoadClient which was removed
     4        https://bugs.webkit.org/show_bug.cgi?id=107417
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        We had no choice but remove the ResourceLoadClientEfl after r140285
     9        and thus our public API signals depending on it. The test_ewk2_auth_request
     10        unit test was skipped because it depends these signals and will be fixed in a
     11        different patch.
     12
     13        * PlatformEfl.cmake:
     14        * UIProcess/API/efl/EWebKit2.h:
     15        * UIProcess/API/efl/EwkViewCallbacks.h:
     16        * UIProcess/API/efl/EwkViewImpl.cpp:
     17        (EwkViewImpl::EwkViewImpl):
     18        * UIProcess/API/efl/EwkViewImpl.h:
     19        (WebKit):
     20        (EwkViewImpl):
     21        * UIProcess/API/efl/ewk_resource.cpp: Removed.
     22        * UIProcess/API/efl/ewk_resource.h: Removed.
     23        * UIProcess/API/efl/ewk_resource_private.h: Removed.
     24        * UIProcess/API/efl/ewk_view.cpp:
     25        * UIProcess/API/efl/ewk_view.h:
     26        * UIProcess/efl/ResourceLoadClientEfl.cpp: Removed.
     27        * UIProcess/efl/ResourceLoadClientEfl.h: Removed.
     28
    1292013-01-20  Viatcheslav Ostapenko  <sl.ostapenko@samsung.com>
    230

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r139702 r140309  
    6666    UIProcess/API/efl/ewk_popup_menu.cpp
    6767    UIProcess/API/efl/ewk_popup_menu_item.cpp
    68     UIProcess/API/efl/ewk_resource.cpp
    6968    UIProcess/API/efl/ewk_security_origin.cpp
    7069    UIProcess/API/efl/ewk_settings.cpp
    … …  
    9594    UIProcess/efl/PageViewportControllerClientEfl.cpp
    9695    UIProcess/efl/RequestManagerClientEfl.cpp
    97     UIProcess/efl/ResourceLoadClientEfl.cpp
    9896    UIProcess/efl/TextCheckerEfl.cpp
    9997    UIProcess/efl/VibrationClientEfl.cpp
    … …  
    284282    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_popup_menu.h"
    285283    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_popup_menu_item.h"
    286     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_resource.h"
    287284    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_security_origin.h"
    288285    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_settings.h"
    … …  
    367364# will clash with tests from the WebKit 1 test suite.
    368365set(EWK2UnitTests_BINARIES
    369     test_ewk2_auth_request
    370366    test_ewk2_back_forward_list
    371367    test_ewk2_color_picker
    … …  
    390386)
    391387
     388# Skipped unit tests list:
     389#
     390# webkit.org/b/107422: test_ewk2_auth_request
     391#
     392
    392393if (ENABLE_API_TESTS)
    393394    foreach (testName ${EWK2UnitTests_BINARIES})

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

    r135394 r140309  
    5151#include "ewk_popup_menu.h"
    5252#include "ewk_popup_menu_item.h"
    53 #include "ewk_resource.h"
    5453#include "ewk_security_origin.h"
    5554#include "ewk_settings.h"

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

    r137410 r140309  
    3939typedef struct EwkObject Ewk_Form_Submission_Request;
    4040typedef struct EwkObject Ewk_Navigation_Policy_Decision;
    41 typedef struct EwkObject Ewk_Resource;
    4241#if ENABLE(WEB_INTENTS)
    4342typedef struct EwkObject Ewk_Intent;
    … …  
    4948
    5049struct Ewk_Download_Job_Error;
    51 struct Ewk_Resource_Request;
    52 struct Ewk_Resource_Load_Response;
    53 struct Ewk_Resource_Load_Error;
    5450struct Ewk_CSS_Size;
    5551
    … …  
    7571    ProvisionalLoadRedirect,
    7672    ProvisionalLoadStarted,
    77     ResourceLoadStarted,
    78     ResourceLoadResponse,
    79     ResourceLoadFailed,
    80     ResourceLoadFinished,
    81     ResourceRequestSent,
    8273    StatusBarVisible,
    8374    NavigationPolicyDecision,
    … …  
    198189DECLARE_EWK_VIEW_CALLBACK(NavigationPolicyDecision, "policy,decision,navigation", Ewk_Navigation_Policy_Decision*);
    199190DECLARE_EWK_VIEW_CALLBACK(NewWindowPolicyDecision, "policy,decision,new,window", Ewk_Navigation_Policy_Decision*);
    200 DECLARE_EWK_VIEW_CALLBACK(ResourceLoadStarted, "resource,request,new", Ewk_Resource_Request*);
    201 DECLARE_EWK_VIEW_CALLBACK(ResourceLoadResponse, "resource,request,response", Ewk_Resource_Load_Response*);
    202 DECLARE_EWK_VIEW_CALLBACK(ResourceLoadFailed, "resource,request,failed", Ewk_Resource_Load_Error*);
    203 DECLARE_EWK_VIEW_CALLBACK(ResourceLoadFinished, "resource,request,finished", Ewk_Resource*);
    204 DECLARE_EWK_VIEW_CALLBACK(ResourceRequestSent, "resource,request,sent", Ewk_Resource_Request*);
    205191DECLARE_EWK_VIEW_CALLBACK(StatusBarVisible, "statusbar,visible", bool*);
    206192DECLARE_EWK_VIEW_CALLBACK(TextFound, "text,found", unsigned*);

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

    r139937 r140309  
    3535#include "PagePolicyClientEfl.h"
    3636#include "PageUIClientEfl.h"
    37 #include "ResourceLoadClientEfl.h"
    3837#include "SnapshotImageGL.h"
    3938#include "WKDictionary.h"
    … …  
    123122    , m_pagePolicyClient(PagePolicyClientEfl::create(this))
    124123    , m_pageUIClient(PageUIClientEfl::create(this))
    125     , m_resourceLoadClient(ResourceLoadClientEfl::create(this))
    126124    , m_contextMenuClient(ContextMenuClientEfl::create(this))
    127125    , m_findClient(FindClientEfl::create(this))

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

    r139937 r140309  
    5959class PagePolicyClientEfl;
    6060class PageUIClientEfl;
    61 class ResourceLoadClientEfl;
    6261class WebContextMenuItemData;
    6362class WebContextMenuProxyEfl;
    … …  
    256255    OwnPtr<WebKit::PagePolicyClientEfl> m_pagePolicyClient;
    257256    OwnPtr<WebKit::PageUIClientEfl> m_pageUIClient;
    258     OwnPtr<WebKit::ResourceLoadClientEfl> m_resourceLoadClient;
    259257    OwnPtr<WebKit::ContextMenuClientEfl> m_contextMenuClient;
    260258    OwnPtr<WebKit::FindClientEfl> m_findClient;

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

    r139422 r140309  
    3333#include "PagePolicyClientEfl.h"
    3434#include "PageUIClientEfl.h"
    35 #include "ResourceLoadClientEfl.h"
    3635#include "WKAPICast.h"
    3736#include "WKEinaSharedString.h"

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

    r139422 r140309  
    6464 *   To make a policy decision asynchronously, simply increment the reference count of the
    6565 *   #Ewk_Navigation_Policy_Decision object using ewk_navigation_policy_decision_ref().
    66  * - "resource,request,failed", const Ewk_Resource_Load_Error*: a resource failed loading.
    67  * - "resource,request,finished", const Ewk_Resource*: a resource finished loading.
    68  * - "resource,request,new", const Ewk_Resource_Request*: a resource request was initiated.
    69  * - "resource,request,response", Ewk_Resource_Load_Response*: a response to a resource request was received.
    70  * - "resource,request,sent", const Ewk_Resource_Request*: a resource request was sent.
    7166 * - "text,found", unsigned int*: the requested text was found and it gives the number of matches.
    7267 * - "title,changed", const char*: title of the main frame was changed.
    … …  
    8984#include "ewk_intent.h"
    9085#include "ewk_popup_menu.h"
    91 #include "ewk_resource.h"
    9286#include "ewk_security_origin.h"
    9387#include "ewk_settings.h"
    … …  
    232226};
    233227
    234 /// Creates a type name for Ewk_Resource_Request.
    235 typedef struct Ewk_Resource_Request Ewk_Resource_Request;
    236 
    237 /**
    238  * @brief Structure containing details about a resource request.
    239  */
    240 struct Ewk_Resource_Request {
    241     Ewk_Resource *resource; /**< resource being requested */
    242     Ewk_Url_Request *request; /**< URL request for the resource */
    243     Ewk_Url_Response *redirect_response; /**< Possible redirect response for the resource or @c NULL */
    244 };
    245 
    246 /// Creates a type name for Ewk_Resource_Load_Response.
    247 typedef struct Ewk_Resource_Load_Response Ewk_Resource_Load_Response;
    248 
    249 /**
    250  * @brief Structure containing details about a response to a resource request.
    251  */
    252 struct Ewk_Resource_Load_Response {
    253     Ewk_Resource *resource; /**< resource requested */
    254     Ewk_Url_Response *response; /**< resource load response */
    255 };
    256 
    257 /// Creates a type name for Ewk_Resource_Load_Error.
    258 typedef struct Ewk_Resource_Load_Error Ewk_Resource_Load_Error;
    259 
    260 /**
    261  * @brief Structure containing details about a resource load error.
    262  *
    263  * Details given about a resource load failure.
    264  */
    265 struct Ewk_Resource_Load_Error {
    266     Ewk_Resource *resource; /**< resource that failed loading */
    267     Ewk_Error *error; /**< load error */
    268 };
    269 
    270228/// Creates a type name for Ewk_Download_Job_Error.
    271229typedef struct Ewk_Download_Job_Error Ewk_Download_Job_Error;
Note: See TracChangeset for help on using the changeset viewer.