Title: [86760] trunk/Source/WebCore
- Revision
- 86760
- Author
- [email protected]
- Date
- 2011-05-18 07:31:10 -0700 (Wed, 18 May 2011)
Log Message
2011-05-18 Pavel Feldman <[email protected]>
Reviewed by Yury Semikhatsky.
Web Inspector: make parentId for frame optional.
https://bugs.webkit.org/show_bug.cgi?id=61032
* inspector/Inspector.json:
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::buildObjectForFrame):
* inspector/front-end/ResourceTreeModel.js:
(WebInspector.ResourceTreeModel.prototype._addFrame):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (86759 => 86760)
--- trunk/Source/WebCore/ChangeLog 2011-05-18 14:27:28 UTC (rev 86759)
+++ trunk/Source/WebCore/ChangeLog 2011-05-18 14:31:10 UTC (rev 86760)
@@ -1,3 +1,16 @@
+2011-05-18 Pavel Feldman <[email protected]>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: make parentId for frame optional.
+ https://bugs.webkit.org/show_bug.cgi?id=61032
+
+ * inspector/Inspector.json:
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::buildObjectForFrame):
+ * inspector/front-end/ResourceTreeModel.js:
+ (WebInspector.ResourceTreeModel.prototype._addFrame):
+
2011-05-18 Gabor Loki <[email protected]>
Reviewed by Nikolas Zimmermann.
Modified: trunk/Source/WebCore/inspector/Inspector.json (86759 => 86760)
--- trunk/Source/WebCore/inspector/Inspector.json 2011-05-18 14:27:28 UTC (rev 86759)
+++ trunk/Source/WebCore/inspector/Inspector.json 2011-05-18 14:31:10 UTC (rev 86760)
@@ -72,7 +72,7 @@
"description": "Information about the Frame on the page.",
"properties": [
{ "name": "id", "type": "string", "description": "Frame unique identifier." },
- { "name": "parentId", "type": "string", "description": "Parent frame identifier." },
+ { "name": "parentId", "type": "string", "optional": true, "description": "Parent frame identifier." },
{ "name": "loaderId", "type": "string", "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." }
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (86759 => 86760)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2011-05-18 14:27:28 UTC (rev 86759)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2011-05-18 14:31:10 UTC (rev 86760)
@@ -584,7 +584,8 @@
{
RefPtr<InspectorObject> frameObject = InspectorObject::create();
frameObject->setString("id", frameId(frame));
- frameObject->setString("parentId", frameId(frame->tree()->parent()));
+ if (frame->tree()->parent())
+ frameObject->setString("parentId", frameId(frame->tree()->parent()));
if (frame->ownerElement()) {
String name = frame->ownerElement()->getAttribute(HTMLNames::nameAttr);
if (name.isEmpty())
Modified: trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js (86759 => 86760)
--- trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2011-05-18 14:27:28 UTC (rev 86759)
+++ trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2011-05-18 14:31:10 UTC (rev 86760)
@@ -89,6 +89,7 @@
_addFrame: function(frame)
{
+ frame.parentId = frame.parentId || "";
this._frameIds[frame.id] = frame;
var subframes = this._subframes[frame.parentId];
if (!subframes) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
