Changeset 196347 in webkit
- Timestamp:
- Feb 9, 2016 5:08:04 PM (8 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r196341 r196347 1 2016-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 1 16 2016-02-09 Anders Carlsson <andersca@apple.com> 2 17 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm
r196341 r196347 127 127 @implementation WKUserContentController (WKPrivate) 128 128 129 - (void)_removeUserScript:(WKUserScript *)userScript130 {131 _userContentControllerProxy->removeUserScript(*userScript->_userScript);132 }133 134 129 - (void)_addUserContentFilter:(_WKUserContentFilter *)userContentFilter 135 130 { … … 153 148 } 154 149 155 - (NSArray *)_userStyleSheets156 {157 return wrapper(_userContentControllerProxy->userStyleSheets());158 }159 160 150 - (void)_addUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet 161 151 { 162 _userContentControllerProxy->addUserStyleSheet(*userStyleSheet->_userStyleSheet); 163 } 164 165 - (void)_removeUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet 166 { 167 _userContentControllerProxy->removeUserStyleSheet(*userStyleSheet->_userStyleSheet); 152 _userContentControllerProxy->addUserStyleSheet(userStyleSheet->_userStyleSheet->userStyleSheet()); 168 153 } 169 154 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h
r196341 r196347 28 28 #if WK_API_ENABLED 29 29 30 @class WKUserScript;31 30 @class _WKUserContentFilter; 32 31 @class _WKUserStyleSheet; … … 34 33 @interface WKUserContentController (WKPrivate) 35 34 36 - (void)_removeUserScript:(WKUserScript *)userScript WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);37 38 35 - (void)_addUserContentFilter:(_WKUserContentFilter *)userContentFilter WK_AVAILABLE(10_11, 9_0); 39 36 - (void)_removeUserContentFilter:(NSString *)userContentFilterName WK_AVAILABLE(10_11, 9_0); 40 37 - (void)_removeAllUserContentFilters WK_AVAILABLE(10_11, 9_0); 41 38 42 @property (nonatomic, readonly, copy) WK_ARRAY(_WKUserStyleSheet *) *_userStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);43 39 - (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);45 40 - (void)_removeAllUserStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA); 46 41 -
trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp
r196341 r196347 29 29 #include "APIArray.h" 30 30 #include "APIUserScript.h" 31 #include "APIUserStyleSheet.h"32 31 #include "DataReference.h" 33 32 #include "WebProcessProxy.h" … … 54 53 : m_identifier(generateIdentifier()) 55 54 , m_userScripts(API::Array::create()) 56 , m_userStyleSheets(API::Array::create())57 55 { 58 56 } … … 80 78 webProcessProxy.connection()->send(Messages::WebUserContentController::AddUserScripts(userScripts), m_identifier); 81 79 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); 86 81 87 82 Vector<WebScriptMessageHandlerHandle> messageHandlerHandles; … … 114 109 } 115 110 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 124 111 void WebUserContentControllerProxy::removeAllUserScripts() 125 112 { … … 130 117 } 131 118 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); 119 void 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); 146 125 } 147 126 148 127 void WebUserContentControllerProxy::removeAllUserStyleSheets() 149 128 { 150 m_userStyleSheets ->elements().clear();129 m_userStyleSheets.clear(); 151 130 152 131 for (WebProcessProxy* process : m_processes) -
trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h
r196341 r196347 42 42 class UserContentExtension; 43 43 class UserScript; 44 class UserStyleSheet;45 44 } 46 45 … … 50 49 51 50 namespace WebCore { 51 class UserScript; 52 class UserStyleSheet; 52 53 struct SecurityOriginData; 53 54 } … … 74 75 API::Array& userScripts() { return m_userScripts.get(); } 75 76 void addUserScript(API::UserScript&); 76 void removeUserScript(const API::UserScript&);77 77 void removeAllUserScripts(); 78 78 79 API::Array& userStyleSheets() { return m_userStyleSheets.get(); } 80 void addUserStyleSheet(API::UserStyleSheet&); 81 void removeUserStyleSheet(const API::UserStyleSheet&); 79 void addUserStyleSheet(WebCore::UserStyleSheet); 82 80 void removeAllUserStyleSheets(); 83 81 … … 101 99 HashSet<WebProcessProxy*> m_processes; 102 100 Ref<API::Array> m_userScripts; 103 Ref<API::Array> m_userStyleSheets;101 Vector<WebCore::UserStyleSheet> m_userStyleSheets; 104 102 HashMap<uint64_t, RefPtr<WebScriptMessageHandler>> m_scriptMessageHandlers; 105 103 -
trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp
r196341 r196347 91 91 } 92 92 93 void WebUserContentController::removeUserScript(const String& urlString)94 {95 m_userContentController->removeUserScript(mainThreadNormalWorld(), URL(URL(), urlString));96 }97 98 93 void WebUserContentController::removeAllUserScripts() 99 94 { … … 107 102 std::make_unique<WebCore::UserStyleSheet>(userStyleSheet), InjectInExistingDocuments); 108 103 } 109 }110 111 void WebUserContentController::removeUserStyleSheet(const String& urlString)112 {113 m_userContentController->removeUserStyleSheet(mainThreadNormalWorld(), URL(URL(), urlString));114 104 } 115 105 -
trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.h
r196341 r196347 54 54 55 55 void addUserScripts(const Vector<WebCore::UserScript>&); 56 void removeUserScript(const String& urlString);57 56 void removeAllUserScripts(); 58 57 59 58 void addUserStyleSheets(const Vector<WebCore::UserStyleSheet>&); 60 void removeUserStyleSheet(const String& urlString);61 59 void removeAllUserStyleSheets(); 62 60 -
trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.messages.in
r196341 r196347 26 26 messages -> WebUserContentController { 27 27 AddUserScripts(Vector<WebCore::UserScript> userScripts); 28 RemoveUserScript(String url);29 28 RemoveAllUserScripts(); 30 29 31 30 AddUserStyleSheets(Vector<WebCore::UserStyleSheet> userStyleSheets); 32 RemoveUserStyleSheet(String url);33 31 RemoveAllUserStyleSheets(); 34 32
Note: See TracChangeset
for help on using the changeset viewer.