<!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>[160203] trunk/Source</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/160203">160203</a></dd>
<dt>Author</dt> <dd>seokju@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-05 17:09:09 -0800 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove 'cookiesString' output from Page.getCookies
https://bugs.webkit.org/show_bug.cgi?id=125268
Reviewed by Timothy Hatcher.
Remove 'cookiesString' output from Page.getCookies protocol.
It is no longer meaningful because it is an unused parameter.
Source/WebCore:
No new tests, no behavior change.
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::getCookies):
* inspector/InspectorPageAgent.h:
* inspector/protocol/Page.json:
Source/WebInspectorUI:
* UserInterface/CookieStorageContentView.js:
(WebInspector.CookieStorageContentView.prototype.update):
* UserInterface/InspectorBackendCommands.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgenth">trunk/Source/WebCore/inspector/InspectorPageAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorprotocolPagejson">trunk/Source/WebCore/inspector/protocol/Page.json</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceCookieStorageContentViewjs">trunk/Source/WebInspectorUI/UserInterface/CookieStorageContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceInspectorBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160202 => 160203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-06 00:57:43 UTC (rev 160202)
+++ trunk/Source/WebCore/ChangeLog 2013-12-06 01:09:09 UTC (rev 160203)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-12-05 Seokju Kwon <seokju@webkit.org>
+
+ Web Inspector: Remove 'cookiesString' output from Page.getCookies
+ https://bugs.webkit.org/show_bug.cgi?id=125268
+
+ Reviewed by Timothy Hatcher.
+
+ Remove 'cookiesString' output from Page.getCookies protocol.
+ It is no longer meaningful because it is an unused parameter.
+
+ No new tests, no behavior change.
+
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::getCookies):
+ * inspector/InspectorPageAgent.h:
+ * inspector/protocol/Page.json:
+
</ins><span class="cx"> 2013-12-05 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: expose node and frame snapshot capabilities.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (160202 => 160203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2013-12-06 00:57:43 UTC (rev 160202)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2013-12-06 01:09:09 UTC (rev 160203)
</span><span class="lines">@@ -528,7 +528,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::getCookies(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie>>& cookies, WTF::String* cookiesString)
</del><ins>+void InspectorPageAgent::getCookies(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie>>& cookies)
</ins><span class="cx"> {
</span><span class="cx"> // If we can get raw cookies.
</span><span class="cx"> ListHashSet<Cookie> rawCookiesList;
</span><span class="lines">@@ -564,13 +564,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Do not return empty string/empty array. Make returns optional instead. https://bugs.webkit.org/show_bug.cgi?id=80855
</span><del>- if (rawCookiesImplemented) {
</del><ins>+ if (rawCookiesImplemented)
</ins><span class="cx"> cookies = buildArrayForCookies(rawCookiesList);
</span><del>- *cookiesString = "";
- } else {
</del><ins>+ else
</ins><span class="cx"> cookies = TypeBuilder::Array<TypeBuilder::Page::Cookie>::create();
</span><del>- *cookiesString = stringCookiesList.toString();
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorPageAgent::deleteCookie(ErrorString*, const String& cookieName, const String& url)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (160202 => 160203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2013-12-06 00:57:43 UTC (rev 160202)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2013-12-06 01:09:09 UTC (rev 160203)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> virtual void removeScriptToEvaluateOnLoad(ErrorString*, const String& identifier);
</span><span class="cx"> virtual void reload(ErrorString*, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad, const String* optionalScriptPreprocessor);
</span><span class="cx"> virtual void navigate(ErrorString*, const String& url);
</span><del>- virtual void getCookies(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie>>& cookies, WTF::String* cookiesString);
</del><ins>+ virtual void getCookies(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie>>& cookies);
</ins><span class="cx"> virtual void deleteCookie(ErrorString*, const String& cookieName, const String& url);
</span><span class="cx"> virtual void getResourceTree(ErrorString*, RefPtr<TypeBuilder::Page::FrameResourceTree>&);
</span><span class="cx"> virtual void getResourceContent(ErrorString*, const String& frameId, const String& url, String* content, bool* base64Encoded);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorprotocolPagejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/Page.json (160202 => 160203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/protocol/Page.json 2013-12-06 00:57:43 UTC (rev 160202)
+++ trunk/Source/WebCore/inspector/protocol/Page.json 2013-12-06 01:09:09 UTC (rev 160203)
</span><span class="lines">@@ -135,10 +135,9 @@
</span><span class="cx"> {
</span><span class="cx"> "name": "getCookies",
</span><span class="cx"> "returns": [
</span><del>- { "name": "cookies", "type": "array", "items": { "$ref": "Cookie"}, "description": "Array of cookie objects." },
- { "name": "cookiesString", "type": "string", "description": "document.cookie string representation of the cookies." }
</del><ins>+ { "name": "cookies", "type": "array", "items": { "$ref": "Cookie"}, "description": "Array of cookie objects." }
</ins><span class="cx"> ],
</span><del>- "description": "Returns all browser cookies. Depending on the backend support, will either return detailed cookie information in the <code>cookie</code> field or string cookie representation using <code>cookieString</code>."
</del><ins>+ "description": "Returns all browser cookies. Depending on the backend support, will return detailed cookie information in the <code>cookies</code> field."
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "deleteCookie",
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (160202 => 160203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2013-12-06 00:57:43 UTC (rev 160202)
+++ trunk/Source/WebInspectorUI/ChangeLog 2013-12-06 01:09:09 UTC (rev 160203)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-05 Seokju Kwon <seokju@webkit.org>
+
+ Web Inspector: Remove 'cookiesString' output from Page.getCookies
+ https://bugs.webkit.org/show_bug.cgi?id=125268
+
+ Reviewed by Timothy Hatcher.
+
+ Remove 'cookiesString' output from Page.getCookies protocol.
+ It is no longer meaningful because it is an unused parameter.
+
+ * UserInterface/CookieStorageContentView.js:
+ (WebInspector.CookieStorageContentView.prototype.update):
+ * UserInterface/InspectorBackendCommands.js:
+
</ins><span class="cx"> 2013-12-05 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: expose node and frame snapshot capabilities.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceCookieStorageContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/CookieStorageContentView.js (160202 => 160203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/CookieStorageContentView.js 2013-12-06 00:57:43 UTC (rev 160202)
+++ trunk/Source/WebInspectorUI/UserInterface/CookieStorageContentView.js 2013-12-06 01:09:09 UTC (rev 160203)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> update: function()
</span><span class="cx"> {
</span><del>- function callback(error, cookies, cookiesString)
</del><ins>+ function callback(error, cookies)
</ins><span class="cx"> {
</span><span class="cx"> if (error)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceInspectorBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js (160202 => 160203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js 2013-12-06 00:57:43 UTC (rev 160202)
+++ trunk/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js 2013-12-06 01:09:09 UTC (rev 160203)
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> InspectorBackend.registerCommand("Page.removeScriptToEvaluateOnLoad", [{"name": "identifier", "type": "string", "optional": false}], []);
</span><span class="cx"> InspectorBackend.registerCommand("Page.reload", [{"name": "ignoreCache", "type": "boolean", "optional": true}, {"name": "scriptToEvaluateOnLoad", "type": "string", "optional": true}, {"name": "scriptPreprocessor", "type": "string", "optional": true}], []);
</span><span class="cx"> InspectorBackend.registerCommand("Page.navigate", [{"name": "url", "type": "string", "optional": false}], []);
</span><del>-InspectorBackend.registerCommand("Page.getCookies", [], ["cookies", "cookiesString"]);
</del><ins>+InspectorBackend.registerCommand("Page.getCookies", [], ["cookies"]);
</ins><span class="cx"> InspectorBackend.registerCommand("Page.deleteCookie", [{"name": "cookieName", "type": "string", "optional": false}, {"name": "url", "type": "string", "optional": false}], []);
</span><span class="cx"> InspectorBackend.registerCommand("Page.getResourceTree", [], ["frameTree"]);
</span><span class="cx"> InspectorBackend.registerCommand("Page.getResourceContent", [{"name": "frameId", "type": "string", "optional": false}, {"name": "url", "type": "string", "optional": false}], ["content", "base64Encoded"]);
</span></span></pre>
</div>
</div>
</body>
</html>