Diff
Modified: trunk/LayoutTests/ChangeLog (139417 => 139418)
--- trunk/LayoutTests/ChangeLog 2013-01-11 09:53:11 UTC (rev 139417)
+++ trunk/LayoutTests/ChangeLog 2013-01-11 10:06:11 UTC (rev 139418)
@@ -1,3 +1,14 @@
+2013-01-11 Eugene Klyuchnikov <[email protected]>
+
+ Web Inspector: [Resources] "Delete" cookie deletes all cookies with matching name.
+ https://bugs.webkit.org/show_bug.cgi?id=105633
+
+ Reviewed by Pavel Feldman.
+
+ Adopt new signatures.
+
+ * http/tests/inspector/resource-main-cookies.php:
+
2013-01-11 Pavel Feldman <[email protected]>
Web Inspector [chromium]: Debugger.globalObjectCleared is not dispatched on reload after renderer swap
Modified: trunk/LayoutTests/http/tests/inspector/resource-main-cookies.php (139417 => 139418)
--- trunk/LayoutTests/http/tests/inspector/resource-main-cookies.php 2013-01-11 09:53:11 UTC (rev 139417)
+++ trunk/LayoutTests/http/tests/inspector/resource-main-cookies.php 2013-01-11 10:06:11 UTC (rev 139418)
@@ -11,8 +11,9 @@
{
var cookieName = "cookieName";
var cookieDomain = "127.0.0.1";
+ var cookieURL = "http://" + cookieDomain + "/";
// Ensure cookie is deleted before testing.
- PageAgent.deleteCookie(cookieName, cookieDomain, step1);
+ PageAgent.deleteCookie(cookieName, cookieURL, step1);
function step1()
{
@@ -33,7 +34,7 @@
}
}
// Ensure cookie is deleted after testing.
- PageAgent.deleteCookie(cookieName, cookieDomain, step4);
+ PageAgent.deleteCookie(cookieName, cookieURL, step4);
}
function step4()
Modified: trunk/Source/WebCore/ChangeLog (139417 => 139418)
--- trunk/Source/WebCore/ChangeLog 2013-01-11 09:53:11 UTC (rev 139417)
+++ trunk/Source/WebCore/ChangeLog 2013-01-11 10:06:11 UTC (rev 139418)
@@ -1,3 +1,20 @@
+2013-01-11 Eugene Klyuchnikov <[email protected]>
+
+ Web Inspector: [Resources] "Delete" cookie deletes all cookies with matching name.
+ https://bugs.webkit.org/show_bug.cgi?id=105633
+
+ Reviewed by Pavel Feldman.
+
+ "Delete" cookie deletes all cookies with matching name,
+ ignoring domain and path.
+
+ * inspector/Inspector.json: Change argument "domain" to "url"
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::deleteCookie): Use url to delte cookies.
+ * inspector/InspectorPageAgent.h: Adopt new signature.
+ * inspector/front-end/CookieItemsView.js:
+ (WebInspector.CookieItemsView.prototype._deleteCookie): Ditto.
+
2013-01-11 KwangYong Choi <[email protected]>
[EFL] Fix unused parameter build error
Modified: trunk/Source/WebCore/inspector/Inspector.json (139417 => 139418)
--- trunk/Source/WebCore/inspector/Inspector.json 2013-01-11 09:53:11 UTC (rev 139417)
+++ trunk/Source/WebCore/inspector/Inspector.json 2013-01-11 10:06:11 UTC (rev 139418)
@@ -259,9 +259,9 @@
"name": "deleteCookie",
"parameters": [
{ "name": "cookieName", "type": "string", "description": "Name of the cookie to remove." },
- { "name": "domain", "type": "string", "description": "Domain of the cookie to remove." }
+ { "name": "url", "type": "string", "description": "URL to match cooke domain and path." }
],
- "description": "Deletes browser cookie with given name for the given domain.",
+ "description": "Deletes browser cookie with given name, domain and path.",
"hidden": true
},
{
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (139417 => 139418)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2013-01-11 09:53:11 UTC (rev 139417)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2013-01-11 10:06:11 UTC (rev 139418)
@@ -567,17 +567,11 @@
}
}
-void InspectorPageAgent::deleteCookie(ErrorString*, const String& cookieName, const String& domain)
+void InspectorPageAgent::deleteCookie(ErrorString*, const String& cookieName, const String& url)
{
- for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext(m_page->mainFrame())) {
- Document* document = frame->document();
- if (document->url().host() != domain)
- continue;
-
- Vector<KURL> allURLs = allResourcesURLsForFrame(frame);
- for (Vector<KURL>::const_iterator it = allURLs.begin(); it != allURLs.end(); ++it)
- WebCore::deleteCookie(document, KURL(ParsedURLString, *it), cookieName);
- }
+ KURL parsedURL(ParsedURLString, url);
+ for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext(m_page->mainFrame()))
+ WebCore::deleteCookie(frame->document(), parsedURL, cookieName);
}
void InspectorPageAgent::getResourceTree(ErrorString*, RefPtr<TypeBuilder::Page::FrameResourceTree>& object)
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (139417 => 139418)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2013-01-11 09:53:11 UTC (rev 139417)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2013-01-11 10:06:11 UTC (rev 139418)
@@ -100,7 +100,7 @@
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 deleteCookie(ErrorString*, const String& cookieName, const String& domain);
+ 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);
virtual void searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<TypeBuilder::Array<TypeBuilder::Page::SearchMatch> >&);
Modified: trunk/Source/WebCore/inspector/front-end/CookieItemsView.js (139417 => 139418)
--- trunk/Source/WebCore/inspector/front-end/CookieItemsView.js 2013-01-11 09:53:11 UTC (rev 139417)
+++ trunk/Source/WebCore/inspector/front-end/CookieItemsView.js 2013-01-11 10:06:11 UTC (rev 139418)
@@ -143,7 +143,7 @@
*/
_deleteCookie: function(cookie)
{
- PageAgent.deleteCookie(cookie.name(), this._cookieDomain);
+ PageAgent.deleteCookie(cookie.name(), "http://" + cookie.domain() + cookie.path());
this._update();
},
