Modified: trunk/Source/WebKit/win/ChangeLog (176522 => 176523)
--- trunk/Source/WebKit/win/ChangeLog 2014-11-24 20:48:49 UTC (rev 176522)
+++ trunk/Source/WebKit/win/ChangeLog 2014-11-24 22:09:06 UTC (rev 176523)
@@ -1,3 +1,23 @@
+2014-11-24 Anders Carlsson <[email protected]>
+
+ 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.
+
2014-11-21 Jer Noble <[email protected]>
Support multiple signatures of diagnostic logging.
Modified: trunk/Source/WebKit/win/WebView.cpp (176522 => 176523)
--- trunk/Source/WebKit/win/WebView.cpp 2014-11-24 20:48:49 UTC (rev 176522)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-11-24 22:09:06 UTC (rev 176523)
@@ -6339,157 +6339,44 @@
#endif
}
-static Vector<String> toStringVector(unsigned patternsCount, BSTR* patterns)
-{
- Vector<String> patternsVector;
- if (!patternsCount)
- return patternsVector;
- for (unsigned i = 0; i < patternsCount; ++i)
- patternsVector.append(toString(patterns[i]));
- return patternsVector;
-}
-
HRESULT WebView::addUserScriptToGroup(BSTR groupName, IWebScriptWorld* iWorld, BSTR source, BSTR url,
unsigned whitelistCount, BSTR* whitelist,
unsigned blacklistCount, BSTR* blacklist,
WebUserScriptInjectionTime injectionTime)
{
- COMPtr<WebScriptWorld> world(Query, iWorld);
- if (!world)
- return E_POINTER;
-
- String group = toString(groupName);
- if (group.isEmpty())
- return E_INVALIDARG;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- ASSERT(pageGroup);
- if (!pageGroup)
- return E_FAIL;
-
- pageGroup->addUserScriptToWorld(world->world(), toString(source), toURL(url),
- toStringVector(whitelistCount, whitelist), toStringVector(blacklistCount, blacklist),
- injectionTime == WebInjectAtDocumentStart ? InjectAtDocumentStart : InjectAtDocumentEnd,
- InjectInAllFrames);
-
- return S_OK;
+ return E_NOTIMPL;
}
HRESULT WebView::addUserStyleSheetToGroup(BSTR groupName, IWebScriptWorld* iWorld, BSTR source, BSTR url,
unsigned whitelistCount, BSTR* whitelist,
unsigned blacklistCount, BSTR* blacklist)
{
- COMPtr<WebScriptWorld> world(Query, iWorld);
- if (!world)
- return E_POINTER;
-
- String group = toString(groupName);
- if (group.isEmpty())
- return E_INVALIDARG;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- ASSERT(pageGroup);
- if (!pageGroup)
- return E_FAIL;
-
- pageGroup->addUserStyleSheetToWorld(world->world(), toString(source), toURL(url),
- toStringVector(whitelistCount, whitelist), toStringVector(blacklistCount, blacklist),
- InjectInAllFrames);
-
- return S_OK;
+ return E_NOTIMPL;
}
HRESULT WebView::removeUserScriptFromGroup(BSTR groupName, IWebScriptWorld* iWorld, BSTR url)
{
- COMPtr<WebScriptWorld> world(Query, iWorld);
- if (!world)
- return E_POINTER;
-
- String group = toString(groupName);
- if (group.isEmpty())
- return E_INVALIDARG;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- ASSERT(pageGroup);
- if (!pageGroup)
- return E_FAIL;
-
- pageGroup->removeUserScriptFromWorld(world->world(), toURL(url));
-
- return S_OK;
+ return E_NOTIMPL;
}
HRESULT WebView::removeUserStyleSheetFromGroup(BSTR groupName, IWebScriptWorld* iWorld, BSTR url)
{
- COMPtr<WebScriptWorld> world(Query, iWorld);
- if (!world)
- return E_POINTER;
-
- String group = toString(groupName);
- if (group.isEmpty())
- return E_INVALIDARG;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- ASSERT(pageGroup);
- if (!pageGroup)
- return E_FAIL;
-
- pageGroup->removeUserStyleSheetFromWorld(world->world(), toURL(url));
-
- return S_OK;
+ return E_NOTIMPL;
}
HRESULT WebView::removeUserScriptsFromGroup(BSTR groupName, IWebScriptWorld* iWorld)
{
- COMPtr<WebScriptWorld> world(Query, iWorld);
- if (!world)
- return E_POINTER;
-
- String group = toString(groupName);
- if (group.isEmpty())
- return E_INVALIDARG;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- ASSERT(pageGroup);
- if (!pageGroup)
- return E_FAIL;
-
- pageGroup->removeUserScriptsFromWorld(world->world());
- return S_OK;
+ return E_NOTIMPL;
}
HRESULT WebView::removeUserStyleSheetsFromGroup(BSTR groupName, IWebScriptWorld* iWorld)
{
- COMPtr<WebScriptWorld> world(Query, iWorld);
- if (!world)
- return E_POINTER;
-
- String group = toString(groupName);
- if (group.isEmpty())
- return E_INVALIDARG;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- ASSERT(pageGroup);
- if (!pageGroup)
- return E_FAIL;
-
- pageGroup->removeUserStyleSheetsFromWorld(world->world());
- return S_OK;
+ return E_NOTIMPL;
}
HRESULT WebView::removeAllUserContentFromGroup(BSTR groupName)
{
- String group = toString(groupName);
- if (group.isEmpty())
- return E_INVALIDARG;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- ASSERT(pageGroup);
- if (!pageGroup)
- return E_FAIL;
-
- pageGroup->removeAllUserContent();
- return S_OK;
+ return E_NOTIMPL;
}
HRESULT WebView::invalidateBackingStore(const RECT* rect)
