Diff
Modified: trunk/Source/WebCore/ChangeLog (160202 => 160203)
--- 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)
@@ -1,3 +1,20 @@
+2013-12-05 Seokju Kwon <[email protected]>
+
+ 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:
+
2013-12-05 Brian J. Burg <[email protected]>
Web Inspector: expose node and frame snapshot capabilities.
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (160202 => 160203)
--- 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)
@@ -528,7 +528,7 @@
return result;
}
-void InspectorPageAgent::getCookies(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie>>& cookies, WTF::String* cookiesString)
+void InspectorPageAgent::getCookies(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie>>& cookies)
{
// If we can get raw cookies.
ListHashSet<Cookie> rawCookiesList;
@@ -564,13 +564,10 @@
}
// FIXME: Do not return empty string/empty array. Make returns optional instead. https://bugs.webkit.org/show_bug.cgi?id=80855
- if (rawCookiesImplemented) {
+ if (rawCookiesImplemented)
cookies = buildArrayForCookies(rawCookiesList);
- *cookiesString = "";
- } else {
+ else
cookies = TypeBuilder::Array<TypeBuilder::Page::Cookie>::create();
- *cookiesString = stringCookiesList.toString();
- }
}
void InspectorPageAgent::deleteCookie(ErrorString*, const String& cookieName, const String& url)
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (160202 => 160203)
--- 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)
@@ -101,7 +101,7 @@
virtual void removeScriptToEvaluateOnLoad(ErrorString*, const String& identifier);
virtual void reload(ErrorString*, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad, const String* optionalScriptPreprocessor);
virtual void navigate(ErrorString*, const String& url);
- virtual void getCookies(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie>>& cookies, WTF::String* cookiesString);
+ virtual void getCookies(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie>>& cookies);
virtual void deleteCookie(ErrorString*, const String& cookieName, const String& url);
virtual void getResourceTree(ErrorString*, RefPtr<TypeBuilder::Page::FrameResourceTree>&);
virtual void getResourceContent(ErrorString*, const String& frameId, const String& url, String* content, bool* base64Encoded);
Modified: trunk/Source/WebCore/inspector/protocol/Page.json (160202 => 160203)
--- 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)
@@ -135,10 +135,9 @@
{
"name": "getCookies",
"returns": [
- { "name": "cookies", "type": "array", "items": { "$ref": "Cookie"}, "description": "Array of cookie objects." },
- { "name": "cookiesString", "type": "string", "description": "document.cookie string representation of the cookies." }
+ { "name": "cookies", "type": "array", "items": { "$ref": "Cookie"}, "description": "Array of cookie objects." }
],
- "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>."
+ "description": "Returns all browser cookies. Depending on the backend support, will return detailed cookie information in the <code>cookies</code> field."
},
{
"name": "deleteCookie",
Modified: trunk/Source/WebInspectorUI/ChangeLog (160202 => 160203)
--- 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)
@@ -1,3 +1,17 @@
+2013-12-05 Seokju Kwon <[email protected]>
+
+ 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:
+
2013-12-05 Brian J. Burg <[email protected]>
Web Inspector: expose node and frame snapshot capabilities.
Modified: trunk/Source/WebInspectorUI/UserInterface/CookieStorageContentView.js (160202 => 160203)
--- 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)
@@ -41,7 +41,7 @@
update: function()
{
- function callback(error, cookies, cookiesString)
+ function callback(error, cookies)
{
if (error)
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js (160202 => 160203)
--- 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)
@@ -308,7 +308,7 @@
InspectorBackend.registerCommand("Page.removeScriptToEvaluateOnLoad", [{"name": "identifier", "type": "string", "optional": false}], []);
InspectorBackend.registerCommand("Page.reload", [{"name": "ignoreCache", "type": "boolean", "optional": true}, {"name": "scriptToEvaluateOnLoad", "type": "string", "optional": true}, {"name": "scriptPreprocessor", "type": "string", "optional": true}], []);
InspectorBackend.registerCommand("Page.navigate", [{"name": "url", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Page.getCookies", [], ["cookies", "cookiesString"]);
+InspectorBackend.registerCommand("Page.getCookies", [], ["cookies"]);
InspectorBackend.registerCommand("Page.deleteCookie", [{"name": "cookieName", "type": "string", "optional": false}, {"name": "url", "type": "string", "optional": false}], []);
InspectorBackend.registerCommand("Page.getResourceTree", [], ["frameTree"]);
InspectorBackend.registerCommand("Page.getResourceContent", [{"name": "frameId", "type": "string", "optional": false}, {"name": "url", "type": "string", "optional": false}], ["content", "base64Encoded"]);
