[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Wed Apr 7 23:49:04 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit a7260e009243640a6222017a6eab2f810a9ff0da
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 19 13:03:10 2009 +0000
2009-11-19 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Pavel Feldman.
Store cookie domains in the WebInspector object
The cookie domains have been moved from StoragePanel into WebInspector.
Also, the document URLs are now passed inside the WebInspector.addResource()
payload rather than pushed directly from InspectorController.
https://bugs.webkit.org/show_bug.cgi?id=31627
* inspector/InspectorController.cpp:
(WebCore::InspectorController::populateScriptObjects):
(WebCore::InspectorController::didFinishLoading):
* inspector/InspectorFrontend.cpp:
* inspector/InspectorFrontend.h:
* inspector/InspectorResource.cpp:
(WebCore::InspectorResource::createScriptObject):
(WebCore::InspectorResource::updateScriptObject):
* inspector/front-end/StoragePanel.js:
(WebInspector.StoragePanel.prototype.reset):
(WebInspector.StoragePanel.prototype.addCookieDomain):
* inspector/front-end/inspector.js:
(WebInspector.addResource):
(WebInspector.addCookieDomain):
(WebInspector.reset):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51182 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 17f39ef..38e8851 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,30 @@
+2009-11-19 Alexander Pavlov <apavlov at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Store cookie domains in the WebInspector object
+
+ The cookie domains have been moved from StoragePanel into WebInspector.
+ Also, the document URLs are now passed inside the WebInspector.addResource()
+ payload rather than pushed directly from InspectorController.
+ https://bugs.webkit.org/show_bug.cgi?id=31627
+
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::populateScriptObjects):
+ (WebCore::InspectorController::didFinishLoading):
+ * inspector/InspectorFrontend.cpp:
+ * inspector/InspectorFrontend.h:
+ * inspector/InspectorResource.cpp:
+ (WebCore::InspectorResource::createScriptObject):
+ (WebCore::InspectorResource::updateScriptObject):
+ * inspector/front-end/StoragePanel.js:
+ (WebInspector.StoragePanel.prototype.reset):
+ (WebInspector.StoragePanel.prototype.addCookieDomain):
+ * inspector/front-end/inspector.js:
+ (WebInspector.addResource):
+ (WebInspector.addCookieDomain):
+ (WebInspector.reset):
+
2009-11-19 Zoltan Horvath <zoltan at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 617c4bb..920c3f0 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -670,12 +670,8 @@ void InspectorController::populateScriptObjects()
m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
ResourcesMap::iterator resourcesEnd = m_resources.end();
- for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it) {
+ for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it)
it->second->createScriptObject(m_frontend.get());
- KURL resourceURL = it->second->frame()->document()->url();
- if (resourceURL.protocolInHTTPFamily() || resourceURL.protocolIs("file"))
- m_frontend->addCookieDomain(resourceURL.host());
- }
unsigned messageCount = m_consoleMessages.size();
for (unsigned i = 0; i < messageCount; ++i)
@@ -1011,12 +1007,8 @@ void InspectorController::didFinishLoading(DocumentLoader*, unsigned long identi
addResource(resource.get());
- if (windowVisible()) {
+ if (windowVisible())
resource->updateScriptObject(m_frontend.get());
- KURL resourceURL = resource->frame()->document()->url();
- if (resourceURL.protocolInHTTPFamily() || resourceURL.protocolIs("file"))
- m_frontend->addCookieDomain(resourceURL.host());
- }
}
void InspectorController::didFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError& /*error*/)
diff --git a/WebCore/inspector/InspectorFrontend.cpp b/WebCore/inspector/InspectorFrontend.cpp
index fc5f551..6942d02 100644
--- a/WebCore/inspector/InspectorFrontend.cpp
+++ b/WebCore/inspector/InspectorFrontend.cpp
@@ -132,13 +132,6 @@ void InspectorFrontend::removeResource(long long identifier)
function->call();
}
-void InspectorFrontend::addCookieDomain(String domain)
-{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("addCookieDomain"));
- function->appendArgument(domain);
- function->call();
-}
-
void InspectorFrontend::updateFocusedNode(long long nodeId)
{
OwnPtr<ScriptFunctionCall> function(newFunctionCall("updateFocusedNode"));
diff --git a/WebCore/inspector/InspectorFrontend.h b/WebCore/inspector/InspectorFrontend.h
index 3cb9b8c..8d818d1 100644
--- a/WebCore/inspector/InspectorFrontend.h
+++ b/WebCore/inspector/InspectorFrontend.h
@@ -71,8 +71,6 @@ namespace WebCore {
bool updateResource(long long identifier, const ScriptObject& resourceObj);
void removeResource(long long identifier);
- void addCookieDomain(String);
-
void updateFocusedNode(long long nodeId);
void setAttachedWindow(bool attached);
void showPanel(int panel);
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index fe1522e..0870240 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -128,6 +128,7 @@ void InspectorResource::createScriptObject(InspectorFrontend* frontend)
ScriptObject requestHeaders = frontend->newScriptObject();
populateHeadersObject(&requestHeaders, m_requestHeaderFields);
jsonObject.set("requestHeaders", requestHeaders);
+ jsonObject.set("documentURL", m_frame->document()->url().string());
jsonObject.set("requestURL", requestURL());
jsonObject.set("host", m_requestURL.host());
jsonObject.set("path", m_requestURL.path());
@@ -156,6 +157,7 @@ void InspectorResource::updateScriptObject(InspectorFrontend* frontend)
ScriptObject jsonObject = frontend->newScriptObject();
if (m_changes.hasChange(RequestChange)) {
jsonObject.set("url", requestURL());
+ jsonObject.set("documentURL", m_frame->document()->url().string());
jsonObject.set("domain", m_requestURL.host());
jsonObject.set("path", m_requestURL.path());
jsonObject.set("lastPathComponent", m_requestURL.lastPathComponent());
diff --git a/WebCore/inspector/front-end/StoragePanel.js b/WebCore/inspector/front-end/StoragePanel.js
index 1aa11ee..dd558df 100644
--- a/WebCore/inspector/front-end/StoragePanel.js
+++ b/WebCore/inspector/front-end/StoragePanel.js
@@ -97,7 +97,6 @@ WebInspector.StoragePanel.prototype = {
this._domStorage = [];
- this._cookieDomains = {};
this._cookieViews = {};
this.databasesListTreeElement.removeChildren();
@@ -124,13 +123,8 @@ WebInspector.StoragePanel.prototype = {
addCookieDomain: function(domain)
{
- // Eliminate duplicate domains from the list.
- if (typeof this._cookieDomains[domain] !== "undefined")
- return;
-
var cookieDomainTreeElement = new WebInspector.CookieSidebarTreeElement(domain);
this.cookieListTreeElement.appendChild(cookieDomainTreeElement);
- this._cookieDomains[domain] = true;
},
addDOMStorage: function(domStorage)
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 6627a8b..b632c2c 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -70,6 +70,7 @@ preloadImages();
var WebInspector = {
resources: {},
resourceURLMap: {},
+ cookieDomains: {},
missingLocalizedStrings: {},
get previousFocusElement()
@@ -984,6 +985,10 @@ WebInspector.addResource = function(identifier, payload)
if (this.panels.resources)
this.panels.resources.addResource(resource);
+
+ var match = payload.documentURL.match(/^(http[s]?|file):\/\/([\/]*[^\/]+)/i);
+ if (match)
+ this.addCookieDomain(match[1].toLowerCase() === "file" ? "" : match[2]);
}
WebInspector.clearConsoleMessages = function()
@@ -1095,6 +1100,11 @@ WebInspector.addDatabase = function(payload)
WebInspector.addCookieDomain = function(domain)
{
+ // Eliminate duplicate domains from the list.
+ if (domain in this.cookieDomains)
+ return;
+ this.cookieDomains[domain] = true;
+
if (!this.panels.storage)
return;
this.panels.storage.addCookieDomain(domain);
@@ -1195,6 +1205,7 @@ WebInspector.reset = function()
this.resources = {};
this.resourceURLMap = {};
+ this.cookieDomains = {};
this.hoveredDOMNode = null;
delete this.mainResource;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list