⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 176523 in webkit


Ignore:
Timestamp:
Nov 24, 2014, 2:09:06 PM (12 years ago)
Author:
andersca@apple.com
Message:

Stub out user content WebView member functions on Windows
​https://bugs.webkit.org/show_bug.cgi?id=139033

Reviewed by Sam Weinig.

These functions aren't used by any clients and hinder getting rid of PageGroup.
If it turns out they're still needed we can copy the user content controller code from Mac Legacy WebKit.

  • WebView.cpp:

(WebView::addUserScriptToGroup):
(WebView::addUserStyleSheetToGroup):
(WebView::removeUserScriptFromGroup):
(WebView::removeUserStyleSheetFromGroup):
(WebView::removeUserScriptsFromGroup):
(WebView::removeUserStyleSheetsFromGroup):
(WebView::removeAllUserContentFromGroup):
(toStringVector): Deleted.

Location:
trunk/Source/WebKit/win
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/win/ChangeLog

    r176499 r176523  
     12014-11-24  Anders Carlsson  <andersca@apple.com>
     2
     3        Stub out user content WebView member functions on Windows
     4        https://bugs.webkit.org/show_bug.cgi?id=139033
     5
     6        Reviewed by Sam Weinig.
     7
     8        These functions aren't used by any clients and hinder getting rid of PageGroup.
     9        If it turns out they're still needed we can copy the user content controller code from Mac Legacy WebKit.
     10
     11        * WebView.cpp:
     12        (WebView::addUserScriptToGroup):
     13        (WebView::addUserStyleSheetToGroup):
     14        (WebView::removeUserScriptFromGroup):
     15        (WebView::removeUserStyleSheetFromGroup):
     16        (WebView::removeUserScriptsFromGroup):
     17        (WebView::removeUserStyleSheetsFromGroup):
     18        (WebView::removeAllUserContentFromGroup):
     19        (toStringVector): Deleted.
     20
    1212014-11-21  Jer Noble  <jer.noble@apple.com>
    222

  • trunk/Source/WebKit/win/WebView.cpp

    r176499 r176523  
    63406340}
    63416341
    6342 static Vector<String> toStringVector(unsigned patternsCount, BSTR* patterns)
    6343 {
    6344     Vector<String> patternsVector;
    6345     if (!patternsCount)
    6346         return patternsVector;
    6347     for (unsigned i = 0; i < patternsCount; ++i)
    6348         patternsVector.append(toString(patterns[i]));
    6349     return patternsVector;
    6350 }
    6351 
    63526342HRESULT WebView::addUserScriptToGroup(BSTR groupName, IWebScriptWorld* iWorld, BSTR source, BSTR url,
    63536343                                      unsigned whitelistCount, BSTR* whitelist,
    … …  
    63556345                                      WebUserScriptInjectionTime injectionTime)
    63566346{
    6357     COMPtr<WebScriptWorld> world(Query, iWorld);
    6358     if (!world)
    6359         return E_POINTER;
    6360 
    6361     String group = toString(groupName);
    6362     if (group.isEmpty())
    6363         return E_INVALIDARG;
    6364 
    6365     PageGroup* pageGroup = PageGroup::pageGroup(group);
    6366     ASSERT(pageGroup);
    6367     if (!pageGroup)
    6368         return E_FAIL;
    6369 
    6370     pageGroup->addUserScriptToWorld(world->world(), toString(source), toURL(url),
    6371                                     toStringVector(whitelistCount, whitelist), toStringVector(blacklistCount, blacklist),
    6372                                     injectionTime == WebInjectAtDocumentStart ? InjectAtDocumentStart : InjectAtDocumentEnd,
    6373                                     InjectInAllFrames);
    6374 
    6375     return S_OK;
     6347    return E_NOTIMPL;
    63766348}
    63776349
    … …  
    63806352                                          unsigned blacklistCount, BSTR* blacklist)
    63816353{
    6382     COMPtr<WebScriptWorld> world(Query, iWorld);
    6383     if (!world)
    6384         return E_POINTER;
    6385 
    6386     String group = toString(groupName);
    6387     if (group.isEmpty())
    6388         return E_INVALIDARG;
    6389 
    6390     PageGroup* pageGroup = PageGroup::pageGroup(group);
    6391     ASSERT(pageGroup);
    6392     if (!pageGroup)
    6393         return E_FAIL;
    6394 
    6395     pageGroup->addUserStyleSheetToWorld(world->world(), toString(source), toURL(url),
    6396                                         toStringVector(whitelistCount, whitelist), toStringVector(blacklistCount, blacklist),
    6397                                         InjectInAllFrames);
    6398 
    6399     return S_OK;
     6354    return E_NOTIMPL;
    64006355}
    64016356
    64026357HRESULT WebView::removeUserScriptFromGroup(BSTR groupName, IWebScriptWorld* iWorld, BSTR url)
    64036358{
    6404     COMPtr<WebScriptWorld> world(Query, iWorld);
    6405     if (!world)
    6406         return E_POINTER;
    6407 
    6408     String group = toString(groupName);
    6409     if (group.isEmpty())
    6410         return E_INVALIDARG;
    6411 
    6412     PageGroup* pageGroup = PageGroup::pageGroup(group);
    6413     ASSERT(pageGroup);
    6414     if (!pageGroup)
    6415         return E_FAIL;
    6416 
    6417     pageGroup->removeUserScriptFromWorld(world->world(), toURL(url));
    6418 
    6419     return S_OK;
     6359    return E_NOTIMPL;
    64206360}
    64216361
    64226362HRESULT WebView::removeUserStyleSheetFromGroup(BSTR groupName, IWebScriptWorld* iWorld, BSTR url)
    64236363{
    6424     COMPtr<WebScriptWorld> world(Query, iWorld);
    6425     if (!world)
    6426         return E_POINTER;
    6427 
    6428     String group = toString(groupName);
    6429     if (group.isEmpty())
    6430         return E_INVALIDARG;
    6431 
    6432     PageGroup* pageGroup = PageGroup::pageGroup(group);
    6433     ASSERT(pageGroup);
    6434     if (!pageGroup)
    6435         return E_FAIL;
    6436 
    6437     pageGroup->removeUserStyleSheetFromWorld(world->world(), toURL(url));
    6438 
    6439     return S_OK;
     6364    return E_NOTIMPL;
    64406365}
    64416366
    64426367HRESULT WebView::removeUserScriptsFromGroup(BSTR groupName, IWebScriptWorld* iWorld)
    64436368{
    6444     COMPtr<WebScriptWorld> world(Query, iWorld);
    6445     if (!world)
    6446         return E_POINTER;
    6447 
    6448     String group = toString(groupName);
    6449     if (group.isEmpty())
    6450         return E_INVALIDARG;
    6451 
    6452     PageGroup* pageGroup = PageGroup::pageGroup(group);
    6453     ASSERT(pageGroup);
    6454     if (!pageGroup)
    6455         return E_FAIL;
    6456 
    6457     pageGroup->removeUserScriptsFromWorld(world->world());
    6458     return S_OK;
     6369    return E_NOTIMPL;
    64596370}
    64606371
    64616372HRESULT WebView::removeUserStyleSheetsFromGroup(BSTR groupName, IWebScriptWorld* iWorld)
    64626373{
    6463     COMPtr<WebScriptWorld> world(Query, iWorld);
    6464     if (!world)
    6465         return E_POINTER;
    6466 
    6467     String group = toString(groupName);
    6468     if (group.isEmpty())
    6469         return E_INVALIDARG;
    6470 
    6471     PageGroup* pageGroup = PageGroup::pageGroup(group);
    6472     ASSERT(pageGroup);
    6473     if (!pageGroup)
    6474         return E_FAIL;
    6475 
    6476     pageGroup->removeUserStyleSheetsFromWorld(world->world());
    6477     return S_OK;
     6374    return E_NOTIMPL;
    64786375}
    64796376
    64806377HRESULT WebView::removeAllUserContentFromGroup(BSTR groupName)
    64816378{
    6482     String group = toString(groupName);
    6483     if (group.isEmpty())
    6484         return E_INVALIDARG;
    6485 
    6486     PageGroup* pageGroup = PageGroup::pageGroup(group);
    6487     ASSERT(pageGroup);
    6488     if (!pageGroup)
    6489         return E_FAIL;
    6490 
    6491     pageGroup->removeAllUserContent();
    6492     return S_OK;
     6379    return E_NOTIMPL;
    64936380}
    64946381
Note: See TracChangeset for help on using the changeset viewer.