<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176523] trunk/Source/WebKit/win</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176523">176523</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-11-24 14:09:06 -0800 (Mon, 24 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (176522 => 176523)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-11-24 Anders Carlsson <andersca@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2014-11-21 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Support multiple signatures of diagnostic logging.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (176522 => 176523)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -6339,157 +6339,44 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> HRESULT WebView::addUserScriptToGroup(BSTR groupName, IWebScriptWorld* iWorld, BSTR source, BSTR url,
</span><span class="cx"> unsigned whitelistCount, BSTR* whitelist,
</span><span class="cx"> unsigned blacklistCount, BSTR* blacklist,
</span><span class="cx"> WebUserScriptInjectionTime injectionTime)
</span><span class="cx"> {
</span><del>- 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;
</del><ins>+ return E_NOTIMPL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebView::addUserStyleSheetToGroup(BSTR groupName, IWebScriptWorld* iWorld, BSTR source, BSTR url,
</span><span class="cx"> unsigned whitelistCount, BSTR* whitelist,
</span><span class="cx"> unsigned blacklistCount, BSTR* blacklist)
</span><span class="cx"> {
</span><del>- 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;
</del><ins>+ return E_NOTIMPL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebView::removeUserScriptFromGroup(BSTR groupName, IWebScriptWorld* iWorld, BSTR url)
</span><span class="cx"> {
</span><del>- 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;
</del><ins>+ return E_NOTIMPL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebView::removeUserStyleSheetFromGroup(BSTR groupName, IWebScriptWorld* iWorld, BSTR url)
</span><span class="cx"> {
</span><del>- 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;
</del><ins>+ return E_NOTIMPL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebView::removeUserScriptsFromGroup(BSTR groupName, IWebScriptWorld* iWorld)
</span><span class="cx"> {
</span><del>- 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;
</del><ins>+ return E_NOTIMPL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebView::removeUserStyleSheetsFromGroup(BSTR groupName, IWebScriptWorld* iWorld)
</span><span class="cx"> {
</span><del>- 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;
</del><ins>+ return E_NOTIMPL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebView::removeAllUserContentFromGroup(BSTR groupName)
</span><span class="cx"> {
</span><del>- 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;
</del><ins>+ return E_NOTIMPL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebView::invalidateBackingStore(const RECT* rect)
</span></span></pre>
</div>
</div>
</body>
</html>