Changeset 196347 in webkit


Ignore:
Timestamp:
Feb 9, 2016 5:08:04 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r196341.
https://bugs.webkit.org/show_bug.cgi?id=154056

This change broke existing API tests on Mac and iOS (Requested
by ryanhaddad on #webkit).

Reverted changeset:

"Add SPI to remove individual user scripts or user style
sheets"
https://bugs.webkit.org/show_bug.cgi?id=154046
http://trac.webkit.org/changeset/196341

Location:
trunk/Source/WebKit2
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r196341 r196347  
     12016-02-09  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r196341.
     4        https://bugs.webkit.org/show_bug.cgi?id=154056
     5
     6        This change broke existing API tests on Mac and iOS (Requested
     7        by ryanhaddad on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Add SPI to remove individual user scripts or user style
     12        sheets"
     13        https://bugs.webkit.org/show_bug.cgi?id=154046
     14        http://trac.webkit.org/changeset/196341
     15
    1162016-02-09  Anders Carlsson  <andersca@apple.com>
    217
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm

    r196341 r196347  
    127127@implementation WKUserContentController (WKPrivate)
    128128
    129 - (void)_removeUserScript:(WKUserScript *)userScript
    130 {
    131     _userContentControllerProxy->removeUserScript(*userScript->_userScript);
    132 }
    133 
    134129- (void)_addUserContentFilter:(_WKUserContentFilter *)userContentFilter
    135130{
     
    153148}
    154149
    155 - (NSArray *)_userStyleSheets
    156 {
    157     return wrapper(_userContentControllerProxy->userStyleSheets());
    158 }
    159 
    160150- (void)_addUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet
    161151{
    162     _userContentControllerProxy->addUserStyleSheet(*userStyleSheet->_userStyleSheet);
    163 }
    164 
    165 - (void)_removeUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet
    166 {
    167     _userContentControllerProxy->removeUserStyleSheet(*userStyleSheet->_userStyleSheet);
     152    _userContentControllerProxy->addUserStyleSheet(userStyleSheet->_userStyleSheet->userStyleSheet());
    168153}
    169154
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h

    r196341 r196347  
    2828#if WK_API_ENABLED
    2929
    30 @class WKUserScript;
    3130@class _WKUserContentFilter;
    3231@class _WKUserStyleSheet;
     
    3433@interface WKUserContentController (WKPrivate)
    3534
    36 - (void)_removeUserScript:(WKUserScript *)userScript WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    37 
    3835- (void)_addUserContentFilter:(_WKUserContentFilter *)userContentFilter WK_AVAILABLE(10_11, 9_0);
    3936- (void)_removeUserContentFilter:(NSString *)userContentFilterName WK_AVAILABLE(10_11, 9_0);
    4037- (void)_removeAllUserContentFilters WK_AVAILABLE(10_11, 9_0);
    4138
    42 @property (nonatomic, readonly, copy) WK_ARRAY(_WKUserStyleSheet *) *_userStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    4339- (void)_addUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    44 - (void)_removeUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    4540- (void)_removeAllUserStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    4641
  • trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp

    r196341 r196347  
    2929#include "APIArray.h"
    3030#include "APIUserScript.h"
    31 #include "APIUserStyleSheet.h"
    3231#include "DataReference.h"
    3332#include "WebProcessProxy.h"
     
    5453    : m_identifier(generateIdentifier())
    5554    , m_userScripts(API::Array::create())
    56     , m_userStyleSheets(API::Array::create())
    5755{
    5856}
     
    8078    webProcessProxy.connection()->send(Messages::WebUserContentController::AddUserScripts(userScripts), m_identifier);
    8179
    82     Vector<WebCore::UserStyleSheet> userStyleSheets;
    83     for (const auto& userStyleSheet : m_userScripts->elementsOfType<API::UserStyleSheet>())
    84         userStyleSheets.append(userStyleSheet->userStyleSheet());
    85     webProcessProxy.connection()->send(Messages::WebUserContentController::AddUserStyleSheets(userStyleSheets), m_identifier);
     80    webProcessProxy.connection()->send(Messages::WebUserContentController::AddUserStyleSheets(m_userStyleSheets), m_identifier);
    8681
    8782    Vector<WebScriptMessageHandlerHandle> messageHandlerHandles;
     
    114109}
    115110
    116 void WebUserContentControllerProxy::removeUserScript(const API::UserScript& userScript)
    117 {
    118     for (WebProcessProxy* process : m_processes)
    119         process->connection()->send(Messages::WebUserContentController::RemoveUserScript({ userScript.userScript().url().string() }), m_identifier);
    120 
    121     m_userScripts->elements().removeAll(&userScript);
    122 }
    123 
    124111void WebUserContentControllerProxy::removeAllUserScripts()
    125112{
     
    130117}
    131118
    132 void WebUserContentControllerProxy::addUserStyleSheet(API::UserStyleSheet& userStyleSheet)
    133 {
    134     m_userStyleSheets->elements().append(&userStyleSheet);
    135 
    136     for (WebProcessProxy* process : m_processes)
    137         process->connection()->send(Messages::WebUserContentController::AddUserStyleSheets({ userStyleSheet.userStyleSheet() }), m_identifier);
    138 }
    139 
    140 void WebUserContentControllerProxy::removeUserStyleSheet(const API::UserStyleSheet& userStyleSheet)
    141 {
    142     for (WebProcessProxy* process : m_processes)
    143         process->connection()->send(Messages::WebUserContentController::RemoveUserStyleSheet({ userStyleSheet.userStyleSheet().url().string() }), m_identifier);
    144 
    145     m_userStyleSheets->elements().removeAll(&userStyleSheet);
     119void WebUserContentControllerProxy::addUserStyleSheet(WebCore::UserStyleSheet userStyleSheet)
     120{
     121    m_userStyleSheets.append(WTFMove(userStyleSheet));
     122
     123    for (WebProcessProxy* process : m_processes)
     124        process->connection()->send(Messages::WebUserContentController::AddUserStyleSheets({ m_userStyleSheets.last() }), m_identifier);
    146125}
    147126
    148127void WebUserContentControllerProxy::removeAllUserStyleSheets()
    149128{
    150     m_userStyleSheets->elements().clear();
     129    m_userStyleSheets.clear();
    151130
    152131    for (WebProcessProxy* process : m_processes)
  • trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h

    r196341 r196347  
    4242class UserContentExtension;
    4343class UserScript;
    44 class UserStyleSheet;
    4544}
    4645
     
    5049
    5150namespace WebCore {
     51class UserScript;
     52class UserStyleSheet;
    5253struct SecurityOriginData;
    5354}
     
    7475    API::Array& userScripts() { return m_userScripts.get(); }
    7576    void addUserScript(API::UserScript&);
    76     void removeUserScript(const API::UserScript&);
    7777    void removeAllUserScripts();
    7878
    79     API::Array& userStyleSheets() { return m_userStyleSheets.get(); }
    80     void addUserStyleSheet(API::UserStyleSheet&);
    81     void removeUserStyleSheet(const API::UserStyleSheet&);
     79    void addUserStyleSheet(WebCore::UserStyleSheet);
    8280    void removeAllUserStyleSheets();
    8381
     
    10199    HashSet<WebProcessProxy*> m_processes;   
    102100    Ref<API::Array> m_userScripts;
    103     Ref<API::Array> m_userStyleSheets;
     101    Vector<WebCore::UserStyleSheet> m_userStyleSheets;
    104102    HashMap<uint64_t, RefPtr<WebScriptMessageHandler>> m_scriptMessageHandlers;
    105103
  • trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp

    r196341 r196347  
    9191}
    9292
    93 void WebUserContentController::removeUserScript(const String& urlString)
    94 {
    95     m_userContentController->removeUserScript(mainThreadNormalWorld(), URL(URL(), urlString));
    96 }
    97 
    9893void WebUserContentController::removeAllUserScripts()
    9994{
     
    107102            std::make_unique<WebCore::UserStyleSheet>(userStyleSheet), InjectInExistingDocuments);
    108103    }
    109 }
    110 
    111 void WebUserContentController::removeUserStyleSheet(const String& urlString)
    112 {
    113     m_userContentController->removeUserStyleSheet(mainThreadNormalWorld(), URL(URL(), urlString));
    114104}
    115105
  • trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.h

    r196341 r196347  
    5454
    5555    void addUserScripts(const Vector<WebCore::UserScript>&);
    56     void removeUserScript(const String& urlString);
    5756    void removeAllUserScripts();
    5857
    5958    void addUserStyleSheets(const Vector<WebCore::UserStyleSheet>&);
    60     void removeUserStyleSheet(const String& urlString);
    6159    void removeAllUserStyleSheets();
    6260
  • trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.messages.in

    r196341 r196347  
    2626messages -> WebUserContentController {
    2727    AddUserScripts(Vector<WebCore::UserScript> userScripts);
    28     RemoveUserScript(String url);
    2928    RemoveAllUserScripts();
    3029
    3130    AddUserStyleSheets(Vector<WebCore::UserStyleSheet> userStyleSheets);
    32     RemoveUserStyleSheet(String url);
    3331    RemoveAllUserStyleSheets();
    3432
Note: See TracChangeset for help on using the changeset viewer.