Title: [133288] trunk/Source/WebCore
- Revision
- 133288
- Author
- vse...@chromium.org
- Date
- 2012-11-02 05:16:22 -0700 (Fri, 02 Nov 2012)
Log Message
Web Inspector: Fix compilation errors
https://bugs.webkit.org/show_bug.cgi?id=101027
Reviewed by Yury Semikhatsky.
* inspector/InjectedScriptSource.js:
(.):
* inspector/front-end/NativeMemorySnapshotView.js:
(WebInspector.NativeSnapshotNode.prototype._createSizeCell):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (133287 => 133288)
--- trunk/Source/WebCore/ChangeLog 2012-11-02 12:09:41 UTC (rev 133287)
+++ trunk/Source/WebCore/ChangeLog 2012-11-02 12:16:22 UTC (rev 133288)
@@ -1,3 +1,15 @@
+2012-11-02 Vsevolod Vlasov <vse...@chromium.org>
+
+ Web Inspector: Fix compilation errors
+ https://bugs.webkit.org/show_bug.cgi?id=101027
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/InjectedScriptSource.js:
+ (.):
+ * inspector/front-end/NativeMemorySnapshotView.js:
+ (WebInspector.NativeSnapshotNode.prototype._createSizeCell):
+
2012-11-02 Andreas Kling <kl...@webkit.org>
Only resolve attribute-derived style once per shared ElementAttributeData.
Modified: trunk/Source/WebCore/inspector/InjectedScriptSource.js (133287 => 133288)
--- trunk/Source/WebCore/inspector/InjectedScriptSource.js 2012-11-02 12:09:41 UTC (rev 133287)
+++ trunk/Source/WebCore/inspector/InjectedScriptSource.js 2012-11-02 12:16:22 UTC (rev 133288)
@@ -48,7 +48,7 @@
/**
* Please use this bind, not the one from Function.prototype
- * @param {function()} func
+ * @param {function(...)} func
* @param {Object} thisObject
* @param {...number} var_args
*/
@@ -552,7 +552,7 @@
var callFrame = this._callFrameForId(topCallFrame, callFrameId);
if (!callFrame)
return "Could not find call frame with given id";
- return this._evaluateAndWrap(callFrame.evaluate, callFrame, _expression_, objectGroup, true, injectCommandLineAPI, returnByValue);
+ return this._evaluateAndWrap(callFrame.evaluate, callFrame, _expression_, objectGroup, true, injectCommandLineAPI, returnByValue, generatePreview);
},
/**
Modified: trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js (133287 => 133288)
--- trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js 2012-11-02 12:09:41 UTC (rev 133287)
+++ trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js 2012-11-02 12:16:22 UTC (rev 133288)
@@ -106,11 +106,11 @@
*/
_createSizeCell: function(columnIdentifier)
{
- var cell = this;
+ var node = this;
var viewProperties = null;
while (!viewProperties || viewProperties._fillStyle === "inherit") {
- viewProperties = WebInspector.MemoryBlockViewProperties._forMemoryBlock(cell._nodeData);
- cell = cell.parent;
+ viewProperties = WebInspector.MemoryBlockViewProperties._forMemoryBlock(node._nodeData);
+ node = node.parent;
}
var sizeKiB = this._nodeData.size / 1024;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
