Skip to content
  • weinig@apple.com's avatar
    Make UserScript and UserStyleSheet value objects that are copyable · 1a6cf377
    weinig@apple.com authored
    https://bugs.webkit.org/show_bug.cgi?id=99275
    
    Reviewed by Tim Horton.
    
    Source/WebCore:
    
    Simplify UserScript and UserStyleSheet and make them more easily usable
    without sticking them in an OwnPtr.
    
    * WebCore.exp.in:
    Update exports.
    
    * page/PageGroup.cpp:
    (WebCore::PageGroup::addUserScriptToWorld):
    (WebCore::PageGroup::addUserStyleSheetToWorld):
    * page/PageGroup.h:
    (PageGroup):
    * page/UserContentURLPattern.cpp:
    (WebCore::UserContentURLPattern::matchesPatterns):
    * page/UserContentURLPattern.h:
    (UserContentURLPattern):
    Update to not assume whitelist and blacklist are in Vector<String>*.
    
    * page/UserScript.h:
    (UserScript):
    (WebCore::UserScript::UserScript):
    (WebCore::UserScript::whitelist):
    (WebCore::UserScript::blacklist):
    * page/UserStyleSheet.h:
    (UserStyleSheet):
    (WebCore::UserStyleSheet::UserStyleSheet):
    (WebCore::UserStyleSheet::whitelist):
    (WebCore::UserStyleSheet::blacklist):
    Switch OwnPtr<Vector<String> > to Vector<String> and remove Noncopyable restriction.
    
    Source/WebKit/chromium:
    
    * src/WebViewImpl.cpp:
    (WebKit::WebView::addUserScript):
    (WebKit::WebView::addUserStyleSheet):
    Update for new PageGroup function signatures.
    
    Source/WebKit/efl:
    
    * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
    (DumpRenderTreeSupportEfl::addUserScript):
    (DumpRenderTreeSupportEfl::addUserStyleSheet):
    Update for new PageGroup function signatures.
    
    Source/WebKit/mac:
    
    * WebView/WebView.mm:
    (-[WebView _injectMailQuirksScript]):
    (-[WebView _injectOutlookQuirksScript]):
    Update for new PageGroup function signatures.
    
    Source/WebKit2:
    
    * Shared/UserContentContainer.cpp:
    (WebKit::toStringVector):
    (WebKit::UserContentContainer::Item::Item):
    (WebKit::UserContentContainer::Item::encode):
    (WebKit::UserContentContainer::Item::decode):
    * Shared/UserContentContainer.h:
    (WebKit::UserContentContainer::Item::whitelist):
    (WebKit::UserContentContainer::Item::blacklist):
    Switch UserContentContainer::Item to store Vector<String> instead of ImmutableArray, easing
    transition to new PageGroup function signatures.
    
    * WebProcess/InjectedBundle/InjectedBundle.cpp:
    (WebKit::toStringVector):
    * WebProcess/WebPage/qt/WebPageQt.cpp:
    (WebKit::WebPage::setUserScripts):
    Update for new PageGroup function signatures.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@131275 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    1a6cf377