Title: [144049] trunk/Source/WebCore
- Revision
- 144049
- Author
- [email protected]
- Date
- 2013-02-26 05:51:16 -0800 (Tue, 26 Feb 2013)
Log Message
Web Inspector: in protocol make field "securityOrigin" in type Page.Frame mandatory
https://bugs.webkit.org/show_bug.cgi?id=80857
Reviewed by Vsevolod Vlasov.
Frame.securityOrigin has always been set to a valid value, so this change just fixes
the protocol flaw.
* inspector/Inspector.json:
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::buildObjectForFrame):
* inspector/front-end/ResourceTreeModel.js:
(WebInspector.ResourceTreeFrame):
(WebInspector.ResourceTreeFrame.prototype._navigate):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144048 => 144049)
--- trunk/Source/WebCore/ChangeLog 2013-02-26 13:44:38 UTC (rev 144048)
+++ trunk/Source/WebCore/ChangeLog 2013-02-26 13:51:16 UTC (rev 144049)
@@ -1,3 +1,20 @@
+2013-02-26 Alexander Pavlov <[email protected]>
+
+ Web Inspector: in protocol make field "securityOrigin" in type Page.Frame mandatory
+ https://bugs.webkit.org/show_bug.cgi?id=80857
+
+ Reviewed by Vsevolod Vlasov.
+
+ Frame.securityOrigin has always been set to a valid value, so this change just fixes
+ the protocol flaw.
+
+ * inspector/Inspector.json:
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::buildObjectForFrame):
+ * inspector/front-end/ResourceTreeModel.js:
+ (WebInspector.ResourceTreeFrame):
+ (WebInspector.ResourceTreeFrame.prototype._navigate):
+
2013-02-26 Andrey Kosyakov <[email protected]>
Unreviewed build fix following r144041.
Modified: trunk/Source/WebCore/inspector/Inspector.json (144048 => 144049)
--- trunk/Source/WebCore/inspector/Inspector.json 2013-02-26 13:44:38 UTC (rev 144048)
+++ trunk/Source/WebCore/inspector/Inspector.json 2013-02-26 13:51:16 UTC (rev 144049)
@@ -111,7 +111,7 @@
{ "name": "loaderId", "$ref": "Network.LoaderId", "description": "Identifier of the loader associated with this frame." },
{ "name": "name", "type": "string", "optional": true, "description": "Frame's name as specified in the tag." },
{ "name": "url", "type": "string", "description": "Frame document's URL." },
- { "name": "securityOrigin", "type": "string", "optional": true, "description": "Frame document's security origin." },
+ { "name": "securityOrigin", "type": "string", "description": "Frame document's security origin." },
{ "name": "mimeType", "type": "string", "description": "Frame document's mimeType as determined by the browser." }
],
"hidden": true
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (144048 => 144049)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2013-02-26 13:44:38 UTC (rev 144048)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2013-02-26 13:51:16 UTC (rev 144049)
@@ -1074,10 +1074,11 @@
PassRefPtr<TypeBuilder::Page::Frame> InspectorPageAgent::buildObjectForFrame(Frame* frame)
{
RefPtr<TypeBuilder::Page::Frame> frameObject = TypeBuilder::Page::Frame::create()
- .setId(frameId(frame))
- .setLoaderId(loaderId(frame->loader()->documentLoader()))
- .setUrl(frame->document()->url().string())
- .setMimeType(frame->loader()->documentLoader()->responseMIMEType());
+ .setId(frameId(frame))
+ .setLoaderId(loaderId(frame->loader()->documentLoader()))
+ .setUrl(frame->document()->url().string())
+ .setMimeType(frame->loader()->documentLoader()->responseMIMEType())
+ .setSecurityOrigin(frame->document()->securityOrigin()->toRawString());
if (frame->tree()->parent())
frameObject->setParentId(frameId(frame->tree()->parent()));
if (frame->ownerElement()) {
@@ -1086,8 +1087,6 @@
name = frame->ownerElement()->getAttribute(HTMLNames::idAttr);
frameObject->setName(name);
}
- // FIXME: Make this field non-optional. https://bugs.webkit.org/show_bug.cgi?id=80857
- frameObject->setSecurityOrigin(frame->document()->securityOrigin()->toRawString());
return frameObject;
}
Modified: trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js (144048 => 144049)
--- trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2013-02-26 13:44:38 UTC (rev 144048)
+++ trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2013-02-26 13:51:16 UTC (rev 144049)
@@ -423,7 +423,7 @@
this._loaderId = payload.loaderId;
this._name = payload.name;
this._url = payload.url;
- this._securityOrigin = payload.securityOrigin || "";
+ this._securityOrigin = payload.securityOrigin;
this._mimeType = payload.mimeType;
/**
@@ -513,7 +513,7 @@
this._loaderId = framePayload.loaderId;
this._name = framePayload.name;
this._url = framePayload.url;
- this._securityOrigin = framePayload.securityOrigin || "";
+ this._securityOrigin = framePayload.securityOrigin;
this._mimeType = framePayload.mimeType;
var mainResource = this._resourcesMap[this._url];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
