Changeset 218146 in webkit
- Timestamp:
- Jun 12, 2017 3:37:59 PM (7 years ago)
- Location:
- trunk/Source
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r218145 r218146 1 2017-06-12 Alex Christensen <achristensen@webkit.org> 2 3 Modernize UserScript.h 4 https://bugs.webkit.org/show_bug.cgi?id=173273 5 6 Reviewed by Tim Horton. 7 8 No change in behavior. Moved encoders to UserScript.h. Use more Rvalues. 9 10 * page/UserScript.h: 11 (WebCore::UserScript::UserScript): 12 (WebCore::UserScript::encode): 13 (WebCore::UserScript::decode): 14 1 15 2017-06-12 Aaron Chu <aaron_chu@apple.com> 2 16 -
trunk/Source/WebCore/page/UserScript.h
r208179 r218146 36 36 WTF_MAKE_FAST_ALLOCATED; 37 37 public: 38 UserScript() 39 : m_injectionTime(InjectAtDocumentStart) 40 , m_injectedFrames(InjectInAllFrames) 41 { 42 } 38 UserScript() { } 39 ~UserScript() { } 43 40 44 UserScript( const String& source, const URL& url, Vector<String>&& whitelist, Vector<String>&& blacklist, UserScriptInjectionTime injectionTime, UserContentInjectedFrames injectedFrames)45 : m_source( source)46 , m_url( url)41 UserScript(String&& source, URL&& url, Vector<String>&& whitelist, Vector<String>&& blacklist, UserScriptInjectionTime injectionTime, UserContentInjectedFrames injectedFrames) 42 : m_source(WTFMove(source)) 43 , m_url(WTFMove(url)) 47 44 , m_whitelist(WTFMove(whitelist)) 48 45 , m_blacklist(WTFMove(blacklist)) … … 59 56 UserContentInjectedFrames injectedFrames() const { return m_injectedFrames; } 60 57 58 template<class Encoder> void encode(Encoder&) const; 59 template<class Decoder> static bool decode(Decoder&, UserScript&); 60 61 61 private: 62 62 String m_source; … … 64 64 Vector<String> m_whitelist; 65 65 Vector<String> m_blacklist; 66 UserScriptInjectionTime m_injectionTime ;67 UserContentInjectedFrames m_injectedFrames ;66 UserScriptInjectionTime m_injectionTime { InjectAtDocumentStart }; 67 UserContentInjectedFrames m_injectedFrames { InjectInAllFrames }; 68 68 }; 69 69 70 template<class Encoder> 71 void UserScript::encode(Encoder& encoder) const 72 { 73 encoder << m_source; 74 encoder << m_url; 75 encoder << m_whitelist; 76 encoder << m_blacklist; 77 encoder.encodeEnum(m_injectionTime); 78 encoder.encodeEnum(m_injectedFrames); 79 } 80 81 template<class Decoder> 82 bool UserScript::decode(Decoder& decoder, UserScript& userScript) 83 { 84 String source; 85 if (!decoder.decode(source)) 86 return false; 87 88 URL url; 89 if (!decoder.decode(url)) 90 return false; 91 92 Vector<String> whitelist; 93 if (!decoder.decode(whitelist)) 94 return false; 95 96 Vector<String> blacklist; 97 if (!decoder.decode(blacklist)) 98 return false; 99 100 UserScriptInjectionTime injectionTime; 101 if (!decoder.decodeEnum(injectionTime)) 102 return false; 103 104 UserContentInjectedFrames injectedFrames; 105 if (!decoder.decodeEnum(injectedFrames)) 106 return false; 107 108 userScript = { WTFMove(source), WTFMove(url), WTFMove(whitelist), WTFMove(blacklist), injectionTime, injectedFrames }; 109 return true; 110 } 111 70 112 } // namespace WebCore -
trunk/Source/WebKit2/ChangeLog
r218144 r218146 1 2017-06-12 Alex Christensen <achristensen@webkit.org> 2 3 Modernize UserScript.h 4 https://bugs.webkit.org/show_bug.cgi?id=173273 5 6 Reviewed by Tim Horton. 7 8 * Shared/WebCoreArgumentCoders.cpp: 9 (IPC::ArgumentCoder<UserScript>::encode): Deleted. 10 (IPC::ArgumentCoder<UserScript>::decode): Deleted. 11 * Shared/WebCoreArgumentCoders.h: 12 * UIProcess/API/C/WKPageGroup.cpp: 13 (WKPageGroupAddUserScript): 14 * WebProcess/InjectedBundle/InjectedBundle.cpp: 15 (WebKit::InjectedBundle::addUserScript): 16 * WebProcess/InjectedBundle/InjectedBundle.h: 17 * WebProcess/WebPage/WebPage.cpp: 18 (WebKit::WebPage::addUserScript): 19 * WebProcess/WebPage/WebPage.h: 20 1 21 2017-06-12 Tim Horton <timothy_horton@apple.com> 2 22 -
trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
r218128 r218146 68 68 #include <WebCore/TransformationMatrix.h> 69 69 #include <WebCore/URL.h> 70 #include <WebCore/UserScript.h>71 70 #include <WebCore/UserStyleSheet.h> 72 71 #include <WebCore/ViewportArguments.h> … … 1737 1736 } 1738 1737 #endif 1739 1740 void ArgumentCoder<UserScript>::encode(Encoder& encoder, const UserScript& userScript)1741 {1742 encoder << userScript.source();1743 encoder << userScript.url();1744 encoder << userScript.whitelist();1745 encoder << userScript.blacklist();1746 encoder.encodeEnum(userScript.injectionTime());1747 encoder.encodeEnum(userScript.injectedFrames());1748 }1749 1750 bool ArgumentCoder<UserScript>::decode(Decoder& decoder, UserScript& userScript)1751 {1752 String source;1753 if (!decoder.decode(source))1754 return false;1755 1756 URL url;1757 if (!decoder.decode(url))1758 return false;1759 1760 Vector<String> whitelist;1761 if (!decoder.decode(whitelist))1762 return false;1763 1764 Vector<String> blacklist;1765 if (!decoder.decode(blacklist))1766 return false;1767 1768 UserScriptInjectionTime injectionTime;1769 if (!decoder.decodeEnum(injectionTime))1770 return false;1771 1772 UserContentInjectedFrames injectedFrames;1773 if (!decoder.decodeEnum(injectedFrames))1774 return false;1775 1776 userScript = UserScript(source, url, WTFMove(whitelist), WTFMove(blacklist), injectionTime, injectedFrames);1777 return true;1778 }1779 1738 1780 1739 void ArgumentCoder<ScrollableAreaParameters>::encode(Encoder& encoder, const ScrollableAreaParameters& parameters) -
trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h
r217310 r218146 86 86 class TransformationMatrix; 87 87 class UserStyleSheet; 88 class UserScript;89 88 class URL; 90 89 struct CompositionUnderline; … … 477 476 }; 478 477 479 template<> struct ArgumentCoder<WebCore::UserScript> {480 static void encode(Encoder&, const WebCore::UserScript&);481 static bool decode(Decoder&, WebCore::UserScript&);482 };483 484 478 template<> struct ArgumentCoder<WebCore::ScrollableAreaParameters> { 485 479 static void encode(Encoder&, const WebCore::ScrollableAreaParameters&); -
trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp
r217531 r218146 96 96 auto whitelist = toImpl(whitelistedURLPatterns); 97 97 auto blacklist = toImpl(blacklistedURLPatterns); 98 99 Ref<API::UserScript> userScript = API::UserScript::create(WebCore::UserScript { source, (baseURLString.isEmpty() ? WebCore::blankURL() : WebCore::URL(WebCore::URL(), baseURLString)), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), toUserScriptInjectionTime(injectionTime), toUserContentInjectedFrames(injectedFrames) }, API::UserContentWorld::normalWorld()); 98 99 auto url = baseURLString.isEmpty() ? WebCore::blankURL() : WebCore::URL(WebCore::URL(), baseURLString); 100 Ref<API::UserScript> userScript = API::UserScript::create(WebCore::UserScript { WTFMove(source), WTFMove(url), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), toUserScriptInjectionTime(injectionTime), toUserContentInjectedFrames(injectedFrames) }, API::UserContentWorld::normalWorld()); 100 101 toImpl(pageGroupRef)->userContentController().addUserScript(userScript.get()); 101 102 } -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
r218129 r218146 426 426 } 427 427 428 void InjectedBundle::addUserScript(WebPageGroupProxy* pageGroup, InjectedBundleScriptWorld* scriptWorld, const String& source, const String& url, API::Array* whitelist, API::Array* blacklist, WebCore::UserScriptInjectionTime injectionTime, WebCore::UserContentInjectedFrames injectedFrames)428 void InjectedBundle::addUserScript(WebPageGroupProxy* pageGroup, InjectedBundleScriptWorld* scriptWorld, String&& source, String&& url, API::Array* whitelist, API::Array* blacklist, WebCore::UserScriptInjectionTime injectionTime, WebCore::UserContentInjectedFrames injectedFrames) 429 429 { 430 430 // url is not from URL::string(), i.e. it has not already been parsed by URL, so we have to use the relative URL constructor for URL instead of the ParsedURLStringTag version. 431 UserScript userScript { source, URL(URL(), url), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), injectionTime, injectedFrames };431 UserScript userScript { WTFMove(source), URL(URL(), url), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), injectionTime, injectedFrames }; 432 432 433 433 pageGroup->userContentController().addUserScript(*scriptWorld, WTFMove(userScript)); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
r216810 r218146 24 24 */ 25 25 26 #ifndef InjectedBundle_h 27 #define InjectedBundle_h 26 #pragma once 28 27 29 28 #include "APIObject.h" … … 121 120 122 121 // UserContent API 123 void addUserScript(WebPageGroupProxy*, InjectedBundleScriptWorld*, const String& source, const String& url, API::Array* whitelist, API::Array* blacklist, WebCore::UserScriptInjectionTime, WebCore::UserContentInjectedFrames);122 void addUserScript(WebPageGroupProxy*, InjectedBundleScriptWorld*, String&& source, String&& url, API::Array* whitelist, API::Array* blacklist, WebCore::UserScriptInjectionTime, WebCore::UserContentInjectedFrames); 124 123 void addUserStyleSheet(WebPageGroupProxy*, InjectedBundleScriptWorld*, const String& source, const String& url, API::Array* whitelist, API::Array* blacklist, WebCore::UserContentInjectedFrames); 125 124 void removeUserScript(WebPageGroupProxy*, InjectedBundleScriptWorld*, const String& url); … … 172 171 } // namespace WebKit 173 172 174 #endif // InjectedBundle_h -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r218129 r218146 5807 5807 } 5808 5808 5809 void WebPage::addUserScript( const String& source, WebCore::UserContentInjectedFrames injectedFrames, WebCore::UserScriptInjectionTime injectionTime)5810 { 5811 WebCore::UserScript userScript { source, WebCore::blankURL(), Vector<String>(), Vector<String>(), injectionTime, injectedFrames };5809 void WebPage::addUserScript(String&& source, WebCore::UserContentInjectedFrames injectedFrames, WebCore::UserScriptInjectionTime injectionTime) 5810 { 5811 WebCore::UserScript userScript { WTFMove(source), URL(WebCore::blankURL()), Vector<String>(), Vector<String>(), injectionTime, injectedFrames }; 5812 5812 5813 5813 m_userContentController->addUserScript(InjectedBundleScriptWorld::normalWorld(), WTFMove(userScript)); -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
r217725 r218146 942 942 #endif 943 943 944 void addUserScript( const String& source, WebCore::UserContentInjectedFrames, WebCore::UserScriptInjectionTime);944 void addUserScript(String&& source, WebCore::UserContentInjectedFrames, WebCore::UserScriptInjectionTime); 945 945 void addUserStyleSheet(const String& source, WebCore::UserContentInjectedFrames); 946 946 void removeAllUserContent();
Note: See TracChangeset
for help on using the changeset viewer.