Title: [144418] branches/chromium/1410/Source/WebCore
- Revision
- 144418
- Author
- [email protected]
- Date
- 2013-02-28 22:23:57 -0800 (Thu, 28 Feb 2013)
Log Message
Merge 144161
> Web Inspector: timeline stops working on certain sites
> https://bugs.webkit.org/show_bug.cgi?id=110955
>
> Reviewed by Alexander Pavlov.
>
> Analysis: "timerId" value is number,
> so it is not wrapped to node as expected.
>
> Solution: wrap values of all types except Node.
>
> * inspector/front-end/TimelinePresentationModel.js:
> Wrap nonstring values to text nodes.
>
[email protected]
Review URL: https://codereview.chromium.org/12389044
Modified Paths
Diff
Modified: branches/chromium/1410/Source/WebCore/ChangeLog (144417 => 144418)
--- branches/chromium/1410/Source/WebCore/ChangeLog 2013-03-01 06:07:55 UTC (rev 144417)
+++ branches/chromium/1410/Source/WebCore/ChangeLog 2013-03-01 06:23:57 UTC (rev 144418)
@@ -1,3 +1,18 @@
+2013-02-27 Eugene Klyuchnikov <[email protected]>
+
+ Web Inspector: timeline stops working on certain sites
+ https://bugs.webkit.org/show_bug.cgi?id=110955
+
+ Reviewed by Alexander Pavlov.
+
+ Analysis: "timerId" value is number,
+ so it is not wrapped to node as expected.
+
+ Solution: wrap values of all types except Node.
+
+ * inspector/front-end/TimelinePresentationModel.js:
+ Wrap nonstring values to text nodes.
+
2013-02-11 Zhenyao Mo <[email protected]>
WEBGL_compressed_texture_s3tc extension can be enabled even when not supported
Modified: branches/chromium/1410/Source/WebCore/inspector/front-end/TimelinePresentationModel.js (144417 => 144418)
--- branches/chromium/1410/Source/WebCore/inspector/front-end/TimelinePresentationModel.js 2013-03-01 06:07:55 UTC (rev 144417)
+++ branches/chromium/1410/Source/WebCore/inspector/front-end/TimelinePresentationModel.js 2013-03-01 06:23:57 UTC (rev 144418)
@@ -1019,8 +1019,8 @@
break;
}
- if (typeof details === "string")
- return this._createSpanWithText(details);
+ if (details && !(details instanceof Node))
+ return this._createSpanWithText("" + details);
return details ? details : null;
},
@@ -1055,11 +1055,15 @@
},
/**
- * @param {string=} defaultValue
+ * @param {*=} defaultValue
+ * @return {Element|string}
*/
_linkifyScriptLocation: function(defaultValue)
{
- return this.scriptName ? this._linkifyLocation(this.scriptName, this.scriptLine, 0) : defaultValue;
+ if (this.scriptName)
+ return this._linkifyLocation(this.scriptName, this.scriptLine, 0);
+ else
+ return defaultValue ? "" + defaultValue : null;
},
calculateAggregatedStats: function(categories)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
