[webkit-changes] [147308] trunk/Source/WebCore

[loislo]

Title: [147308] trunk/Source/WebCore








Revision 147308
Author loi...@chromium.org
Date 2013-04-01 01:13:15 -0700 (Mon, 01 Apr 2013)


Log Message
Web Inspector: Flame Chart. Extract item to coordinates conversion into a separate function.
https://bugs.webkit.org/show_bug.cgi?id=113682

Reviewed by Yury Semikhatsky.

The calculation was extracted into entryToAnchorBox.

Drive by fixes: unnecessary members were removed.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.Entry):
(WebInspector.FlameChart.prototype._calculateTimelineData):
(WebInspector.FlameChart.prototype._calculateTimelineDataForSamples):
(WebInspector.FlameChart.prototype._getPopoverAnchor):
(WebInspector.FlameChart.prototype._entryToAnchorBox):
(WebInspector.FlameChart.prototype.draw):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (147307 => 147308)

--- trunk/Source/WebCore/ChangeLog	2013-04-01 07:19:52 UTC (rev 147307)
+++ trunk/Source/WebCore/ChangeLog	2013-04-01 08:13:15 UTC (rev 147308)
@@ -1,3 +1,23 @@
+2013-04-01  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Extract item to coordinates conversion into a separate function.
+https://bugs.webkit.org/show_bug.cgi?id=113682
+
+Reviewed by Yury Semikhatsky.
+
+The calculation was extracted into entryToAnchorBox.
+
+Drive by fixes: unnecessary members were removed.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.Entry):
+(WebInspector.FlameChart.prototype._calculateTimelineData):
+(WebInspector.FlameChart.prototype._calculateTimelineDataForSamples):
+(WebInspector.FlameChart.prototype._getPopoverAnchor):
+(WebInspector.FlameChart.prototype._entryToAnchorBox):
+(WebInspector.FlameChart.prototype.draw):
+
 2013-03-31  Zalan Bujtas  za...@apple.com
 
 Gradient background does not get repainted when child box is expanded.


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (147307 => 147308)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-04-01 07:19:52 UTC (rev 147307)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-04-01 08:13:15 UTC (rev 147308)
@@ -65,7 +65,6 @@
 this.element.addEventListener(click, this._onClick.bind(this), false);
 this._popoverHelper = new WebInspector.PopoverHelper(this._chartContainer, this._getPopoverAnchor.bind(this), this._showPopover.bind(this));
 this._popoverHelper.setTimeout(250);
-this._anchorBox = new AnchorBox(0, 0, 0, 0);
 this._linkifier = new WebInspector.Linkifier();
 this._highlightedNodeIndex = -1;
 
@@ -74,7 +73,8 @@
 }
 
 /**
- * @constructor
+ * @constructorentries.push(new WebInspector.FlameChart.Entry(colorPair, level, node.totalTime, offset, node));
+/
  * @implements {WebInspector.TimelineGrid.Calculator}
  */
 WebInspector.FlameChart.Calculator = function()
@@ -211,6 +211,22 @@
 }
 }
 
+/**
+ * @constructor
+ * @param {!Object} colorPair
+ * @param {!number} depth
+ * @param {!number} duration
+ * @param {!number} startTime
+ * @param {Object} node
+ */
+WebInspector.FlameChart.Entry = function(colorPair, depth, duration, startTime, node)
+{
+this.colorPair = colorPair;
+this.depth = depth;
+this.duration = duration;
+this.startTime = startTime;
+this.node = node;
+}
 
 WebInspector.FlameChart.prototype = {
 _onWindowChanged: function(event)
@@ -264,9 +280,6 @@
 if (!this._cpuProfileView.profileHead)
 return null;
 
-var functionColorPairs = { };
-var currentColorIndex = 0;
-
 var index = 0;
 var entries = [];
 
@@ -290,13 +303,7 @@
 
 var colorPair = colorGenerator._colorPairForID(node.functionName + : + node.url + : + node.lineNumber);
 
-entries.push({
-colorPair: colorPair,
-depth: level,
-duration: node.totalTime,
-startTime: offset,
-node: node
-});
+entries.push(new WebInspector.FlameChart.Entry(colorPair, level, node.totalTime, offset, node));
 
 ++index;
 
@@ -332,11 +339,9 @@
 var samples = this._cpuProfileView.samples;
 var idToNode = this._cpuProfileView._idToNode;
 var samplesCount = samples.length;
-var functionColorPairs = { };
-var currentColorIndex = 0;
 
 var index = 0;
-var entries = [];
+var entries = /** @type {Array.!WebInspector.FlameChart.Entry} */ ([]);
 
 var openIntervals = [];
 var stackTrace = [];
@@ -366,16 +371,8 @@
 while (node) {
 var colorPair = colorGenerator._colorPairForID(node.functionName + : + node.url + : + node.lineNumber);
 
-entries.push({
-

[webkit-changes] [147213] trunk/Source/WebCore

[loislo]

Title: [147213] trunk/Source/WebCore








Revision 147213
Author loi...@chromium.org
Date 2013-03-29 06:56:55 -0700 (Fri, 29 Mar 2013)


Log Message
Web Inspector: Flame Chart. Developers will have more clue
if two different profiles will have same colors for same functions.
https://bugs.webkit.org/show_bug.cgi?id=113410

Reviewed by Pavel Feldman.

The code related to color generator was extracted into a separate class.
The instance of the class was stored as static private member of the FlameChart class,
so all the profiles will share the same instance and will use same colors.
The colors itself were slightly adjusted.

Drive by fix: coordinatesToNodeIndex was fixed. The error was introduced in the patch about left padding.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.ColorGenerator):
(WebInspector.FlameChart.ColorGenerator.prototype._colorPairForID):
(WebInspector.FlameChart.prototype._calculateTimelineData):
(WebInspector.FlameChart.prototype._calculateTimelineDataForSamples):
(WebInspector.FlameChart.prototype._coordinatesToNodeIndex):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (147212 => 147213)

--- trunk/Source/WebCore/ChangeLog	2013-03-29 13:18:39 UTC (rev 147212)
+++ trunk/Source/WebCore/ChangeLog	2013-03-29 13:56:55 UTC (rev 147213)
@@ -1,3 +1,26 @@
+2013-03-29  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Developers will have more clue
+if two different profiles will have same colors for same functions.
+https://bugs.webkit.org/show_bug.cgi?id=113410
+
+Reviewed by Pavel Feldman.
+
+The code related to color generator was extracted into a separate class.
+The instance of the class was stored as static private member of the FlameChart class,
+so all the profiles will share the same instance and will use same colors.
+The colors itself were slightly adjusted.
+
+Drive by fix: coordinatesToNodeIndex was fixed. The error was introduced in the patch about left padding.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.ColorGenerator):
+(WebInspector.FlameChart.ColorGenerator.prototype._colorPairForID):
+(WebInspector.FlameChart.prototype._calculateTimelineData):
+(WebInspector.FlameChart.prototype._calculateTimelineDataForSamples):
+(WebInspector.FlameChart.prototype._coordinatesToNodeIndex):
+
 2013-03-29  Charles Wei  charles@torchmobile.com.cn
 
 [BlackBerry] Cleanup the CONTEXT_MENUS in BlackBerry porting


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (147212 => 147213)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-29 13:18:39 UTC (rev 147212)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-29 13:56:55 UTC (rev 147213)
@@ -70,6 +70,9 @@
 this._anchorElement.className = item-anchor;
 this._linkifier = new WebInspector.Linkifier();
 this._highlightedNodeIndex = -1;
+
+if (!WebInspector.FlameChart._colorGenerator)
+WebInspector.FlameChart._colorGenerator = new WebInspector.FlameChart.ColorGenerator();
 }
 
 /**
@@ -184,6 +187,33 @@
 SelectedNode: SelectedNode
 }
 
+/**
+ * @constructor
+ */
+WebInspector.FlameChart.ColorGenerator = function()
+{
+this._colorPairs = {};
+this._currentColorIndex = 0;
+}
+
+WebInspector.FlameChart.ColorGenerator.prototype = {
+/**
+ * @param {!string} id
+ */
+_colorPairForID: function(id)
+{
+var colorPairs = this._colorPairs;
+var colorPair = colorPairs[id];
+if (!colorPair) {
+var currentColorIndex = ++this._currentColorIndex;
+var hue = (currentColorIndex * 5 + 11 * (currentColorIndex % 2)) % 360;
+colorPairs[id] = colorPair = {highlighted: hsla( + hue + , 100%, 33%, 0.7), normal: hsla( + hue + , 100%, 66%, 0.7)};
+}
+return colorPair;
+}
+}
+
+
 WebInspector.FlameChart.prototype = {
 _onWindowChanged: function(event)
 {
@@ -253,19 +283,14 @@
 
 var levelOffsets = /** @type {Array.!number} */ ([0]);
 var levelExitIndexes = /** @type {Array.!number} */ ([0]);
+var colorGenerator = WebInspector.FlameChart._colorGenerator;
 
 while (stack.length) {
 var level = levelOffsets.length - 1;
 var node = stack.pop();
 var offset = levelOffsets[level];
 
-var functionUID = node.functionName + : + node.url + : + node.lineNumber;
-var colorPair = functionColorPairs[functionUID];
-if (!colorPair) {
-++currentColorIndex;
-var hue = (currentColorIndex * 5 + 11 * (currentColorIndex % 2)) % 360;
-functionColorPairs[functionUID] = colorPair = {highlighted: hsl( + hue + , 

[webkit-changes] [147224] trunk/Source/WebCore

[loislo]

Title: [147224] trunk/Source/WebCore








Revision 147224
Author loi...@chromium.org
Date 2013-03-29 09:47:27 -0700 (Fri, 29 Mar 2013)


Log Message
Web Inspector: Flame Chart. Remove hopping ancorElement and use anchorBox instead.
https://bugs.webkit.org/show_bug.cgi?id=113579

Reviewed by Pavel Feldman.

Initially I made a fake anchor element and moved it according to the highlighted element position.
It was a hack and after http://trac.webkit.org/changeset/147209 I'm able to remove it.

Drive by fix: the code was moved from onMouseMove to getPopoverAnchor.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.prototype._getPopoverAnchor):
-(WebInspector.FlameChart.prototype._onMouseMove)
* inspector/front-end/flameChart.css:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js
trunk/Source/WebCore/inspector/front-end/flameChart.css




Diff

Modified: trunk/Source/WebCore/ChangeLog (147223 => 147224)

--- trunk/Source/WebCore/ChangeLog	2013-03-29 16:37:59 UTC (rev 147223)
+++ trunk/Source/WebCore/ChangeLog	2013-03-29 16:47:27 UTC (rev 147224)
@@ -1,3 +1,21 @@
+2013-03-29  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Remove hopping ancorElement and use anchorBox instead.
+https://bugs.webkit.org/show_bug.cgi?id=113579
+
+Reviewed by Pavel Feldman.
+
+Initially I made a fake anchor element and moved it according to the highlighted element position.
+It was a hack and after http://trac.webkit.org/changeset/147209 I'm able to remove it.
+
+Drive by fix: the code was moved from onMouseMove to getPopoverAnchor.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.prototype._getPopoverAnchor):
+-(WebInspector.FlameChart.prototype._onMouseMove)
+* inspector/front-end/flameChart.css:
+
 2013-03-29  Kondapally Kalyan  kalyan.kondapa...@intel.com
 
 [EFL][EGL] Add support for creating offscreen surface.


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (147223 => 147224)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-29 16:37:59 UTC (rev 147223)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-29 16:47:27 UTC (rev 147224)
@@ -61,13 +61,11 @@
 this._barHeight = 15;
 this._minWidth = 1;
 this._paddingLeft = 15;
-this._canvas.addEventListener(mousemove, this._onMouseMove.bind(this), false);
 this._canvas.addEventListener(mousewheel, this._onMouseWheel.bind(this), false);
 this.element.addEventListener(click, this._onClick.bind(this), false);
 this._popoverHelper = new WebInspector.PopoverHelper(this._chartContainer, this._getPopoverAnchor.bind(this), this._showPopover.bind(this));
 this._popoverHelper.setTimeout(250);
-this._anchorElement = this._chartContainer.createChild(span);
-this._anchorElement.className = item-anchor;
+this._anchorBox = new AnchorBox(0, 0, 0, 0);
 this._linkifier = new WebInspector.Linkifier();
 this._highlightedNodeIndex = -1;
 
@@ -393,11 +391,36 @@
 return this._timelineData;
 },
 
-_getPopoverAnchor: function()
+_getPopoverAnchor: function(element, event)
 {
-if (this._highlightedNodeIndex === -1 || this._isDragging)
+if (this._isDragging)
 return null;
-return this._anchorElement;
+
+var nodeIndex = this._coordinatesToNodeIndex(event.offsetX, event.offsetY);
+
+this._highlightedNodeIndex = nodeIndex;
+this.update();
+
+if (nodeIndex === -1)
+return null;
+
+var timelineEntries = this._timelineData.entries;
+
+var anchorLeft = Math.floor(timelineEntries[nodeIndex].startTime * this._timeToPixel - this._pixelWindowLeft + this._paddingLeft);
+var anchorTop = Math.floor(this._canvas.height - (timelineEntries[nodeIndex].depth + 1) * this._barHeight);
+
+var anchorWidth = Math.floor(timelineEntries[nodeIndex].duration * this._timeToPixel);
+if (anchorLeft  0) {
+anchorWidth += anchorLeft;
+anchorLeft = 0;
+}
+
+anchorLeft = Number.constrain(anchorLeft, 0, this._canvas.width);
+anchorWidth = Number.constrain(anchorWidth, 0, this._canvas.width - anchorLeft);
+
+var canvasOffsetLeft = event.pageX - event.offsetX;
+var canvasOffsetTop = event.pageY - event.offsetY;
+return new AnchorBox(anchorLeft + canvasOffsetLeft, anchorTop + canvasOffsetTop, anchorWidth, this._barHeight);
 },
 
 _showPopover: function(anchor, popover)
@@ -434,35 +457,6 @@
 this.dispatchEventToListeners(WebInspector.FlameChart.Events.SelectedNode, node);
 },
 
-_onMouseMove: function(e)
-{
-if (this._isDragging)
-return;
-var nodeIndex = this._coordinatesToNodeIndex(e.offsetX, e.offsetY);
-if (nodeIndex 

[webkit-changes] [147076] trunk/Source/WebCore

[loislo]

Title: [147076] trunk/Source/WebCore








Revision 147076
Author loi...@chromium.org
Date 2013-03-28 00:40:37 -0700 (Thu, 28 Mar 2013)


Log Message
Web Inspector: Timeline. Refresh is slow when user drags the overview window.
https://bugs.webkit.org/show_bug.cgi?id=113371

Reviewed by Pavel Feldman.

The root of problem is the 300ms delay in scheduleRefresh method.
It was introduced for the case when we add a huge number of records per second.
The scheduleRefresh was written such a way that refresh happened immediately
only for the scrolling operations. Actually we would like to see fast
refresh every time when it is forced by an user action.

In this patch additional flag newRecordWasAdded was added to the
_invalidateAndScheduleRefresh. I made it mandatory because the function
is also used as a callback for an event and it is easy to make a mistake and
interpret the event as the flag.

* inspector/front-end/TimelinePanel.js:
(WebInspector.TimelinePanel.prototype._onCategoryCheckboxClicked):
(WebInspector.TimelinePanel.prototype._durationFilterChanged):
(WebInspector.TimelinePanel.prototype._repopulateRecords):
(WebInspector.TimelinePanel.prototype._onTimelineEventRecorded):
(WebInspector.TimelinePanel.prototype._onRecordsCleared):
(WebInspector.TimelinePanel.prototype._invalidateAndScheduleRefresh):
(WebInspector.TimelinePanel.prototype._scheduleRefresh):
(WebInspector.TimelinePanel.prototype._revealRecord):
(WebInspector.TimelinePanel.prototype._refreshRecords):
(WebInspector.TimelinePanel.prototype.performFilter):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/TimelinePanel.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (147075 => 147076)

--- trunk/Source/WebCore/ChangeLog	2013-03-28 07:29:03 UTC (rev 147075)
+++ trunk/Source/WebCore/ChangeLog	2013-03-28 07:40:37 UTC (rev 147076)
@@ -1,3 +1,33 @@
+2013-03-27  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Timeline. Refresh is slow when user drags the overview window.
+https://bugs.webkit.org/show_bug.cgi?id=113371
+
+Reviewed by Pavel Feldman.
+
+The root of problem is the 300ms delay in scheduleRefresh method.
+It was introduced for the case when we add a huge number of records per second.
+The scheduleRefresh was written such a way that refresh happened immediately
+only for the scrolling operations. Actually we would like to see fast
+refresh every time when it is forced by an user action.
+
+In this patch additional flag newRecordWasAdded was added to the
+_invalidateAndScheduleRefresh. I made it mandatory because the function
+is also used as a callback for an event and it is easy to make a mistake and
+interpret the event as the flag.
+
+* inspector/front-end/TimelinePanel.js:
+(WebInspector.TimelinePanel.prototype._onCategoryCheckboxClicked):
+(WebInspector.TimelinePanel.prototype._durationFilterChanged):
+(WebInspector.TimelinePanel.prototype._repopulateRecords):
+(WebInspector.TimelinePanel.prototype._onTimelineEventRecorded):
+(WebInspector.TimelinePanel.prototype._onRecordsCleared):
+(WebInspector.TimelinePanel.prototype._invalidateAndScheduleRefresh):
+(WebInspector.TimelinePanel.prototype._scheduleRefresh):
+(WebInspector.TimelinePanel.prototype._revealRecord):
+(WebInspector.TimelinePanel.prototype._refreshRecords):
+(WebInspector.TimelinePanel.prototype.performFilter):
+
 2013-03-27  Keishi Hattori  kei...@webkit.org
 
 Dragging to edge should always snap to min/max.


Modified: trunk/Source/WebCore/inspector/front-end/TimelinePanel.js (147075 => 147076)

--- trunk/Source/WebCore/inspector/front-end/TimelinePanel.js	2013-03-28 07:29:03 UTC (rev 147075)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePanel.js	2013-03-28 07:40:37 UTC (rev 147076)
@@ -53,7 +53,7 @@
 this._glueRecordsSetting = WebInspector.settings.createSetting(timelineGlueRecords, false);
 
 this._overviewPane = new WebInspector.TimelineOverviewPane(this._model);
-this._overviewPane.addEventListener(WebInspector.TimelineOverviewPane.Events.WindowChanged, this._invalidateAndScheduleRefresh.bind(this, false));
+this._overviewPane.addEventListener(WebInspector.TimelineOverviewPane.Events.WindowChanged, this._invalidateAndScheduleRefresh.bind(this, false, true));
 this._overviewPane.addEventListener(WebInspector.TimelineOverviewPane.Events.ModeChanged, this._overviewModeChanged, this);
 this._overviewPane.show(this.element);
 
@@ -328,7 +328,7 @@
 _onCategoryCheckboxClicked: function(category, event)
 {
 category.hidden = !event.target.checked;
-this._invalidateAndScheduleRefresh(true);
+this._invalidateAndScheduleRefresh(true, true);
 },
 
 /**
@@ -604,7 +604,7 @@
 this._durationFilter.setMinimumRecordDuration(minimumRecordDuration);
 

[webkit-changes] [146969] trunk/Source/WebCore

[loislo]

Title: [146969] trunk/Source/WebCore








Revision 146969
Author loi...@chromium.org
Date 2013-03-27 00:31:20 -0700 (Wed, 27 Mar 2013)


Log Message
Web Inspector: Timeline. Scroll dividers with the underlying events.
https://bugs.webkit.org/show_bug.cgi?id=113315

Reviewed by Pavel Feldman.

Now when TimelineGrid is able to draw dividers with any offset
we could cut away paddingLeft member of Timeline.Calculator
and clear the code of TimelineGrid.

* inspector/front-end/TimelineGrid.js:
(WebInspector.TimelineGrid.prototype.updateDividers):
* inspector/front-end/TimelinePanel.js:
(WebInspector.TimelinePanel.prototype._refresh):
(WebInspector.TimelineCalculator.prototype.computePosition):
(WebInspector.TimelineCalculator.prototype.setDisplayWindow):
(WebInspector.TimelineCalculator.prototype.grandMinimumBoundary):
* inspector/front-end/inspectorCommon.css:
(.resources-dividers-label-bar):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/TimelineGrid.js
trunk/Source/WebCore/inspector/front-end/TimelinePanel.js
trunk/Source/WebCore/inspector/front-end/inspectorCommon.css




Diff

Modified: trunk/Source/WebCore/ChangeLog (146968 => 146969)

--- trunk/Source/WebCore/ChangeLog	2013-03-27 07:08:30 UTC (rev 146968)
+++ trunk/Source/WebCore/ChangeLog	2013-03-27 07:31:20 UTC (rev 146969)
@@ -1,3 +1,24 @@
+2013-03-26  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Timeline. Scroll dividers with the underlying events.
+https://bugs.webkit.org/show_bug.cgi?id=113315
+
+Reviewed by Pavel Feldman.
+
+Now when TimelineGrid is able to draw dividers with any offset
+we could cut away paddingLeft member of Timeline.Calculator
+and clear the code of TimelineGrid.
+
+* inspector/front-end/TimelineGrid.js:
+(WebInspector.TimelineGrid.prototype.updateDividers):
+* inspector/front-end/TimelinePanel.js:
+(WebInspector.TimelinePanel.prototype._refresh):
+(WebInspector.TimelineCalculator.prototype.computePosition):
+(WebInspector.TimelineCalculator.prototype.setDisplayWindow):
+(WebInspector.TimelineCalculator.prototype.grandMinimumBoundary):
+* inspector/front-end/inspectorCommon.css:
+(.resources-dividers-label-bar):
+
 2013-03-27  Kondapally Kalyan  kalyan.kondapa...@intel.com
 
 [CoordGfx] Support to share GraphicsSurface flags with client.


Modified: trunk/Source/WebCore/inspector/front-end/TimelineGrid.js (146968 => 146969)

--- trunk/Source/WebCore/inspector/front-end/TimelineGrid.js	2013-03-27 07:08:30 UTC (rev 146968)
+++ trunk/Source/WebCore/inspector/front-end/TimelineGrid.js	2013-03-27 07:31:20 UTC (rev 146969)
@@ -89,9 +89,8 @@
 var divider = this._dividersElement.firstChild;
 var dividerLabelBar = this._dividersLabelBarElement.firstChild;
 
-var paddingLeft = calculator.paddingLeft;
 var sliceRemainder = (calculator.minimumBoundary() - calculator.grandMinimumBoundary()) % slice;
-for (var i = paddingLeft ? 0 : 1; i = dividerCount; ++i) {
+for (var i = 0; i = dividerCount; ++i) {
 if (!divider) {
 divider = document.createElement(div);
 divider.className = resources-divider;
@@ -106,7 +105,7 @@
 this._dividersLabelBarElement.appendChild(dividerLabelBar);
 }
 
-if (i === (paddingLeft ? 0 : 1)) {
+if (!i) {
 divider.addStyleClass(first);
 dividerLabelBar.addStyleClass(first);
 } else {
@@ -124,7 +123,7 @@
 
 var left;
 if (!slice) {
-left = dividersElementClientWidth / dividerCount * i + paddingLeft;
+left = dividersElementClientWidth / dividerCount * i;
 dividerLabelBar._labelElement.textContent = ;
 } else {
 left = calculator.computePosition(calculator.minimumBoundary() + slice * i - sliceRemainder);


Modified: trunk/Source/WebCore/inspector/front-end/TimelinePanel.js (146968 => 146969)

--- trunk/Source/WebCore/inspector/front-end/TimelinePanel.js	2013-03-27 07:08:30 UTC (rev 146968)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePanel.js	2013-03-27 07:31:20 UTC (rev 146969)
@@ -784,7 +784,7 @@
 delete this._refreshTimeout;
 }
 
-this._timelinePaddingLeft = !this._overviewPane.windowLeft() ? this._expandOffset : 0;
+this._timelinePaddingLeft = this._expandOffset;
 this._calculator.setWindow(this._overviewPane.windowStartTime(), this._overviewPane.windowEndTime());
 this._calculator.setDisplayWindow(this._timelinePaddingLeft, this._graphRowsElementWidth);
 
@@ -1292,7 +1292,7 @@
  */
 computePosition: function(time)
 {
-return (time - this._minimumBoundary) / this.boundarySpan() * this._workingArea + this.paddingLeft;
+return (time - this._minimumBoundary) / 

[webkit-changes] [146970] trunk/Source/WebCore

[loislo]

Title: [146970] trunk/Source/WebCore








Revision 146970
Author loi...@chromium.org
Date 2013-03-27 01:01:06 -0700 (Wed, 27 Mar 2013)


Log Message
Unreviewed. Web Inspector. rename method Timeline.Calculator.grandMinimumBoundary to Timeline.Calculator.zeroTime

No changes in behaviour.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart.Calculator.prototype.zeroTime):
(WebInspector.FlameChart.OverviewCalculator.prototype.zeroTime):
* inspector/front-end/NetworkPanel.js:
(WebInspector.NetworkBaseCalculator.prototype.zeroTime):
* inspector/front-end/TimelineGrid.js:
(WebInspector.TimelineGrid.prototype.updateDividers):
(WebInspector.TimelineGrid.Calculator.prototype.zeroTime):
* inspector/front-end/TimelineOverviewPane.js:
(WebInspector.TimelineOverviewCalculator.prototype.zeroTime):
* inspector/front-end/TimelinePanel.js:
(WebInspector.TimelineCalculator.prototype.zeroTime):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js
trunk/Source/WebCore/inspector/front-end/NetworkPanel.js
trunk/Source/WebCore/inspector/front-end/TimelineGrid.js
trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js
trunk/Source/WebCore/inspector/front-end/TimelinePanel.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146969 => 146970)

--- trunk/Source/WebCore/ChangeLog	2013-03-27 07:31:20 UTC (rev 146969)
+++ trunk/Source/WebCore/ChangeLog	2013-03-27 08:01:06 UTC (rev 146970)
@@ -1,3 +1,22 @@
+2013-03-27  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed. Web Inspector. rename method Timeline.Calculator.grandMinimumBoundary to Timeline.Calculator.zeroTime
+
+No changes in behaviour.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart.Calculator.prototype.zeroTime):
+(WebInspector.FlameChart.OverviewCalculator.prototype.zeroTime):
+* inspector/front-end/NetworkPanel.js:
+(WebInspector.NetworkBaseCalculator.prototype.zeroTime):
+* inspector/front-end/TimelineGrid.js:
+(WebInspector.TimelineGrid.prototype.updateDividers):
+(WebInspector.TimelineGrid.Calculator.prototype.zeroTime):
+* inspector/front-end/TimelineOverviewPane.js:
+(WebInspector.TimelineOverviewCalculator.prototype.zeroTime):
+* inspector/front-end/TimelinePanel.js:
+(WebInspector.TimelineCalculator.prototype.zeroTime):
+
 2013-03-26  Ilya Tikhonovsky  loi...@chromium.org
 
 Web Inspector: Timeline. Scroll dividers with the underlying events.


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (146969 => 146970)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-27 07:31:20 UTC (rev 146969)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-27 08:01:06 UTC (rev 146970)
@@ -113,7 +113,7 @@
 return this._minimumBoundaries;
 },
 
-grandMinimumBoundary: function()
+zeroTime: function()
 {
 return 0;
 },
@@ -166,7 +166,7 @@
 return this._minimumBoundaries;
 },
 
-grandMinimumBoundary: function()
+zeroTime: function()
 {
 return this._minimumBoundaries;
 },


Modified: trunk/Source/WebCore/inspector/front-end/NetworkPanel.js (146969 => 146970)

--- trunk/Source/WebCore/inspector/front-end/NetworkPanel.js	2013-03-27 07:31:20 UTC (rev 146969)
+++ trunk/Source/WebCore/inspector/front-end/NetworkPanel.js	2013-03-27 08:01:06 UTC (rev 146970)
@@ -1792,7 +1792,7 @@
 return this._minimumBoundary;
 },
 
-grandMinimumBoundary: function()
+zeroTime: function()
 {
 return this._minimumBoundary;
 },


Modified: trunk/Source/WebCore/inspector/front-end/TimelineGrid.js (146969 => 146970)

--- trunk/Source/WebCore/inspector/front-end/TimelineGrid.js	2013-03-27 07:31:20 UTC (rev 146969)
+++ trunk/Source/WebCore/inspector/front-end/TimelineGrid.js	2013-03-27 08:01:06 UTC (rev 146970)
@@ -89,7 +89,7 @@
 var divider = this._dividersElement.firstChild;
 var dividerLabelBar = this._dividersLabelBarElement.firstChild;
 
-var sliceRemainder = (calculator.minimumBoundary() - calculator.grandMinimumBoundary()) % slice;
+var sliceRemainder = (calculator.minimumBoundary() - calculator.zeroTime()) % slice;
 for (var i = 0; i = dividerCount; ++i) {
 if (!divider) {
 divider = document.createElement(div);
@@ -231,7 +231,7 @@
 minimumBoundary: function() { },
 
 /** @return {number} */
-grandMinimumBoundary: function() { },
+zeroTime: function() { },
 
 /** @return {number} */
 maximumBoundary: function() { },


Modified: trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js (146969 => 146970)

--- trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js	2013-03-27 07:31:20 UTC (rev 146969)
+++ trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js	2013-03-27 08:01:06 UTC (rev 146970)
@@ -401,7 +401,7 @@
 

[webkit-changes] [146981] trunk/Source/WebCore

[loislo]

Title: [146981] trunk/Source/WebCore








Revision 146981
Author loi...@chromium.org
Date 2013-03-27 07:22:19 -0700 (Wed, 27 Mar 2013)


Log Message
Web Inspector: FlameChart. Provide 15px padding left for the chart so developers will see the first divider with '0' title.
https://bugs.webkit.org/show_bug.cgi?id=113404

Reviewed by Pavel Feldman.

15px paddingLeft was added to the code for the chart.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.Calculator.prototype._updateBoundaries):
(WebInspector.FlameChart.Calculator.prototype.computePosition):
(WebInspector.FlameChart.prototype.draw):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146980 => 146981)

--- trunk/Source/WebCore/ChangeLog	2013-03-27 14:18:33 UTC (rev 146980)
+++ trunk/Source/WebCore/ChangeLog	2013-03-27 14:22:19 UTC (rev 146981)
@@ -1,3 +1,18 @@
+2013-03-27  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: FlameChart. Provide 15px padding left for the chart so developers will see the first divider with '0' title.
+https://bugs.webkit.org/show_bug.cgi?id=113404
+
+Reviewed by Pavel Feldman.
+
+15px paddingLeft was added to the code for the chart.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.Calculator.prototype._updateBoundaries):
+(WebInspector.FlameChart.Calculator.prototype.computePosition):
+(WebInspector.FlameChart.prototype.draw):
+
 2013-03-27  Kent Tamura  tk...@chromium.org
 
 Rename HTMLFormControlElement::readOnly to isReadOnly


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (146980 => 146981)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-27 14:18:33 UTC (rev 146980)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-27 14:22:19 UTC (rev 146981)
@@ -60,6 +60,7 @@
 this._windowRight = 1.0;
 this._barHeight = 15;
 this._minWidth = 1;
+this._paddingLeft = 15;
 this._canvas.addEventListener(mousemove, this._onMouseMove.bind(this), false);
 this._canvas.addEventListener(mousewheel, this._onMouseWheel.bind(this), false);
 this.element.addEventListener(click, this._onClick.bind(this), false);
@@ -87,7 +88,9 @@
 {
 this._minimumBoundaries = flameChart._windowLeft * flameChart._timelineData.totalTime;
 this._maximumBoundaries = flameChart._windowRight * flameChart._timelineData.totalTime;
-this._timeToPixel = flameChart._canvas.width / this.boundarySpan();
+this._paddingLeft = flameChart._paddingLeft;
+this._width = flameChart._canvas.width - this._paddingLeft;
+this._timeToPixel = this._width / this.boundarySpan();
 },
 
 /**
@@ -95,7 +98,7 @@
  */
 computePosition: function(time)
 {
-return (time - this._minimumBoundaries) * this._timeToPixel;
+return (time - this._minimumBoundaries) * this._timeToPixel + this._paddingLeft;
 },
 
 formatTime: function(value)
@@ -531,7 +534,8 @@
 var barHeight = this._barHeight;
 
 var context = this._canvas.getContext(2d);
-var paddingLeft = 2;
+var textPaddingLeft = 2;
+var paddingLeft = this._paddingLeft;
 context.font = (barHeight - 3) + px sans-serif;
 context.textBaseline = top;
 this._dotsWidth = context.measureText(\u2026).width;
@@ -556,16 +560,16 @@
 color = colorPair.normal;
 
 context.beginPath();
-context.rect(x, y, barWidth - 1, barHeight - 1);
+context.rect(x + paddingLeft, y, barWidth - 1, barHeight - 1);
 context.fillStyle = color;
 context.fill();
 
-var xText = Math.max(0, x);
-var widthText = barWidth - paddingLeft + x - xText;
-var title = this._prepareTitle(context, timelineData.entries[i].node.functionName, barWidth - paddingLeft - xText + x);
+var xText = Math.max(0, x + paddingLeft);
+var widthText = barWidth - textPaddingLeft + x - xText;
+var title = this._prepareTitle(context, timelineData.entries[i].node.functionName, widthText);
 if (title) {
 context.fillStyle = #333;
-context.fillText(title, xText + paddingLeft, y - 1);
+context.fillText(title, xText + textPaddingLeft, y - 1);
 }
 }
 },






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [146987] trunk/Source/WebCore

[loislo]

Title: [146987] trunk/Source/WebCore








Revision 146987
Author loi...@chromium.org
Date 2013-03-27 08:35:45 -0700 (Wed, 27 Mar 2013)


Log Message
Web Inspector: CPU profiler. Swap FlameChart with Data Grid.
https://bugs.webkit.org/show_bug.cgi?id=113395

Reviewed by Pavel Feldman.

Looks like FlameChart is more powerful and flexible instrument
than plain old ProfileTree in DataGrid. The same action like
'look for the most expensive function in a frame' could be easily
done with FlameChart and need number of clicks in DataGrid.
So in an offline discussion we decided to place FlameChart on top of DataGrid.

* inspector/front-end/CPUProfileView.js:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/CPUProfileView.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146986 => 146987)

--- trunk/Source/WebCore/ChangeLog	2013-03-27 14:53:41 UTC (rev 146986)
+++ trunk/Source/WebCore/ChangeLog	2013-03-27 15:35:45 UTC (rev 146987)
@@ -1,3 +1,18 @@
+2013-03-27  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: CPU profiler. Swap FlameChart with Data Grid.
+https://bugs.webkit.org/show_bug.cgi?id=113395
+
+Reviewed by Pavel Feldman.
+
+Looks like FlameChart is more powerful and flexible instrument
+than plain old ProfileTree in DataGrid. The same action like
+'look for the most expensive function in a frame' could be easily
+done with FlameChart and need number of clicks in DataGrid.
+So in an offline discussion we decided to place FlameChart on top of DataGrid.
+
+* inspector/front-end/CPUProfileView.js:
+
 2013-03-27  Chris Fleizach  cfleiz...@apple.com
 
 Regression in tests due to https://bugs.webkit.org/show_bug.cgi?id=113339


Modified: trunk/Source/WebCore/inspector/front-end/CPUProfileView.js (146986 => 146987)

--- trunk/Source/WebCore/inspector/front-end/CPUProfileView.js	2013-03-27 14:53:41 UTC (rev 146986)
+++ trunk/Source/WebCore/inspector/front-end/CPUProfileView.js	2013-03-27 15:35:45 UTC (rev 146987)
@@ -56,11 +56,11 @@
 this._splitView = new WebInspector.SplitView(false, flameChartSplitLocation);
 this._splitView.show(this.element);
 
-this.dataGrid.show(this._splitView.firstElement());
-
 this.flameChart = new WebInspector.FlameChart(this);
 this.flameChart.addEventListener(WebInspector.FlameChart.Events.SelectedNode, this._revealProfilerNode.bind(this));
-this.flameChart.show(this._splitView.secondElement());
+this.flameChart.show(this._splitView.firstElement());
+
+this.dataGrid.show(this._splitView.secondElement());
 } else
 this.dataGrid.show(this.element);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [146858] trunk/Source/WebCore

[loislo]

Title: [146858] trunk/Source/WebCore








Revision 146858
Author loi...@chromium.org
Date 2013-03-26 01:20:18 -0700 (Tue, 26 Mar 2013)


Log Message
Web Inspector: [FlameChart] Make function bar highlighted consistent with cursor.
https://bugs.webkit.org/show_bug.cgi?id=113266.

Patch by Pan Deng pan.d...@intel.com on 2013-03-26
Reviewed by Vsevolod Vlasov.

In Flamechart, the highlighted function bar is not consistent with cursor sometimes,
reason is that time range that converted from cursor position is truncated by floor.
Actually float value is expected to compare with function startTime and duration.

No new tests.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart.prototype._coordinatesToNodeIndex): Remove floor

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146857 => 146858)

--- trunk/Source/WebCore/ChangeLog	2013-03-26 08:09:26 UTC (rev 146857)
+++ trunk/Source/WebCore/ChangeLog	2013-03-26 08:20:18 UTC (rev 146858)
@@ -1,3 +1,19 @@
+2013-03-26  Pan Deng  pan.d...@intel.com
+
+Web Inspector: [FlameChart] Make function bar highlighted consistent with cursor.
+https://bugs.webkit.org/show_bug.cgi?id=113266.
+
+Reviewed by Vsevolod Vlasov.
+
+In Flamechart, the highlighted function bar is not consistent with cursor sometimes, 
+reason is that time range that converted from cursor position is truncated by floor. 
+Actually float value is expected to compare with function startTime and duration.
+
+No new tests.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart.prototype._coordinatesToNodeIndex): Remove floor
+
 2013-03-26  Mihnea Ovidenie  mih...@adobe.com
 
 [CSSRegions]: Crash accessing offsetParent for contentNodes inside a flow thread


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (146857 => 146858)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-26 08:09:26 UTC (rev 146857)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-26 08:20:18 UTC (rev 146858)
@@ -451,7 +451,7 @@
 if (!timelineData)
 return -1;
 var timelineEntries = timelineData.entries;
-var cursorTime = Math.floor((x + this._pixelWindowLeft) * this._pixelToTime);
+var cursorTime = (x + this._pixelWindowLeft) * this._pixelToTime;
 var cursorLevel = Math.floor((this._canvas.height - y) / this._barHeight);
 
 for (var i = 0; i  timelineEntries.length; ++i) {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [146866] trunk/Source/WebCore

[loislo]

Title: [146866] trunk/Source/WebCore








Revision 146866
Author loi...@chromium.org
Date 2013-03-26 04:23:26 -0700 (Tue, 26 Mar 2013)


Log Message
Web Inspector: OverviewGrid. Dragged window may change its width due to accumulating rounding error.
https://bugs.webkit.org/show_bug.cgi?id=113138

Reviewed by Pavel Feldman.

The old version had problem with rounding because it recalculates the window size on each event.
The new version just calculates the dragging delta and moves the window
to the new position based on the initial values and the delta.

* inspector/front-end/OverviewGrid.js:
(WebInspector.OverviewGrid.Window.prototype._startWindowDragging):
(WebInspector.OverviewGrid.Window.prototype._windowDragging):
(WebInspector.OverviewGrid.Window.prototype._onMouseWheel):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/OverviewGrid.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146865 => 146866)

--- trunk/Source/WebCore/ChangeLog	2013-03-26 10:44:18 UTC (rev 146865)
+++ trunk/Source/WebCore/ChangeLog	2013-03-26 11:23:26 UTC (rev 146866)
@@ -1,3 +1,19 @@
+2013-03-26  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: OverviewGrid. Dragged window may change its width due to accumulating rounding error.
+https://bugs.webkit.org/show_bug.cgi?id=113138
+
+Reviewed by Pavel Feldman.
+
+The old version had problem with rounding because it recalculates the window size on each event.
+The new version just calculates the dragging delta and moves the window
+to the new position based on the initial values and the delta.
+
+* inspector/front-end/OverviewGrid.js:
+(WebInspector.OverviewGrid.Window.prototype._startWindowDragging):
+(WebInspector.OverviewGrid.Window.prototype._windowDragging):
+(WebInspector.OverviewGrid.Window.prototype._onMouseWheel):
+
 2013-03-26  Kent Tamura  tk...@chromium.org
 
 Rename HTMLInputElement::isIndeterminate to Element::shouldAppearIndeterminate


Modified: trunk/Source/WebCore/inspector/front-end/OverviewGrid.js (146865 => 146866)

--- trunk/Source/WebCore/inspector/front-end/OverviewGrid.js	2013-03-26 10:44:18 UTC (rev 146865)
+++ trunk/Source/WebCore/inspector/front-end/OverviewGrid.js	2013-03-26 11:23:26 UTC (rev 146866)
@@ -305,8 +305,9 @@
  */
 _startWindowDragging: function(event)
 {
-var windowLeft = this._leftResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
-this._dragOffset = windowLeft - event.pageX;
+this._dragStartPoint = event.pageX;
+this._dragStartLeft = this.windowLeft;
+this._dragStartRight = this.windowRight;
 return true;
 },
 
@@ -315,10 +316,15 @@
  */
 _windowDragging: function(event)
 {
-var windowLeft = this._leftResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
-var start = this._dragOffset + event.pageX;
-this._moveWindow(start);
 event.preventDefault();
+var delta = (event.pageX - this._dragStartPoint) / this._parentElement.clientWidth;
+if (this._dragStartLeft + delta  0)
+delta = -this._dragStartLeft;
+
+if (this._dragStartRight + delta  1)
+delta = 1 - this._dragStartRight;
+
+this._setWindow(this._dragStartLeft + delta, this._dragStartRight + delta);
 },
 
 /**
@@ -332,28 +338,6 @@
 /**
  * @param {number} start
  */
-_moveWindow: function(start)
-{
-var windowLeft = this._leftResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
-var windowRight = this._rightResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
-var windowSize = windowRight - windowLeft;
-var end = start + windowSize;
-
-if (start  0) {
-start = 0;
-end = windowSize;
-}
-
-if (end  this._parentElement.clientWidth) {
-end = this._parentElement.clientWidth;
-start = end - windowSize;
-}
-this._setWindowPosition(start, end);
-},
-
-/**
- * @param {number} start
- */
 _resizeWindowLeft: function(start)
 {
 // Glue to edge.
@@ -428,9 +412,18 @@
 this._zoom(Math.pow(zoomFactor, -event.wheelDeltaY * mouseWheelZoomSpeed), referencePoint);
 }
 if (typeof event.wheelDeltaX === number  event.wheelDeltaX) {
+var offset = Math.round(event.wheelDeltaX * WebInspector.OverviewGrid.WindowScrollSpeedFactor);
 var windowLeft = this._leftResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
-var start = windowLeft - Math.round(event.wheelDeltaX * WebInspector.OverviewGrid.WindowScrollSpeedFactor);
-this._moveWindow(start);
+var windowRight = this._rightResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
+
+if (windowLeft - offset  

[webkit-changes] [146890] trunk/Source/WebCore

[loislo]

Title: [146890] trunk/Source/WebCore








Revision 146890
Author loi...@chromium.org
Date 2013-03-26 08:54:21 -0700 (Tue, 26 Mar 2013)


Log Message
Web Inspector: Flame Chart. Scroll dividers together with underlying chart.
http://bugs.webkit.org/show_bug.cgi?id=113080

Reviewed by Pavel Feldman.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart.Calculator.prototype.grandMinimumBoundary):
(WebInspector.FlameChart.prototype._canvasDragging):
* inspector/front-end/TimelineGrid.js:
(WebInspector.TimelineGrid.prototype.updateDividers):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js
trunk/Source/WebCore/inspector/front-end/NetworkPanel.js
trunk/Source/WebCore/inspector/front-end/TimelineGrid.js
trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js
trunk/Source/WebCore/inspector/front-end/TimelinePanel.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146889 => 146890)

--- trunk/Source/WebCore/ChangeLog	2013-03-26 15:53:36 UTC (rev 146889)
+++ trunk/Source/WebCore/ChangeLog	2013-03-26 15:54:21 UTC (rev 146890)
@@ -1,3 +1,41 @@
+2013-03-22  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Scroll dividers together with underlying chart.
+http://bugs.webkit.org/show_bug.cgi?id=113080
+
+Reviewed by Pavel Feldman.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart.Calculator.prototype.grandMinimumBoundary):
+(WebInspector.FlameChart.prototype._canvasDragging):
+* inspector/front-end/TimelineGrid.js:
+(WebInspector.TimelineGrid.prototype.updateDividers):
+
+2013-03-26  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Scroll dividers together with underlying chart.
+http://bugs.webkit.org/show_bug.cgi?id=113080
+
+Reviewed by Pavel Feldman.
+
+The only thing we need to do for this feature is to automatically adjust
+the initial offset for the dividers. I measured the speed of scrolling and found
+no difference. The speed is about 16ms so we have 60fps on dragging.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart.Calculator.prototype.grandMinimumBoundary):
+(WebInspector.FlameChart.OverviewCalculator.prototype.grandMinimumBoundary):
+(WebInspector.FlameChart.prototype._canvasDragging):
+* inspector/front-end/NetworkPanel.js:
+(WebInspector.NetworkBaseCalculator.prototype.grandMinimumBoundary):
+* inspector/front-end/TimelineGrid.js:
+(WebInspector.TimelineGrid.prototype.updateDividers):
+(WebInspector.TimelineGrid.Calculator.prototype.grandMinimumBoundary):
+* inspector/front-end/TimelineOverviewPane.js:
+(WebInspector.TimelineOverviewCalculator.prototype.grandMinimumBoundary):
+* inspector/front-end/TimelinePanel.js:
+(WebInspector.TimelineCalculator.prototype.grandMinimumBoundary):
+
 2013-03-26  Mike West  mk...@chromium.org
 
 CSP 1.1: Experiment with 'base-uri' directive.


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (146889 => 146890)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-26 15:53:36 UTC (rev 146889)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-26 15:54:21 UTC (rev 146890)
@@ -113,6 +113,11 @@
 return this._minimumBoundaries;
 },
 
+grandMinimumBoundary: function()
+{
+return 0;
+},
+
 boundarySpan: function()
 {
 return this._maximumBoundaries - this._minimumBoundaries;
@@ -161,6 +166,11 @@
 return this._minimumBoundaries;
 },
 
+grandMinimumBoundary: function()
+{
+return this._minimumBoundaries;
+},
+
 boundarySpan: function()
 {
 return this._maximumBoundaries - this._minimumBoundaries;
@@ -204,7 +214,6 @@
 if (windowRight === this._windowRight)
 return;
 windowShift = windowRight - this._dragStartWindowRight;
-
 this._overviewGrid.setWindow(this._dragStartWindowLeft + windowShift, this._dragStartWindowRight + windowShift);
 },
 


Modified: trunk/Source/WebCore/inspector/front-end/NetworkPanel.js (146889 => 146890)

--- trunk/Source/WebCore/inspector/front-end/NetworkPanel.js	2013-03-26 15:53:36 UTC (rev 146889)
+++ trunk/Source/WebCore/inspector/front-end/NetworkPanel.js	2013-03-26 15:54:21 UTC (rev 146890)
@@ -1792,6 +1792,11 @@
 return this._minimumBoundary;
 },
 
+grandMinimumBoundary: function()
+{
+return this._minimumBoundary;
+},
+
 _value: function(item)
 {
 return 0;


Modified: trunk/Source/WebCore/inspector/front-end/TimelineGrid.js (146889 => 146890)

--- trunk/Source/WebCore/inspector/front-end/TimelineGrid.js	2013-03-26 15:53:36 UTC (rev 146889)
+++ trunk/Source/WebCore/inspector/front-end/TimelineGrid.js	2013-03-26 15:54:21 UTC (rev 146890)
@@ -90,6 +90,7 @@
   

[webkit-changes] [146893] trunk/Source/WebCore

[loislo]

Title: [146893] trunk/Source/WebCore








Revision 146893
Author loi...@chromium.org
Date 2013-03-26 09:02:30 -0700 (Tue, 26 Mar 2013)


Log Message
Unreviewed. WebInspector: remove unnecessary method.

* inspector/front-end/OverviewGrid.js:
(WebInspector.OverviewGrid.Window):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/OverviewGrid.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146892 => 146893)

--- trunk/Source/WebCore/ChangeLog	2013-03-26 16:00:06 UTC (rev 146892)
+++ trunk/Source/WebCore/ChangeLog	2013-03-26 16:02:30 UTC (rev 146893)
@@ -1,3 +1,10 @@
+2013-03-26  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed. WebInspector: remove unnecessary method.
+
+* inspector/front-end/OverviewGrid.js:
+(WebInspector.OverviewGrid.Window):
+
 2013-03-22  Ilya Tikhonovsky  loi...@chromium.org
 
 Web Inspector: Flame Chart. Scroll dividers together with underlying chart.


Modified: trunk/Source/WebCore/inspector/front-end/OverviewGrid.js (146892 => 146893)

--- trunk/Source/WebCore/inspector/front-end/OverviewGrid.js	2013-03-26 16:00:06 UTC (rev 146892)
+++ trunk/Source/WebCore/inspector/front-end/OverviewGrid.js	2013-03-26 16:02:30 UTC (rev 146893)
@@ -179,7 +179,7 @@
 this._dividersLabelBarElement = dividersLabelBarElement;
 
 WebInspector.installDragHandle(this._parentElement, this._startWindowSelectorDragging.bind(this), this._windowSelectorDragging.bind(this), this._endWindowSelectorDragging.bind(this), ew-resize);
-WebInspector.installDragHandle(this._dividersLabelBarElement, this._startWindowDragging.bind(this), this._windowDragging.bind(this), this._endWindowDragging.bind(this), move);
+WebInspector.installDragHandle(this._dividersLabelBarElement, this._startWindowDragging.bind(this), this._windowDragging.bind(this), null, move);
 
 this.windowLeft = 0.0;
 this.windowRight = 1.0;
@@ -328,14 +328,6 @@
 },
 
 /**
- * @param {Event} event
- */
-_endWindowDragging: function(event)
-{
-delete this._dragOffset;
-},
-
-/**
  * @param {number} start
  */
 _resizeWindowLeft: function(start)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [146577] trunk/Source/WebCore

[loislo]

Title: [146577] trunk/Source/WebCore








Revision 146577
Author loi...@chromium.org
Date 2013-03-22 02:00:08 -0700 (Fri, 22 Mar 2013)


Log Message
Web Inspector: Flame Chart. move overview window when user scrolls the chart.
https://bugs.webkit.org/show_bug.cgi?id=113014

Reviewed by Yury Semikhatsky.

I found that I could use scaling mechanics in OverviewGrid for scaling the chart.
But the dragging part was not so simple due to the different approaches in
OverviewGrid and FlameChart. OverviewGrid used _windowLeft and _windowRight
when FlameChart used _xOffset and _xScaleFactor and width.
It was not practical and I rewrote the FlameChart mechanics
and now it also uses _windowLeft _windowRight.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.Calculator.prototype._updateBoundaries):
(WebInspector.FlameChart.Calculator.prototype.computePosition):
(WebInspector.FlameChart.prototype._onWindowChanged):
(WebInspector.FlameChart.prototype._startCanvasDragging):
(WebInspector.FlameChart.prototype._canvasDragging):
(WebInspector.FlameChart.prototype._onMouseMove):
(WebInspector.FlameChart.prototype._onMouseWheel):
(WebInspector.FlameChart.prototype._coordinatesToNodeIndex):
(WebInspector.FlameChart.prototype._drawOverviewCanvas):
(WebInspector.FlameChart.prototype.draw):
(WebInspector.FlameChart.prototype._updateBoundaries):
(WebInspector.FlameChart.prototype.update):
* inspector/front-end/OverviewGrid.js:
(WebInspector.OverviewGrid.prototype.setWindowPosition):
(WebInspector.OverviewGrid.prototype.setWindow):
(WebInspector.OverviewGrid.prototype.addEventListener):
(WebInspector.OverviewGrid.prototype.zoom):
(WebInspector.OverviewGrid.Window.prototype._zoom):
* inspector/front-end/inspectorCommon.css:
(.overview-grid-window-rulers):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js
trunk/Source/WebCore/inspector/front-end/OverviewGrid.js
trunk/Source/WebCore/inspector/front-end/inspectorCommon.css




Diff

Modified: trunk/Source/WebCore/ChangeLog (146576 => 146577)

--- trunk/Source/WebCore/ChangeLog	2013-03-22 08:52:32 UTC (rev 146576)
+++ trunk/Source/WebCore/ChangeLog	2013-03-22 09:00:08 UTC (rev 146577)
@@ -1,3 +1,40 @@
+2013-03-22  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. move overview window when user scrolls the chart.
+https://bugs.webkit.org/show_bug.cgi?id=113014
+
+Reviewed by Yury Semikhatsky.
+
+I found that I could use scaling mechanics in OverviewGrid for scaling the chart.
+But the dragging part was not so simple due to the different approaches in
+OverviewGrid and FlameChart. OverviewGrid used _windowLeft and _windowRight
+when FlameChart used _xOffset and _xScaleFactor and width.
+It was not practical and I rewrote the FlameChart mechanics
+and now it also uses _windowLeft _windowRight.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.Calculator.prototype._updateBoundaries):
+(WebInspector.FlameChart.Calculator.prototype.computePosition):
+(WebInspector.FlameChart.prototype._onWindowChanged):
+(WebInspector.FlameChart.prototype._startCanvasDragging):
+(WebInspector.FlameChart.prototype._canvasDragging):
+(WebInspector.FlameChart.prototype._onMouseMove):
+(WebInspector.FlameChart.prototype._onMouseWheel):
+(WebInspector.FlameChart.prototype._coordinatesToNodeIndex):
+(WebInspector.FlameChart.prototype._drawOverviewCanvas):
+(WebInspector.FlameChart.prototype.draw):
+(WebInspector.FlameChart.prototype._updateBoundaries):
+(WebInspector.FlameChart.prototype.update):
+* inspector/front-end/OverviewGrid.js:
+(WebInspector.OverviewGrid.prototype.setWindowPosition):
+(WebInspector.OverviewGrid.prototype.setWindow):
+(WebInspector.OverviewGrid.prototype.addEventListener):
+(WebInspector.OverviewGrid.prototype.zoom):
+(WebInspector.OverviewGrid.Window.prototype._zoom):
+* inspector/front-end/inspectorCommon.css:
+(.overview-grid-window-rulers):
+
 2013-03-22  Steve Block  stevebl...@chromium.org
 
 Move GeolocationClient.h to Modules/geolocation/


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (146576 => 146577)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-22 08:52:32 UTC (rev 146576)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-22 09:00:08 UTC (rev 146577)
@@ -57,12 +57,13 @@
 
 this._cpuProfileView = cpuProfileView;
 this._xScaleFactor = 4.0;
-this._xOffset = 0;
+this._windowLeft = 0.0;
+this._windowRight = 1.0;
 this._barHeight = 10;
 this._minWidth = 1;
-this._canvas.addEventListener(mousemove, this._onMouseMove.bind(this));
-this._canvas.addEventListener(mousewheel, 

[webkit-changes] [146591] trunk/Source/WebCore

[loislo]

Title: [146591] trunk/Source/WebCore








Revision 146591
Author loi...@chromium.org
Date 2013-03-22 05:04:53 -0700 (Fri, 22 Mar 2013)


Log Message
Web Inspector: Flame Chart. Chart has to be zoomed around the mouse pointer.
https://bugs.webkit.org/show_bug.cgi?id=113031

Reviewed by Yury Semikhatsky.

Overview grid is able to zoom around the mouse pointer.
So the simplest way is to translate x coordinate of the mouse pointer hovered over the chart
to x coordinate in term of overview window and pass it to the zoom function.

Minor unrelated fix: draw small border at bottom of the overview grid.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart.prototype._onMouseWheel):
* inspector/front-end/OverviewGrid.js:
(WebInspector.OverviewGrid.prototype.zoom):
* inspector/front-end/flameChart.css:
(#flame-chart-overview-container):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js
trunk/Source/WebCore/inspector/front-end/OverviewGrid.js
trunk/Source/WebCore/inspector/front-end/flameChart.css




Diff

Modified: trunk/Source/WebCore/ChangeLog (146590 => 146591)

--- trunk/Source/WebCore/ChangeLog	2013-03-22 11:58:21 UTC (rev 146590)
+++ trunk/Source/WebCore/ChangeLog	2013-03-22 12:04:53 UTC (rev 146591)
@@ -1,3 +1,23 @@
+2013-03-22  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Chart has to be zoomed around the mouse pointer.
+https://bugs.webkit.org/show_bug.cgi?id=113031
+
+Reviewed by Yury Semikhatsky.
+
+Overview grid is able to zoom around the mouse pointer.
+So the simplest way is to translate x coordinate of the mouse pointer hovered over the chart
+to x coordinate in term of overview window and pass it to the zoom function.
+
+Minor unrelated fix: draw small border at bottom of the overview grid.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart.prototype._onMouseWheel):
+* inspector/front-end/OverviewGrid.js:
+(WebInspector.OverviewGrid.prototype.zoom):
+* inspector/front-end/flameChart.css:
+(#flame-chart-overview-container):
+
 2013-03-22  No'am Rosenthal  n...@webkit.org
 
 [Texmap] TextureMapperImageBuffer should not use rendering code for filters.


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (146590 => 146591)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-22 11:58:21 UTC (rev 146590)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-22 12:04:53 UTC (rev 146591)
@@ -436,7 +436,9 @@
 _onMouseWheel: function(e)
 {
 var zoomFactor = (e.wheelDelta  0) ? 0.9 : 1.1;
-this._overviewGrid.zoom(zoomFactor);
+var windowPoint = (this._pixelWindowLeft + e.offsetX) / this._totalPixels;
+var overviewReferencePoint = Math.floor(windowPoint * this._pixelWindowWidth);
+this._overviewGrid.zoom(zoomFactor, overviewReferencePoint);
 this._hidePopover();
 },
 


Modified: trunk/Source/WebCore/inspector/front-end/OverviewGrid.js (146590 => 146591)

--- trunk/Source/WebCore/inspector/front-end/OverviewGrid.js	2013-03-22 11:58:21 UTC (rev 146590)
+++ trunk/Source/WebCore/inspector/front-end/OverviewGrid.js	2013-03-22 12:04:53 UTC (rev 146591)
@@ -152,10 +152,11 @@
 
 /**
  * @param {!number} zoomFactor
+ * @param {!number} referencePoint
  */
-zoom: function(zoomFactor)
+zoom: function(zoomFactor, referencePoint)
 {
-this._window._zoom(zoomFactor);
+this._window._zoom(zoomFactor, referencePoint);
 }
 }
 
@@ -436,7 +437,7 @@
 
 /**
  * @param {number} factor
- * @param {number=} referencePoint
+ * @param {number} referencePoint
  */
 _zoom: function(factor, referencePoint)
 {


Modified: trunk/Source/WebCore/inspector/front-end/flameChart.css (146590 => 146591)

--- trunk/Source/WebCore/inspector/front-end/flameChart.css	2013-03-22 11:58:21 UTC (rev 146590)
+++ trunk/Source/WebCore/inspector/front-end/flameChart.css	2013-03-22 12:04:53 UTC (rev 146591)
@@ -22,3 +22,7 @@
 #flame-chart-overview-grid .resources-dividers-label-bar {
 pointer-events: auto;
 }
+
+#flame-chart-overview-container {
+border-bottom: 1px solid rgba(0, 0, 0, 0.3);
+}






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [146619] trunk/Source/WebCore

[loislo]

Title: [146619] trunk/Source/WebCore








Revision 146619
Author loi...@chromium.org
Date 2013-03-22 08:56:22 -0700 (Fri, 22 Mar 2013)


Log Message
Web Inspector: FlameChart. Draw function names over flame chart bar if they fit into the bar.
https://bugs.webkit.org/show_bug.cgi?id=113052

Reviewed by Vsevolod Vlasov.

The draw function will draw the bar title if the text is less than bar width.
Unfortunately almost all the projects which need to be profiled
use long function names with dots. So if the function name has dots and
doesn't fit into the space then prepareTitle will try to drop the prefix before dot.
If the title has no dots then the function will strip the tail of the title.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.prototype.draw):
(WebInspector.FlameChart.prototype._prepareTitle):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146618 => 146619)

--- trunk/Source/WebCore/ChangeLog	2013-03-22 15:55:11 UTC (rev 146618)
+++ trunk/Source/WebCore/ChangeLog	2013-03-22 15:56:22 UTC (rev 146619)
@@ -1,3 +1,21 @@
+2013-03-22  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: FlameChart. Draw function names over flame chart bar if they fit into the bar.
+https://bugs.webkit.org/show_bug.cgi?id=113052
+
+Reviewed by Vsevolod Vlasov.
+
+The draw function will draw the bar title if the text is less than bar width.
+Unfortunately almost all the projects which need to be profiled
+use long function names with dots. So if the function name has dots and
+doesn't fit into the space then prepareTitle will try to drop the prefix before dot.
+If the title has no dots then the function will strip the tail of the title.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.prototype.draw):
+(WebInspector.FlameChart.prototype._prepareTitle):
+
 2013-03-22  Vladislav Kaznacheev  kaznach...@chromium.org
 
 Web Inspector: Add hidden attribute to the recently added APIs in Inspector.json


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (146618 => 146619)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-22 15:55:11 UTC (rev 146618)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-22 15:56:22 UTC (rev 146619)
@@ -56,10 +56,9 @@
 WebInspector.installDragHandle(this._canvas, this._startCanvasDragging.bind(this), this._canvasDragging.bind(this), this._endCanvasDragging.bind(this), col-resize);
 
 this._cpuProfileView = cpuProfileView;
-this._xScaleFactor = 4.0;
 this._windowLeft = 0.0;
 this._windowRight = 1.0;
-this._barHeight = 10;
+this._barHeight = 15;
 this._minWidth = 1;
 this._canvas.addEventListener(mousemove, this._onMouseMove.bind(this), false);
 this._canvas.addEventListener(mousewheel, this._onMouseWheel.bind(this), false);
@@ -523,6 +522,10 @@
 var barHeight = this._barHeight;
 
 var context = this._canvas.getContext(2d);
+var paddingLeft = 2;
+context.font = (barHeight - 3) + px sans-serif;
+context.textBaseline = top;
+this._dotsWidth = context.measureText(\u2026).width;
 
 for (var i = 0; i  timelineEntries.length; ++i) {
 var startTime = timelineEntries[i].startTime;
@@ -547,9 +550,49 @@
 context.rect(x, y, barWidth - 1, barHeight - 1);
 context.fillStyle = color;
 context.fill();
+
+var xText = Math.max(0, x);
+var widthText = barWidth - paddingLeft + x - xText;
+var title = this._prepareTitle(context, timelineData.entries[i].node.functionName, barWidth - paddingLeft - xText + x);
+if (title) {
+context.fillStyle = #333;
+context.fillText(title, xText + paddingLeft, y - 1);
+}
 }
 },
 
+_prepareTitle: function(context, title, maxSize)
+{
+if (maxSize  this._dotsWidth)
+return null;
+var titleWidth = context.measureText(title).width;
+if (maxSize  titleWidth)
+return title;
+maxSize -= this._dotsWidth;
+var dotRegExp=/[\.\$]/g;
+var match = dotRegExp.exec(title);
+if (!match) {
+var visiblePartSize = maxSize / titleWidth;
+var newTextLength = Math.floor(title.length * visiblePartSize) + 1;
+var minTextLength = 4;
+if (newTextLength  minTextLength)
+return null;
+var substring;
+do {
+--newTextLength;
+substring = title.substring(0, newTextLength);
+} while (context.measureText(substring).width  maxSize);
+return title.substring(0, newTextLength) + \u2026;
+}
+

[webkit-changes] [146448] trunk/Source/WebCore

[loislo]

Title: [146448] trunk/Source/WebCore








Revision 146448
Author loi...@chromium.org
Date 2013-03-21 01:02:10 -0700 (Thu, 21 Mar 2013)


Log Message
Web Inspector: Flame Chart. draw background for the FlameChart overview pane with the CPU aggregated data.
https://bugs.webkit.org/show_bug.cgi?id=112823

Reviewed by Yury Semikhatsky.

The idea of the patch is to collect the data about stack depth for the each X
and draw a line with help of this data.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.prototype.onResize):
(WebInspector.FlameChart.prototype._drawOverviewCanvas):
(WebInspector.FlameChart.prototype.update):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146447 => 146448)

--- trunk/Source/WebCore/ChangeLog	2013-03-21 07:52:58 UTC (rev 146447)
+++ trunk/Source/WebCore/ChangeLog	2013-03-21 08:02:10 UTC (rev 146448)
@@ -1,3 +1,19 @@
+2013-03-20  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. draw background for the FlameChart overview pane with the CPU aggregated data.
+https://bugs.webkit.org/show_bug.cgi?id=112823
+
+Reviewed by Yury Semikhatsky.
+
+The idea of the patch is to collect the data about stack depth for the each X
+and draw a line with help of this data.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.prototype.onResize):
+(WebInspector.FlameChart.prototype._drawOverviewCanvas):
+(WebInspector.FlameChart.prototype.update):
+
 2013-03-21  Eugene Klyuchnikov  eus...@chromium.org
 
 Web Inspector: [Settings] Fix JS compiler warnings.


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (146447 => 146448)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-21 07:52:58 UTC (rev 146447)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-21 08:02:10 UTC (rev 146448)
@@ -45,6 +45,7 @@
 this._overviewContainer.appendChild(this._overviewGrid.element);
 this._overviewCalculator = new WebInspector.FlameChart.OverviewCalculator();
 this._overviewGrid.addEventListener(WebInspector.OverviewGrid.Events.WindowChanged, this._onWindowChanged, this);
+this._overviewCanvas = this._overviewContainer.createChild(canvas);
 
 this._chartContainer = this.element.createChild(div, chart-container);
 this._timelineGrid = new WebInspector.TimelineGrid();
@@ -432,10 +433,48 @@
 
 onResize: function()
 {
+this._updateOverviewCanvas = true;
 this._hidePopover();
 this._scheduleUpdate();
 },
 
+_drawOverviewCanvas: function(width, height)
+{
+this._overviewCanvas.width = width;
+this._overviewCanvas.height = height;
+
+if (!this._timelineData)
+return;
+
+var nodeCount = this._timelineData.nodeCount;
+var depths = this._timelineData.depths;
+var startTimes = this._timelineData.startTimes;
+var durations = this._timelineData.durations;
+var drawData = new Uint8Array(width);
+var scaleFactor = width / this._timelineData.totalTime;
+
+for (var nodeIndex = 0; nodeIndex  nodeCount; ++nodeIndex) {
+var start = Math.floor(startTimes[nodeIndex] * scaleFactor);
+var finish = Math.floor((startTimes[nodeIndex] + durations[nodeIndex]) * scaleFactor);
+for (var x = start; x  finish; ++x)
+drawData[x] = Math.max(drawData[x], depths[nodeIndex] + 1);
+}
+
+var context = this._overviewCanvas.getContext(2d);
+var yScaleFactor = 2;
+context.lineWidth = 0.5;
+context.strokeStyle = rgba(20,0,0,0.8);
+context.fillStyle=rgba(214,225,254, 0.8);
+context.moveTo(0, height - 1);
+for (var x = 0; x  width; ++x)
+context.lineTo(x, height - drawData[x] * yScaleFactor - 1);
+context.moveTo(width - 1, height - 1);
+context.moveTo(0, height - 1);
+context.fill();
+context.stroke();
+context.closePath();
+},
+
 /**
  * @param {!number} height
  * @param {!number} width
@@ -496,6 +535,10 @@
 this._timelineGrid.updateDividers(this._calculator);
 this._overviewGrid.updateDividers(this._overviewCalculator);
 }
+if (this._updateOverviewCanvas) {
+this._drawOverviewCanvas(this._overviewContainer.clientWidth, this._overviewContainer.clientHeight);
+this._updateOverviewCanvas = false;
+}
 },
 
 __proto__: WebInspector.View.prototype






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [146330] trunk/Source/WebCore

[loislo]

Title: [146330] trunk/Source/WebCore








Revision 146330
Author loi...@chromium.org
Date 2013-03-20 04:51:27 -0700 (Wed, 20 Mar 2013)


Log Message
Web Inspector: OverviewGrid rename classes according to names of js classes.
https://bugs.webkit.org/show_bug.cgi?id=112786

Reviewed by Yury Semikhatsky.

It is a part of meta bug 'extract OverviewGrid from TimelineOverviewPane'.
As the last step it renames timeline-.. classes to overview-grid-.. classes
and moves them to inspectorCommon.css

* inspector/front-end/OverviewGrid.js:
(WebInspector.OverviewGrid):
(WebInspector.OverviewGrid.Window):
(WebInspector.OverviewGrid.Window.prototype._startWindowSelectorDragging):
(WebInspector.OverviewGrid.WindowSelector):
(WebInspector.OverviewGrid.WindowSelector.prototype._createSelectorElement):
* inspector/front-end/inspectorCommon.css:
(.overview-grid-window-selector):
(.overview-grid-window):
(.overview-grid-dividers-background):
(.overview-grid-window-rulers):
(.overview-grid-window-resizer):
* inspector/front-end/timelinePanel.css:
(.timeline-frame-overview .overview-grid-window):
(.timeline-frame-overview .overview-grid-dividers-background):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/OverviewGrid.js
trunk/Source/WebCore/inspector/front-end/inspectorCommon.css
trunk/Source/WebCore/inspector/front-end/timelinePanel.css




Diff

Modified: trunk/Source/WebCore/ChangeLog (146329 => 146330)

--- trunk/Source/WebCore/ChangeLog	2013-03-20 11:50:58 UTC (rev 146329)
+++ trunk/Source/WebCore/ChangeLog	2013-03-20 11:51:27 UTC (rev 146330)
@@ -1,3 +1,30 @@
+2013-03-20  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: OverviewGrid rename classes according to names of js classes.
+https://bugs.webkit.org/show_bug.cgi?id=112786
+
+Reviewed by Yury Semikhatsky.
+
+It is a part of meta bug 'extract OverviewGrid from TimelineOverviewPane'.
+As the last step it renames timeline-.. classes to overview-grid-.. classes
+and moves them to inspectorCommon.css
+
+* inspector/front-end/OverviewGrid.js:
+(WebInspector.OverviewGrid):
+(WebInspector.OverviewGrid.Window):
+(WebInspector.OverviewGrid.Window.prototype._startWindowSelectorDragging):
+(WebInspector.OverviewGrid.WindowSelector):
+(WebInspector.OverviewGrid.WindowSelector.prototype._createSelectorElement):
+* inspector/front-end/inspectorCommon.css:
+(.overview-grid-window-selector):
+(.overview-grid-window):
+(.overview-grid-dividers-background):
+(.overview-grid-window-rulers):
+(.overview-grid-window-resizer):
+* inspector/front-end/timelinePanel.css:
+(.timeline-frame-overview .overview-grid-window):
+(.timeline-frame-overview .overview-grid-dividers-background):
+
 2013-03-20  Dmitry Zvorygin  zvory...@chromium.org
 
 Web Inspector: Switch Drawer animation from _javascript_ to CSS transitions.


Modified: trunk/Source/WebCore/inspector/front-end/OverviewGrid.js (146329 => 146330)

--- trunk/Source/WebCore/inspector/front-end/OverviewGrid.js	2013-03-20 11:50:58 UTC (rev 146329)
+++ trunk/Source/WebCore/inspector/front-end/OverviewGrid.js	2013-03-20 11:51:27 UTC (rev 146330)
@@ -45,7 +45,7 @@
 
 this.element.appendChild(this._grid.element);
 
-this._window = new WebInspector.OverviewGrid.Window(this.element, this._grid.dividersLabelBarElement, prefix);
+this._window = new WebInspector.OverviewGrid.Window(this.element, this._grid.dividersLabelBarElement);
 }
 
 WebInspector.OverviewGrid.prototype = {
@@ -163,13 +163,11 @@
  * @extends {WebInspector.Object}
  * @param {Element} parentElement
  * @param {Element} dividersLabelBarElement
- * @param {string} prefix
  */
-WebInspector.OverviewGrid.Window = function(parentElement, dividersLabelBarElement, prefix)
+WebInspector.OverviewGrid.Window = function(parentElement, dividersLabelBarElement)
 {
 this._parentElement = parentElement;
 this._dividersLabelBarElement = dividersLabelBarElement;
-this._prefix = prefix;
 
 WebInspector.installDragHandle(this._parentElement, this._startWindowSelectorDragging.bind(this), this._windowSelectorDragging.bind(this), this._endWindowSelectorDragging.bind(this), ew-resize);
 WebInspector.installDragHandle(this._dividersLabelBarElement, this._startWindowDragging.bind(this), this._windowDragging.bind(this), this._endWindowDragging.bind(this), ew-resize);
@@ -181,25 +179,25 @@
 this._parentElement.addEventListener(dblclick, this._resizeWindowMaximum.bind(this), true);
 
 this._overviewWindowElement = document.createElement(div);
-this._overviewWindowElement.className = prefix + -overview-window;
+this._overviewWindowElement.className = overview-grid-window;
 parentElement.appendChild(this._overviewWindowElement);
 
 this._overviewWindowBordersElement = document.createElement(div);
-

[webkit-changes] [146354] trunk/Source/WebCore

[loislo]

Title: [146354] trunk/Source/WebCore








Revision 146354
Author loi...@chromium.org
Date 2013-03-20 09:19:07 -0700 (Wed, 20 Mar 2013)


Log Message
Web Inspector: Flame Chart. Provide Overview pane for better user expirience.
https://bugs.webkit.org/show_bug.cgi?id=112496

Reviewed by Yury Semikhatsky.

This patch implements basic part of Overview Pane in FlameChart.
The idea of the patch is to move everything into chart-container element.
And put OverviewGrid into new overview-container element.

Drive by change: fix the layout of the flame chart elements.
Drive by change: fix the drag window  drag resizer mechanics
for the case when the parent element has zero offsetLeft.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.OverviewCalculator):
(WebInspector.FlameChart.OverviewCalculator.prototype._updateBoundaries):
(WebInspector.FlameChart.OverviewCalculator.prototype.computePosition):
(WebInspector.FlameChart.OverviewCalculator.prototype.formatTime):
(WebInspector.FlameChart.OverviewCalculator.prototype.maximumBoundary):
(WebInspector.FlameChart.OverviewCalculator.prototype.minimumBoundary):
(WebInspector.FlameChart.OverviewCalculator.prototype.boundarySpan):
(WebInspector.FlameChart.prototype._onWindowChanged):
(WebInspector.FlameChart.prototype._adjustXScale):
(WebInspector.FlameChart.prototype.update):
* inspector/front-end/OverviewGrid.js:
(WebInspector.OverviewGrid.Window):
(WebInspector.OverviewGrid.Window.prototype._resizerElementStartDragging):
(WebInspector.OverviewGrid.Window.prototype._leftResizeElementDragging):
(WebInspector.OverviewGrid.Window.prototype._rightResizeElementDragging):
(WebInspector.OverviewGrid.Window.prototype._startWindowSelectorDragging):
(WebInspector.OverviewGrid.Window.prototype._windowSelectorDragging):
(WebInspector.OverviewGrid.Window.prototype._endWindowSelectorDragging):
(WebInspector.OverviewGrid.Window.prototype._setWindowPosition):
(WebInspector.OverviewGrid.Window.prototype._onMouseWheel):
(WebInspector.OverviewGrid.WindowSelector):
* inspector/front-end/TimelineOverviewPane.js:
* inspector/front-end/flameChart.css:
(.chart-container .item-anchor):
(.overview-container):
(.chart-container):
(#flame-chart-overview-grid .resources-dividers-label-bar):
* inspector/front-end/inspectorCommon.css:
(.resources-divider-label):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js
trunk/Source/WebCore/inspector/front-end/OverviewGrid.js
trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js
trunk/Source/WebCore/inspector/front-end/flameChart.css
trunk/Source/WebCore/inspector/front-end/inspectorCommon.css




Diff

Modified: trunk/Source/WebCore/ChangeLog (146353 => 146354)

--- trunk/Source/WebCore/ChangeLog	2013-03-20 16:07:26 UTC (rev 146353)
+++ trunk/Source/WebCore/ChangeLog	2013-03-20 16:19:07 UTC (rev 146354)
@@ -1,3 +1,50 @@
+2013-03-20  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Provide Overview pane for better user expirience.
+https://bugs.webkit.org/show_bug.cgi?id=112496
+
+Reviewed by Yury Semikhatsky.
+
+This patch implements basic part of Overview Pane in FlameChart.
+The idea of the patch is to move everything into chart-container element.
+And put OverviewGrid into new overview-container element.
+
+Drive by change: fix the layout of the flame chart elements.
+Drive by change: fix the drag window  drag resizer mechanics
+for the case when the parent element has zero offsetLeft.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.OverviewCalculator):
+(WebInspector.FlameChart.OverviewCalculator.prototype._updateBoundaries):
+(WebInspector.FlameChart.OverviewCalculator.prototype.computePosition):
+(WebInspector.FlameChart.OverviewCalculator.prototype.formatTime):
+(WebInspector.FlameChart.OverviewCalculator.prototype.maximumBoundary):
+(WebInspector.FlameChart.OverviewCalculator.prototype.minimumBoundary):
+(WebInspector.FlameChart.OverviewCalculator.prototype.boundarySpan):
+(WebInspector.FlameChart.prototype._onWindowChanged):
+(WebInspector.FlameChart.prototype._adjustXScale):
+(WebInspector.FlameChart.prototype.update):
+* inspector/front-end/OverviewGrid.js:
+(WebInspector.OverviewGrid.Window):
+(WebInspector.OverviewGrid.Window.prototype._resizerElementStartDragging):
+(WebInspector.OverviewGrid.Window.prototype._leftResizeElementDragging):
+(WebInspector.OverviewGrid.Window.prototype._rightResizeElementDragging):
+(WebInspector.OverviewGrid.Window.prototype._startWindowSelectorDragging):
+(WebInspector.OverviewGrid.Window.prototype._windowSelectorDragging):
+(WebInspector.OverviewGrid.Window.prototype._endWindowSelectorDragging):
+

[webkit-changes] [146199] trunk/Source/WebCore

[loislo]

Title: [146199] trunk/Source/WebCore








Revision 146199
Author loi...@chromium.org
Date 2013-03-19 04:46:26 -0700 (Tue, 19 Mar 2013)


Log Message
Web Inspector: move _timelineGrid  _timelineOverviewWindow from TimelineOverviewPane into a new class OverviewGrid.
https://bugs.webkit.org/show_bug.cgi?id=112584

Reviewed by Pavel Feldman.

It is the first path in the set.
The end goal is to extract OverviewGrid with window selectors
into a separate class in separate file and reuse it in CPU FlameChart.

* inspector/front-end/TimelineOverviewPane.js:
(WebInspector.TimelineOverviewPane):
(WebInspector.OverviewGrid):
(WebInspector.OverviewGrid.prototype.get grid):
(WebInspector.OverviewGrid.prototype.get clientWidth):
(WebInspector.OverviewGrid.prototype.showItemsGraphsElement):
(WebInspector.OverviewGrid.prototype.hideItemsGraphsElement):
(WebInspector.OverviewGrid.prototype.updateDividers):
(WebInspector.OverviewGrid.prototype.addEventDividers):
(WebInspector.OverviewGrid.prototype.removeEventDividers):
(WebInspector.OverviewGrid.prototype.setWindowPosition):
(WebInspector.OverviewGrid.prototype.reset):
(WebInspector.OverviewGrid.prototype.get windowLeft):
(WebInspector.OverviewGrid.prototype.get windowRight):
(WebInspector.OverviewGrid.prototype.setWindow):
(WebInspector.OverviewGrid.prototype.addEventListener):
(WebInspector.TimelineOverviewPane.prototype.setMode):
(WebInspector.TimelineOverviewPane.prototype._setFrameMode):
(WebInspector.TimelineOverviewPane.prototype._update):
(WebInspector.TimelineOverviewPane.prototype.sidebarResized):
(WebInspector.TimelineOverviewPane.prototype.zoomToFrame):
(WebInspector.TimelineOverviewPane.prototype._reset):
(WebInspector.TimelineOverviewPane.prototype.windowLeft):
(WebInspector.TimelineOverviewPane.prototype.windowRight):
(WebInspector.TimelineOverviewPane.prototype._updateWindow):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146198 => 146199)

--- trunk/Source/WebCore/ChangeLog	2013-03-19 11:43:23 UTC (rev 146198)
+++ trunk/Source/WebCore/ChangeLog	2013-03-19 11:46:26 UTC (rev 146199)
@@ -1,3 +1,40 @@
+2013-03-19  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: move _timelineGrid  _timelineOverviewWindow from TimelineOverviewPane into a new class OverviewGrid.
+https://bugs.webkit.org/show_bug.cgi?id=112584
+
+Reviewed by Pavel Feldman.
+
+It is the first path in the set.
+The end goal is to extract OverviewGrid with window selectors
+into a separate class in separate file and reuse it in CPU FlameChart.
+
+* inspector/front-end/TimelineOverviewPane.js:
+(WebInspector.TimelineOverviewPane):
+(WebInspector.OverviewGrid):
+(WebInspector.OverviewGrid.prototype.get grid):
+(WebInspector.OverviewGrid.prototype.get clientWidth):
+(WebInspector.OverviewGrid.prototype.showItemsGraphsElement):
+(WebInspector.OverviewGrid.prototype.hideItemsGraphsElement):
+(WebInspector.OverviewGrid.prototype.updateDividers):
+(WebInspector.OverviewGrid.prototype.addEventDividers):
+(WebInspector.OverviewGrid.prototype.removeEventDividers):
+(WebInspector.OverviewGrid.prototype.setWindowPosition):
+(WebInspector.OverviewGrid.prototype.reset):
+(WebInspector.OverviewGrid.prototype.get windowLeft):
+(WebInspector.OverviewGrid.prototype.get windowRight):
+(WebInspector.OverviewGrid.prototype.setWindow):
+(WebInspector.OverviewGrid.prototype.addEventListener):
+(WebInspector.TimelineOverviewPane.prototype.setMode):
+(WebInspector.TimelineOverviewPane.prototype._setFrameMode):
+(WebInspector.TimelineOverviewPane.prototype._update):
+(WebInspector.TimelineOverviewPane.prototype.sidebarResized):
+(WebInspector.TimelineOverviewPane.prototype.zoomToFrame):
+(WebInspector.TimelineOverviewPane.prototype._reset):
+(WebInspector.TimelineOverviewPane.prototype.windowLeft):
+(WebInspector.TimelineOverviewPane.prototype.windowRight):
+(WebInspector.TimelineOverviewPane.prototype._updateWindow):
+
 2013-03-19  Vladislav Kaznacheev  kaznach...@chromium.org
 
 Web Inspector: Add Inspector.targetCrashed event to Inspector protocol.


Modified: trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js (146198 => 146199)

--- trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js	2013-03-19 11:43:23 UTC (rev 146198)
+++ trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js	2013-03-19 11:46:26 UTC (rev 146199)
@@ -74,40 +74,154 @@
 
 this._overviewItems[this._currentMode].revealAndSelect(false);
 
-this._overviewContainer = this.element.createChild(div, fill);
-this._overviewContainer.id = timeline-overview-container;
+this._overviewGrid = new WebInspector.OverviewGrid(timeline);
+  

[webkit-changes] [146200] trunk/Source/WebCore

[loislo]

Title: [146200] trunk/Source/WebCore








Revision 146200
Author loi...@chromium.org
Date 2013-03-19 05:54:56 -0700 (Tue, 19 Mar 2013)


Log Message
Web Inspector: rename TimelineOverviewWindow to OverviewGrid.Window and fix names for constants.
https://bugs.webkit.org/show_bug.cgi?id=112685

Reviewed by Yury Semikhatsky.

It is the second patch which extracts OverviewGrid from TimelineOverviewPane.
It renames internal components of OverviewGrid.
WebInspector.TimelineOverviewWindow - WebInspector.OverviewGrid.Window
WebInspector.TimelineOverviewWindow.WindowSelector - WebInspector.OverviewGrid.WindowSelector

and moves constants from WebInspector.TimelineOverviewWindow namespace to WebInspector.OverviewGrid namespace

* inspector/front-end/TimelineOverviewPane.js:
(WebInspector.TimelineOverviewPane):
(WebInspector.OverviewGrid):
(WebInspector.OverviewGrid.Window):
(WebInspector.OverviewGrid.Window.prototype._startWindowSelectorDragging):
(WebInspector.OverviewGrid.Window.prototype._endWindowSelectorDragging):
(WebInspector.OverviewGrid.Window.prototype._startWindowDragging):
(WebInspector.OverviewGrid.Window.prototype._windowDragging):
(WebInspector.OverviewGrid.Window.prototype._moveWindow):
(WebInspector.OverviewGrid.Window.prototype._resizeWindowRight):
(WebInspector.OverviewGrid.Window.prototype._setWindowPosition):
(WebInspector.OverviewGrid.Window.prototype._onMouseWheel):
(WebInspector.OverviewGrid.Window.prototype._zoom):
(WebInspector.OverviewGrid.WindowSelector):
(WebInspector.OverviewGrid.WindowSelector.prototype._createSelectorElement):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146199 => 146200)

--- trunk/Source/WebCore/ChangeLog	2013-03-19 11:46:26 UTC (rev 146199)
+++ trunk/Source/WebCore/ChangeLog	2013-03-19 12:54:56 UTC (rev 146200)
@@ -1,5 +1,35 @@
 2013-03-19  Ilya Tikhonovsky  loi...@chromium.org
 
+Web Inspector: rename TimelineOverviewWindow to OverviewGrid.Window and fix names for constants.
+https://bugs.webkit.org/show_bug.cgi?id=112685
+
+Reviewed by Yury Semikhatsky.
+
+It is the second patch which extracts OverviewGrid from TimelineOverviewPane.
+It renames internal components of OverviewGrid.
+WebInspector.TimelineOverviewWindow - WebInspector.OverviewGrid.Window
+WebInspector.TimelineOverviewWindow.WindowSelector - WebInspector.OverviewGrid.WindowSelector
+
+and moves constants from WebInspector.TimelineOverviewWindow namespace to WebInspector.OverviewGrid namespace
+
+* inspector/front-end/TimelineOverviewPane.js:
+(WebInspector.TimelineOverviewPane):
+(WebInspector.OverviewGrid):
+(WebInspector.OverviewGrid.Window):
+(WebInspector.OverviewGrid.Window.prototype._startWindowSelectorDragging):
+(WebInspector.OverviewGrid.Window.prototype._endWindowSelectorDragging):
+(WebInspector.OverviewGrid.Window.prototype._startWindowDragging):
+(WebInspector.OverviewGrid.Window.prototype._windowDragging):
+(WebInspector.OverviewGrid.Window.prototype._moveWindow):
+(WebInspector.OverviewGrid.Window.prototype._resizeWindowRight):
+(WebInspector.OverviewGrid.Window.prototype._setWindowPosition):
+(WebInspector.OverviewGrid.Window.prototype._onMouseWheel):
+(WebInspector.OverviewGrid.Window.prototype._zoom):
+(WebInspector.OverviewGrid.WindowSelector):
+(WebInspector.OverviewGrid.WindowSelector.prototype._createSelectorElement):
+
+2013-03-19  Ilya Tikhonovsky  loi...@chromium.org
+
 Web Inspector: move _timelineGrid  _timelineOverviewWindow from TimelineOverviewPane into a new class OverviewGrid.
 https://bugs.webkit.org/show_bug.cgi?id=112584
 


Modified: trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js (146199 => 146200)

--- trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js	2013-03-19 11:46:26 UTC (rev 146199)
+++ trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js	2013-03-19 12:54:56 UTC (rev 146200)
@@ -96,11 +96,12 @@
 
 model.addEventListener(WebInspector.TimelineModel.Events.RecordAdded, this._onRecordAdded, this);
 model.addEventListener(WebInspector.TimelineModel.Events.RecordsCleared, this._reset, this);
-this._overviewGrid.addEventListener(WebInspector.TimelineOverviewWindow.Events.WindowChanged, this._onWindowChanged, this);
+this._overviewGrid.addEventListener(WebInspector.OverviewGrid.Events.WindowChanged, this._onWindowChanged, this);
 }
 
 /**
  * @constructor
+ * @param {string} prefix
  */
 WebInspector.OverviewGrid = function(prefix)
 {
@@ -115,7 +116,7 @@
 
 this.element.appendChild(this._grid.element);
 
-this._window = new WebInspector.TimelineOverviewWindow(this.element, this._grid.dividersLabelBarElement);
+this._window = new WebInspector.OverviewGrid.Window(this.element, 

[webkit-changes] [146204] trunk/Source/WebCore

[loislo]

Title: [146204] trunk/Source/WebCore








Revision 146204
Author loi...@chromium.org
Date 2013-03-19 07:47:15 -0700 (Tue, 19 Mar 2013)


Log Message
Web Inspector: move OverviewGrid and OverviewWindow into separate file.
https://bugs.webkit.org/show_bug.cgi?id=112693

Reviewed by Yury Semikhatsky.

It is the third patch for the meta bug Web Inspector: meta bug: extract OverviewGrid from TimelineOverviewPane
It just moves the OverviewGrid and the related classes into its own file.

* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* inspector/compile-front-end.py:
* inspector/front-end/OverviewGrid.js: Added.
(WebInspector.OverviewGrid):
(WebInspector.OverviewGrid.prototype.itemsGraphsElement):
(WebInspector.OverviewGrid.prototype.insertBeforeItemsGraphsElement):
(WebInspector.OverviewGrid.prototype.clientWidth):
(WebInspector.OverviewGrid.prototype.showItemsGraphsElement):
(WebInspector.OverviewGrid.prototype.hideItemsGraphsElement):
(WebInspector.OverviewGrid.prototype.updateDividers):
(WebInspector.OverviewGrid.prototype.addEventDividers):
(WebInspector.OverviewGrid.prototype.removeEventDividers):
(WebInspector.OverviewGrid.prototype.setWindowPosition):
(WebInspector.OverviewGrid.prototype.reset):
(WebInspector.OverviewGrid.prototype.windowLeft):
(WebInspector.OverviewGrid.prototype.windowRight):
(WebInspector.OverviewGrid.prototype.setWindow):
(WebInspector.OverviewGrid.prototype.addEventListener):
(WebInspector.OverviewGrid.Window):
(WebInspector.OverviewGrid.Window.prototype.reset):
(WebInspector.OverviewGrid.Window.prototype._leftResizeElementDragging):
(WebInspector.OverviewGrid.Window.prototype._rightResizeElementDragging):
(WebInspector.OverviewGrid.Window.prototype._startWindowSelectorDragging):
(WebInspector.OverviewGrid.Window.prototype._windowSelectorDragging):
(WebInspector.OverviewGrid.Window.prototype._endWindowSelectorDragging):
(WebInspector.OverviewGrid.Window.prototype._startWindowDragging):
(WebInspector.OverviewGrid.Window.prototype._windowDragging):
(WebInspector.OverviewGrid.Window.prototype._endWindowDragging):
(WebInspector.OverviewGrid.Window.prototype._moveWindow):
(WebInspector.OverviewGrid.Window.prototype._resizeWindowLeft):
(WebInspector.OverviewGrid.Window.prototype._resizeWindowRight):
(WebInspector.OverviewGrid.Window.prototype._resizeWindowMaximum):
(WebInspector.OverviewGrid.Window.prototype._setWindow):
(WebInspector.OverviewGrid.Window.prototype._setWindowPosition):
(WebInspector.OverviewGrid.Window.prototype._onMouseWheel):
(WebInspector.OverviewGrid.Window.prototype._zoom):
(WebInspector.OverviewGrid.WindowSelector):
(WebInspector.OverviewGrid.WindowSelector.prototype._createSelectorElement):
(WebInspector.OverviewGrid.WindowSelector.prototype._close):
(WebInspector.OverviewGrid.WindowSelector.prototype._updatePosition):
* inspector/front-end/TimelineOverviewPane.js:
* inspector/front-end/WebKit.qrc:
* inspector/front-end/inspector.html:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.gypi
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
trunk/Source/WebCore/inspector/compile-front-end.py
trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js
trunk/Source/WebCore/inspector/front-end/WebKit.qrc
trunk/Source/WebCore/inspector/front-end/inspector.html


Added Paths

trunk/Source/WebCore/inspector/front-end/OverviewGrid.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146203 => 146204)

--- trunk/Source/WebCore/ChangeLog	2013-03-19 14:28:39 UTC (rev 146203)
+++ trunk/Source/WebCore/ChangeLog	2013-03-19 14:47:15 UTC (rev 146204)
@@ -1,3 +1,60 @@
+2013-03-19  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: move OverviewGrid and OverviewWindow into separate file.
+https://bugs.webkit.org/show_bug.cgi?id=112693
+
+Reviewed by Yury Semikhatsky.
+
+It is the third patch for the meta bug Web Inspector: meta bug: extract OverviewGrid from TimelineOverviewPane
+It just moves the OverviewGrid and the related classes into its own file.
+
+* WebCore.gypi:
+* WebCore.vcproj/WebCore.vcproj:
+* WebCore.vcxproj/WebCore.vcxproj:
+* WebCore.vcxproj/WebCore.vcxproj.filters:
+* inspector/compile-front-end.py:
+* inspector/front-end/OverviewGrid.js: Added.
+(WebInspector.OverviewGrid):
+(WebInspector.OverviewGrid.prototype.itemsGraphsElement):
+(WebInspector.OverviewGrid.prototype.insertBeforeItemsGraphsElement):
+(WebInspector.OverviewGrid.prototype.clientWidth):
+(WebInspector.OverviewGrid.prototype.showItemsGraphsElement):
+(WebInspector.OverviewGrid.prototype.hideItemsGraphsElement):
+(WebInspector.OverviewGrid.prototype.updateDividers):
+

[webkit-changes] [146079] trunk/Source/WebCore

[loislo]

Title: [146079] trunk/Source/WebCore








Revision 146079
Author loi...@chromium.org
Date 2013-03-18 10:16:48 -0700 (Mon, 18 Mar 2013)


Log Message
Web Inspector: move _timelineGrid  _timelineOverviewWindow from TimelineOverviewPane into a new class OverviewGrid.
https://bugs.webkit.org/show_bug.cgi?id=112584

Reviewed by Pavel Feldman.

It is the first path in the set.
The end goal is to extract OverviewGrid with window selectors
into a separate class in separate file and reuse it in CPU FlameChart.

* inspector/front-end/TimelineOverviewPane.js:
(WebInspector.TimelineOverviewPane):
(WebInspector.OverviewGrid):
(WebInspector.OverviewGrid.prototype.get grid):
(WebInspector.OverviewGrid.prototype.get clientWidth):
(WebInspector.OverviewGrid.prototype.showItemsGraphsElement):
(WebInspector.OverviewGrid.prototype.hideItemsGraphsElement):
(WebInspector.OverviewGrid.prototype.updateDividers):
(WebInspector.OverviewGrid.prototype.addEventDividers):
(WebInspector.OverviewGrid.prototype.removeEventDividers):
(WebInspector.OverviewGrid.prototype.setWindowPosition):
(WebInspector.OverviewGrid.prototype.reset):
(WebInspector.OverviewGrid.prototype.get windowLeft):
(WebInspector.OverviewGrid.prototype.get windowRight):
(WebInspector.OverviewGrid.prototype.setWindow):
(WebInspector.OverviewGrid.prototype.addEventListener):
(WebInspector.TimelineOverviewPane.prototype.setMode):
(WebInspector.TimelineOverviewPane.prototype._setFrameMode):
(WebInspector.TimelineOverviewPane.prototype._update):
(WebInspector.TimelineOverviewPane.prototype.sidebarResized):
(WebInspector.TimelineOverviewPane.prototype.zoomToFrame):
(WebInspector.TimelineOverviewPane.prototype._reset):
(WebInspector.TimelineOverviewPane.prototype.windowLeft):
(WebInspector.TimelineOverviewPane.prototype.windowRight):
(WebInspector.TimelineOverviewPane.prototype._updateWindow):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (146078 => 146079)

--- trunk/Source/WebCore/ChangeLog	2013-03-18 17:14:57 UTC (rev 146078)
+++ trunk/Source/WebCore/ChangeLog	2013-03-18 17:16:48 UTC (rev 146079)
@@ -1,3 +1,40 @@
+2013-03-18  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: move _timelineGrid  _timelineOverviewWindow from TimelineOverviewPane into a new class OverviewGrid.
+https://bugs.webkit.org/show_bug.cgi?id=112584
+
+Reviewed by Pavel Feldman.
+
+It is the first path in the set.
+The end goal is to extract OverviewGrid with window selectors
+into a separate class in separate file and reuse it in CPU FlameChart.
+
+* inspector/front-end/TimelineOverviewPane.js:
+(WebInspector.TimelineOverviewPane):
+(WebInspector.OverviewGrid):
+(WebInspector.OverviewGrid.prototype.get grid):
+(WebInspector.OverviewGrid.prototype.get clientWidth):
+(WebInspector.OverviewGrid.prototype.showItemsGraphsElement):
+(WebInspector.OverviewGrid.prototype.hideItemsGraphsElement):
+(WebInspector.OverviewGrid.prototype.updateDividers):
+(WebInspector.OverviewGrid.prototype.addEventDividers):
+(WebInspector.OverviewGrid.prototype.removeEventDividers):
+(WebInspector.OverviewGrid.prototype.setWindowPosition):
+(WebInspector.OverviewGrid.prototype.reset):
+(WebInspector.OverviewGrid.prototype.get windowLeft):
+(WebInspector.OverviewGrid.prototype.get windowRight):
+(WebInspector.OverviewGrid.prototype.setWindow):
+(WebInspector.OverviewGrid.prototype.addEventListener):
+(WebInspector.TimelineOverviewPane.prototype.setMode):
+(WebInspector.TimelineOverviewPane.prototype._setFrameMode):
+(WebInspector.TimelineOverviewPane.prototype._update):
+(WebInspector.TimelineOverviewPane.prototype.sidebarResized):
+(WebInspector.TimelineOverviewPane.prototype.zoomToFrame):
+(WebInspector.TimelineOverviewPane.prototype._reset):
+(WebInspector.TimelineOverviewPane.prototype.windowLeft):
+(WebInspector.TimelineOverviewPane.prototype.windowRight):
+(WebInspector.TimelineOverviewPane.prototype._updateWindow):
+
 2013-03-18  Adam Barth  aba...@webkit.org
 
 [V8] Crash when accessing onclick attribute of document from XMLHttpRequest


Modified: trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js (146078 => 146079)

--- trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js	2013-03-18 17:14:57 UTC (rev 146078)
+++ trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js	2013-03-18 17:16:48 UTC (rev 146079)
@@ -74,40 +74,152 @@
 
 this._overviewItems[this._currentMode].revealAndSelect(false);
 
-this._overviewContainer = this.element.createChild(div, fill);
-this._overviewContainer.id = timeline-overview-container;
+this._overviewGrid = new WebInspector.OverviewGrid(timeline);
 
-

[webkit-changes] [145888] trunk/Source/WebCore

[loislo]

Title: [145888] trunk/Source/WebCore








Revision 145888
Author loi...@chromium.org
Date 2013-03-15 01:38:07 -0700 (Fri, 15 Mar 2013)


Log Message
Web Inspector: Flame Chart. When user zooms the chart, the point under cursor has to be the zooming center.
https://bugs.webkit.org/show_bug.cgi?id=112417

Reviewed by Yury Semikhatsky.

It converts the cursor position into time,
changes the scale factor and calculates the new offset for the canvas.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart.prototype._adjustXScale):
(WebInspector.FlameChart.prototype._onMouseWheel):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (145887 => 145888)

--- trunk/Source/WebCore/ChangeLog	2013-03-15 08:33:14 UTC (rev 145887)
+++ trunk/Source/WebCore/ChangeLog	2013-03-15 08:38:07 UTC (rev 145888)
@@ -1,3 +1,17 @@
+2013-03-15  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. When user zooms the chart, the point under cursor has to be the zooming center.
+https://bugs.webkit.org/show_bug.cgi?id=112417
+
+Reviewed by Yury Semikhatsky.
+
+It converts the cursor position into time,
+changes the scale factor and calculates the new offset for the canvas.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart.prototype._adjustXScale):
+(WebInspector.FlameChart.prototype._onMouseWheel):
+
 2013-03-13  Eugene Klyuchnikov  eus...@chromium.org
 
 Web Inspector: [Network] Sort columns context menu items alphabetically.


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (145887 => 145888)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-15 08:33:14 UTC (rev 145887)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-15 08:38:07 UTC (rev 145888)
@@ -257,16 +257,28 @@
 
 _adjustXScale: function(direction, x)
 {
+var cursorTime = (x + this._xOffset) / this._xScaleFactor;
 if (direction  0)
 this._xScaleFactor /= 2;
 else
 this._xScaleFactor *= 2;
+
+var absoluteX = Math.floor(cursorTime * this._xScaleFactor);
+var rightEndOfViewPort = absoluteX - x + this._canvas.width;
+
+var rightEndOfGraph = Math.floor(this._timelineData.totalTime * this._xScaleFactor);
+if (rightEndOfViewPort  rightEndOfGraph)
+rightEndOfViewPort = rightEndOfGraph;
+
+this._xOffset = rightEndOfViewPort - this._canvas.width;
+if (this._xOffset  0)
+this._xOffset = 0;
 },
 
 _onMouseWheel: function(e)
 {
 if (!e.shiftKey)
-this._adjustXScale(e.wheelDelta, e.x);
+this._adjustXScale(e.wheelDelta, e.offsetX);
 else
 this._adjustXOffset(e.wheelDelta);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [145894] trunk/Source/WebCore

[loislo]

Title: [145894] trunk/Source/WebCore








Revision 145894
Author loi...@chromium.org
Date 2013-03-15 03:46:10 -0700 (Fri, 15 Mar 2013)


Log Message
Web Inspector: Flame Chart. xOffset calculates incorrectly when chart width less that canvas.width.
https://bugs.webkit.org/show_bug.cgi?id=112423

Reviewed by Yury Semikhatsky.

I extracted xOffset assigment procedure into a separate function.

Drive by fix: size and posion of anchor element was adjusted.
Drive by fix: we will not paint item if it is not visible.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart.prototype._maxXOffset):
(WebInspector.FlameChart.prototype._setXOffset):
(WebInspector.FlameChart.prototype._canvasDragging):
(WebInspector.FlameChart.prototype._onMouseMove):
(WebInspector.FlameChart.prototype._adjustXOffset):
(WebInspector.FlameChart.prototype._adjustXScale):
(WebInspector.FlameChart.prototype.draw):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (145893 => 145894)

--- trunk/Source/WebCore/ChangeLog	2013-03-15 10:40:29 UTC (rev 145893)
+++ trunk/Source/WebCore/ChangeLog	2013-03-15 10:46:10 UTC (rev 145894)
@@ -1,3 +1,24 @@
+2013-03-15  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. xOffset calculates incorrectly when chart width less that canvas.width.
+https://bugs.webkit.org/show_bug.cgi?id=112423
+
+Reviewed by Yury Semikhatsky.
+
+I extracted xOffset assigment procedure into a separate function.
+
+Drive by fix: size and posion of anchor element was adjusted.
+Drive by fix: we will not paint item if it is not visible.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart.prototype._maxXOffset):
+(WebInspector.FlameChart.prototype._setXOffset):
+(WebInspector.FlameChart.prototype._canvasDragging):
+(WebInspector.FlameChart.prototype._onMouseMove):
+(WebInspector.FlameChart.prototype._adjustXOffset):
+(WebInspector.FlameChart.prototype._adjustXScale):
+(WebInspector.FlameChart.prototype.draw):
+
 2013-03-15  Noam Rosenthal  n...@webkit.org
 
 [Texmap] Change brightness filter to match new spec


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (145893 => 145894)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-15 10:40:29 UTC (rev 145893)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-15 10:46:10 UTC (rev 145894)
@@ -74,20 +74,29 @@
 return true;
 },
 
-_canvasDragging: function(event)
+_maxXOffset: function()
 {
-this._xOffset = this._dragStartXOffset + this._dragStartPoint - event.pageX;
+if (!this._timelineData)
+return 0;
+var maxXOffset = Math.floor(this._timelineData.totalTime * this._xScaleFactor - this._canvas.width);
+return maxXOffset  0 ? maxXOffset : 0;
+},
 
-if (this._xOffset  0)
-this._xOffset = 0;
-else {
-var maxXOffset = this._timelineData.totalTime * this._xScaleFactor - this._canvas.width;
-if (this._xOffset  maxXOffset)
-this._xOffset = maxXOffset;
+_setXOffset: function(xOffset)
+{
+xOffset = Number.constrain(xOffset, 0, this._maxXOffset());
+
+if (xOffset !== this._xOffset) {
+this._xOffset = xOffset;
+this._scheduleUpdate();
 }
-this._scheduleUpdate();
 },
 
+_canvasDragging: function(event)
+{
+this._setXOffset(this._dragStartXOffset + this._dragStartPoint - event.pageX);
+},
+
 _endCanvasDragging: function()
 {
 this._isDragging = false;
@@ -240,39 +249,35 @@
 
 var timelineData = this._timelineData;
 
+var anchorLeft = Math.floor(timelineData.startTimes[nodeIndex] * this._xScaleFactor - this._xOffset);
+anchorLeft = Number.constrain(anchorLeft, 0, this._canvas.width);
+
+var anchorWidth = Math.floor(timelineData.durations[nodeIndex] * this._xScaleFactor);
+anchorWidth = Number.constrain(anchorWidth, 0, this._canvas.width - anchorLeft);
+
 var style = this._anchorElement.style;
-style.width = Math.floor(timelineData.durations[nodeIndex] * this._xScaleFactor) + px;
+style.width = anchorWidth + px;
 style.height = this._barHeight + px;
-style.left = Math.floor(timelineData.startTimes[nodeIndex] * this._xScaleFactor - this._xOffset) + px;
+style.left = anchorLeft + px;
 style.top = Math.floor(this._canvas.height - (timelineData.depths[nodeIndex] + 1) * this._barHeight) + px;
 },
 
 _adjustXOffset: function(direction)
 {
 var step = this._xScaleFactor * 5;
-this._xOffset += direction  0 ? step : -step;
-if (this._xOffset  0)
-this._xOffset = 0;
+this._setXOffset(this._xOffset + (direction  0 ? 

[webkit-changes] [145900] trunk/Source/WebCore

[loislo]

Title: [145900] trunk/Source/WebCore








Revision 145900
Author loi...@chromium.org
Date 2013-03-15 06:29:01 -0700 (Fri, 15 Mar 2013)


Log Message
Web Inspector: Flame Chart. Draw timeline grid over flame chart items.
https://bugs.webkit.org/show_bug.cgi?id=112439

Reviewed by Pavel Feldman.

I've used WebInspector.TimelineGrid

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.Calculator):
(WebInspector.FlameChart.Calculator.prototype._updateBoundaries):
(WebInspector.FlameChart.Calculator.prototype.computePosition):
(WebInspector.FlameChart.Calculator.prototype.formatTime):
(WebInspector.FlameChart.Calculator.prototype.maximumBoundary):
(WebInspector.FlameChart.Calculator.prototype.minimumBoundary):
(WebInspector.FlameChart.Calculator.prototype.boundarySpan):
(WebInspector.FlameChart.prototype.update):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (145899 => 145900)

--- trunk/Source/WebCore/ChangeLog	2013-03-15 12:48:01 UTC (rev 145899)
+++ trunk/Source/WebCore/ChangeLog	2013-03-15 13:29:01 UTC (rev 145900)
@@ -1,3 +1,23 @@
+2013-03-15  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Draw timeline grid over flame chart items.
+https://bugs.webkit.org/show_bug.cgi?id=112439
+
+Reviewed by Pavel Feldman.
+
+I've used WebInspector.TimelineGrid
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.Calculator):
+(WebInspector.FlameChart.Calculator.prototype._updateBoundaries):
+(WebInspector.FlameChart.Calculator.prototype.computePosition):
+(WebInspector.FlameChart.Calculator.prototype.formatTime):
+(WebInspector.FlameChart.Calculator.prototype.maximumBoundary):
+(WebInspector.FlameChart.Calculator.prototype.minimumBoundary):
+(WebInspector.FlameChart.Calculator.prototype.boundarySpan):
+(WebInspector.FlameChart.prototype.update):
+
 2013-03-15  Marja Hölttä  ma...@chromium.org
 
 [V8] Add machinery for generating specialized bindings for the main world


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (145899 => 145900)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-15 12:48:01 UTC (rev 145899)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-15 13:29:01 UTC (rev 145900)
@@ -39,6 +39,9 @@
 this.registerRequiredCSS(flameChart.css);
 
 this.element.className = flame-chart;
+this._timelineGrid = new WebInspector.TimelineGrid();
+this._calculator = new WebInspector.FlameChart.Calculator();
+this.element.appendChild(this._timelineGrid.element);
 this._canvas = this.element.createChild(canvas);
 WebInspector.installDragHandle(this._canvas, this._startCanvasDragging.bind(this), this._canvasDragging.bind(this), this._endCanvasDragging.bind(this), col-resize);
 
@@ -58,6 +61,54 @@
 this._highlightedNodeIndex = -1;
 }
 
+/**
+ * @constructor
+ * @implements {WebInspector.TimelineGrid.Calculator}
+ */
+WebInspector.FlameChart.Calculator = function()
+{
+}
+
+WebInspector.FlameChart.Calculator.prototype = {
+/**
+ * @param {WebInspector.FlameChart} flameChart
+ */
+_updateBoundaries: function(flameChart)
+{
+this._xScaleFactor = flameChart._xScaleFactor;
+this._minimumBoundaries = flameChart._xOffset / this._xScaleFactor;
+this._maximumBoundaries = (flameChart._xOffset + flameChart._canvas.width) / this._xScaleFactor;
+},
+
+/**
+ * @param {number} time
+ */
+computePosition: function(time)
+{
+return (time - this._minimumBoundaries) * this._xScaleFactor;
+},
+
+formatTime: function(value)
+{
+return Number.secondsToString((value + this._minimumBoundaries) / 1000);
+},
+
+maximumBoundary: function()
+{
+return this._maximumBoundaries;
+},
+
+minimumBoundary: function()
+{
+return this._minimumBoundaries;
+},
+
+boundarySpan: function()
+{
+return this._maximumBoundaries - this._minimumBoundaries;
+}
+}
+
 WebInspector.FlameChart.Events = {
 SelectedNode: SelectedNode
 }
@@ -372,6 +423,11 @@
 {
 this._updateTimerId = 0;
 this.draw(this.element.clientWidth, this.element.clientHeight);
+if (this._timelineData) {
+this._calculator._updateBoundaries(this);
+this._timelineGrid.element.style.width = this.element.clientWidth;
+this._timelineGrid.updateDividers(this._calculator);
+}
 },
 
 __proto__: WebInspector.View.prototype






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [145790] trunk/Source/WebCore

[loislo]

Title: [145790] trunk/Source/WebCore








Revision 145790
Author loi...@chromium.org
Date 2013-03-14 00:38:14 -0700 (Thu, 14 Mar 2013)


Log Message
Web Inspector: Flame Chart. Rewrite drawing procedure for better performance.
https://bugs.webkit.org/show_bug.cgi?id=112264

Reviewed by Yury Semikhatsky.

I traverses the profile tree in calculateTimelineData and calculates all the sizes and colors.
Later in draw code we lineary pass the array and draw items.
Also we could easily swap to another format of the profile.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.prototype._nodeCount):
(WebInspector.FlameChart.prototype._calculateTimelineData.appendReversedArray):
(WebInspector.FlameChart.prototype._calculateTimelineData):
(WebInspector.FlameChart.prototype._getPopoverAnchor):
(WebInspector.FlameChart.prototype._showPopover):
(WebInspector.FlameChart.prototype._hidePopover):
(WebInspector.FlameChart.prototype._onClick):
(WebInspector.FlameChart.prototype._onMouseMove):
(WebInspector.FlameChart.prototype._coordinatesToNodeIndex):
(WebInspector.FlameChart.prototype.onResize):
(WebInspector.FlameChart.prototype.draw):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (145789 => 145790)

--- trunk/Source/WebCore/ChangeLog	2013-03-14 07:30:59 UTC (rev 145789)
+++ trunk/Source/WebCore/ChangeLog	2013-03-14 07:38:14 UTC (rev 145790)
@@ -1,3 +1,28 @@
+2013-03-13  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Rewrite drawing procedure for better performance.
+https://bugs.webkit.org/show_bug.cgi?id=112264
+
+Reviewed by Yury Semikhatsky.
+
+I traverses the profile tree in calculateTimelineData and calculates all the sizes and colors.
+Later in draw code we lineary pass the array and draw items.
+Also we could easily swap to another format of the profile.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.prototype._nodeCount):
+(WebInspector.FlameChart.prototype._calculateTimelineData.appendReversedArray):
+(WebInspector.FlameChart.prototype._calculateTimelineData):
+(WebInspector.FlameChart.prototype._getPopoverAnchor):
+(WebInspector.FlameChart.prototype._showPopover):
+(WebInspector.FlameChart.prototype._hidePopover):
+(WebInspector.FlameChart.prototype._onClick):
+(WebInspector.FlameChart.prototype._onMouseMove):
+(WebInspector.FlameChart.prototype._coordinatesToNodeIndex):
+(WebInspector.FlameChart.prototype.onResize):
+(WebInspector.FlameChart.prototype.draw):
+
 2013-03-14  Alice Liu  alice@apple.com
 
 Add to HistoryItem a way to know if its underlying CachedPage has expired.


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (145789 => 145790)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-14 07:30:59 UTC (rev 145789)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-14 07:38:14 UTC (rev 145790)
@@ -42,15 +42,16 @@
 this._canvas = this.element.createChild(canvas);
 this._cpuProfileView = cpuProfileView;
 this._xScaleFactor = 0.0;
-this._yScaleFactor = 10;
-this._minWidth = 0;
+this._barHeight = 10;
+this._minWidth = 1;
 this.element._onmousemove_ = this._onMouseMove.bind(this);
 this.element._onclick_ = this._onClick.bind(this);
 this._popoverHelper = new WebInspector.PopoverHelper(this.element, this._getPopoverAnchor.bind(this), this._showPopover.bind(this));
+this._popoverHelper.setTimeout(300);
 this._anchorElement = this.element.createChild(span);
 this._anchorElement.className = item-anchor;
 this._linkifier = new WebInspector.Linkifier();
-this._colorIndexes = { };
+this._highlightedNodeIndex = -1;
 }
 
 WebInspector.FlameChart.Events = {
@@ -58,16 +59,107 @@
 }
 
 WebInspector.FlameChart.prototype = {
+_nodeCount: function()
+{
+var nodes = this._cpuProfileView.profileHead.children.slice();
+
+var nodeCount = 0;
+while (nodes.length) {
+var node = nodes.pop();
+++nodeCount;
+nodes = nodes.concat(node.children);
+}
+return nodeCount;
+},
+
+_calculateTimelineData: function()
+{
+if (this._timelineData)
+return this._timelineData;
+
+if (!this._cpuProfileView.profileHead)
+return null;
+
+var nodeCount = this._nodeCount();
+var functionColorPairs = { };
+var currentColorIndex = 0;
+
+var startTimes = new Float32Array(nodeCount);
+var durations = new Float32Array(nodeCount);
+var depths = new Uint8Array(nodeCount);
+var nodes = new Array(nodeCount);
+var colorPairs = new Array(nodeCount);
+var index = 0;
+
+

[webkit-changes] [145796] trunk/Source/WebCore

[loislo]

Title: [145796] trunk/Source/WebCore








Revision 145796
Author loi...@chromium.org
Date 2013-03-14 02:00:32 -0700 (Thu, 14 Mar 2013)


Log Message
Web Inspector: Flame Chart. Minor changes for the popover.
https://bugs.webkit.org/show_bug.cgi?id=112331

Reviewed by Yury Semikhatsky.

popover timeout needs to be decreased a bit.
hidePopover call in onMouseMove doesn't necessary.
We have to keep anchor element unmodified if the hovered item didn't changed.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.prototype._onMouseMove):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (145795 => 145796)

--- trunk/Source/WebCore/ChangeLog	2013-03-14 08:57:27 UTC (rev 145795)
+++ trunk/Source/WebCore/ChangeLog	2013-03-14 09:00:32 UTC (rev 145796)
@@ -1,3 +1,18 @@
+2013-03-14  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Minor changes for the popover.
+https://bugs.webkit.org/show_bug.cgi?id=112331
+
+Reviewed by Yury Semikhatsky.
+
+popover timeout needs to be decreased a bit.
+hidePopover call in onMouseMove doesn't necessary.
+We have to keep anchor element unmodified if the hovered item didn't changed.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.prototype._onMouseMove):
+
 2013-03-14  Jonathan Liu  net...@gmail.com
 
 Fix detection of Intel Mac OS X platform on Intel Mac 64-bit


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (145795 => 145796)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-14 08:57:27 UTC (rev 145795)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-14 09:00:32 UTC (rev 145796)
@@ -47,7 +47,7 @@
 this.element._onmousemove_ = this._onMouseMove.bind(this);
 this.element._onclick_ = this._onClick.bind(this);
 this._popoverHelper = new WebInspector.PopoverHelper(this.element, this._getPopoverAnchor.bind(this), this._showPopover.bind(this));
-this._popoverHelper.setTimeout(300);
+this._popoverHelper.setTimeout(250);
 this._anchorElement = this.element.createChild(span);
 this._anchorElement.className = item-anchor;
 this._linkifier = new WebInspector.Linkifier();
@@ -190,11 +190,10 @@
 _onMouseMove: function(e)
 {
 var nodeIndex = this._coordinatesToNodeIndex(e.offsetX, e.offsetY);
-if (nodeIndex !== this._highlightedNodeIndex) {
-this._highlightedNodeIndex = nodeIndex;
-this._hidePopover();
-this.update();
-}
+if (nodeIndex === this._highlightedNodeIndex)
+return;
+this._highlightedNodeIndex = nodeIndex;
+this.update();
 
 if (nodeIndex === -1)
 return;
@@ -280,5 +279,3 @@
 
 __proto__: WebInspector.View.prototype
 };
-
-//@ sourceURL=http://localhost/inspector/front-end/FlameChart.js
\ No newline at end of file






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [145807] trunk/Source/WebCore

[loislo]

Title: [145807] trunk/Source/WebCore








Revision 145807
Author loi...@chromium.org
Date 2013-03-14 06:36:00 -0700 (Thu, 14 Mar 2013)


Log Message
Web Inspector: Flame Chart. Support scroll and zoom with help of mouse wheel.
https://bugs.webkit.org/show_bug.cgi?id=112337

Reviewed by Yury Semikhatsky.

New member variable _xOffset were introduced.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.prototype._onMouseMove):
(WebInspector.FlameChart.prototype._adjustXOffset):
(WebInspector.FlameChart.prototype._adjustXScale):
(WebInspector.FlameChart.prototype._onMouseWheel):
(WebInspector.FlameChart.prototype._coordinatesToNodeIndex):
(WebInspector.FlameChart.prototype.onResize):
(WebInspector.FlameChart.prototype.draw):
(WebInspector.FlameChart.prototype._scheduleUpdate):
(WebInspector.FlameChart.prototype.update):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (145806 => 145807)

--- trunk/Source/WebCore/ChangeLog	2013-03-14 12:29:43 UTC (rev 145806)
+++ trunk/Source/WebCore/ChangeLog	2013-03-14 13:36:00 UTC (rev 145807)
@@ -1,3 +1,24 @@
+2013-03-14  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Support scroll and zoom with help of mouse wheel.
+https://bugs.webkit.org/show_bug.cgi?id=112337
+
+Reviewed by Yury Semikhatsky.
+
+New member variable _xOffset were introduced.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.prototype._onMouseMove):
+(WebInspector.FlameChart.prototype._adjustXOffset):
+(WebInspector.FlameChart.prototype._adjustXScale):
+(WebInspector.FlameChart.prototype._onMouseWheel):
+(WebInspector.FlameChart.prototype._coordinatesToNodeIndex):
+(WebInspector.FlameChart.prototype.onResize):
+(WebInspector.FlameChart.prototype.draw):
+(WebInspector.FlameChart.prototype._scheduleUpdate):
+(WebInspector.FlameChart.prototype.update):
+
 2013-03-14  No'am Rosenthal  n...@webkit.org
 
 [Texmap] Synchronize layers only if the layer has been changed.


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (145806 => 145807)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-14 12:29:43 UTC (rev 145806)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-14 13:36:00 UTC (rev 145807)
@@ -41,10 +41,12 @@
 this.element.className = flame-chart;
 this._canvas = this.element.createChild(canvas);
 this._cpuProfileView = cpuProfileView;
-this._xScaleFactor = 0.0;
+this._xScaleFactor = 4.0;
+this._xOffset = 0;
 this._barHeight = 10;
 this._minWidth = 1;
 this.element._onmousemove_ = this._onMouseMove.bind(this);
+this.element._onmousewheel_ = this._onMouseWheel.bind(this);
 this.element._onclick_ = this._onClick.bind(this);
 this._popoverHelper = new WebInspector.PopoverHelper(this.element, this._getPopoverAnchor.bind(this), this._showPopover.bind(this));
 this._popoverHelper.setTimeout(250);
@@ -203,10 +205,37 @@
 var style = this._anchorElement.style;
 style.width = Math.floor(timelineData.durations[nodeIndex] * this._xScaleFactor) + px;
 style.height = this._barHeight + px;
-style.left = Math.floor(timelineData.startTimes[nodeIndex] * this._xScaleFactor) + px;
+style.left = Math.floor(timelineData.startTimes[nodeIndex] * this._xScaleFactor - this._xOffset) + px;
 style.top = Math.floor(this._canvas.height - (timelineData.depths[nodeIndex] + 1) * this._barHeight) + px;
 },
 
+_adjustXOffset: function(direction)
+{
+var step = this._xScaleFactor * 5;
+this._xOffset += direction  0 ? step : -step;
+if (this._xOffset  0)
+this._xOffset = 0;
+},
+
+_adjustXScale: function(direction, x)
+{
+if (direction  0)
+this._xScaleFactor /= 2;
+else
+this._xScaleFactor *= 2;
+},
+
+_onMouseWheel: function(e)
+{
+if (e.shiftKey)
+this._adjustXScale(e.wheelDelta, e.x);
+else
+this._adjustXOffset(e.wheelDelta);
+
+this._hidePopover();
+this._scheduleUpdate();
+},
+
 /**
  * @param {!number} x
  * @param {!number} y
@@ -216,7 +245,7 @@
 var timelineData = this._timelineData;
 if (!timelineData)
 return -1;
-var cursorTime = x / this._xScaleFactor;
+var cursorTime = (x + this._xOffset) / this._xScaleFactor;
 var cursorLevel = Math.floor((this._canvas.height - y) / this._barHeight);
 
 for (var i = 0; i  timelineData.nodeCount; ++i) {
@@ -232,7 +261,7 @@
 onResize: function()
 {
 this._hidePopover();
-this.update();
+this._scheduleUpdate();
 },
 
 /**
@@ -246,17 

[webkit-changes] [145874] trunk/Source/WebCore

[loislo]

Title: [145874] trunk/Source/WebCore








Revision 145874
Author loi...@chromium.org
Date 2013-03-14 22:26:33 -0700 (Thu, 14 Mar 2013)


Log Message
Web Inspector: Flame Chart. Support scrolling by dragging.
https://bugs.webkit.org/show_bug.cgi?id=112346

Reviewed by Yury Semikhatsky.

Drag hander was added. It seems that simple repaint works well.
When the user starts dragging we hide the popover, change offset
and do update for the new canvas image.
Drive by change: Due to new way of scrolling the canvas I changed
the behaiviour of the wheel events. Now wheel scrolls if Shift key pressed
and zooms if not.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.prototype._startCanvasDragging):
(WebInspector.FlameChart.prototype._canvasDragging):
(WebInspector.FlameChart.prototype._endCanvasDragging):
(WebInspector.FlameChart.prototype._onMouseWheel):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (145873 => 145874)

--- trunk/Source/WebCore/ChangeLog	2013-03-15 05:14:28 UTC (rev 145873)
+++ trunk/Source/WebCore/ChangeLog	2013-03-15 05:26:33 UTC (rev 145874)
@@ -1,3 +1,24 @@
+2013-03-14  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Support scrolling by dragging.
+https://bugs.webkit.org/show_bug.cgi?id=112346
+
+Reviewed by Yury Semikhatsky.
+
+Drag hander was added. It seems that simple repaint works well.
+When the user starts dragging we hide the popover, change offset
+and do update for the new canvas image.
+Drive by change: Due to new way of scrolling the canvas I changed
+the behaiviour of the wheel events. Now wheel scrolls if Shift key pressed
+and zooms if not.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.prototype._startCanvasDragging):
+(WebInspector.FlameChart.prototype._canvasDragging):
+(WebInspector.FlameChart.prototype._endCanvasDragging):
+(WebInspector.FlameChart.prototype._onMouseWheel):
+
 2013-03-14  Hayato Ito  hay...@chromium.org
 
 [Shadow Dom]: Non Bubbling events in ShadowDOM dispatch in an incorrect order


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (145873 => 145874)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-15 05:14:28 UTC (rev 145873)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-15 05:26:33 UTC (rev 145874)
@@ -40,6 +40,8 @@
 
 this.element.className = flame-chart;
 this._canvas = this.element.createChild(canvas);
+WebInspector.installDragHandle(this._canvas, this._startCanvasDragging.bind(this), this._canvasDragging.bind(this), this._endCanvasDragging.bind(this), col-resize);
+
 this._cpuProfileView = cpuProfileView;
 this._xScaleFactor = 4.0;
 this._xOffset = 0;
@@ -61,6 +63,36 @@
 }
 
 WebInspector.FlameChart.prototype = {
+_startCanvasDragging: function(event)
+{
+if (!this._timelineData)
+return false;
+this._isDragging = true;
+this._dragStartPoint = event.pageX;
+this._dragStartXOffset = this._xOffset;
+this._hidePopover();
+return true;
+},
+
+_canvasDragging: function(event)
+{
+this._xOffset = this._dragStartXOffset + this._dragStartPoint - event.pageX;
+
+if (this._xOffset  0)
+this._xOffset = 0;
+else {
+var maxXOffset = this._timelineData.totalTime * this._xScaleFactor - this._canvas.width;
+if (this._xOffset  maxXOffset)
+this._xOffset = maxXOffset;
+}
+this._scheduleUpdate();
+},
+
+_endCanvasDragging: function()
+{
+this._isDragging = false;
+},
+
 _nodeCount: function()
 {
 var nodes = this._cpuProfileView.profileHead.children.slice();
@@ -154,14 +186,18 @@
 
 _getPopoverAnchor: function()
 {
-if (this._highlightedNodeIndex === -1)
+if (this._highlightedNodeIndex === -1 || this._isDragging)
 return null;
 return this._anchorElement;
 },
 
 _showPopover: function(anchor, popover)
 {
+if (this._isDragging)
+return;
 var node = this._timelineData.nodes[this._highlightedNodeIndex];
+if (!node)
+return;
 var contentHelper = new WebInspector.PopoverContentHelper(node.functionName);
 contentHelper.appendTextRow(WebInspector.UIString(Total time), Number.secondsToString(node.totalTime / 1000, true));
 contentHelper.appendTextRow(WebInspector.UIString(Self time), Number.secondsToString(node.selfTime / 1000, true));
@@ -191,6 +227,8 @@
 
 _onMouseMove: function(e)
 {
+if (this._isDragging)
+return;
 var nodeIndex = this._coordinatesToNodeIndex(e.offsetX, e.offsetY);

[webkit-changes] [145704] trunk/Source/WebCore

[loislo]

Title: [145704] trunk/Source/WebCore








Revision 145704
Author loi...@chromium.org
Date 2013-03-13 05:18:06 -0700 (Wed, 13 Mar 2013)


Log Message
Web Inspector: throw an exception if the requested lazy loaded script does not exist.
https://bugs.webkit.org/show_bug.cgi?id=112237

Reviewed by Pavel Feldman.

* inspector/front-end/utilities.js:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/utilities.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (145703 => 145704)

--- trunk/Source/WebCore/ChangeLog	2013-03-13 12:13:23 UTC (rev 145703)
+++ trunk/Source/WebCore/ChangeLog	2013-03-13 12:18:06 UTC (rev 145704)
@@ -1,3 +1,12 @@
+2013-03-13  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: throw an exception if the requested lazy loaded script does not exist.
+https://bugs.webkit.org/show_bug.cgi?id=112237
+
+Reviewed by Pavel Feldman.
+
+* inspector/front-end/utilities.js:
+
 2013-03-13  Mike West  mk...@chromium.org
 
 Pass the XSSAuditor's report URL to the XSSAuditorDelegate on the main thread.


Modified: trunk/Source/WebCore/inspector/front-end/utilities.js (145703 => 145704)

--- trunk/Source/WebCore/inspector/front-end/utilities.js	2013-03-13 12:13:23 UTC (rev 145703)
+++ trunk/Source/WebCore/inspector/front-end/utilities.js	2013-03-13 12:18:06 UTC (rev 145704)
@@ -970,10 +970,13 @@
 /**
  * This function behavior depends on the debug_devtools flag value.
  * - In debug mode it loads scripts synchronously via xhr request.
- * - In release mode every occurrence of importScript gets replaced with
- * the script source code on the compilation phase.
+ * - In release mode every occurrence of importScript in the js files
+ *   that have been white listed in the build system gets replaced with
+ *   the script source code on the compilation phase.
+ *   The build system will throw an exception if it found importScript call
+ *   in other files.
  *
- * To load scripts lazily in release mode call loasScript function.
+ * To load scripts lazily in release mode call loadScript function.
  * @param {string} scriptName
  */
 function importScript(scriptName)
@@ -986,6 +989,8 @@
 scriptName = scriptName.split(/).reverse()[0];
 xhr.open(GET, scriptName, false);
 xhr.send(null);
+if (!xhr.responseText)
+throw empty response arrived for script ' + scriptName + ';
 var sourceURL = WebInspector.ParsedURL.completeURL(window.location.href, scriptName); 
 window.eval(xhr.responseText + \n//@ sourceURL= + sourceURL);
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [145065] trunk/Source/WebCore

[loislo]

Title: [145065] trunk/Source/WebCore








Revision 145065
Author loi...@chromium.org
Date 2013-03-07 05:36:43 -0800 (Thu, 07 Mar 2013)


Log Message
Web Inspector: Flame Chart. Stick item color to the function.
https://bugs.webkit.org/show_bug.cgi?id=111697

Reviewed by Yury Semikhatsky.

Different nodes associated with a single function have to use the same color.
Minor polish: do not filter out (idle) and (program) items. They were big due to an error on v8 side.
Set minimum width to 0 for more precise picture.

* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.prototype._rootNodes):
(WebInspector.FlameChart.prototype.draw):
(WebInspector.FlameChart.prototype._drawNode):
(WebInspector.FlameChart.prototype._drawBar):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (145064 => 145065)

--- trunk/Source/WebCore/ChangeLog	2013-03-07 12:55:51 UTC (rev 145064)
+++ trunk/Source/WebCore/ChangeLog	2013-03-07 13:36:43 UTC (rev 145065)
@@ -1,3 +1,21 @@
+2013-03-07  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Flame Chart. Stick item color to the function.
+https://bugs.webkit.org/show_bug.cgi?id=111697
+
+Reviewed by Yury Semikhatsky.
+
+Different nodes associated with a single function have to use the same color.
+Minor polish: do not filter out (idle) and (program) items. They were big due to an error on v8 side.
+Set minimum width to 0 for more precise picture.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.prototype._rootNodes):
+(WebInspector.FlameChart.prototype.draw):
+(WebInspector.FlameChart.prototype._drawNode):
+(WebInspector.FlameChart.prototype._drawBar):
+
 2013-03-07  Andrey Lushnikov  lushni...@chromium.org
 
 Web Inspector: [ACE] gutter size should be fixed.


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (145064 => 145065)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-07 12:55:51 UTC (rev 145064)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-07 13:36:43 UTC (rev 145065)
@@ -43,13 +43,14 @@
 this._cpuProfileView = cpuProfileView;
 this._xScaleFactor = 0.0;
 this._yScaleFactor = 10;
-this._minWidth = 3;
+this._minWidth = 0;
 this.element._onmousemove_ = this._onMouseMove.bind(this);
 this.element._onclick_ = this._onClick.bind(this);
 this._popoverHelper = new WebInspector.PopoverHelper(this.element, this._getPopoverAnchor.bind(this), this._showPopover.bind(this));
 this._anchorElement = this.element.createChild(span);
 this._anchorElement.className = item-anchor;
 this._linkifier = new WebInspector.Linkifier();
+this._colorIndexes = { };
 }
 
 WebInspector.FlameChart.Events = {
@@ -137,25 +138,10 @@
  */
 _rootNodes: function()
 {
-if (this._rootNodesArray)
-return this._rootNodesArray.slice();
-
-var profileHead = this._cpuProfileView.profileHead;
-if (!profileHead)
+if (!this._cpuProfileView.profileHead)
 return null;
-var totalTime = 0;
-var nodes = [];
-for (var i = 0; i  profileHead.children.length; ++i) {
-var node = profileHead.children[i];
-if (node.functionName === (program) || node.functionName === (idle))
-continue;
-totalTime += node.totalTime;
-nodes.push(node);
-}
-
-this._rootNodesArray = nodes;
-this._totalTime = totalTime;
-return nodes.slice();
+this._totalTime = this._cpuProfileView.profileHead.totalTime;
+return this._cpuProfileView.profileHead.children.slice();
 },
 
 /**
@@ -167,9 +153,8 @@
 if (!this._rootNodes())
 return;
 
-var margin = 0;
-this._canvas.height = height - margin;
-this._canvas.width = width - margin;
+this._canvas.height = height;
+this._canvas.width = width;
 
 this._xScaleFactor = width / this._totalTime;
 this._colorIndex = 0;
@@ -186,8 +171,15 @@
  */
 _drawNode: function(offset, level, node)
 {
-++this._colorIndex;
-var hue = (this._colorIndex * 2 + 11 * (this._colorIndex % 2)) % 360;
+var colorIndex = node.colorIndex;
+if (!colorIndex) {
+var functionUID = node.functionName + : + node.url + : + node.lineNumber;
+colorIndex = this._colorIndexes[functionUID];
+if (!colorIndex)
+this._colorIndexes[functionUID] = colorIndex = ++this._colorIndex;
+node.colorIndex = colorIndex;
+}
+var hue = (colorIndex * 5 + 11 * (colorIndex % 2)) % 360;
 var lightness = this._highlightedNode === node ? 33 : 67;
 var color = hsl( + hue + , 

[webkit-changes] [144895] trunk/Source/WebCore

[loislo]

Title: [144895] trunk/Source/WebCore








Revision 144895
Author loi...@chromium.org
Date 2013-03-06 00:59:40 -0800 (Wed, 06 Mar 2013)


Log Message
Web Inspector: Could not open Profiles panel.
https://bugs.webkit.org/show_bug.cgi?id=111535

Reviewed by Alexander Pavlov.

* inspector/front-end/CPUProfileView.js:
* inspector/front-end/ProfilesPanel.js:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/CPUProfileView.js
trunk/Source/WebCore/inspector/front-end/ProfilesPanel.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (144894 => 144895)

--- trunk/Source/WebCore/ChangeLog	2013-03-06 08:29:42 UTC (rev 144894)
+++ trunk/Source/WebCore/ChangeLog	2013-03-06 08:59:40 UTC (rev 144895)
@@ -1,3 +1,13 @@
+2013-03-06  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Could not open Profiles panel.
+https://bugs.webkit.org/show_bug.cgi?id=111535
+
+Reviewed by Alexander Pavlov.
+
+* inspector/front-end/CPUProfileView.js:
+* inspector/front-end/ProfilesPanel.js:
+
 2013-03-06  Tony Chang  t...@chromium.org
 
 Crash during middle mouse click when page is removed


Modified: trunk/Source/WebCore/inspector/front-end/CPUProfileView.js (144894 => 144895)

--- trunk/Source/WebCore/inspector/front-end/CPUProfileView.js	2013-03-06 08:29:42 UTC (rev 144894)
+++ trunk/Source/WebCore/inspector/front-end/CPUProfileView.js	2013-03-06 08:59:40 UTC (rev 144895)
@@ -774,5 +774,3 @@
 
 __proto__: WebInspector.ProfileHeader.prototype
 }
-
-importScript(FlameChart.js);


Modified: trunk/Source/WebCore/inspector/front-end/ProfilesPanel.js (144894 => 144895)

--- trunk/Source/WebCore/inspector/front-end/ProfilesPanel.js	2013-03-06 08:29:42 UTC (rev 144894)
+++ trunk/Source/WebCore/inspector/front-end/ProfilesPanel.js	2013-03-06 08:59:40 UTC (rev 144895)
@@ -1453,6 +1453,7 @@
 importScript(BottomUpProfileDataGridTree.js);
 importScript(CPUProfileView.js);
 importScript(CSSSelectorProfileView.js);
+importScript(FlameChart.js);
 importScript(HeapSnapshot.js);
 importScript(HeapSnapshotDataGrids.js);
 importScript(HeapSnapshotGridNodes.js);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144759] trunk/Source/WebCore

[loislo]

Title: [144759] trunk/Source/WebCore








Revision 144759
Author loi...@chromium.org
Date 2013-03-05 07:29:16 -0800 (Tue, 05 Mar 2013)


Log Message
Web Inspector: move PopoverContentHelper from TimelinePresentationModel.js to Popover.js.
https://bugs.webkit.org/show_bug.cgi?id=111431

Reviewed by Yury Semikhatsky.

class WebInspector.TimelinePresentationModel.PopoverContentHelper was renamed to WebInspector.PopoverContentHelper.
Style names were changed accordingly.

* inspector/front-end/Popover.js:
(WebInspector.PopoverContentHelper):
(WebInspector.PopoverContentHelper.prototype.contentTable):
(WebInspector.PopoverContentHelper.prototype._createCell):
(WebInspector.PopoverContentHelper.prototype.appendTextRow):
(WebInspector.PopoverContentHelper.prototype.appendElementRow):
(WebInspector.PopoverContentHelper.prototype.appendStackTrace):
* inspector/front-end/TimelinePresentationModel.js:
(WebInspector.TimelinePresentationModel.prototype.generateMainThreadBarPopupContent):
(WebInspector.TimelinePresentationModel.Record.prototype._generatePopupContentWithImagePreview):
(WebInspector.TimelinePresentationModel.generatePopupContentForFrame):
(WebInspector.TimelinePresentationModel.generatePopupContentForFrameStatistics):
* inspector/front-end/popover.css:
(.popover-details):
(.popover-function-name):
(.popover-stacktrace-title):
(.popover-details-row-title):
(.popover-details-row-data):
(.popover-details-title):
* inspector/front-end/timelinePanel.css:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/Popover.js
trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js
trunk/Source/WebCore/inspector/front-end/popover.css
trunk/Source/WebCore/inspector/front-end/timelinePanel.css




Diff

Modified: trunk/Source/WebCore/ChangeLog (144758 => 144759)

--- trunk/Source/WebCore/ChangeLog	2013-03-05 15:00:00 UTC (rev 144758)
+++ trunk/Source/WebCore/ChangeLog	2013-03-05 15:29:16 UTC (rev 144759)
@@ -1,3 +1,34 @@
+2013-03-05  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: move PopoverContentHelper from TimelinePresentationModel.js to Popover.js.
+https://bugs.webkit.org/show_bug.cgi?id=111431
+
+Reviewed by Yury Semikhatsky.
+
+class WebInspector.TimelinePresentationModel.PopoverContentHelper was renamed to WebInspector.PopoverContentHelper.
+Style names were changed accordingly.
+
+* inspector/front-end/Popover.js:
+(WebInspector.PopoverContentHelper):
+(WebInspector.PopoverContentHelper.prototype.contentTable):
+(WebInspector.PopoverContentHelper.prototype._createCell):
+(WebInspector.PopoverContentHelper.prototype.appendTextRow):
+(WebInspector.PopoverContentHelper.prototype.appendElementRow):
+(WebInspector.PopoverContentHelper.prototype.appendStackTrace):
+* inspector/front-end/TimelinePresentationModel.js:
+(WebInspector.TimelinePresentationModel.prototype.generateMainThreadBarPopupContent):
+(WebInspector.TimelinePresentationModel.Record.prototype._generatePopupContentWithImagePreview):
+(WebInspector.TimelinePresentationModel.generatePopupContentForFrame):
+(WebInspector.TimelinePresentationModel.generatePopupContentForFrameStatistics):
+* inspector/front-end/popover.css:
+(.popover-details):
+(.popover-function-name):
+(.popover-stacktrace-title):
+(.popover-details-row-title):
+(.popover-details-row-data):
+(.popover-details-title):
+* inspector/front-end/timelinePanel.css:
+
 2013-03-05  Yury Semikhatsky  yu...@chromium.org
 
 Web Inspector: remove Live native memory chart experiment


Modified: trunk/Source/WebCore/inspector/front-end/Popover.js (144758 => 144759)

--- trunk/Source/WebCore/inspector/front-end/Popover.js	2013-03-05 15:00:00 UTC (rev 144758)
+++ trunk/Source/WebCore/inspector/front-end/Popover.js	2013-03-05 15:29:16 UTC (rev 144759)
@@ -364,4 +364,84 @@
 WebInspector.Popover.Orientation = {
 Top: top,
 Bottom: bottom
-}
\ No newline at end of file
+}
+
+/**
+ * @constructor
+ * @param {string} title
+ */
+WebInspector.PopoverContentHelper = function(title)
+{
+this._contentTable = document.createElement(table);
+var titleCell = this._createCell(WebInspector.UIString(%s - Details, title), popover-details-title);
+titleCell.colSpan = 2;
+var titleRow = document.createElement(tr);
+titleRow.appendChild(titleCell);
+this._contentTable.appendChild(titleRow);
+}
+
+WebInspector.PopoverContentHelper.prototype = {
+contentTable: function()
+{
+return this._contentTable;
+},
+
+/**
+ * @param {string=} styleName
+ */
+_createCell: function(content, styleName)
+{
+var text = document.createElement(label);
+text.appendChild(document.createTextNode(content));
+var cell = document.createElement(td);
+cell.className = 

[webkit-changes] [144618] trunk/Source/WebCore

[loislo]

Title: [144618] trunk/Source/WebCore








Revision 144618
Author loi...@chromium.org
Date 2013-03-04 04:39:49 -0800 (Mon, 04 Mar 2013)


Log Message
Web Inspector: implement Flame Chart for CPU profiler.
https://bugs.webkit.org/show_bug.cgi?id=62

Reviewed by Yury Semikhatsky.

It is an initial implementation. The next step is to provide
function names and other stats about the hovered item.

* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* inspector/compile-front-end.py:
* inspector/front-end/CPUProfileView.js:
(WebInspector.CPUProfileView.prototype._getCPUProfileCallback):
* inspector/front-end/FlameChart.js: Added.
(WebInspector.FlameChart):
(WebInspector.FlameChart.prototype._onMouseMove):
(WebInspector.FlameChart.prototype.findNodeCallback):
(WebInspector.FlameChart.prototype._coordinatesToNode):
(WebInspector.FlameChart.prototype.onResize):
(WebInspector.FlameChart.prototype._rootNodes):
(WebInspector.FlameChart.prototype.draw):
(WebInspector.FlameChart.prototype._drawNode):
(WebInspector.FlameChart.prototype._forEachNode):
(WebInspector.FlameChart.prototype._drawBar):
(WebInspector.FlameChart.prototype.update):
* inspector/front-end/Settings.js:
(WebInspector.ExperimentsSettings):
* inspector/front-end/WebKit.qrc:
* inspector/front-end/flameChart.css: Added.
(.flame-chart):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.gypi
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
trunk/Source/WebCore/inspector/compile-front-end.py
trunk/Source/WebCore/inspector/front-end/CPUProfileView.js
trunk/Source/WebCore/inspector/front-end/Settings.js
trunk/Source/WebCore/inspector/front-end/WebKit.qrc


Added Paths

trunk/Source/WebCore/inspector/front-end/FlameChart.js
trunk/Source/WebCore/inspector/front-end/flameChart.css




Diff

Modified: trunk/Source/WebCore/ChangeLog (144617 => 144618)

--- trunk/Source/WebCore/ChangeLog	2013-03-04 12:26:53 UTC (rev 144617)
+++ trunk/Source/WebCore/ChangeLog	2013-03-04 12:39:49 UTC (rev 144618)
@@ -1,3 +1,38 @@
+2013-03-04  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: implement Flame Chart for CPU profiler.
+https://bugs.webkit.org/show_bug.cgi?id=62
+
+Reviewed by Yury Semikhatsky.
+
+It is an initial implementation. The next step is to provide
+function names and other stats about the hovered item.
+
+* WebCore.gypi:
+* WebCore.vcproj/WebCore.vcproj:
+* WebCore.vcxproj/WebCore.vcxproj:
+* WebCore.vcxproj/WebCore.vcxproj.filters:
+* inspector/compile-front-end.py:
+* inspector/front-end/CPUProfileView.js:
+(WebInspector.CPUProfileView.prototype._getCPUProfileCallback):
+* inspector/front-end/FlameChart.js: Added.
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.prototype._onMouseMove):
+(WebInspector.FlameChart.prototype.findNodeCallback):
+(WebInspector.FlameChart.prototype._coordinatesToNode):
+(WebInspector.FlameChart.prototype.onResize):
+(WebInspector.FlameChart.prototype._rootNodes):
+(WebInspector.FlameChart.prototype.draw):
+(WebInspector.FlameChart.prototype._drawNode):
+(WebInspector.FlameChart.prototype._forEachNode):
+(WebInspector.FlameChart.prototype._drawBar):
+(WebInspector.FlameChart.prototype.update):
+* inspector/front-end/Settings.js:
+(WebInspector.ExperimentsSettings):
+* inspector/front-end/WebKit.qrc:
+* inspector/front-end/flameChart.css: Added.
+(.flame-chart):
+
 2013-03-04  Marja Hölttä  ma...@chromium.org
 
 [V8] Add a context type parameter to GetTemplate and ConfigureV8SomethingTemplate functions


Modified: trunk/Source/WebCore/WebCore.gypi (144617 => 144618)

--- trunk/Source/WebCore/WebCore.gypi	2013-03-04 12:26:53 UTC (rev 144617)
+++ trunk/Source/WebCore/WebCore.gypi	2013-03-04 12:39:49 UTC (rev 144618)
@@ -5448,6 +5448,7 @@
 'inspector/front-end/dataGrid.css',
 'inspector/front-end/elementsPanel.css',
 'inspector/front-end/filteredItemSelectionDialog.css',
+'inspector/front-end/flameChart.css',
 'inspector/front-end/heapProfiler.css',
 'inspector/front-end/helpScreen.css',
 'inspector/front-end/indexedDBViews.css',
@@ -5536,6 +5537,7 @@
 'inspector/front-end/BottomUpProfileDataGridTree.js',
 'inspector/front-end/CPUProfileView.js',
 'inspector/front-end/CSSSelectorProfileView.js',
+'inspector/front-end/FlameChart.js',
 'inspector/front-end/HeapSnapshot.js',
 'inspector/front-end/HeapSnapshotDataGrids.js',
 'inspector/front-end/HeapSnapshotGridNodes.js',


Modified: 

[webkit-changes] [144621] trunk/Source/WebCore

[loislo]

Title: [144621] trunk/Source/WebCore








Revision 144621
Author loi...@chromium.org
Date 2013-03-04 05:15:26 -0800 (Mon, 04 Mar 2013)


Log Message
Web Inspector: Unreviewed. Fix for closure type annotations.

* inspector/front-end/FlameChart.js:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (144620 => 144621)

--- trunk/Source/WebCore/ChangeLog	2013-03-04 13:07:49 UTC (rev 144620)
+++ trunk/Source/WebCore/ChangeLog	2013-03-04 13:15:26 UTC (rev 144621)
@@ -1,3 +1,9 @@
+2013-03-04  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Unreviewed. Fix for closure type annotations.
+
+* inspector/front-end/FlameChart.js:
+
 2013-03-04  Kondapally Kalyan  kalyan.kondapa...@intel.com
 
 [EFL] Build fix when compiling with GLES2 support enabled.


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (144620 => 144621)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-04 13:07:49 UTC (rev 144620)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-04 13:15:26 UTC (rev 144621)
@@ -129,6 +129,11 @@
 this._forEachNode(this._drawNode.bind(this));
 },
 
+/**
+ * @param {!number} offset
+ * @param {!number} level
+ * @param {!ProfilerAgent.CPUProfileNode} node
+ */
 _drawNode: function(offset, level, node)
 {
 ++this._colorIndex;
@@ -138,6 +143,9 @@
 this._drawBar(this._context, offset, level, node, color);
 },
 
+/**
+ * @param {!function(!number, !number, !ProfilerAgent.CPUProfileNode)} callback
+ */
 _forEachNode: function(callback)
 {
 var nodes = this._rootNodes();
@@ -169,7 +177,7 @@
  * @param {number} offset
  * @param {number} level
  * @param {!ProfilerAgent.CPUProfileNode} node
- * @param {!WebInspector.Color} hslColor
+ * @param {!string} hslColor
  */
 _drawBar: function(context, offset, level, node, hslColor)
 {
@@ -190,5 +198,3 @@
 
 __proto__: WebInspector.View.prototype
 };
-
-//@ sourceURL=http://localhost/inspector/front-end/FlameChart.js






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144625] trunk/Source/WebCore

[loislo]

Title: [144625] trunk/Source/WebCore








Revision 144625
Author loi...@chromium.org
Date 2013-03-04 07:07:17 -0800 (Mon, 04 Mar 2013)


Log Message
Web Inspector: CPU Flame Chart: reveal profiler DataGrid node when user clicks on a FlameChart item.
https://bugs.webkit.org/show_bug.cgi?id=111309

Reviewed by Yury Semikhatsky.

* inspector/front-end/CPUProfileView.js:
(WebInspector.CPUProfileView.prototype._revealProfilerNode):
* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.prototype._onClick):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/CPUProfileView.js
trunk/Source/WebCore/inspector/front-end/FlameChart.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (144624 => 144625)

--- trunk/Source/WebCore/ChangeLog	2013-03-04 14:07:57 UTC (rev 144624)
+++ trunk/Source/WebCore/ChangeLog	2013-03-04 15:07:17 UTC (rev 144625)
@@ -1,3 +1,16 @@
+2013-03-04  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: CPU Flame Chart: reveal profiler DataGrid node when user clicks on a FlameChart item.
+https://bugs.webkit.org/show_bug.cgi?id=111309
+
+Reviewed by Yury Semikhatsky.
+
+* inspector/front-end/CPUProfileView.js:
+(WebInspector.CPUProfileView.prototype._revealProfilerNode):
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.prototype._onClick):
+
 2013-03-04  Antoine Quint  grao...@apple.com
 
 Web Inspector: remove existing LayerTreeAgent protocol APIs


Modified: trunk/Source/WebCore/inspector/front-end/CPUProfileView.js (144624 => 144625)

--- trunk/Source/WebCore/inspector/front-end/CPUProfileView.js	2013-03-04 14:07:57 UTC (rev 144624)
+++ trunk/Source/WebCore/inspector/front-end/CPUProfileView.js	2013-03-04 15:07:17 UTC (rev 144625)
@@ -61,6 +61,7 @@
 this.dataGrid.show(this._splitView.firstElement());
 
 this.flameChart = new WebInspector.FlameChart(this);
+this.flameChart.addEventListener(WebInspector.FlameChart.Events.SelectedNode, this._revealProfilerNode.bind(this));
 this.flameChart.show(this._splitView.secondElement());
 } else
 this.dataGrid.show(this.element);
@@ -98,6 +99,17 @@
 WebInspector.CPUProfileView._TypeHeavy = Heavy;
 
 WebInspector.CPUProfileView.prototype = {
+_revealProfilerNode: function(event)
+{
+var current = this.profileDataGridTree.children[0];
+
+while (current  current.profileNode !== event.data)
+current = current.traverseNextNode(false, null, false);
+
+if (current)
+current.revealAndSelect();
+},
+
 /**
  * @param {?Protocol.Error} error
  * @param {ProfilerAgent.CPUProfile} profile


Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (144624 => 144625)

--- trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-04 14:07:57 UTC (rev 144624)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js	2013-03-04 15:07:17 UTC (rev 144625)
@@ -45,9 +45,21 @@
 this._yScaleFactor = 10;
 this._minWidth = 3;
 this.element._onmousemove_ = this._onMouseMove.bind(this);
+this.element._onclick_ = this._onClick.bind(this);
 }
 
+WebInspector.FlameChart.Events = {
+SelectedNode: SelectedNode
+}
+
 WebInspector.FlameChart.prototype = {
+_onClick: function(e)
+{
+if (!this._highlightedNode)
+return;
+this.dispatchEventToListeners(WebInspector.FlameChart.Events.SelectedNode, this._highlightedNode);
+},
+
 _onMouseMove: function(e)
 {
 var node = this._coordinatesToNode(e.offsetX, e.offsetY);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144527] trunk

[loislo]

Title: [144527] trunk








Revision 144527
Author loi...@chromium.org
Date 2013-03-01 21:23:18 -0800 (Fri, 01 Mar 2013)


Log Message
Web Inspector: Native Memory Instrumentation: do not visit raw pointers by default.
https://bugs.webkit.org/show_bug.cgi?id=110943

Reviewed by Yury Semikhatsky.

Unfortunately in many cases raw pointer may point to an object that has been deleted.
There is no working solution to solve this problem in general.
It could be solved only on case by case basis.

Source/WebCore:

* inspector/HeapGraphSerializer.cpp:
(WebCore::HeapGraphSerializer::HeapGraphSerializer):
(WebCore::HeapGraphSerializer::reportLeaf):
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::reportMemoryUsage):
* platform/graphics/BitmapImage.cpp:
(WebCore::FrameData::reportMemoryUsage):
* platform/graphics/skia/MemoryInstrumentationSkia.cpp:
(reportMemoryUsage):

Source/WTF:

* wtf/MemoryInstrumentation.h:
(WTF::MemoryInstrumentation::addObject):
(WTF::MemoryInstrumentation::MemberTypeTraits::addObject):
(WTF::MemoryClassInfo::addMember):
(WTF::MemoryInstrumentation::addObjectImpl):
* wtf/MemoryInstrumentationString.h:
(WTF::reportMemoryUsage):

Tools:

* TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp:
* TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp:
(TestWebKitAPI::TEST):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MemoryInstrumentation.h
trunk/Source/WTF/wtf/MemoryInstrumentationString.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
trunk/Source/WebCore/loader/cache/MemoryCache.cpp
trunk/Source/WebCore/platform/graphics/BitmapImage.cpp
trunk/Source/WebCore/platform/graphics/skia/MemoryInstrumentationSkia.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp
trunk/Tools/TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (144526 => 144527)

--- trunk/Source/WTF/ChangeLog	2013-03-02 05:18:43 UTC (rev 144526)
+++ trunk/Source/WTF/ChangeLog	2013-03-02 05:23:18 UTC (rev 144527)
@@ -1,3 +1,22 @@
+2013-03-01  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: do not visit raw pointers by default.
+https://bugs.webkit.org/show_bug.cgi?id=110943
+
+Reviewed by Yury Semikhatsky.
+
+Unfortunately in many cases raw pointer may point to an object that has been deleted.
+There is no working solution to solve this problem in general.
+It could be solved only on case by case basis.
+
+* wtf/MemoryInstrumentation.h:
+(WTF::MemoryInstrumentation::addObject):
+(WTF::MemoryInstrumentation::MemberTypeTraits::addObject):
+(WTF::MemoryClassInfo::addMember):
+(WTF::MemoryInstrumentation::addObjectImpl):
+* wtf/MemoryInstrumentationString.h:
+(WTF::reportMemoryUsage):
+
 2013-03-01  Eric Seidel  e...@webkit.org
 
 Threaded HTML Parser has an extra copy of every byte from the network


Modified: trunk/Source/WTF/wtf/MemoryInstrumentation.h (144526 => 144527)

--- trunk/Source/WTF/wtf/MemoryInstrumentation.h	2013-03-02 05:18:43 UTC (rev 144526)
+++ trunk/Source/WTF/wtf/MemoryInstrumentation.h	2013-03-02 05:23:18 UTC (rev 144527)
@@ -48,8 +48,7 @@
 enum MemberType {
 PointerMember,
 ReferenceMember,
-OwnPtrMember,
-RefPtrMember,
+RetainingPointer,
 LastMemberTypeEntry
 };
 
@@ -167,7 +166,10 @@
 virtual void callReportMemoryUsage(MemoryObjectInfo*) OVERRIDE;
 };
 
-templatetypename T void addObject(const T t, MemoryObjectInfo* ownerObjectInfo, const char* edgeName) { MemberTypeTraitsT::addObject(this, t, ownerObjectInfo, edgeName); }
+templatetypename T void addObject(const T t, MemoryObjectInfo* ownerObjectInfo, const char* edgeName, MemberType memberType)
+{
+MemberTypeTraitsT::addObject(this, t, ownerObjectInfo, edgeName, memberType);
+}
 void addRawBuffer(const void* buffer, MemoryObjectType ownerObjectType, size_t size, const char* className = 0, const char* edgeName = 0)
 {
 if (!buffer || visited(buffer))
@@ -179,7 +181,7 @@
 
 templatetypename T
 struct MemberTypeTraits { // Default ReferenceMember implementation.
-static void addObject(MemoryInstrumentation* instrumentation, const T t, MemoryObjectInfo* ownerObjectInfo, const char* edgeName)
+static void addObject(MemoryInstrumentation* instrumentation, const T t, MemoryObjectInfo* ownerObjectInfo, const char* edgeName, MemberType)
 {
 instrumentation-addObjectImpl(t, ownerObjectInfo, ReferenceMember, edgeName);
 }
@@ -192,9 +194,9 @@
 
 templatetypename T
 struct MemberTypeTraitsT* { // Custom PointerMember implementation.
-static void addObject(MemoryInstrumentation* instrumentation, const T* const t, MemoryObjectInfo* ownerObjectInfo, const char* edgeName)
+static void addObject(MemoryInstrumentation* 

[webkit-changes] [143889] trunk

[loislo]

Title: [143889] trunk








Revision 143889
Author loi...@chromium.org
Date 2013-02-25 01:10:11 -0800 (Mon, 25 Feb 2013)


Log Message
Web Inspector: Improve speed of Linkifier.reset operation.
https://bugs.webkit.org/show_bug.cgi?id=110696

Reviewed by Yury Semikhatsky.

Linkifier calls Location.dispose N times and each dispose method calls Array.remove
which scans entire array and does splice. So the complexity of Linkifier.reset
is O(N^2). I replaced the arrays with Set and got O(N) complexity.

Drive by fix: The identifier generator was slightly changed.
Now it produces identifiers that couldn't be converted into a number.
So the engine will never convert Set/Map object into an array.

Source/WebCore:

* inspector/front-end/Script.js:
(WebInspector.Script):
(WebInspector.Script.prototype.updateLocations):
(WebInspector.Script.prototype.createLiveLocation):
* inspector/front-end/UISourceCode.js:
(WebInspector.UISourceCode):
(WebInspector.UISourceCode.prototype.addLiveLocation):
(WebInspector.UISourceCode.prototype.updateLiveLocations):
* inspector/front-end/utilities.js:

LayoutTests:

* inspector/debugger/callstack-placards-discarded.html:
* inspector/debugger/linkifier.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/inspector/debugger/callstack-placards-discarded.html
trunk/LayoutTests/inspector/debugger/linkifier.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/Script.js
trunk/Source/WebCore/inspector/front-end/UISourceCode.js
trunk/Source/WebCore/inspector/front-end/utilities.js




Diff

Modified: trunk/LayoutTests/ChangeLog (143888 => 143889)

--- trunk/LayoutTests/ChangeLog	2013-02-25 08:09:17 UTC (rev 143888)
+++ trunk/LayoutTests/ChangeLog	2013-02-25 09:10:11 UTC (rev 143889)
@@ -1,3 +1,21 @@
+2013-02-25  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Improve speed of Linkifier.reset operation.
+https://bugs.webkit.org/show_bug.cgi?id=110696
+
+Reviewed by Yury Semikhatsky.
+
+Linkifier calls Location.dispose N times and each dispose method calls Array.remove
+which scans entire array and does splice. So the complexity of Linkifier.reset
+is O(N^2). I replaced the arrays with Set and got O(N) complexity.
+
+Drive by fix: The identifier generator was slightly changed.
+Now it produces identifiers that couldn't be converted into a number.
+So the engine will never convert Set/Map object into an array.
+
+* inspector/debugger/callstack-placards-discarded.html:
+* inspector/debugger/linkifier.html:
+
 2013-02-24  Kihong Kwon  kihong.k...@samsung.com
 
 Add an ASSERT to didChangeDeviceProximity


Modified: trunk/LayoutTests/inspector/debugger/callstack-placards-discarded.html (143888 => 143889)

--- trunk/LayoutTests/inspector/debugger/callstack-placards-discarded.html	2013-02-25 08:09:17 UTC (rev 143888)
+++ trunk/LayoutTests/inspector/debugger/callstack-placards-discarded.html	2013-02-25 09:10:11 UTC (rev 143889)
@@ -57,7 +57,7 @@
 var count = 0;
 var scripts = WebInspector.debuggerModel.scripts;
 for (var id in scripts)
-count += scripts[id]._locations.length;
+count += scripts[id]._locations.size();
 return count;
 }
 }


Modified: trunk/LayoutTests/inspector/debugger/linkifier.html (143888 => 143889)

--- trunk/LayoutTests/inspector/debugger/linkifier.html	2013-02-25 08:09:17 UTC (rev 143888)
+++ trunk/LayoutTests/inspector/debugger/linkifier.html	2013-02-25 09:10:11 UTC (rev 143889)
@@ -75,7 +75,7 @@
 
 function liveLocationsCount()
 {
-return script._locations.length;
+return script._locations.size();
 }
 }
 


Modified: trunk/Source/WebCore/ChangeLog (143888 => 143889)

--- trunk/Source/WebCore/ChangeLog	2013-02-25 08:09:17 UTC (rev 143888)
+++ trunk/Source/WebCore/ChangeLog	2013-02-25 09:10:11 UTC (rev 143889)
@@ -1,3 +1,28 @@
+2013-02-24  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Improve speed of Linkifier.reset operation.
+https://bugs.webkit.org/show_bug.cgi?id=110696
+
+Reviewed by Yury Semikhatsky.
+
+Linkifier calls Location.dispose N times and each dispose method calls Array.remove
+which scans entire array and does splice. So the complexity of Linkifier.reset
+is O(N^2). I replaced the arrays with Set and got O(N) complexity.
+
+Drive by fix: The identifier generator was slightly changed.
+Now it produces identifiers that couldn't be converted into a number.
+So the engine will never convert Set/Map object into an array.
+
+* inspector/front-end/Script.js:
+(WebInspector.Script):
+(WebInspector.Script.prototype.updateLocations):
+(WebInspector.Script.prototype.createLiveLocation):
+* inspector/front-end/UISourceCode.js:
+(WebInspector.UISourceCode):
+

[webkit-changes] [143894] trunk/Source/WebCore

[loislo]

Title: [143894] trunk/Source/WebCore








Revision 143894
Author loi...@chromium.org
Date 2013-02-25 01:48:29 -0800 (Mon, 25 Feb 2013)


Log Message
Unreviewed fix of type annotation for this._liveLocations.

* inspector/front-end/UISourceCode.js:
(WebInspector.UISourceCode):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/UISourceCode.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (143893 => 143894)

--- trunk/Source/WebCore/ChangeLog	2013-02-25 09:42:09 UTC (rev 143893)
+++ trunk/Source/WebCore/ChangeLog	2013-02-25 09:48:29 UTC (rev 143894)
@@ -1,3 +1,10 @@
+2013-02-25  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed fix of type annotation for this._liveLocations.
+
+* inspector/front-end/UISourceCode.js:
+(WebInspector.UISourceCode):
+
 2013-02-25  Kent Tamura  tk...@chromium.org
 
 Fix style errors in WebCore/editing/{htmlediting,markup,visible_units}.*


Modified: trunk/Source/WebCore/inspector/front-end/UISourceCode.js (143893 => 143894)

--- trunk/Source/WebCore/inspector/front-end/UISourceCode.js	2013-02-25 09:42:09 UTC (rev 143893)
+++ trunk/Source/WebCore/inspector/front-end/UISourceCode.js	2013-02-25 09:48:29 UTC (rev 143894)
@@ -51,9 +51,6 @@
  * @type Array.function(?string,boolean,string)
  */
 this._requestContentCallbacks = [];
-/**
- * @type {Object.number, WebInspector.LiveLocation}
- */
 this._liveLocations = new Set();
 /**
  * @type {Array.WebInspector.PresentationConsoleMessage}






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143913] trunk

[loislo]

Title: [143913] trunk








Revision 143913
Author loi...@chromium.org
Date 2013-02-25 05:37:35 -0800 (Mon, 25 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: replace String with const char* in MemoryObjectInfo
https://bugs.webkit.org/show_bug.cgi?id=110599

Reviewed by Yury Semikhatsky.

Due to potentially dynamic nature of names and classNames we need to make a copy of the strings
that were given us via MemoryInstrumentation calls.
So I extended client api with registerString method that pushes the strings
down to the serializer.

Source/WebCore:

* css/InspectorCSSOMWrappers.h:
* inspector/HeapGraphSerializer.cpp:
(WebCore::HeapGraphSerializer::HeapGraphSerializer):
(WebCore::HeapGraphSerializer::reportNodeImpl):
(WebCore::HeapGraphSerializer::reportEdgeImpl):
(WebCore::HeapGraphSerializer::registerString):
(WebCore::HeapGraphSerializer::registerTypeString):
(WebCore::HeapGraphSerializer::addRootNode):
* inspector/HeapGraphSerializer.h:
(HeapGraphSerializer):
* inspector/MemoryInstrumentationImpl.cpp:
(WebCore::MemoryInstrumentationClientImpl::registerString):
(WebCore):
* inspector/MemoryInstrumentationImpl.h:
(MemoryInstrumentationClientImpl):
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::reportMemoryUsage):

Source/WTF:

* wtf/MemoryInstrumentation.h:
(MemoryInstrumentationClient):
* wtf/MemoryObjectInfo.h:
(WTF::MemoryObjectInfo::MemoryObjectInfo):
(WTF::MemoryObjectInfo::setClassName):
(WTF::MemoryObjectInfo::classNameId):
(WTF::MemoryObjectInfo::setName):
(WTF::MemoryObjectInfo::nameId):
(MemoryObjectInfo):

Tools:

* TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp:
* TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp:
(TestWebKitAPI::Helper::Helper):
(Helper):
(TestWebKitAPI::Helper::addNode):
(TestWebKitAPI::TEST):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MemoryInstrumentation.h
trunk/Source/WTF/wtf/MemoryObjectInfo.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/InspectorCSSOMWrappers.h
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
trunk/Source/WebCore/inspector/HeapGraphSerializer.h
trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.cpp
trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.h
trunk/Source/WebCore/loader/cache/CachedResource.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp
trunk/Tools/TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (143912 => 143913)

--- trunk/Source/WTF/ChangeLog	2013-02-25 13:21:10 UTC (rev 143912)
+++ trunk/Source/WTF/ChangeLog	2013-02-25 13:37:35 UTC (rev 143913)
@@ -1,3 +1,25 @@
+2013-02-23  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: replace String with const char* in MemoryObjectInfo
+https://bugs.webkit.org/show_bug.cgi?id=110599
+
+Reviewed by Yury Semikhatsky.
+
+Due to potentially dynamic nature of names and classNames we need to make a copy of the strings
+that were given us via MemoryInstrumentation calls.
+So I extended client api with registerString method that pushes the strings
+down to the serializer.
+
+* wtf/MemoryInstrumentation.h:
+(MemoryInstrumentationClient):
+* wtf/MemoryObjectInfo.h:
+(WTF::MemoryObjectInfo::MemoryObjectInfo):
+(WTF::MemoryObjectInfo::setClassName):
+(WTF::MemoryObjectInfo::classNameId):
+(WTF::MemoryObjectInfo::setName):
+(WTF::MemoryObjectInfo::nameId):
+(MemoryObjectInfo):
+
 2013-02-21  Brady Eidson  beid...@apple.com
 
 Move fastlog2() to WTF/MathExtras.h so it can be used from multiple projects.


Modified: trunk/Source/WTF/wtf/MemoryInstrumentation.h (143912 => 143913)

--- trunk/Source/WTF/wtf/MemoryInstrumentation.h	2013-02-25 13:21:10 UTC (rev 143912)
+++ trunk/Source/WTF/wtf/MemoryInstrumentation.h	2013-02-25 13:37:35 UTC (rev 143913)
@@ -66,6 +66,7 @@
 virtual void reportEdge(const void* target, const char* edgeName, MemberType) = 0;
 virtual void reportLeaf(const MemoryObjectInfo, const char* edgeName) = 0;
 virtual void reportBaseAddress(const void* base, const void* real) = 0;
+virtual int registerString(const char*) = 0;
 };
 
 class MemoryInstrumentation {


Modified: trunk/Source/WTF/wtf/MemoryObjectInfo.h (143912 => 143913)

--- trunk/Source/WTF/wtf/MemoryObjectInfo.h	2013-02-25 13:21:10 UTC (rev 143912)
+++ trunk/Source/WTF/wtf/MemoryObjectInfo.h	2013-02-25 13:37:35 UTC (rev 143913)
@@ -32,7 +32,6 @@
 #define MemoryObjectInfo_h
 
 #include wtf/MemoryInstrumentation.h
-#include wtf/text/WTFString.h
 
 namespace WTF {
 
@@ -51,6 +50,8 @@
 , m_firstVisit(true)
 , m_customAllocation(false)
 , m_isRoot(false)
+, m_classNameId(0)
+, m_nameId(0)
 { }
 
 typedef MemoryClassInfo ClassInfo;
@@ -62,18 +63,18 @@
 bool customAllocation() const { return m_customAllocation; 

[webkit-changes] [143455] trunk/Source/WebCore

[loislo]

Title: [143455] trunk/Source/WebCore








Revision 143455
Author loi...@chromium.org
Date 2013-02-20 05:40:19 -0800 (Wed, 20 Feb 2013)


Log Message
Web Inspector: fix for frontend closure compile errors.
https://bugs.webkit.org/show_bug.cgi?id=110329

Reviewed by Vsevolod Vlasov.

It has no tests because it has no code changes.

* inspector/front-end/HeapSnapshot.js:
(HeapSnapshotMetainfo):
* inspector/front-end/NativeMemorySnapshotView.js:
(WebInspector.NativeSnapshotProfileType.prototype.buttonClicked.didReceiveMemorySnapshot):
(WebInspector.NativeSnapshotProfileType.prototype.buttonClicked):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js
trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (143454 => 143455)

--- trunk/Source/WebCore/ChangeLog	2013-02-20 13:38:02 UTC (rev 143454)
+++ trunk/Source/WebCore/ChangeLog	2013-02-20 13:40:19 UTC (rev 143455)
@@ -1,3 +1,18 @@
+2013-02-20  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: fix for frontend closure compile errors.
+https://bugs.webkit.org/show_bug.cgi?id=110329
+
+Reviewed by Vsevolod Vlasov.
+
+It has no tests because it has no code changes.
+
+* inspector/front-end/HeapSnapshot.js:
+(HeapSnapshotMetainfo):
+* inspector/front-end/NativeMemorySnapshotView.js:
+(WebInspector.NativeSnapshotProfileType.prototype.buttonClicked.didReceiveMemorySnapshot):
+(WebInspector.NativeSnapshotProfileType.prototype.buttonClicked):
+
 2013-02-20  Florin Malita  fmal...@chromium.org
 
 Clear SVGPathSeg role on removal.


Modified: trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js (143454 => 143455)

--- trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js	2013-02-20 13:38:02 UTC (rev 143454)
+++ trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js	2013-02-20 13:40:19 UTC (rev 143455)
@@ -508,6 +508,7 @@
 this.node_types = [];
 this.edge_fields = [];
 this.edge_types = [];
+this.type_strings = {};
 
 // Old format.
 this.fields = [];


Modified: trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js (143454 => 143455)

--- trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js	2013-02-20 13:38:02 UTC (rev 143454)
+++ trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js	2013-02-20 13:40:19 UTC (rev 143455)
@@ -266,16 +266,18 @@
 /**
  * @param {?string} error
  * @param {?MemoryAgent.MemoryBlock} memoryBlock
+ * @param {Object=} graphMetaInformation
  */
 function didReceiveMemorySnapshot(error, memoryBlock, graphMetaInformation)
 {
+var metaInformation = /** @type{HeapSnapshotMetainfo} */(graphMetaInformation);
 this.isTemporary = false;
 this.sidebarElement.subtitle = Number.bytesToString(/** @type{number} */(memoryBlock.size));
 
-var edgeFieldCount = graphMetaInformation.edge_fields.length;
-var nodeFieldCount = graphMetaInformation.node_fields.length;
-var nodeIdFieldOffset = graphMetaInformation.node_fields.indexOf(id);
-var toNodeIdFieldOffset = graphMetaInformation.edge_fields.indexOf(to_node);
+var edgeFieldCount = metaInformation.edge_fields.length;
+var nodeFieldCount = metaInformation.node_fields.length;
+var nodeIdFieldOffset = metaInformation.node_fields.indexOf(id);
+var toNodeIdFieldOffset = metaInformation.edge_fields.indexOf(to_node);
 
 var baseToRealNodeIdMap = {};
 for (var i = 0; i  this._baseToRealNodeId.length; i += 2)
@@ -295,7 +297,7 @@
 
 var heapSnapshot = {
 snapshot: {
-meta: graphMetaInformation,
+meta: metaInformation,
 node_count: this._nodes.length / nodeFieldCount,
 edge_count: this._edges.length / edgeFieldCount,
 root_index: this._nodes.length - nodeFieldCount






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143317] trunk/Source/WebCore

[loislo]

Title: [143317] trunk/Source/WebCore








Revision 143317
Author loi...@chromium.org
Date 2013-02-19 04:21:12 -0800 (Tue, 19 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: show user provided name property of the heap snapshot node.
https://bugs.webkit.org/show_bug.cgi?id=110124

Reviewed by Yury Semikhatsky.

Publish userProvidedName into grid node.

* inspector/front-end/HeapSnapshotGridNodes.js:
(WebInspector.HeapSnapshotGenericObjectNode):
(WebInspector.HeapSnapshotGenericObjectNode.prototype._createObjectCell):
(WebInspector.HeapSnapshotGenericObjectNode.prototype.get data):
* inspector/front-end/HeapSnapshotProxy.js:
(WebInspector.HeapSnapshotWorker):
* inspector/front-end/NativeHeapSnapshot.js:
(WebInspector.NativeHeapSnapshotNode.prototype.serialize):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/HeapSnapshotGridNodes.js
trunk/Source/WebCore/inspector/front-end/NativeHeapSnapshot.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (143316 => 143317)

--- trunk/Source/WebCore/ChangeLog	2013-02-19 12:15:11 UTC (rev 143316)
+++ trunk/Source/WebCore/ChangeLog	2013-02-19 12:21:12 UTC (rev 143317)
@@ -1,3 +1,21 @@
+2013-02-18  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: show user provided name property of the heap snapshot node.
+https://bugs.webkit.org/show_bug.cgi?id=110124
+
+Reviewed by Yury Semikhatsky.
+
+Publish userProvidedName into grid node.
+
+* inspector/front-end/HeapSnapshotGridNodes.js:
+(WebInspector.HeapSnapshotGenericObjectNode):
+(WebInspector.HeapSnapshotGenericObjectNode.prototype._createObjectCell):
+(WebInspector.HeapSnapshotGenericObjectNode.prototype.get data):
+* inspector/front-end/HeapSnapshotProxy.js:
+(WebInspector.HeapSnapshotWorker):
+* inspector/front-end/NativeHeapSnapshot.js:
+(WebInspector.NativeHeapSnapshotNode.prototype.serialize):
+
 2013-02-19  Arpita Bahuguna  a@samsung.com
 
 Caret is not displayed when trying to focus inside a contenteditable element containing an empty block.


Modified: trunk/Source/WebCore/inspector/front-end/HeapSnapshotGridNodes.js (143316 => 143317)

--- trunk/Source/WebCore/inspector/front-end/HeapSnapshotGridNodes.js	2013-02-19 12:15:11 UTC (rev 143316)
+++ trunk/Source/WebCore/inspector/front-end/HeapSnapshotGridNodes.js	2013-02-19 12:21:12 UTC (rev 143317)
@@ -350,6 +350,7 @@
 if (!node)
 return;
 this._name = node.name;
+this._displayName = node.displayName;
 this._type = node.type;
 this._distance = node.distance;
 this._shallowSize = node.selfSize;
@@ -383,19 +384,31 @@
 var div = document.createElement(div);
 div.className = source-code event-properties;
 div.style.overflow = visible;
+
 var data = ""
 if (this._prefixObjectCell)
 this._prefixObjectCell(div, data);
+
 var valueSpan = document.createElement(span);
 valueSpan.className = value console-formatted- + data.valueStyle;
 valueSpan.textContent = data.value;
 div.appendChild(valueSpan);
+
+if (this.data.displayName) {
+var nameSpan = document.createElement(span);
+nameSpan.className = name console-formatted-name;
+nameSpan.textContent =   + this.data.displayName;
+div.appendChild(nameSpan);
+}
+
 var idSpan = document.createElement(span);
 idSpan.className = console-formatted-id;
 idSpan.textContent =  @ + data[nodeId];
 div.appendChild(idSpan);
+
 if (this._postfixObjectCell)
 this._postfixObjectCell(div, data);
+
 cell.appendChild(div);
 cell.addStyleClass(disclosure);
 if (this.depth)
@@ -444,6 +457,7 @@
 valueStyle +=  detached-dom-tree-node;
 data[object] = { valueStyle: valueStyle, value: value, nodeId: this.snapshotNodeId };
 
+data[displayName] = this._displayName;
 data[distance] =  this._distance;
 data[shallowSize] = Number.withThousandsSeparator(this._shallowSize);
 data[retainedSize] = Number.withThousandsSeparator(this._retainedSize);


Modified: trunk/Source/WebCore/inspector/front-end/NativeHeapSnapshot.js (143316 => 143317)

--- trunk/Source/WebCore/inspector/front-end/NativeHeapSnapshot.js	2013-02-19 12:15:11 UTC (rev 143316)
+++ trunk/Source/WebCore/inspector/front-end/NativeHeapSnapshot.js	2013-02-19 12:21:12 UTC (rev 143317)
@@ -109,6 +109,7 @@
 return {
 id: this.id(),
 name: this.className(),
+displayName: this.name(),
 distance: this.distance(),
 nodeIndex: this.nodeIndex,
 retainedSize: this.retainedSize(),






___
webkit-changes mailing list
webkit-changes@lists.webkit.org

[webkit-changes] [143175] trunk

[loislo]

Title: [143175] trunk








Revision 143175
Author loi...@chromium.org
Date 2013-02-18 01:54:33 -0800 (Mon, 18 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: reportLeaf method doesn't report the leaf node properly.
https://bugs.webkit.org/show_bug.cgi?id=109554

In some cases leaves have no pointer so with the old schema we can't generate nodeId for them because we
can't insert 0 into hashmap. It happens when we call addPrivateBuffer method.

Drive by fix: I introduced a client interface for the HeapGraphSerializer.
It helps me to do the tests for the serializer.

Reviewed by Yury Semikhatsky.

It is covered by newly added tests in TestWebKitAPI.

Source/WebCore:

* inspector/HeapGraphSerializer.cpp:
(WebCore::HeapGraphSerializer::HeapGraphSerializer):
(WebCore::HeapGraphSerializer::pushUpdate):
(WebCore::HeapGraphSerializer::reportNode):
(WebCore::HeapGraphSerializer::toNodeId):
(WebCore::HeapGraphSerializer::addRootNode):
* inspector/HeapGraphSerializer.h:
(HeapGraphSerializer):
(Client):
(WebCore::HeapGraphSerializer::Client::~Client):
* inspector/InspectorMemoryAgent.cpp:
(WebCore):
(WebCore::InspectorMemoryAgent::getProcessMemoryDistributionImpl):

Tools:

* TestWebKitAPI/TestWebKitAPI.gypi:
* TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp: Added.
(TestWebKitAPI):
(HeapGraphReceiver):
(TestWebKitAPI::HeapGraphReceiver::HeapGraphReceiver):
(TestWebKitAPI::HeapGraphReceiver::printGraph):
(TestWebKitAPI::HeapGraphReceiver::dumpNodes):
(TestWebKitAPI::HeapGraphReceiver::dumpEdges):
(TestWebKitAPI::HeapGraphReceiver::dumpBaseToRealNodeId):
(TestWebKitAPI::HeapGraphReceiver::dumpStrings):
(TestWebKitAPI::HeapGraphReceiver::serializer):
(TestWebKitAPI::HeapGraphReceiver::chunkPart):
(TestWebKitAPI::HeapGraphReceiver::dumpPart):
(TestWebKitAPI::HeapGraphReceiver::stringValue):
(TestWebKitAPI::HeapGraphReceiver::intValue):
(TestWebKitAPI::HeapGraphReceiver::nodeToString):
(TestWebKitAPI::HeapGraphReceiver::edgeToString):
(TestWebKitAPI::HeapGraphReceiver::printNode):
(Helper):
(TestWebKitAPI::Helper::Helper):
(TestWebKitAPI::Helper::addNode):
(TestWebKitAPI::Helper::addEdge):
(TestWebKitAPI::Helper::done):
(Object):
(TestWebKitAPI::Helper::Object::Object):
(TestWebKitAPI::TEST):
(Owner):
(TestWebKitAPI::Owner::Owner):
(TestWebKitAPI::Owner::reportMemoryUsage):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
trunk/Source/WebCore/inspector/HeapGraphSerializer.h
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp


Added Paths

trunk/Tools/TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (143174 => 143175)

--- trunk/Source/WebCore/ChangeLog	2013-02-18 09:30:22 UTC (rev 143174)
+++ trunk/Source/WebCore/ChangeLog	2013-02-18 09:54:33 UTC (rev 143175)
@@ -1,3 +1,32 @@
+2013-02-13  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: reportLeaf method doesn't report the leaf node properly.
+https://bugs.webkit.org/show_bug.cgi?id=109554
+
+In some cases leaves have no pointer so with the old schema we can't generate nodeId for them because we
+can't insert 0 into hashmap. It happens when we call addPrivateBuffer method.
+
+Drive by fix: I introduced a client interface for the HeapGraphSerializer.
+It helps me to do the tests for the serializer.
+
+Reviewed by Yury Semikhatsky.
+
+It is covered by newly added tests in TestWebKitAPI.
+
+* inspector/HeapGraphSerializer.cpp:
+(WebCore::HeapGraphSerializer::HeapGraphSerializer):
+(WebCore::HeapGraphSerializer::pushUpdate):
+(WebCore::HeapGraphSerializer::reportNode):
+(WebCore::HeapGraphSerializer::toNodeId):
+(WebCore::HeapGraphSerializer::addRootNode):
+* inspector/HeapGraphSerializer.h:
+(HeapGraphSerializer):
+(Client):
+(WebCore::HeapGraphSerializer::Client::~Client):
+* inspector/InspectorMemoryAgent.cpp:
+(WebCore):
+(WebCore::InspectorMemoryAgent::getProcessMemoryDistributionImpl):
+
 2013-02-18  Sheriff Bot  webkit.review@gmail.com
 
 Unreviewed, rolling out r143100.


Modified: trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp (143174 => 143175)

--- trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp	2013-02-18 09:30:22 UTC (rev 143174)
+++ trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp	2013-02-18 09:54:33 UTC (rev 143175)
@@ -43,15 +43,16 @@
 
 namespace WebCore {
 
-HeapGraphSerializer::HeapGraphSerializer(InspectorFrontend::Memory* frontend)
-: m_frontend(frontend)
+HeapGraphSerializer::HeapGraphSerializer(Client* client)
+: m_client(client)
 , m_strings(Strings::create())
 , m_edges(Edges::create())
 , m_nodeEdgesCount(0)
 , m_nodes(Nodes::create())
 , 

[webkit-changes] [143178] trunk/Source/WebCore

[loislo]

Title: [143178] trunk/Source/WebCore








Revision 143178
Author loi...@chromium.org
Date 2013-02-18 02:20:08 -0800 (Mon, 18 Feb 2013)


Log Message
Unreviewed speculative fix for Chromium Mac.

* WebCore.gypi:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.gypi




Diff

Modified: trunk/Source/WebCore/ChangeLog (143177 => 143178)

--- trunk/Source/WebCore/ChangeLog	2013-02-18 10:15:19 UTC (rev 143177)
+++ trunk/Source/WebCore/ChangeLog	2013-02-18 10:20:08 UTC (rev 143178)
@@ -1,3 +1,9 @@
+2013-02-18  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed speculative fix for Chromium Mac.
+
+* WebCore.gypi:
+
 2013-02-13  Ilya Tikhonovsky  loi...@chromium.org
 
 Web Inspector: Native Memory Instrumentation: reportLeaf method doesn't report the leaf node properly.


Modified: trunk/Source/WebCore/WebCore.gypi (143177 => 143178)

--- trunk/Source/WebCore/WebCore.gypi	2013-02-18 10:15:19 UTC (rev 143177)
+++ trunk/Source/WebCore/WebCore.gypi	2013-02-18 10:20:08 UTC (rev 143178)
@@ -1172,8 +1172,8 @@
 'accessibility/atk/WebKitAccessibleWrapperAtk.h',
 'accessibility/mac/AXObjectCacheMac.mm',
 'accessibility/mac/AccessibilityObjectMac.mm',
-'accessibility/mac/WebAccessibilityObjectWrapper.h',
-'accessibility/mac/WebAccessibilityObjectWrapper.mm',
+'accessibility/mac/WebAccessibilityObjectWrapperBase.h',
+'accessibility/mac/WebAccessibilityObjectWrapperBase.mm',
 'accessibility/win/AXObjectCacheWin.cpp',
 'accessibility/win/AccessibilityObjectWin.cpp',
 'accessibility/win/AccessibilityObjectWrapperWin.h',






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143181] trunk/Source/JavaScriptCore

[loislo]

Title: [143181] trunk/Source/_javascript_Core








Revision 143181
Author loi...@chromium.org
Date 2013-02-18 02:30:06 -0800 (Mon, 18 Feb 2013)


Log Message
Unreviewed speculative build fix for Apple Win bots.

* _javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (143180 => 143181)

--- trunk/Source/_javascript_Core/ChangeLog	2013-02-18 10:29:56 UTC (rev 143180)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-02-18 10:30:06 UTC (rev 143181)
@@ -1,3 +1,9 @@
+2013-02-18  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed speculative build fix for Apple Win bots.
+
+* _javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def:
+
 2013-02-18  Filip Pizlo  fpi...@apple.com
 
 Fix indentation of StructureStubInfo.h


Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def (143180 => 143181)

--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def	2013-02-18 10:29:56 UTC (rev 143180)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def	2013-02-18 10:30:06 UTC (rev 143181)
@@ -25,6 +25,7 @@
 ??0RefCountedLeakCounter@WTF@@QAE@PBD@Z
 ??0RegExpObject@JSC@@IAE@PAVJSGlobalObject@1@PAVStructure@1@PAVRegExp@1@@Z
 ??0SHA1@WTF@@QAE@XZ
+??0SourceProvider@JSC@@QAE@ABVString@WTF@@ABVTextPosition@3@PAVSourceProviderCache@1@@Z
 ??0StringObject@JSC@@IAE@AAVJSGlobalData@1@PAVStructure@1@@Z
 ??0StringPrintStream@WTF@@QAE@XZ
 ??0Structure@JSC@@AAE@AAVJSGlobalData@1@PAVJSGlobalObject@1@VJSValue@1@ABVTypeInfo@1@PBUClassInfo@1@EI@Z
@@ -46,6 +47,7 @@
 ??1MemoryInstrumentation@WTF@@UAE@XZ
 ??1Mutex@WTF@@QAE@XZ
 ??1RefCountedLeakCounter@WTF@@QAE@XZ
+??1SourceProvider@JSC@@UAE@XZ
 ??1SourceProviderCache@JSC@@QAE@XZ
 ??1StringPrintStream@WTF@@UAE@XZ
 ??1ThreadCondition@WTF@@QAE@XZ






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143218] trunk/Source/WebCore

[loislo]

Title: [143218] trunk/Source/WebCore








Revision 143218
Author loi...@chromium.org
Date 2013-02-18 07:46:06 -0800 (Mon, 18 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: Generate meta information for HeapSnapshot parser.
https://bugs.webkit.org/show_bug.cgi?id=110104

Reviewed by Yury Semikhatsky.

The format of Native heap snapshot is slightly different so it should provide its own meta information.

* inspector/HeapGraphSerializer.cpp:
(WebCore::HeapGraphSerializer::HeapGraphSerializer):
(WebCore::HeapGraphSerializer::finish):
(WebCore::HeapGraphSerializer::reportMemoryUsage):
(WebCore::HeapGraphSerializer::registerTypeString):
(WebCore):
* inspector/HeapGraphSerializer.h:
(HeapGraphSerializer):
* inspector/Inspector.json:
* inspector/InspectorMemoryAgent.cpp:
(WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
(WebCore::InspectorMemoryAgent::getProcessMemoryDistributionImpl):
* inspector/InspectorMemoryAgent.h:
(InspectorMemoryAgent):
* inspector/front-end/HeapSnapshot.js:
(WebInspector.HeapSnapshot.prototype._buildPostOrderIndex):
* inspector/front-end/NativeHeapSnapshot.js:
(WebInspector.NativeHeapSnapshot):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
trunk/Source/WebCore/inspector/HeapGraphSerializer.h
trunk/Source/WebCore/inspector/Inspector.json
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
trunk/Source/WebCore/inspector/InspectorMemoryAgent.h
trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js
trunk/Source/WebCore/inspector/front-end/NativeHeapSnapshot.js
trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (143217 => 143218)

--- trunk/Source/WebCore/ChangeLog	2013-02-18 15:40:17 UTC (rev 143217)
+++ trunk/Source/WebCore/ChangeLog	2013-02-18 15:46:06 UTC (rev 143218)
@@ -1,3 +1,32 @@
+2013-02-18  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: Generate meta information for HeapSnapshot parser.
+https://bugs.webkit.org/show_bug.cgi?id=110104
+
+Reviewed by Yury Semikhatsky.
+
+The format of Native heap snapshot is slightly different so it should provide its own meta information.
+
+
+* inspector/HeapGraphSerializer.cpp:
+(WebCore::HeapGraphSerializer::HeapGraphSerializer):
+(WebCore::HeapGraphSerializer::finish):
+(WebCore::HeapGraphSerializer::reportMemoryUsage):
+(WebCore::HeapGraphSerializer::registerTypeString):
+(WebCore):
+* inspector/HeapGraphSerializer.h:
+(HeapGraphSerializer):
+* inspector/Inspector.json:
+* inspector/InspectorMemoryAgent.cpp:
+(WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
+(WebCore::InspectorMemoryAgent::getProcessMemoryDistributionImpl):
+* inspector/InspectorMemoryAgent.h:
+(InspectorMemoryAgent):
+* inspector/front-end/HeapSnapshot.js:
+(WebInspector.HeapSnapshot.prototype._buildPostOrderIndex):
+* inspector/front-end/NativeHeapSnapshot.js:
+(WebInspector.NativeHeapSnapshot):
+
 2013-02-18  Carlos Garcia Campos  cgar...@igalia.com
 
 [GTK] Force single header includes in GObject DOM bindings


Modified: trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp (143217 => 143218)

--- trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp	2013-02-18 15:40:17 UTC (rev 143217)
+++ trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp	2013-02-18 15:46:06 UTC (rev 143218)
@@ -50,6 +50,7 @@
 , m_nodeEdgesCount(0)
 , m_nodes(Nodes::create())
 , m_baseToRealNodeIdMap(BaseToRealNodeIdMap::create())
+, m_typeStrings(InspectorObject::create())
 , m_leafCount(0)
 {
 ASSERT(m_client);
@@ -57,10 +58,12 @@
 
 memset(m_edgeTypes, 0, sizeof(m_edgeTypes));
 
-m_edgeTypes[WTF::PointerMember] = addString(weak);
-m_edgeTypes[WTF::OwnPtrMember] = addString(ownRef);
-m_edgeTypes[WTF::RefPtrMember] = addString(countRef);
+m_edgeTypes[WTF::PointerMember] = registerTypeString(weak);
+m_edgeTypes[WTF::OwnPtrMember] = m_edgeTypes[WTF::RefPtrMember] = registerTypeString(property);
 
+// FIXME: It is used as a magic constant for 'object' node type.
+registerTypeString(object);
+
 m_unknownClassNameId = addString(unknown);
 }
 
@@ -155,21 +158,55 @@
 m_baseToRealNodeIdMap-addItem(toNodeId(real));
 }
 
-void HeapGraphSerializer::finish()
+PassRefPtrInspectorObject HeapGraphSerializer::finish()
 {
 addRootNode();
 pushUpdate();
+String metaString =
+{
+\node_fields\:[
+\type\,
+\name\,
+\id\,
+\self_size\,
+\edge_count\
+],
+\node_types\:[
+[], // FIXME: It is a fallback for Heap Snapshot parser. In case of Native Heap Snapshot it is a plain string id.
+

[webkit-changes] [143292] trunk/Source/JavaScriptCore

[loislo]

Title: [143292] trunk/Source/_javascript_Core








Revision 143292
Author loi...@chromium.org
Date 2013-02-18 21:51:18 -0800 (Mon, 18 Feb 2013)


Log Message
Unreviewed build fix for Apple Windows. Second stage.
Add missed export statement.

* _javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (143291 => 143292)

--- trunk/Source/_javascript_Core/ChangeLog	2013-02-19 03:52:04 UTC (rev 143291)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-02-19 05:51:18 UTC (rev 143292)
@@ -1,3 +1,10 @@
+2013-02-18  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed build fix for Apple Windows. Second stage.
+Add missed export statement.
+
+* _javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def:
+
 2013-02-18  Roger Fong  roger_f...@apple.com
 
 Unreviewed Windows build fix.


Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def (143291 => 143292)

--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def	2013-02-19 03:52:04 UTC (rev 143291)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def	2013-02-19 05:51:18 UTC (rev 143292)
@@ -25,6 +25,7 @@
 ??0RefCountedLeakCounter@WTF@@QAE@PBD@Z
 ??0RegExpObject@JSC@@IAE@PAVJSGlobalObject@1@PAVStructure@1@PAVRegExp@1@@Z
 ??0SHA1@WTF@@QAE@XZ
+??0SourceProvider@JSC@@QAE@ABVString@WTF@@ABVTextPosition@3@@Z
 ??0StringObject@JSC@@IAE@AAVJSGlobalData@1@PAVStructure@1@@Z
 ??0StringPrintStream@WTF@@QAE@XZ
 ??0Structure@JSC@@AAE@AAVJSGlobalData@1@PAVJSGlobalObject@1@VJSValue@1@ABVTypeInfo@1@PBUClassInfo@1@EI@Z






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143298] trunk/Tools

[loislo]

Title: [143298] trunk/Tools








Revision 143298
Author loi...@chromium.org
Date 2013-02-18 23:18:17 -0800 (Mon, 18 Feb 2013)


Log Message
Unreviewed. Adjust expectations.

* TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp:
(TestWebKitAPI::TEST):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp




Diff

Modified: trunk/Tools/ChangeLog (143297 => 143298)

--- trunk/Tools/ChangeLog	2013-02-19 06:57:53 UTC (rev 143297)
+++ trunk/Tools/ChangeLog	2013-02-19 07:18:17 UTC (rev 143298)
@@ -1,3 +1,10 @@
+2013-02-18  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed. Adjust expectations.
+
+* TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp:
+(TestWebKitAPI::TEST):
+
 2013-02-18  Zan Dobersek  zdober...@igalia.com
 
 Unreviewed GTK gardening.


Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp (143297 => 143298)

--- trunk/Tools/TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp	2013-02-19 06:57:53 UTC (rev 143297)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp	2013-02-19 07:18:17 UTC (rev 143298)
@@ -216,7 +216,7 @@
 Helper helper(receiver.serializer());
 helper.done();
 receiver.printGraph();
-EXPECT_EQ(String(['','weak','ownRef','countRef','unknown','Root']), receiver.dumpStrings());
+EXPECT_EQ(String(['','weak','property','object','unknown','Root']), receiver.dumpStrings());
 EXPECT_EQ(String([5,0,1,0,0]), receiver.dumpNodes()); // Only Root object.
 EXPECT_EQ(String([]), receiver.dumpEdges()); // No edges.
 EXPECT_EQ(String([]), receiver.dumpBaseToRealNodeId()); // No id maps.
@@ -229,7 +229,7 @@
 helper.addNode(ClassName, objectName, true);
 helper.done();
 receiver.printGraph();
-EXPECT_EQ(String(['','weak','ownRef','countRef','unknown','ClassName','objectName','Root']), receiver.dumpStrings());
+EXPECT_EQ(String(['','weak','property','object','unknown','ClassName','objectName','Root']), receiver.dumpStrings());
 EXPECT_EQ(String([5,6,1,0,0,7,0,2,0,1]), receiver.dumpNodes());
 EXPECT_EQ(String([1,0,1]), receiver.dumpEdges());
 EXPECT_EQ(String([]), receiver.dumpBaseToRealNodeId());
@@ -244,7 +244,7 @@
 helper.addNode(Parent, parent, true);
 helper.done();
 receiver.printGraph();
-EXPECT_EQ(String(['','weak','ownRef','countRef','unknown','Child','child','pointerToChild','Parent','parent','Root']), receiver.dumpStrings());
+EXPECT_EQ(String(['','weak','property','object','unknown','Child','child','pointerToChild','Parent','parent','Root']), receiver.dumpStrings());
 EXPECT_EQ(String([5,6,1,0,0,8,9,2,0,1,10,0,3,0,1]), receiver.dumpNodes());
 EXPECT_EQ(String([2,7,1,1,0,2]), receiver.dumpEdges());
 EXPECT_EQ(String([]), receiver.dumpBaseToRealNodeId());






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [142858] trunk/Source/WebCore

[loislo]

Title: [142858] trunk/Source/WebCore








Revision 142858
Author loi...@chromium.org
Date 2013-02-14 00:38:07 -0800 (Thu, 14 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: Report child nodes as direct members of a container node to make them look like a tree in the snapshot.
https://bugs.webkit.org/show_bug.cgi?id=109703

Also we need to traverse the tree from the top root element down to the leaves.

Reviewed by Yury Semikhatsky.

* dom/ContainerNode.cpp:
(WebCore::ContainerNode::reportMemoryUsage):
* dom/Node.cpp:
(WebCore::Node::reportMemoryUsage):
* inspector/InspectorMemoryAgent.cpp:
(WebCore):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/ContainerNode.cpp
trunk/Source/WebCore/dom/Node.cpp
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (142857 => 142858)

--- trunk/Source/WebCore/ChangeLog	2013-02-14 08:07:40 UTC (rev 142857)
+++ trunk/Source/WebCore/ChangeLog	2013-02-14 08:38:07 UTC (rev 142858)
@@ -1,3 +1,19 @@
+2013-02-13  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: Report child nodes as direct members of a container node to make them look like a tree in the snapshot.
+https://bugs.webkit.org/show_bug.cgi?id=109703
+
+Also we need to traverse the tree from the top root element down to the leaves.
+
+Reviewed by Yury Semikhatsky.
+
+* dom/ContainerNode.cpp:
+(WebCore::ContainerNode::reportMemoryUsage):
+* dom/Node.cpp:
+(WebCore::Node::reportMemoryUsage):
+* inspector/InspectorMemoryAgent.cpp:
+(WebCore):
+
 2013-02-13  Hayato Ito  hay...@chromium.org
 
 [Shadow DOM] Implements a '::distributed()' pseudo element.


Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (142857 => 142858)

--- trunk/Source/WebCore/dom/ContainerNode.cpp	2013-02-14 08:07:40 UTC (rev 142857)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp	2013-02-14 08:38:07 UTC (rev 142858)
@@ -1077,8 +1077,14 @@
 {
 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
 Node::reportMemoryUsage(memoryObjectInfo);
-info.addMember(m_firstChild, firstChild);
-info.addMember(m_lastChild, lastChild);
+info.ignoreMember(m_firstChild);
+info.ignoreMember(m_lastChild);
+
+// Report child nodes as direct members to make them look like a tree in the snapshot.
+NodeVector children;
+getChildNodes(const_castContainerNode*(this), children);
+for (size_t i = 0; i  children.size(); ++i)
+info.addMember(children[i], child);
 }
 
 static void dispatchChildInsertionEvents(Node* child)


Modified: trunk/Source/WebCore/dom/Node.cpp (142857 => 142858)

--- trunk/Source/WebCore/dom/Node.cpp	2013-02-14 08:07:40 UTC (rev 142857)
+++ trunk/Source/WebCore/dom/Node.cpp	2013-02-14 08:38:07 UTC (rev 142858)
@@ -2577,8 +2577,8 @@
 ScriptWrappable::reportMemoryUsage(memoryObjectInfo);
 info.addMember(m_parentOrShadowHostNode, parentOrShadowHostNode);
 info.addMember(m_treeScope, treeScope);
-info.addMember(m_next, next);
-info.addMember(m_previous, previous);
+info.ignoreMember(m_next);
+info.ignoreMember(m_previous);
 info.addMember(this-renderer(), renderer);
 if (hasRareData()) {
 if (isElementNode())


Modified: trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp (142857 => 142858)

--- trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp	2013-02-14 08:07:40 UTC (rev 142857)
+++ trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp	2013-02-14 08:38:07 UTC (rev 142858)
@@ -233,6 +233,9 @@
 if (node-document()  node-document()-frame()  m_page != node-document()-frame()-page())
 return;
 
+while (Node* parentNode = node-parentNode())
+node = parentNode;
+
 m_memoryInstrumentation.addRootObject(node);
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [142747] trunk

[loislo]

Title: [142747] trunk








Revision 142747
Author loi...@chromium.org
Date 2013-02-13 07:30:22 -0800 (Wed, 13 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: reportLeaf method doesn't report the leaf node properly.
https://bugs.webkit.org/show_bug.cgi?id=109554

In some cases leaves have no pointer so with the old schema we can't generate nodeId for them because we
can't insert 0 into hashmap. It happens when we call addPrivateBuffer method.

Drive by fix: I introduced a client interface for the HeapGraphSerializer.
It helps me to do the tests for the serializer.

Reviewed by Yury Semikhatsky.

It is covered by newly added tests in TestWebKitAPI.

Source/WebCore:

* inspector/HeapGraphSerializer.cpp:
(WebCore::HeapGraphSerializer::HeapGraphSerializer):
(WebCore::HeapGraphSerializer::pushUpdate):
(WebCore::HeapGraphSerializer::reportNode):
(WebCore::HeapGraphSerializer::toNodeId):
(WebCore::HeapGraphSerializer::addRootNode):
* inspector/HeapGraphSerializer.h:
(HeapGraphSerializer):
(Client):
(WebCore::HeapGraphSerializer::Client::~Client):
* inspector/InspectorMemoryAgent.cpp:
(WebCore):
(WebCore::InspectorMemoryAgent::getProcessMemoryDistributionImpl):

Tools:

* TestWebKitAPI/TestWebKitAPI.gypi:
* TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp: Added.
(TestWebKitAPI):
(HeapGraphReceiver):
(TestWebKitAPI::HeapGraphReceiver::HeapGraphReceiver):
(TestWebKitAPI::HeapGraphReceiver::printGraph):
(TestWebKitAPI::HeapGraphReceiver::dumpNodes):
(TestWebKitAPI::HeapGraphReceiver::dumpEdges):
(TestWebKitAPI::HeapGraphReceiver::dumpBaseToRealNodeId):
(TestWebKitAPI::HeapGraphReceiver::dumpStrings):
(TestWebKitAPI::HeapGraphReceiver::serializer):
(TestWebKitAPI::HeapGraphReceiver::chunkPart):
(TestWebKitAPI::HeapGraphReceiver::dumpPart):
(TestWebKitAPI::HeapGraphReceiver::stringValue):
(TestWebKitAPI::HeapGraphReceiver::intValue):
(TestWebKitAPI::HeapGraphReceiver::nodeToString):
(TestWebKitAPI::HeapGraphReceiver::edgeToString):
(TestWebKitAPI::HeapGraphReceiver::printNode):
(Helper):
(TestWebKitAPI::Helper::Helper):
(TestWebKitAPI::Helper::addNode):
(TestWebKitAPI::Helper::addEdge):
(TestWebKitAPI::Helper::done):
(Object):
(TestWebKitAPI::Helper::Object::Object):
(TestWebKitAPI::TEST):
(Owner):
(TestWebKitAPI::Owner::Owner):
(TestWebKitAPI::Owner::reportMemoryUsage):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
trunk/Source/WebCore/inspector/HeapGraphSerializer.h
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/TestWebKitAPI.gypi


Added Paths

trunk/Tools/TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (142746 => 142747)

--- trunk/Source/WebCore/ChangeLog	2013-02-13 15:27:48 UTC (rev 142746)
+++ trunk/Source/WebCore/ChangeLog	2013-02-13 15:30:22 UTC (rev 142747)
@@ -1,3 +1,32 @@
+2013-02-13  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: reportLeaf method doesn't report the leaf node properly.
+https://bugs.webkit.org/show_bug.cgi?id=109554
+
+In some cases leaves have no pointer so with the old schema we can't generate nodeId for them because we
+can't insert 0 into hashmap. It happens when we call addPrivateBuffer method.
+
+Drive by fix: I introduced a client interface for the HeapGraphSerializer.
+It helps me to do the tests for the serializer.
+
+Reviewed by Yury Semikhatsky.
+
+It is covered by newly added tests in TestWebKitAPI.
+
+* inspector/HeapGraphSerializer.cpp:
+(WebCore::HeapGraphSerializer::HeapGraphSerializer):
+(WebCore::HeapGraphSerializer::pushUpdate):
+(WebCore::HeapGraphSerializer::reportNode):
+(WebCore::HeapGraphSerializer::toNodeId):
+(WebCore::HeapGraphSerializer::addRootNode):
+* inspector/HeapGraphSerializer.h:
+(HeapGraphSerializer):
+(Client):
+(WebCore::HeapGraphSerializer::Client::~Client):
+* inspector/InspectorMemoryAgent.cpp:
+(WebCore):
+(WebCore::InspectorMemoryAgent::getProcessMemoryDistributionImpl):
+
 2013-02-13  Yury Semikhatsky  yu...@chromium.org
 
 Web Inspector: add experimental native heap graph to Timeline panel


Modified: trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp (142746 => 142747)

--- trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp	2013-02-13 15:27:48 UTC (rev 142746)
+++ trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp	2013-02-13 15:30:22 UTC (rev 142747)
@@ -43,15 +43,16 @@
 
 namespace WebCore {
 
-HeapGraphSerializer::HeapGraphSerializer(InspectorFrontend::Memory* frontend)
-: m_frontend(frontend)
+HeapGraphSerializer::HeapGraphSerializer(Client* client)
+: m_client(client)
 , m_strings(Strings::create())
 , m_edges(Edges::create())
 , m_nodeEdgesCount(0)
 , m_nodes(Nodes::create())
 , 

[webkit-changes] [142618] trunk

[loislo]

Title: [142618] trunk








Revision 142618
Author loi...@chromium.org
Date 2013-02-12 06:53:34 -0800 (Tue, 12 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: reportLeaf method doesn't report the leaf node properly.
https://bugs.webkit.org/show_bug.cgi?id=109554

Source/WebCore:

In some cases leaves have no pointer so with the old schema we can't generate nodeId for them because we
can't insert 0 into hashmap. It happens when we call addPrivateBuffer method.

Drive by fix: I introduced a client interface for the HeapGraphSerializer.
It helps me to do the tests for the serializer.

Reviewed by Yury Semikhatsky.

It is covered by newly added tests in TestWebKitAPI.

* inspector/HeapGraphSerializer.cpp:
(WebCore::HeapGraphSerializer::HeapGraphSerializer):
(WebCore::HeapGraphSerializer::pushUpdate):
(WebCore::HeapGraphSerializer::reportNode):
(WebCore::HeapGraphSerializer::toNodeId):
(WebCore::HeapGraphSerializer::addRootNode):
* inspector/HeapGraphSerializer.h:
(HeapGraphSerializerClient):
(WebCore::HeapGraphSerializerClient::~HeapGraphSerializerClient):
(HeapGraphSerializer):
* inspector/InspectorMemoryAgent.cpp:
(WebCore::InspectorMemoryAgent::getProcessMemoryDistributionImpl):

Tools:

In some cases leaves have no pointer. As example when we report a leaf via addPrivateBuffer.
This patch has new set of tests for HeapGraphSerializer.

Reviewed by Yury Semikhatsky.

* TestWebKitAPI/TestWebKitAPI.gypi:
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp: Added.
* TestWebKitAPI/win/TestWebKitAPI.vcproj:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
trunk/Source/WebCore/inspector/HeapGraphSerializer.h
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/TestWebKitAPI.gypi
trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
trunk/Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj


Added Paths

trunk/Tools/TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (142617 => 142618)

--- trunk/Source/WebCore/ChangeLog	2013-02-12 14:51:07 UTC (rev 142617)
+++ trunk/Source/WebCore/ChangeLog	2013-02-12 14:53:34 UTC (rev 142618)
@@ -1,3 +1,31 @@
+2013-02-12  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: reportLeaf method doesn't report the leaf node properly.
+https://bugs.webkit.org/show_bug.cgi?id=109554
+
+In some cases leaves have no pointer so with the old schema we can't generate nodeId for them because we
+can't insert 0 into hashmap. It happens when we call addPrivateBuffer method.
+
+Drive by fix: I introduced a client interface for the HeapGraphSerializer.
+It helps me to do the tests for the serializer.
+
+Reviewed by Yury Semikhatsky.
+
+It is covered by newly added tests in TestWebKitAPI.
+
+* inspector/HeapGraphSerializer.cpp:
+(WebCore::HeapGraphSerializer::HeapGraphSerializer):
+(WebCore::HeapGraphSerializer::pushUpdate):
+(WebCore::HeapGraphSerializer::reportNode):
+(WebCore::HeapGraphSerializer::toNodeId):
+(WebCore::HeapGraphSerializer::addRootNode):
+* inspector/HeapGraphSerializer.h:
+(HeapGraphSerializerClient):
+(WebCore::HeapGraphSerializerClient::~HeapGraphSerializerClient):
+(HeapGraphSerializer):
+* inspector/InspectorMemoryAgent.cpp:
+(WebCore::InspectorMemoryAgent::getProcessMemoryDistributionImpl):
+
 2013-02-12  Vsevolod Vlasov  vse...@chromium.org
 
 Web Inspector: Introduce version controller to migrate settings versions.


Modified: trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp (142617 => 142618)

--- trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp	2013-02-12 14:51:07 UTC (rev 142617)
+++ trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp	2013-02-12 14:53:34 UTC (rev 142618)
@@ -43,15 +43,16 @@
 
 namespace WebCore {
 
-HeapGraphSerializer::HeapGraphSerializer(InspectorFrontend::Memory* frontend)
-: m_frontend(frontend)
+HeapGraphSerializer::HeapGraphSerializer(Client* client)
+: m_client(client)
 , m_strings(Strings::create())
 , m_edges(Edges::create())
 , m_nodeEdgesCount(0)
 , m_nodes(Nodes::create())
 , m_baseToRealNodeIdMap(BaseToRealNodeIdMap::create())
+, m_leafCount(0)
 {
-ASSERT(m_frontend);
+ASSERT(m_client);
 m_strings-addItem(String()); // An empty string with 0 index.
 
 memset(m_edgeTypes, 0, sizeof(m_edgeTypes));
@@ -91,7 +92,7 @@
 .setEdges(m_edges.release())
 .setBaseToRealNodeId(m_baseToRealNodeIdMap.release());
 
-m_frontend-addNativeSnapshotChunk(chunk);
+m_client-addNativeSnapshotChunk(chunk.release());
 
 m_strings = Strings::create();
 m_edges = Edges::create();
@@ -101,6 +102,7 @@
 
 void 

[webkit-changes] [142241] trunk/Source/WebCore

[loislo]

Title: [142241] trunk/Source/WebCore








Revision 142241
Author loi...@chromium.org
Date 2013-02-08 00:18:04 -0800 (Fri, 08 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: adjust chunk transfer size for better speed.
https://bugs.webkit.org/show_bug.cgi?id=109263

Reviewed by Yury Semikhatsky.

The chunk size is changed from 100 to 1.
addString counts only first 256 symbols of the string.o

* inspector/HeapGraphSerializer.cpp:
(WebCore::HeapGraphSerializer::pushUpdateIfNeeded):
(WebCore::HeapGraphSerializer::addString):
* inspector/front-end/NativeMemorySnapshotView.js:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (142240 => 142241)

--- trunk/Source/WebCore/ChangeLog	2013-02-08 08:05:49 UTC (rev 142240)
+++ trunk/Source/WebCore/ChangeLog	2013-02-08 08:18:04 UTC (rev 142241)
@@ -1,3 +1,18 @@
+2013-02-08  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: adjust chunk transfer size for better speed.
+https://bugs.webkit.org/show_bug.cgi?id=109263
+
+Reviewed by Yury Semikhatsky.
+
+The chunk size is changed from 100 to 1.
+addString counts only first 256 symbols of the string.o
+
+* inspector/HeapGraphSerializer.cpp:
+(WebCore::HeapGraphSerializer::pushUpdateIfNeeded):
+(WebCore::HeapGraphSerializer::addString):
+* inspector/front-end/NativeMemorySnapshotView.js:
+
 2013-02-08  Kentaro Hara  hara...@chromium.org
 
 Support a relatedTarget attribute on focus/blur events


Modified: trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp (142240 => 142241)

--- trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp	2013-02-08 08:05:49 UTC (rev 142240)
+++ trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp	2013-02-08 08:18:04 UTC (rev 142241)
@@ -69,7 +69,7 @@
 
 void HeapGraphSerializer::pushUpdateIfNeeded()
 {
-static const size_t chunkSize = 100;
+static const size_t chunkSize = 1;
 static const size_t averageEdgesPerNode = 5;
 
 if (m_strings-length() = chunkSize
@@ -174,7 +174,7 @@
 {
 if (string.isEmpty())
 return 0;
-StringMap::AddResult result = m_stringToIndex.add(string, m_stringToIndex.size() + 1);
+StringMap::AddResult result = m_stringToIndex.add(string.left(256), m_stringToIndex.size() + 1);
 if (result.isNewEntry)
 m_strings-addItem(string);
 return result.iterator-value;


Modified: trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js (142240 => 142241)

--- trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js	2013-02-08 08:05:49 UTC (rev 142240)
+++ trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js	2013-02-08 08:18:04 UTC (rev 142241)
@@ -232,9 +232,6 @@
 __proto__: WebInspector.DataGridNode.prototype
 }
 
-
-
-
 /**
  * @constructor
  * @extends {WebInspector.ProfileType}






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [142242] trunk/Source/WTF

[loislo]

Title: [142242] trunk/Source/WTF








Revision 142242
Author loi...@chromium.org
Date 2013-02-08 00:24:16 -0800 (Fri, 08 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: reportBaseAddress needs to be called after the reportNode. So it may reuse the node index for the real address.
https://bugs.webkit.org/show_bug.cgi?id=109051

Reviewed by Yury Semikhatsky.

* wtf/MemoryInstrumentation.cpp:
(WTF::MemoryInstrumentation::WrapperBase::processPointer):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MemoryInstrumentation.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (142241 => 142242)

--- trunk/Source/WTF/ChangeLog	2013-02-08 08:18:04 UTC (rev 142241)
+++ trunk/Source/WTF/ChangeLog	2013-02-08 08:24:16 UTC (rev 142242)
@@ -1,3 +1,13 @@
+2013-02-06  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: reportBaseAddress needs to be called after the reportNode. So it may reuse the node index for the real address.
+https://bugs.webkit.org/show_bug.cgi?id=109051
+
+Reviewed by Yury Semikhatsky.
+
+* wtf/MemoryInstrumentation.cpp:
+(WTF::MemoryInstrumentation::WrapperBase::processPointer):
+
 2013-02-07  David Kilzer  ddkil...@apple.com
 
 Fix #endif comment from r142163 and r142183


Modified: trunk/Source/WTF/wtf/MemoryInstrumentation.cpp (142241 => 142242)

--- trunk/Source/WTF/wtf/MemoryInstrumentation.cpp	2013-02-08 08:18:04 UTC (rev 142241)
+++ trunk/Source/WTF/wtf/MemoryInstrumentation.cpp	2013-02-08 08:24:16 UTC (rev 142242)
@@ -91,14 +91,18 @@
 
 const void* realAddress = memoryObjectInfo.reportedPointer();
 ASSERT(realAddress);
-if (realAddress != m_pointer) {
+
+if (memoryObjectInfo.firstVisit()) {
+memoryInstrumentation-countObjectSize(realAddress, memoryObjectInfo.objectType(), memoryObjectInfo.objectSize());
+memoryInstrumentation-m_client-reportNode(memoryObjectInfo);
+}
+
+if (realAddress != m_pointer)
 memoryInstrumentation-m_client-reportBaseAddress(m_pointer, realAddress);
-if (!memoryObjectInfo.firstVisit())
-return;
-}
-memoryInstrumentation-countObjectSize(realAddress, memoryObjectInfo.objectType(), memoryObjectInfo.objectSize());
-memoryInstrumentation-m_client-reportNode(memoryObjectInfo);
-if (!memoryObjectInfo.customAllocation()  !memoryInstrumentation-checkCountedObject(realAddress)) {
+
+if (memoryObjectInfo.firstVisit()
+ !memoryObjectInfo.customAllocation()
+ !memoryInstrumentation-checkCountedObject(realAddress)) {
 #if DEBUG_POINTER_INSTRUMENTATION
 fputs(Unknown object counted:\n, stderr);
 WTFPrintBacktrace(m_callStack, m_callStackSize);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [142074] trunk/Source/WebCore

[loislo]

Title: [142074] trunk/Source/WebCore








Revision 142074
Author loi...@chromium.org
Date 2013-02-07 00:38:04 -0800 (Thu, 07 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: reduce native heap snapshot runtime memory footprint
https://bugs.webkit.org/show_bug.cgi?id=108824

Reviewed by Yury Semikhatsky.

New event was added into Memory domain addNativeSnapshotChunk.
The content of HeapGraphSerializer is completely rewritten according to new API.
Now it collects strings, nodes, edges and id2id map and pushes when the collected items count exceed a limit.
On the frontend side I added new method for the new event and fixed the postprocessing step.
MemoryInstrumentation was slightly changed. Now it reports base to real address map only after reporting the node with real address.

* inspector/HeapGraphSerializer.cpp:
(WebCore::HeapGraphSerializer::HeapGraphSerializer):
(WebCore::HeapGraphSerializer::pushUpdateIfNeed):
(WebCore):
(WebCore::HeapGraphSerializer::pushUpdate):
(WebCore::HeapGraphSerializer::reportNode):
(WebCore::HeapGraphSerializer::reportNodeImpl):
(WebCore::HeapGraphSerializer::reportEdge):
(WebCore::HeapGraphSerializer::reportEdgeImpl):
(WebCore::HeapGraphSerializer::reportLeaf):
(WebCore::HeapGraphSerializer::reportBaseAddress):
(WebCore::HeapGraphSerializer::finish):
(WebCore::HeapGraphSerializer::reportMemoryUsage):
(WebCore::HeapGraphSerializer::addString):
(WebCore::HeapGraphSerializer::toNodeId):
(WebCore::HeapGraphSerializer::addRootNode):
* inspector/HeapGraphSerializer.h:
(HeapGraphSerializer):
* inspector/Inspector.json:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::processMemoryDistribution):
* inspector/InspectorMemoryAgent.cpp:
(WebCore::InspectorMemoryAgent::getProcessMemoryDistributionMap):
(WebCore):
(WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
(WebCore::InspectorMemoryAgent::getProcessMemoryDistributionImpl):
(WebCore::InspectorMemoryAgent::setFrontend):
(WebCore::InspectorMemoryAgent::clearFrontend):
* inspector/InspectorMemoryAgent.h:
(InspectorMemoryAgent):
* inspector/front-end/NativeHeapSnapshot.js:
(WebInspector.NativeHeapSnapshot):
(WebInspector.NativeHeapSnapshotNode.prototype.classIndex):
(WebInspector.NativeHeapSnapshotNode.prototype.id):
(WebInspector.NativeHeapSnapshotNode.prototype.name):
(WebInspector.NativeHeapSnapshotNode.prototype.serialize):
* inspector/front-end/NativeMemorySnapshotView.js:
(WebInspector.NativeSnapshotProfileType.prototype.buttonClicked.didReceiveMemorySnapshot):
(WebInspector.NativeSnapshotProfileType.prototype.buttonClicked):
(WebInspector.NativeSnapshotProfileHeader):
(WebInspector.NativeSnapshotProfileHeader.prototype.startSnapshotTransfer):
(WebInspector.NativeSnapshotProfileHeader.prototype.addNativeSnapshotChunk):
(WebInspector.NativeMemoryProfileType.prototype.buttonClicked.didReceiveMemorySnapshot):
(WebInspector.NativeMemoryProfileType.prototype.buttonClicked):
(WebInspector.NativeMemoryBarChart.prototype._updateStats):
* inspector/front-end/ProfilesPanel.js:
(WebInspector.ProfilesPanel):
(WebInspector.MemoryDispatcher):
(WebInspector.MemoryDispatcher.prototype.addNativeSnapshotChunk):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
trunk/Source/WebCore/inspector/HeapGraphSerializer.h
trunk/Source/WebCore/inspector/Inspector.json
trunk/Source/WebCore/inspector/InspectorController.cpp
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
trunk/Source/WebCore/inspector/InspectorMemoryAgent.h
trunk/Source/WebCore/inspector/front-end/NativeHeapSnapshot.js
trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js
trunk/Source/WebCore/inspector/front-end/ProfilesPanel.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (142073 => 142074)

--- trunk/Source/WebCore/ChangeLog	2013-02-07 08:34:11 UTC (rev 142073)
+++ trunk/Source/WebCore/ChangeLog	2013-02-07 08:38:04 UTC (rev 142074)
@@ -1,3 +1,66 @@
+2013-02-06  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: reduce native heap snapshot runtime memory footprint
+https://bugs.webkit.org/show_bug.cgi?id=108824
+
+Reviewed by Yury Semikhatsky.
+
+New event was added into Memory domain addNativeSnapshotChunk.
+The content of HeapGraphSerializer is completely rewritten according to new API.
+Now it collects strings, nodes, edges and id2id map and pushes when the collected items count exceed a limit.
+On the frontend side I added new method for the new event and fixed the postprocessing step.
+MemoryInstrumentation was slightly changed. Now it reports base to real address map only after reporting the node with real address.
+
+* inspector/HeapGraphSerializer.cpp:
+(WebCore::HeapGraphSerializer::HeapGraphSerializer):
+(WebCore::HeapGraphSerializer::pushUpdateIfNeed):
+(WebCore):
+(WebCore::HeapGraphSerializer::pushUpdate):
+   

[webkit-changes] [142086] trunk/Source/WebCore

[loislo]

Title: [142086] trunk/Source/WebCore








Revision 142086
Author loi...@chromium.org
Date 2013-02-07 02:05:43 -0800 (Thu, 07 Feb 2013)


Log Message
Unreviewed fix for inspector tests in debug.
m_frontend should be initialized in constructor.

* inspector/InspectorMemoryAgent.cpp:
(WebCore::InspectorMemoryAgent::InspectorMemoryAgent):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (142085 => 142086)

--- trunk/Source/WebCore/ChangeLog	2013-02-07 09:37:42 UTC (rev 142085)
+++ trunk/Source/WebCore/ChangeLog	2013-02-07 10:05:43 UTC (rev 142086)
@@ -1,3 +1,11 @@
+2013-02-07  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed fix for inspector tests in debug.
+m_frontend should be initialized in constructor.
+
+* inspector/InspectorMemoryAgent.cpp:
+(WebCore::InspectorMemoryAgent::InspectorMemoryAgent):
+
 2013-02-07  Yury Semikhatsky  yu...@chromium.org
 
 Web Inspector: reduce number of native memory instrumentation categories


Modified: trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp (142085 => 142086)

--- trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp	2013-02-07 09:37:42 UTC (rev 142085)
+++ trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp	2013-02-07 10:05:43 UTC (rev 142086)
@@ -600,6 +600,7 @@
 : InspectorBaseAgentInspectorMemoryAgent(Memory, instrumentingAgents, state)
 , m_inspectorClient(client)
 , m_page(page)
+, m_frontend(0)
 {
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [141992] trunk/Source

[loislo]

Title: [141992] trunk/Source








Revision 141992
Author loi...@chromium.org
Date 2013-02-06 05:29:30 -0800 (Wed, 06 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: assign class name to the heap graph node automatically
https://bugs.webkit.org/show_bug.cgi?id=107262

Reviewed by Yury Semikhatsky.

Source/_javascript_Core:

* _javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def:

Source/WTF:

We need a way to calculate class name for a pointer automatically.
Otherwise we need to write className manually in all the instrumentation methods.
And for all reported but not instrumented classes.

C++ can do that for us with help of typeid but unfortunatelly it requires rtti.
There is another way to do that. C++ preprocessor provides a define which has a function name.

For g++ and clang it is __PRETTY_FUNCTION__.
For MSVC it is __FUNCTION__.
The content of the string is a function signature.
We can use it because it has the name of the template argument.
The format is sligthly different. That's why I made two different parsers.
One for MSVC the other for GCC, Clang etc.
The other problem is the resulting binary size.
I made very simple function that does the only thing, returns the smallest possible function signature.
Unfortunatelly MSVC doesn't generate template argument name for functions.
It does this only for classes.

* wtf/MemoryInstrumentation.cpp:
(WTF):
(WTF::className):
(WTF::MemoryClassInfo::callReportObjectInfo):
(WTF::MemoryClassInfo::init):
* wtf/MemoryInstrumentation.h:
(WTF):
(WTF::FN::fn):
(WTF::fn):
(WTF::MemoryClassInfo::MemoryClassInfo):
(MemoryClassInfo):
(WTFreportObjectMemoryUsage):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MemoryInstrumentation.cpp
trunk/Source/WTF/wtf/MemoryInstrumentation.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (141991 => 141992)

--- trunk/Source/_javascript_Core/ChangeLog	2013-02-06 13:11:24 UTC (rev 141991)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-02-06 13:29:30 UTC (rev 141992)
@@ -1,3 +1,12 @@
+2013-02-06  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: assign class name to the heap graph node automatically
+https://bugs.webkit.org/show_bug.cgi?id=107262
+
+Reviewed by Yury Semikhatsky.
+
+* _javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def:
+
 2013-02-06  Mike West  mk...@chromium.org
 
 Add an ENABLE_NOSNIFF feature flag.


Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def (141991 => 141992)

--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def	2013-02-06 13:11:24 UTC (rev 141991)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def	2013-02-06 13:29:30 UTC (rev 141992)
@@ -102,7 +102,7 @@
 ?callHostFunctionAsConstructor@JSC@@YI_JPAVExecState@1@@Z
 ?callOnMainThread@WTF@@YAXP6AXPAX@Z0@Z
 ?callOnMainThreadAndWait@WTF@@YAXP6AXPAX@Z0@Z
-?callReportObjectInfo@MemoryInstrumentation@WTF@@CAXPAVMemoryObjectInfo@2@PBXPBDI@Z
+?callReportObjectInfo@MemoryClassInfo@WTF@@SAXPAVMemoryObjectInfo@2@PBXPBD2I@Z
 ?cancelCallOnMainThread@WTF@@YAXP6AXPAX@Z0@Z
 ?canShrink@StringBuilder@WTF@@QBE_NXZ
 ?capacity@Heap@JSC@@QAEIXZ
@@ -265,7 +265,7 @@
 ?indefiniteTime@MediaTime@WTF@@SAABV12@XZ 
 ?init@AtomicString@WTF@@SAXXZ
 ?init@JSGlobalObject@JSC@@AAEXPAVJSObject@2@@Z
-?init@MemoryClassInfo@WTF@@AAEXPBXPBDI@Z
+?init@MemoryClassInfo@WTF@@AAEXPBXPBD1I@Z
 ?initialize@double_conversion@WTF@@YAXXZ
 ?initializeMainThread@WTF@@YAXXZ
 ?initializeThreading@JSC@@YAXXZ


Modified: trunk/Source/WTF/ChangeLog (141991 => 141992)

--- trunk/Source/WTF/ChangeLog	2013-02-06 13:11:24 UTC (rev 141991)
+++ trunk/Source/WTF/ChangeLog	2013-02-06 13:29:30 UTC (rev 141992)
@@ -1,3 +1,41 @@
+2013-02-06  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: assign class name to the heap graph node automatically
+https://bugs.webkit.org/show_bug.cgi?id=107262
+
+Reviewed by Yury Semikhatsky.
+
+We need a way to calculate class name for a pointer automatically.
+Otherwise we need to write className manually in all the instrumentation methods.
+And for all reported but not instrumented classes.
+
+C++ can do that for us with help of typeid but unfortunatelly it requires rtti.
+There is another way to do that. C++ preprocessor provides a define which has a function name.
+
+For g++ and clang it is __PRETTY_FUNCTION__.
+For MSVC it is __FUNCTION__.
+The content of the string is a function signature.
+We can use it because it has the name of 

[webkit-changes] [141874] trunk/Source/WebCore

[loislo]

Title: [141874] trunk/Source/WebCore








Revision 141874
Author loi...@chromium.org
Date 2013-02-05 01:37:13 -0800 (Tue, 05 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: rename Image m_data member to m_encodedImageData for the consistency
https://bugs.webkit.org/show_bug.cgi?id=108913

Reviewed by Yury Semikhatsky.

No new tests because no API changes.

* platform/graphics/Image.cpp:
(WebCore::Image::setData):
(WebCore::Image::reportMemoryUsage):
* platform/graphics/Image.h:
(WebCore::Image::data):
(Image):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/Image.cpp
trunk/Source/WebCore/platform/graphics/Image.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (141873 => 141874)

--- trunk/Source/WebCore/ChangeLog	2013-02-05 09:19:31 UTC (rev 141873)
+++ trunk/Source/WebCore/ChangeLog	2013-02-05 09:37:13 UTC (rev 141874)
@@ -1,3 +1,19 @@
+2013-02-04  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: rename Image m_data member to m_encodedImageData for the consistency
+https://bugs.webkit.org/show_bug.cgi?id=108913
+
+Reviewed by Yury Semikhatsky.
+
+No new tests because no API changes.
+
+* platform/graphics/Image.cpp:
+(WebCore::Image::setData):
+(WebCore::Image::reportMemoryUsage):
+* platform/graphics/Image.h:
+(WebCore::Image::data):
+(Image):
+
 2013-02-05  Hajime Morrita  morr...@google.com
 
 Unreviewed Linux ASAN build fix for r141783.


Modified: trunk/Source/WebCore/platform/graphics/Image.cpp (141873 => 141874)

--- trunk/Source/WebCore/platform/graphics/Image.cpp	2013-02-05 09:19:31 UTC (rev 141873)
+++ trunk/Source/WebCore/platform/graphics/Image.cpp	2013-02-05 09:37:13 UTC (rev 141874)
@@ -70,11 +70,11 @@
 
 bool Image::setData(PassRefPtrSharedBuffer data, bool allDataReceived)
 {
-m_data = data;
-if (!m_data.get())
+m_encodedImageData = data;
+if (!m_encodedImageData.get())
 return true;
 
-int length = m_data-size();
+int length = m_encodedImageData-size();
 if (!length)
 return true;
 
@@ -203,7 +203,7 @@
 {
 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image);
 memoryObjectInfo-setClassName(Image);
-info.addMember(m_data, m_data);
+info.addMember(m_encodedImageData, encodedImageData);
 info.addWeakPointer(m_imageObserver);
 }
 


Modified: trunk/Source/WebCore/platform/graphics/Image.h (141873 => 141874)

--- trunk/Source/WebCore/platform/graphics/Image.h	2013-02-05 09:19:31 UTC (rev 141873)
+++ trunk/Source/WebCore/platform/graphics/Image.h	2013-02-05 09:37:13 UTC (rev 141874)
@@ -128,7 +128,7 @@
 virtual void destroyDecodedData(bool destroyAll = true) = 0;
 virtual unsigned decodedSize() const = 0;
 
-SharedBuffer* data() { return m_data.get(); }
+SharedBuffer* data() { return m_encodedImageData.get(); }
 
 // Animation begins whenever someone draws the image, so startAnimation() is not normally called.
 // It will automatically pause once all observers no longer want to render the image anywhere.
@@ -207,7 +207,7 @@
 virtual Color solidColor() const { return Color(); }
 
 private:
-RefPtrSharedBuffer m_data; // The encoded raw data for the image. 
+RefPtrSharedBuffer m_encodedImageData;
 ImageObserver* m_imageObserver;
 };
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [141591] trunk/Source/WTF

[loislo]

Title: [141591] trunk/Source/WTF








Revision 141591
Author loi...@chromium.org
Date 2013-02-01 07:32:35 -0800 (Fri, 01 Feb 2013)


Log Message
Web Inspector: Native Memory Instrumentation: provide edge names and class names for WTF containers and strings
https://bugs.webkit.org/show_bug.cgi?id=107303

Reviewed by Yury Semikhatsky.

I'd like to use ValueType[] as className for the container data members
because class names of template parameters already present in the container class names.

* wtf/MemoryInstrumentationArrayBufferView.h:
(WTF::reportMemoryUsage):
* wtf/MemoryInstrumentationHashCountedSet.h:
(WTF::reportMemoryUsage):
* wtf/MemoryInstrumentationHashMap.h:
(WTF::reportMemoryUsage):
* wtf/MemoryInstrumentationHashSet.h:
(WTF::reportMemoryUsage):
* wtf/MemoryInstrumentationListHashSet.h:
(WTF::reportMemoryUsage):
* wtf/MemoryInstrumentationSequence.h:
* wtf/MemoryInstrumentationString.h:
(WTF::reportMemoryUsage):
* wtf/MemoryInstrumentationVector.h:
(WTF::reportMemoryUsage):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MemoryInstrumentationArrayBufferView.h
trunk/Source/WTF/wtf/MemoryInstrumentationHashCountedSet.h
trunk/Source/WTF/wtf/MemoryInstrumentationHashMap.h
trunk/Source/WTF/wtf/MemoryInstrumentationHashSet.h
trunk/Source/WTF/wtf/MemoryInstrumentationListHashSet.h
trunk/Source/WTF/wtf/MemoryInstrumentationSequence.h
trunk/Source/WTF/wtf/MemoryInstrumentationString.h
trunk/Source/WTF/wtf/MemoryInstrumentationVector.h




Diff

Modified: trunk/Source/WTF/ChangeLog (141590 => 141591)

--- trunk/Source/WTF/ChangeLog	2013-02-01 15:27:15 UTC (rev 141590)
+++ trunk/Source/WTF/ChangeLog	2013-02-01 15:32:35 UTC (rev 141591)
@@ -1,3 +1,29 @@
+2013-01-18  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: provide edge names and class names for WTF containers and strings
+https://bugs.webkit.org/show_bug.cgi?id=107303
+
+Reviewed by Yury Semikhatsky.
+
+I'd like to use ValueType[] as className for the container data members
+because class names of template parameters already present in the container class names.
+
+* wtf/MemoryInstrumentationArrayBufferView.h:
+(WTF::reportMemoryUsage):
+* wtf/MemoryInstrumentationHashCountedSet.h:
+(WTF::reportMemoryUsage):
+* wtf/MemoryInstrumentationHashMap.h:
+(WTF::reportMemoryUsage):
+* wtf/MemoryInstrumentationHashSet.h:
+(WTF::reportMemoryUsage):
+* wtf/MemoryInstrumentationListHashSet.h:
+(WTF::reportMemoryUsage):
+* wtf/MemoryInstrumentationSequence.h:
+* wtf/MemoryInstrumentationString.h:
+(WTF::reportMemoryUsage):
+* wtf/MemoryInstrumentationVector.h:
+(WTF::reportMemoryUsage):
+
 2013-02-01  Geoffrey Garen  gga...@apple.com
 
 Added TriState to WTF and started using it in one place


Modified: trunk/Source/WTF/wtf/MemoryInstrumentationArrayBufferView.h (141590 => 141591)

--- trunk/Source/WTF/wtf/MemoryInstrumentationArrayBufferView.h	2013-02-01 15:27:15 UTC (rev 141590)
+++ trunk/Source/WTF/wtf/MemoryInstrumentationArrayBufferView.h	2013-02-01 15:32:35 UTC (rev 141591)
@@ -39,13 +39,13 @@
 inline void reportMemoryUsage(const ArrayBufferView* arrayBufferView, MemoryObjectInfo* memoryObjectInfo)
 {
 MemoryClassInfo info(memoryObjectInfo, arrayBufferView);
-info.addMember(arrayBufferView-buffer().get());
+info.addMember(arrayBufferView-buffer().get(), buffer);
 }
 
 inline void reportMemoryUsage(const ArrayBuffer* arrayBuffer, MemoryObjectInfo* memoryObjectInfo)
 {
 MemoryClassInfo info(memoryObjectInfo, arrayBuffer);
-info.addRawBuffer(arrayBuffer-data(), arrayBuffer-byteLength());
+info.addRawBuffer(arrayBuffer-data(), arrayBuffer-byteLength(), byte[], data);
 }
 
 }


Modified: trunk/Source/WTF/wtf/MemoryInstrumentationHashCountedSet.h (141590 => 141591)

--- trunk/Source/WTF/wtf/MemoryInstrumentationHashCountedSet.h	2013-02-01 15:27:15 UTC (rev 141590)
+++ trunk/Source/WTF/wtf/MemoryInstrumentationHashCountedSet.h	2013-02-01 15:32:35 UTC (rev 141591)
@@ -42,7 +42,7 @@
 MemoryClassInfo info(memoryObjectInfo, hashSet);
 
 typedef HashMapValueArg, unsigned, HashArg, TraitsArg HashMapType;
-info.addPrivateBuffer(sizeof(typename HashMapType::ValueType) * hashSet-capacity());
+info.addPrivateBuffer(sizeof(typename HashMapType::ValueType) * hashSet-capacity(), 0, ValueType[], data);
 SequenceMemoryInstrumentationTraitsValueArg::reportMemoryUsage(hashSet-begin().keys(), hashSet-end().keys(), info);
 }
 


Modified: trunk/Source/WTF/wtf/MemoryInstrumentationHashMap.h (141590 => 141591)

--- trunk/Source/WTF/wtf/MemoryInstrumentationHashMap.h	2013-02-01 15:27:15 UTC (rev 141590)
+++ trunk/Source/WTF/wtf/MemoryInstrumentationHashMap.h	2013-02-01 15:32:35 UTC (rev 141591)
@@ -41,7 +41,7 @@
 {
 MemoryClassInfo info(memoryObjectInfo, hashMap);
 typedef HashMapKeyArg, MappedArg, HashArg, 

[webkit-changes] [141539] trunk/Source/WTF

[loislo]

Title: [141539] trunk/Source/WTF








Revision 141539
Author loi...@chromium.org
Date 2013-01-31 22:52:09 -0800 (Thu, 31 Jan 2013)


Log Message
Web Inspector: Native Memory Instrumentation: replace nodeName argument with className
https://bugs.webkit.org/show_bug.cgi?id=107278

Reviewed by Yury Semikhatsky.

I replaced nodeName with className because we newer report node name for private and raw buffers
but need to report their class names.

* wtf/MemoryInstrumentation.cpp:
(WTF::MemoryInstrumentation::reportLinkToBuffer):
(WTF::MemoryClassInfo::addRawBuffer):
(WTF::MemoryClassInfo::addPrivateBuffer):
* wtf/MemoryInstrumentation.h:
(WTF::MemoryInstrumentation::addRawBuffer):
(MemoryClassInfo):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MemoryInstrumentation.cpp
trunk/Source/WTF/wtf/MemoryInstrumentation.h




Diff

Modified: trunk/Source/WTF/ChangeLog (141538 => 141539)

--- trunk/Source/WTF/ChangeLog	2013-02-01 06:36:02 UTC (rev 141538)
+++ trunk/Source/WTF/ChangeLog	2013-02-01 06:52:09 UTC (rev 141539)
@@ -1,3 +1,21 @@
+2013-01-31  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: replace nodeName argument with className
+https://bugs.webkit.org/show_bug.cgi?id=107278
+
+Reviewed by Yury Semikhatsky.
+
+I replaced nodeName with className because we newer report node name for private and raw buffers
+but need to report their class names.
+
+* wtf/MemoryInstrumentation.cpp:
+(WTF::MemoryInstrumentation::reportLinkToBuffer):
+(WTF::MemoryClassInfo::addRawBuffer):
+(WTF::MemoryClassInfo::addPrivateBuffer):
+* wtf/MemoryInstrumentation.h:
+(WTF::MemoryInstrumentation::addRawBuffer):
+(MemoryClassInfo):
+
 2013-01-31  Jessie Berlin  jber...@apple.com
 
 Rolling out r141407 because it is causing crashes under


Modified: trunk/Source/WTF/wtf/MemoryInstrumentation.cpp (141538 => 141539)

--- trunk/Source/WTF/wtf/MemoryInstrumentation.cpp	2013-02-01 06:36:02 UTC (rev 141538)
+++ trunk/Source/WTF/wtf/MemoryInstrumentation.cpp	2013-02-01 06:52:09 UTC (rev 141539)
@@ -64,11 +64,11 @@
 memoryObjectInfo-reportObjectInfo(pointer, objectType, objectSize);
 }
 
-void MemoryInstrumentation::reportLinkToBuffer(const void* buffer, MemoryObjectType ownerObjectType, size_t size, const char* nodeName, const char* edgeName)
+void MemoryInstrumentation::reportLinkToBuffer(const void* buffer, MemoryObjectType ownerObjectType, size_t size, const char* className, const char* edgeName)
 {
 MemoryObjectInfo memoryObjectInfo(this, ownerObjectType, 0);
 memoryObjectInfo.reportObjectInfo(buffer, ownerObjectType, size);
-memoryObjectInfo.setName(nodeName);
+memoryObjectInfo.setClassName(className);
 m_client-reportLeaf(memoryObjectInfo, edgeName);
 }
 
@@ -129,13 +129,13 @@
 m_skipMembers = !m_memoryObjectInfo-firstVisit();
 }
 
-void MemoryClassInfo::addRawBuffer(const void* buffer, size_t size, const char* nodeName, const char* edgeName)
+void MemoryClassInfo::addRawBuffer(const void* buffer, size_t size, const char* className, const char* edgeName)
 {
 if (!m_skipMembers)
-m_memoryInstrumentation-addRawBuffer(buffer, m_objectType, size, nodeName, edgeName);
+m_memoryInstrumentation-addRawBuffer(buffer, m_objectType, size, className, edgeName);
 }
 
-void MemoryClassInfo::addPrivateBuffer(size_t size, MemoryObjectType ownerObjectType, const char* nodeName, const char* edgeName)
+void MemoryClassInfo::addPrivateBuffer(size_t size, MemoryObjectType ownerObjectType, const char* className, const char* edgeName)
 {
 if (!size)
 return;
@@ -144,7 +144,7 @@
 if (!ownerObjectType)
 ownerObjectType = m_objectType;
 m_memoryInstrumentation-countObjectSize(0, ownerObjectType, size);
-m_memoryInstrumentation-reportLinkToBuffer(0, ownerObjectType, size, nodeName, edgeName);
+m_memoryInstrumentation-reportLinkToBuffer(0, ownerObjectType, size, className, edgeName);
 }
 
 void MemoryClassInfo::setCustomAllocation(bool customAllocation)


Modified: trunk/Source/WTF/wtf/MemoryInstrumentation.h (141538 => 141539)

--- trunk/Source/WTF/wtf/MemoryInstrumentation.h	2013-02-01 06:36:02 UTC (rev 141538)
+++ trunk/Source/WTF/wtf/MemoryInstrumentation.h	2013-02-01 06:52:09 UTC (rev 141539)
@@ -169,12 +169,12 @@
 };
 
 templatetypename T void addObject(const T t, MemoryObjectInfo* ownerObjectInfo, const char* edgeName) { MemberTypeTraitsT::addObject(this, t, ownerObjectInfo, edgeName); }
-void addRawBuffer(const void* buffer, MemoryObjectType ownerObjectType, size_t size, const char* nodeName = 0, const char* edgeName = 0)
+void addRawBuffer(const void* buffer, MemoryObjectType ownerObjectType, size_t size, const char* className = 0, const char* edgeName = 0)
 {
 if (!buffer || visited(buffer))
 return;
 countObjectSize(buffer, ownerObjectType, size);
-

[webkit-changes] [139589] trunk/Source/WebCore

[loislo]

Title: [139589] trunk/Source/WebCore








Revision 139589
Author loi...@chromium.org
Date 2013-01-14 00:21:49 -0800 (Mon, 14 Jan 2013)


Log Message
Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 2/N
https://bugs.webkit.org/show_bug.cgi?id=106546

Reviewed by Vsevolod Vlasov.

Many nontrivial class members were added into reportMemoryUsage methods.

* bindings/v8/V8PerIsolateData.cpp:
(WebCore::V8PerIsolateData::reportMemoryUsage):
* css/CSSMediaRule.cpp:
(WebCore::CSSMediaRule::reportMemoryUsage):
* css/CSSProperty.cpp:
(WebCore::CSSProperty::reportMemoryUsage):
* css/CSSStyleSheet.cpp:
(WebCore::CSSStyleSheet::reportMemoryUsage):
* css/MediaList.cpp:
(WebCore::MediaList::reportMemoryUsage):
* css/RuleSet.cpp:
(WebCore::RuleData::reportMemoryUsage):
(WebCore::RuleSet::reportMemoryUsage):
(WebCore::RuleSet::RuleSetSelectorPair::reportMemoryUsage):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::MatchedPropertiesCacheItem::reportMemoryUsage):
(WebCore::StyleResolver::reportMemoryUsage):
* css/StyleSheetContents.cpp:
(WebCore::StyleSheetContents::reportMemoryUsage):
* dom/TreeScope.cpp:
(WebCore::TreeScope::reportMemoryUsage):
* inspector/HeapGraphSerializer.cpp:
(WebCore::HeapGraphSerializer::reportMemoryUsage):
* inspector/InspectorMemoryAgent.cpp:
* inspector/InspectorProfilerAgent.cpp:
(WebCore::InspectorProfilerAgent::reportMemoryUsage):
* inspector/MemoryInstrumentationImpl.cpp:
(WebCore::MemoryInstrumentationClientImpl::reportMemoryUsage):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::reportMemoryUsage):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::reportMemoryUsage):
* loader/MainResourceLoader.cpp:
(WebCore::MainResourceLoader::reportMemoryUsage):
* loader/Prerenderer.cpp:
(WebCore::Prerenderer::reportMemoryUsage):
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::reportMemoryUsage):
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::reportMemoryUsage):
* page/Page.cpp:
(WebCore::Page::reportMemoryUsage):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/v8/V8PerIsolateData.cpp
trunk/Source/WebCore/css/CSSProperty.cpp
trunk/Source/WebCore/css/CSSStyleSheet.cpp
trunk/Source/WebCore/css/MediaList.cpp
trunk/Source/WebCore/css/RuleSet.cpp
trunk/Source/WebCore/css/StyleResolver.cpp
trunk/Source/WebCore/css/StyleSheetContents.cpp
trunk/Source/WebCore/dom/TreeScope.cpp
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp
trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.cpp
trunk/Source/WebCore/loader/DocumentLoader.cpp
trunk/Source/WebCore/loader/FrameLoader.cpp
trunk/Source/WebCore/loader/MainResourceLoader.cpp
trunk/Source/WebCore/loader/Prerenderer.cpp
trunk/Source/WebCore/loader/ResourceLoader.cpp
trunk/Source/WebCore/loader/cache/CachedImage.cpp
trunk/Source/WebCore/page/Page.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (139588 => 139589)

--- trunk/Source/WebCore/ChangeLog	2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/ChangeLog	2013-01-14 08:21:49 UTC (rev 139589)
@@ -1,3 +1,55 @@
+2013-01-10  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 2/N
+https://bugs.webkit.org/show_bug.cgi?id=106546
+
+Reviewed by Vsevolod Vlasov.
+
+Many nontrivial class members were added into reportMemoryUsage methods.
+
+* bindings/v8/V8PerIsolateData.cpp:
+(WebCore::V8PerIsolateData::reportMemoryUsage):
+* css/CSSMediaRule.cpp:
+(WebCore::CSSMediaRule::reportMemoryUsage):
+* css/CSSProperty.cpp:
+(WebCore::CSSProperty::reportMemoryUsage):
+* css/CSSStyleSheet.cpp:
+(WebCore::CSSStyleSheet::reportMemoryUsage):
+* css/MediaList.cpp:
+(WebCore::MediaList::reportMemoryUsage):
+* css/RuleSet.cpp:
+(WebCore::RuleData::reportMemoryUsage):
+(WebCore::RuleSet::reportMemoryUsage):
+(WebCore::RuleSet::RuleSetSelectorPair::reportMemoryUsage):
+* css/StyleResolver.cpp:
+(WebCore::StyleResolver::MatchedPropertiesCacheItem::reportMemoryUsage):
+(WebCore::StyleResolver::reportMemoryUsage):
+* css/StyleSheetContents.cpp:
+(WebCore::StyleSheetContents::reportMemoryUsage):
+* dom/TreeScope.cpp:
+(WebCore::TreeScope::reportMemoryUsage):
+* inspector/HeapGraphSerializer.cpp:
+(WebCore::HeapGraphSerializer::reportMemoryUsage):
+* inspector/InspectorMemoryAgent.cpp:
+* inspector/InspectorProfilerAgent.cpp:
+(WebCore::InspectorProfilerAgent::reportMemoryUsage):
+* inspector/MemoryInstrumentationImpl.cpp:
+(WebCore::MemoryInstrumentationClientImpl::reportMemoryUsage):
+* loader/DocumentLoader.cpp:
+

[webkit-changes] [139590] trunk/Source/WebCore

[loislo]

Title: [139590] trunk/Source/WebCore








Revision 139590
Author loi...@chromium.org
Date 2013-01-14 01:12:30 -0800 (Mon, 14 Jan 2013)


Log Message
Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 3/3
https://bugs.webkit.org/show_bug.cgi?id=106764

Reviewed by Vsevolod Vlasov.

Last three classes with not instrumented members were fixed.

* css/CSSGroupingRule.cpp:
(WebCore::CSSGroupingRule::reportMemoryUsage):
* css/StyleScopeResolver.cpp:
(WebCore::StyleScopeResolver::reportMemoryUsage):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::reportMemoryUsage):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSGroupingRule.cpp
trunk/Source/WebCore/css/StyleScopeResolver.cpp
trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (139589 => 139590)

--- trunk/Source/WebCore/ChangeLog	2013-01-14 08:21:49 UTC (rev 139589)
+++ trunk/Source/WebCore/ChangeLog	2013-01-14 09:12:30 UTC (rev 139590)
@@ -1,3 +1,19 @@
+2013-01-14  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 3/3
+https://bugs.webkit.org/show_bug.cgi?id=106764
+
+Reviewed by Vsevolod Vlasov.
+
+Last three classes with not instrumented members were fixed.
+
+* css/CSSGroupingRule.cpp:
+(WebCore::CSSGroupingRule::reportMemoryUsage):
+* css/StyleScopeResolver.cpp:
+(WebCore::StyleScopeResolver::reportMemoryUsage):
+* loader/cache/CachedResourceLoader.cpp:
+(WebCore::CachedResourceLoader::reportMemoryUsage):
+
 2013-01-10  Ilya Tikhonovsky  loi...@chromium.org
 
 Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 2/N


Modified: trunk/Source/WebCore/css/CSSGroupingRule.cpp (139589 => 139590)

--- trunk/Source/WebCore/css/CSSGroupingRule.cpp	2013-01-14 08:21:49 UTC (rev 139589)
+++ trunk/Source/WebCore/css/CSSGroupingRule.cpp	2013-01-14 09:12:30 UTC (rev 139590)
@@ -164,6 +164,7 @@
 {
 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
 CSSRule::reportMemoryUsage(memoryObjectInfo);
+info.addMember(m_groupRule);
 info.addMember(m_childRuleCSSOMWrappers);
 info.addMember(m_ruleListCSSOMWrapper);
 }


Modified: trunk/Source/WebCore/css/StyleScopeResolver.cpp (139589 => 139590)

--- trunk/Source/WebCore/css/StyleScopeResolver.cpp	2013-01-14 08:21:49 UTC (rev 139589)
+++ trunk/Source/WebCore/css/StyleScopeResolver.cpp	2013-01-14 09:12:30 UTC (rev 139590)
@@ -244,6 +244,7 @@
 info.addMember(m_authorStyles);
 info.addMember(m_stack);
 info.addMember(m_atHostRules);
+info.addMember(m_stackParent);
 }
 
 }


Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (139589 => 139590)

--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp	2013-01-14 08:21:49 UTC (rev 139589)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp	2013-01-14 09:12:30 UTC (rev 139590)
@@ -946,9 +946,17 @@
 {
 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
 info.addMember(m_documentResources);
+info.addMember(m_document);
+info.addMember(m_documentLoader);
 info.addMember(m_validatedURLs);
 info.addMember(m_preloads);
 info.addMember(m_pendingPreloads);
+info.addMember(m_garbageCollectDocumentResourcesTimer);
+#if ENABLE(RESOURCE_TIMING)
+// FIXME: m_initiatorMap has pointers to already deleted CachedResources
+info.ignoreMember(m_initiatorMap);
+#endif
+
 }
 
 const ResourceLoaderOptions CachedResourceLoader::defaultCachedResourceOptions()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [139306] trunk/Source/WebCore

[loislo]

Title: [139306] trunk/Source/WebCore








Revision 139306
Author loi...@chromium.org
Date 2013-01-10 03:31:09 -0800 (Thu, 10 Jan 2013)


Log Message
Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 2/N
https://bugs.webkit.org/show_bug.cgi?id=106546

Reviewed by Vsevolod Vlasov.

Many nontrivial class members were instrumented in reportMemoryUsage methods.

* bindings/v8/V8PerIsolateData.cpp:
(WebCore::V8PerIsolateData::reportMemoryUsage):
* css/CSSMediaRule.cpp:
(WebCore::CSSMediaRule::reportMemoryUsage):
* css/CSSProperty.cpp:
(WebCore::CSSProperty::reportMemoryUsage):
* css/CSSStyleSheet.cpp:
(WebCore::CSSStyleSheet::reportMemoryUsage):
* css/MediaList.cpp:
(WebCore::MediaList::reportMemoryUsage):
* css/RuleSet.cpp:
(WebCore::RuleData::reportMemoryUsage):
(WebCore::RuleSet::reportMemoryUsage):
(WebCore::RuleSet::RuleSetSelectorPair::reportMemoryUsage):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::MatchedPropertiesCacheItem::reportMemoryUsage):
(WebCore::StyleResolver::reportMemoryUsage):
* css/StyleSheetContents.cpp:
(WebCore::StyleSheetContents::reportMemoryUsage):
* dom/TreeScope.cpp:
(WebCore::TreeScope::reportMemoryUsage):
* inspector/HeapGraphSerializer.cpp:
(WebCore::HeapGraphSerializer::reportMemoryUsage):
* inspector/InspectorMemoryAgent.cpp:
* inspector/InspectorProfilerAgent.cpp:
(WebCore::InspectorProfilerAgent::reportMemoryUsage):
* inspector/MemoryInstrumentationImpl.cpp:
(WebCore::MemoryInstrumentationClientImpl::reportMemoryUsage):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::reportMemoryUsage):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::reportMemoryUsage):
* loader/MainResourceLoader.cpp:
(WebCore::MainResourceLoader::reportMemoryUsage):
* loader/Prerenderer.cpp:
(WebCore::Prerenderer::reportMemoryUsage):
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::reportMemoryUsage):
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::reportMemoryUsage):
* page/Page.cpp:
(WebCore::Page::reportMemoryUsage):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/v8/V8PerIsolateData.cpp
trunk/Source/WebCore/css/CSSMediaRule.cpp
trunk/Source/WebCore/css/CSSProperty.cpp
trunk/Source/WebCore/css/CSSStyleSheet.cpp
trunk/Source/WebCore/css/MediaList.cpp
trunk/Source/WebCore/css/RuleSet.cpp
trunk/Source/WebCore/css/StyleResolver.cpp
trunk/Source/WebCore/css/StyleSheetContents.cpp
trunk/Source/WebCore/dom/TreeScope.cpp
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp
trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.cpp
trunk/Source/WebCore/loader/DocumentLoader.cpp
trunk/Source/WebCore/loader/FrameLoader.cpp
trunk/Source/WebCore/loader/MainResourceLoader.cpp
trunk/Source/WebCore/loader/Prerenderer.cpp
trunk/Source/WebCore/loader/ResourceLoader.cpp
trunk/Source/WebCore/loader/cache/CachedImage.cpp
trunk/Source/WebCore/page/Page.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (139305 => 139306)

--- trunk/Source/WebCore/ChangeLog	2013-01-10 11:27:49 UTC (rev 139305)
+++ trunk/Source/WebCore/ChangeLog	2013-01-10 11:31:09 UTC (rev 139306)
@@ -1,3 +1,55 @@
+2013-01-10  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 2/N
+https://bugs.webkit.org/show_bug.cgi?id=106546
+
+Reviewed by Vsevolod Vlasov.
+
+Many nontrivial class members were instrumented in reportMemoryUsage methods.
+
+* bindings/v8/V8PerIsolateData.cpp:
+(WebCore::V8PerIsolateData::reportMemoryUsage):
+* css/CSSMediaRule.cpp:
+(WebCore::CSSMediaRule::reportMemoryUsage):
+* css/CSSProperty.cpp:
+(WebCore::CSSProperty::reportMemoryUsage):
+* css/CSSStyleSheet.cpp:
+(WebCore::CSSStyleSheet::reportMemoryUsage):
+* css/MediaList.cpp:
+(WebCore::MediaList::reportMemoryUsage):
+* css/RuleSet.cpp:
+(WebCore::RuleData::reportMemoryUsage):
+(WebCore::RuleSet::reportMemoryUsage):
+(WebCore::RuleSet::RuleSetSelectorPair::reportMemoryUsage):
+* css/StyleResolver.cpp:
+(WebCore::StyleResolver::MatchedPropertiesCacheItem::reportMemoryUsage):
+(WebCore::StyleResolver::reportMemoryUsage):
+* css/StyleSheetContents.cpp:
+(WebCore::StyleSheetContents::reportMemoryUsage):
+* dom/TreeScope.cpp:
+(WebCore::TreeScope::reportMemoryUsage):
+* inspector/HeapGraphSerializer.cpp:
+(WebCore::HeapGraphSerializer::reportMemoryUsage):
+* inspector/InspectorMemoryAgent.cpp:
+* inspector/InspectorProfilerAgent.cpp:
+(WebCore::InspectorProfilerAgent::reportMemoryUsage):
+* inspector/MemoryInstrumentationImpl.cpp:
+(WebCore::MemoryInstrumentationClientImpl::reportMemoryUsage):
+* 

[webkit-changes] [139310] trunk/Source/WebCore

[loislo]

Title: [139310] trunk/Source/WebCore








Revision 139310
Author loi...@chromium.org
Date 2013-01-10 04:28:11 -0800 (Thu, 10 Jan 2013)


Log Message
Unreviewed, rolling out r139306.
http://trac.webkit.org/changeset/139306
https://bugs.webkit.org/show_bug.cgi?id=106550

it broke inspector-protocol/nmi-webaudio-leak-test.html
(Requested by loislo on #webkit).

Patch by Sheriff Bot webkit.review@gmail.com on 2013-01-10

* bindings/v8/V8PerIsolateData.cpp:
(WebCore::V8PerIsolateData::reportMemoryUsage):
* css/CSSMediaRule.cpp:
(WebCore::CSSMediaRule::reportMemoryUsage):
* css/CSSProperty.cpp:
(WebCore::CSSProperty::reportMemoryUsage):
* css/CSSStyleSheet.cpp:
(WebCore::CSSStyleSheet::reportMemoryUsage):
* css/MediaList.cpp:
(WebCore::MediaList::reportMemoryUsage):
* css/RuleSet.cpp:
(WebCore::RuleData::reportMemoryUsage):
(WebCore::RuleSet::reportMemoryUsage):
(WebCore::RuleSet::RuleSetSelectorPair::reportMemoryUsage):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::MatchedPropertiesCacheItem::reportMemoryUsage):
(WebCore::StyleResolver::reportMemoryUsage):
* css/StyleSheetContents.cpp:
(WebCore::StyleSheetContents::reportMemoryUsage):
* dom/TreeScope.cpp:
(WebCore::TreeScope::reportMemoryUsage):
* inspector/HeapGraphSerializer.cpp:
(WebCore::HeapGraphSerializer::reportMemoryUsage):
* inspector/InspectorMemoryAgent.cpp:
* inspector/InspectorProfilerAgent.cpp:
(WebCore::InspectorProfilerAgent::reportMemoryUsage):
* inspector/MemoryInstrumentationImpl.cpp:
(WebCore::MemoryInstrumentationClientImpl::reportMemoryUsage):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::reportMemoryUsage):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::reportMemoryUsage):
* loader/MainResourceLoader.cpp:
(WebCore::MainResourceLoader::reportMemoryUsage):
* loader/Prerenderer.cpp:
(WebCore::Prerenderer::reportMemoryUsage):
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::reportMemoryUsage):
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::reportMemoryUsage):
* page/Page.cpp:
(WebCore::Page::reportMemoryUsage):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/v8/V8PerIsolateData.cpp
trunk/Source/WebCore/css/CSSMediaRule.cpp
trunk/Source/WebCore/css/CSSProperty.cpp
trunk/Source/WebCore/css/CSSStyleSheet.cpp
trunk/Source/WebCore/css/MediaList.cpp
trunk/Source/WebCore/css/RuleSet.cpp
trunk/Source/WebCore/css/StyleResolver.cpp
trunk/Source/WebCore/css/StyleSheetContents.cpp
trunk/Source/WebCore/dom/TreeScope.cpp
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp
trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.cpp
trunk/Source/WebCore/loader/DocumentLoader.cpp
trunk/Source/WebCore/loader/FrameLoader.cpp
trunk/Source/WebCore/loader/MainResourceLoader.cpp
trunk/Source/WebCore/loader/Prerenderer.cpp
trunk/Source/WebCore/loader/ResourceLoader.cpp
trunk/Source/WebCore/loader/cache/CachedImage.cpp
trunk/Source/WebCore/page/Page.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (139309 => 139310)

--- trunk/Source/WebCore/ChangeLog	2013-01-10 12:25:44 UTC (rev 139309)
+++ trunk/Source/WebCore/ChangeLog	2013-01-10 12:28:11 UTC (rev 139310)
@@ -1,3 +1,55 @@
+2013-01-10  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r139306.
+http://trac.webkit.org/changeset/139306
+https://bugs.webkit.org/show_bug.cgi?id=106550
+
+it broke inspector-protocol/nmi-webaudio-leak-test.html
+(Requested by loislo on #webkit).
+
+* bindings/v8/V8PerIsolateData.cpp:
+(WebCore::V8PerIsolateData::reportMemoryUsage):
+* css/CSSMediaRule.cpp:
+(WebCore::CSSMediaRule::reportMemoryUsage):
+* css/CSSProperty.cpp:
+(WebCore::CSSProperty::reportMemoryUsage):
+* css/CSSStyleSheet.cpp:
+(WebCore::CSSStyleSheet::reportMemoryUsage):
+* css/MediaList.cpp:
+(WebCore::MediaList::reportMemoryUsage):
+* css/RuleSet.cpp:
+(WebCore::RuleData::reportMemoryUsage):
+(WebCore::RuleSet::reportMemoryUsage):
+(WebCore::RuleSet::RuleSetSelectorPair::reportMemoryUsage):
+* css/StyleResolver.cpp:
+(WebCore::StyleResolver::MatchedPropertiesCacheItem::reportMemoryUsage):
+(WebCore::StyleResolver::reportMemoryUsage):
+* css/StyleSheetContents.cpp:
+(WebCore::StyleSheetContents::reportMemoryUsage):
+* dom/TreeScope.cpp:
+(WebCore::TreeScope::reportMemoryUsage):
+* inspector/HeapGraphSerializer.cpp:
+(WebCore::HeapGraphSerializer::reportMemoryUsage):
+* inspector/InspectorMemoryAgent.cpp:
+* inspector/InspectorProfilerAgent.cpp:
+(WebCore::InspectorProfilerAgent::reportMemoryUsage):
+* inspector/MemoryInstrumentationImpl.cpp:
+(WebCore::MemoryInstrumentationClientImpl::reportMemoryUsage):
+* loader/DocumentLoader.

[webkit-changes] [139192] trunk/Source/WebCore

[loislo]

Title: [139192] trunk/Source/WebCore








Revision 139192
Author loi...@chromium.org
Date 2013-01-09 07:02:47 -0800 (Wed, 09 Jan 2013)


Log Message
Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 1/N
https://bugs.webkit.org/show_bug.cgi?id=106445

Reviewed by Vsevolod Vlasov.

The patch has almost mechanical changes.

* bindings/v8/V8Binding.cpp:
* bindings/v8/V8ValueCache.cpp:
(WTF):
(WebCore::StringCache::reportMemoryUsage):
(WebCore):
* dom/Document.cpp:
(WebCore::Document::reportMemoryUsage):
* dom/DocumentStyleSheetCollection.cpp:
(WebCore::DocumentStyleSheetCollection::reportMemoryUsage):
* dom/ElementRareData.cpp:
(WebCore::ElementRareData::reportMemoryUsage):
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::reportMemoryUsage):
* page/Frame.cpp:
(WebCore::Frame::reportMemoryUsage):
* page/Page.cpp:
(WebCore::Page::reportMemoryUsage):
* platform/graphics/skia/NativeImageSkia.cpp:
(WebCore::NativeImageSkia::reportMemoryUsage):
* platform/network/FormData.cpp:
(WebCore::FormData::reportMemoryUsage):
(WebCore):
(WebCore::FormDataElement::reportMemoryUsage):
* platform/network/FormData.h:
(FormDataElement):
* rendering/RenderView.cpp:
(WebCore::RenderView::reportMemoryUsage):
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::reportMemoryUsage):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/v8/V8Binding.cpp
trunk/Source/WebCore/bindings/v8/V8ValueCache.cpp
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp
trunk/Source/WebCore/dom/ElementRareData.cpp
trunk/Source/WebCore/loader/cache/CachedResource.cpp
trunk/Source/WebCore/page/Frame.cpp
trunk/Source/WebCore/page/Page.cpp
trunk/Source/WebCore/platform/graphics/skia/NativeImageSkia.cpp
trunk/Source/WebCore/platform/network/FormData.cpp
trunk/Source/WebCore/platform/network/FormData.h
trunk/Source/WebCore/rendering/RenderView.cpp
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (139191 => 139192)

--- trunk/Source/WebCore/ChangeLog	2013-01-09 14:31:59 UTC (rev 139191)
+++ trunk/Source/WebCore/ChangeLog	2013-01-09 15:02:47 UTC (rev 139192)
@@ -1,3 +1,42 @@
+2012-12-29  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 1/N
+https://bugs.webkit.org/show_bug.cgi?id=106445
+
+Reviewed by Vsevolod Vlasov.
+
+The patch has almost mechanical changes.
+
+* bindings/v8/V8Binding.cpp:
+* bindings/v8/V8ValueCache.cpp:
+(WTF):
+(WebCore::StringCache::reportMemoryUsage):
+(WebCore):
+* dom/Document.cpp:
+(WebCore::Document::reportMemoryUsage):
+* dom/DocumentStyleSheetCollection.cpp:
+(WebCore::DocumentStyleSheetCollection::reportMemoryUsage):
+* dom/ElementRareData.cpp:
+(WebCore::ElementRareData::reportMemoryUsage):
+* loader/cache/CachedResource.cpp:
+(WebCore::CachedResource::reportMemoryUsage):
+* page/Frame.cpp:
+(WebCore::Frame::reportMemoryUsage):
+* page/Page.cpp:
+(WebCore::Page::reportMemoryUsage):
+* platform/graphics/skia/NativeImageSkia.cpp:
+(WebCore::NativeImageSkia::reportMemoryUsage):
+* platform/network/FormData.cpp:
+(WebCore::FormData::reportMemoryUsage):
+(WebCore):
+(WebCore::FormDataElement::reportMemoryUsage):
+* platform/network/FormData.h:
+(FormDataElement):
+* rendering/RenderView.cpp:
+(WebCore::RenderView::reportMemoryUsage):
+* rendering/style/StyleRareNonInheritedData.cpp:
+(WebCore::StyleRareNonInheritedData::reportMemoryUsage):
+
 2013-01-09  Florin Malita  fmal...@chromium.org
 
 [Skia] Implement GraphicsContext::fillRoundedRect() using SkCanvas::drawRRect()


Modified: trunk/Source/WebCore/bindings/v8/V8Binding.cpp (139191 => 139192)

--- trunk/Source/WebCore/bindings/v8/V8Binding.cpp	2013-01-09 14:31:59 UTC (rev 139191)
+++ trunk/Source/WebCore/bindings/v8/V8Binding.cpp	2013-01-09 15:02:47 UTC (rev 139192)
@@ -53,7 +53,6 @@
 #include XPathNSResolver.h
 #include wtf/MathExtras.h
 #include wtf/MainThread.h
-#include wtf/MemoryInstrumentationHashMap.h
 #include wtf/StdLibExtras.h
 #include wtf/Threading.h
 #include wtf/text/AtomicString.h
@@ -62,14 +61,6 @@
 #include wtf/text/StringHash.h
 #include wtf/text/WTFString.h
 
-namespace WTF {
-
-template struct SequenceMemoryInstrumentationTraitsv8::String* {
-template typename I static void reportMemoryUsage(I, I, MemoryClassInfo) { }
-};
-
-}
-
 namespace WebCore {
 
 v8::Handlev8::Value setDOMException(int exceptionCode, v8::Isolate* isolate)
@@ -190,12 +181,6 @@
 return v8::Persistentv8::FunctionTemplate::New(result);
 }
 
-void 

[webkit-changes] [138561] trunk/Source

[loislo]

Title: [138561] trunk/Source








Revision 138561
Author loi...@chromium.org
Date 2012-12-29 01:27:01 -0800 (Sat, 29 Dec 2012)


Log Message
Web Inspector: Native Memory Instrumentation: instrument not instrumented members.
https://bugs.webkit.org/show_bug.cgi?id=105830

Reviewed by Vsevolod Vlasov.

In some cases we don't want to visit some class members.
As example we decided to skip pointers to interface classes such as GraphicLayerClient.
We could use addWeakPointer for them but it can't be used for nonpointer members.
In the offline discussion we came to a conclusion that we need a new instrumentation
method ignoreMember, which will be used for all the members which we won't like to visit/instrument.

DriveBy: Also I instrumented not yet instrumented members.

Source/WebCore:

* bindings/v8/DOMWrapperMap.h:
(WebCore::DOMWrapperMap::reportMemoryUsage):
* bindings/v8/ScriptWrappable.h:
(WebCore::ScriptWrappable::reportMemoryUsage):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::reportMemoryUsage):
* platform/KURLGoogle.cpp:
(WebCore::KURLGooglePrivate::reportMemoryUsage):
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::reportMemoryUsage):
* platform/audio/AudioArray.h:
(WebCore::AudioArray::reportMemoryUsage):
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::reportMemoryUsage):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::reportMemoryUsage):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::RowStruct::reportMemoryUsage):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::reportMemoryUsage):
* rendering/style/StyleRareInheritedData.cpp:
(WebCore::StyleRareInheritedData::reportMemoryUsage):

Source/WTF:

* wtf/MemoryInstrumentation.h:
(MemoryClassInfo):
(WTF::MemoryClassInfo::ignoreMember):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MemoryInstrumentation.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/v8/DOMWrapperMap.h
trunk/Source/WebCore/bindings/v8/ScriptWrappable.h
trunk/Source/WebCore/html/HTMLMediaElement.cpp
trunk/Source/WebCore/platform/KURLGoogle.cpp
trunk/Source/WebCore/platform/SharedBuffer.cpp
trunk/Source/WebCore/platform/audio/AudioArray.h
trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
trunk/Source/WebCore/rendering/RenderTableSection.cpp
trunk/Source/WebCore/rendering/style/RenderStyle.cpp
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (138560 => 138561)

--- trunk/Source/WTF/ChangeLog	2012-12-29 09:19:35 UTC (rev 138560)
+++ trunk/Source/WTF/ChangeLog	2012-12-29 09:27:01 UTC (rev 138561)
@@ -1,3 +1,22 @@
+2012-12-28  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: instrument not instrumented members.
+https://bugs.webkit.org/show_bug.cgi?id=105830
+
+Reviewed by Vsevolod Vlasov.
+
+In some cases we don't want to visit some class members.
+As example we decided to skip pointers to interface classes such as GraphicLayerClient.
+We could use addWeakPointer for them but it can't be used for nonpointer members.
+In the offline discussion we came to a conclusion that we need a new instrumentation
+method ignoreMember, which will be used for all the members which we won't like to visit/instrument.
+
+DriveBy: Also I instrumented not yet instrumented members.
+
+* wtf/MemoryInstrumentation.h:
+(MemoryClassInfo):
+(WTF::MemoryClassInfo::ignoreMember):
+
 2012-12-26  Gyuyoung Kim  gyuyoung@samsung.com
 
 Fix build warning in OSAllocatorPosix.cpp


Modified: trunk/Source/WTF/wtf/MemoryInstrumentation.h (138560 => 138561)

--- trunk/Source/WTF/wtf/MemoryInstrumentation.h	2012-12-29 09:19:35 UTC (rev 138560)
+++ trunk/Source/WTF/wtf/MemoryInstrumentation.h	2012-12-29 09:27:01 UTC (rev 138561)
@@ -243,11 +243,13 @@
 if (!m_skipMembers)
 m_memoryInstrumentation-addObject(member, m_memoryObjectInfo, edgeName);
 }
+
 WTF_EXPORT_PRIVATE void addRawBuffer(const void* buffer, size_t, const char* nodeName = 0, const char* edgeName = 0);
 WTF_EXPORT_PRIVATE void addPrivateBuffer(size_t, MemoryObjectType ownerObjectType = 0, const char* nodeName = 0, const char* edgeName = 0);
 WTF_EXPORT_PRIVATE void setCustomAllocation(bool);
 
 void addWeakPointer(void*) { }
+templatetypename M void ignoreMember(const M) { }
 
 private:
 WTF_EXPORT_PRIVATE void init(const void* pointer, MemoryObjectType, size_t actualSize);


Modified: trunk/Source/WebCore/ChangeLog (138560 => 138561)

--- trunk/Source/WebCore/ChangeLog	2012-12-29 09:19:35 UTC (rev 138560)
+++ trunk/Source/WebCore/ChangeLog	2012-12-29 09:27:01 UTC (rev 138561)
@@ -1,3 +1,41 @@
+2012-12-28  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: instrument not instrumented members.

[webkit-changes] [138562] trunk/Tools

[loislo]

Title: [138562] trunk/Tools








Revision 138562
Author loi...@chromium.org
Date 2012-12-29 02:53:10 -0800 (Sat, 29 Dec 2012)


Log Message
Web Inspector: Native Memory Instrumentation plugin: move function bodies out of class declarations.
https://bugs.webkit.org/show_bug.cgi?id=105852

Reviewed by Alexander Pavlov.

* clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp:
(clang):
(AddMemberCallVisitor):
(ReportMemoryUsageVisitor):
(clang::ReportMemoryUsageAction::ParseArgs):
(clang::AddMemberCallVisitor::VisitCallExpr):
(clang::ReportMemoryUsageVisitor::VisitCXXMethodDecl):
(clang::ReportMemoryUsageVisitor::emitWarning):
(clang::ReportMemoryUsageVisitor::findInstrumentationMethod):
(clang::ReportMemoryUsageVisitor::needsToBeInstrumented):
(clang::ReportMemoryUsageVisitor::CheckMembersCoverage):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp




Diff

Modified: trunk/Tools/ChangeLog (138561 => 138562)

--- trunk/Tools/ChangeLog	2012-12-29 09:27:01 UTC (rev 138561)
+++ trunk/Tools/ChangeLog	2012-12-29 10:53:10 UTC (rev 138562)
@@ -1,3 +1,22 @@
+2012-12-29  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation plugin: move function bodies out of class declarations.
+https://bugs.webkit.org/show_bug.cgi?id=105852
+
+Reviewed by Alexander Pavlov.
+
+* clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp:
+(clang):
+(AddMemberCallVisitor):
+(ReportMemoryUsageVisitor):
+(clang::ReportMemoryUsageAction::ParseArgs):
+(clang::AddMemberCallVisitor::VisitCallExpr):
+(clang::ReportMemoryUsageVisitor::VisitCXXMethodDecl):
+(clang::ReportMemoryUsageVisitor::emitWarning):
+(clang::ReportMemoryUsageVisitor::findInstrumentationMethod):
+(clang::ReportMemoryUsageVisitor::needsToBeInstrumented):
+(clang::ReportMemoryUsageVisitor::CheckMembersCoverage):
+
 2012-12-29  Zan Dobersek  zandober...@gmail.com
 
 [webkitpy] Omit webkitpy/thirdparty/BeautifulSoup.py from code coverage checking


Modified: trunk/Tools/clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp (138561 => 138562)

--- trunk/Tools/clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp	2012-12-29 09:27:01 UTC (rev 138561)
+++ trunk/Tools/clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp	2012-12-29 10:53:10 UTC (rev 138562)
@@ -39,31 +39,16 @@
 
 namespace {
 
-typedef std::vectorstd::string Strings;
+using namespace std;
+typedef vectorstring Strings;
 
 Strings instrumentationMethods;
-const std::string instrimentingMethodName(reportMemoryUsage);
+const char instrumentingMethodName[] = reportMemoryUsage;
 
 class AddMemberCallVisitor : public RecursiveASTVisitorAddMemberCallVisitor {
 public:
-bool VisitCallExpr(CallExpr* callExpr)
-{
-CXXMemberCallExpr* methodCallExpr = dyn_castCXXMemberCallExpr(callExpr);
-bool instrumented = false;
-if (methodCallExpr) {
-std::string methodName = methodCallExpr-getMethodDecl()-getNameAsString();
-Strings::iterator i = find(instrumentationMethods.begin(), instrumentationMethods.end(), methodName);
-instrumented = i != instrumentationMethods.end();
-}
-if (instrumented || !methodCallExpr) {
-for (CallExpr::arg_iterator i = callExpr-arg_begin(); i != callExpr-arg_end(); ++i) {
-if (MemberExpr* memberExpr = dyn_castMemberExpr(*i))
-m_instrumentedMembers.push_back(memberExpr-getMemberNameInfo().getAsString());
-}
-}
-return true;
-}
 
+bool VisitCallExpr(CallExpr*);
 const Strings instrumentedMembers() const { return m_instrumentedMembers; }
 
 private:
@@ -76,76 +61,14 @@
 : m_instance(instance)
 , m_context(context) { }
 
-bool VisitCXXMethodDecl(clang::CXXMethodDecl* decl)
-{
-if (decl-doesThisDeclarationHaveABody()  decl-getNameAsString() == instrimentingMethodName) {
-FullSourceLoc fullLocation = m_context-getFullLoc(decl-getLocStart());
-if (fullLocation.isValid()) {
-AddMemberCallVisitor visitor;
-visitor.TraverseStmt(decl-getBody());
-CheckMembersCoverage(decl-getParent(), visitor.instrumentedMembers(), decl-getLocStart());
-}
-}
-return true;
-}
+bool VisitCXXMethodDecl(clang::CXXMethodDecl*);
 
 private:
-void emitWarning(SourceLocation loc, const char* rawError)
-{
-FullSourceLoc full(loc, m_instance.getSourceManager());
-std::string err([webkit-style] );
-err += rawError;
-DiagnosticsEngine diagnostic = m_instance.getDiagnostics();
-DiagnosticsEngine::Level level = diagnostic.getWarningsAsErrors() ? DiagnosticsEngine::Error : DiagnosticsEngine::Warning;
-unsigned id = diagnostic.getCustomDiagID(level, err);
-DiagnosticBuilder builder = 

[webkit-changes] [138563] trunk/Tools

[loislo]

Title: [138563] trunk/Tools








Revision 138563
Author loi...@chromium.org
Date 2012-12-29 03:38:05 -0800 (Sat, 29 Dec 2012)


Log Message
Web Inspector: Native Memory Instrumentation plugin: do not generate 'not instrumented' warning for instrumented mutable members.
https://bugs.webkit.org/show_bug.cgi?id=105855

Reviewed by Vsevolod Vlasov.

Extract MemberExpr from ImplicitCastExpr. It happens when we instrument a mutable member because
addMember expects const T and the mutable ref to member implicitly converts into const ref to member.

* clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp:
(ReportMemoryUsageVisitor):
(clang::AddMemberCallVisitor::VisitCallExpr):
(clang::ReportMemoryUsageVisitor::VisitCXXMethodDecl):
(clang::ReportMemoryUsageVisitor::checkMembersCoverage):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp




Diff

Modified: trunk/Tools/ChangeLog (138562 => 138563)

--- trunk/Tools/ChangeLog	2012-12-29 10:53:10 UTC (rev 138562)
+++ trunk/Tools/ChangeLog	2012-12-29 11:38:05 UTC (rev 138563)
@@ -1,5 +1,21 @@
 2012-12-29  Ilya Tikhonovsky  loi...@chromium.org
 
+Web Inspector: Native Memory Instrumentation plugin: do not generate 'not instrumented' warning for instrumented mutable members.
+https://bugs.webkit.org/show_bug.cgi?id=105855
+
+Reviewed by Vsevolod Vlasov.
+
+Extract MemberExpr from ImplicitCastExpr. It happens when we instrument a mutable member because
+addMember expects const T and the mutable ref to member implicitly converts into const ref to member.
+
+* clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp:
+(ReportMemoryUsageVisitor):
+(clang::AddMemberCallVisitor::VisitCallExpr):
+(clang::ReportMemoryUsageVisitor::VisitCXXMethodDecl):
+(clang::ReportMemoryUsageVisitor::checkMembersCoverage):
+
+2012-12-29  Ilya Tikhonovsky  loi...@chromium.org
+
 Web Inspector: Native Memory Instrumentation plugin: move function bodies out of class declarations.
 https://bugs.webkit.org/show_bug.cgi?id=105852
 


Modified: trunk/Tools/clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp (138562 => 138563)

--- trunk/Tools/clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp	2012-12-29 10:53:10 UTC (rev 138562)
+++ trunk/Tools/clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp	2012-12-29 11:38:05 UTC (rev 138563)
@@ -67,7 +67,7 @@
 void emitWarning(SourceLocation, const char* rawError);
 CXXMethodDecl* findInstrumentationMethod(CXXRecordDecl*);
 bool needsToBeInstrumented(const Type*);
-void CheckMembersCoverage(const CXXRecordDecl* instrumentedClass, const Strings instrumentedMembers, SourceLocation);
+void checkMembersCoverage(const CXXRecordDecl* instrumentedClass, const Strings instrumentedMembers, SourceLocation);
 
 CompilerInstance m_instance;
 ASTContext* m_context;
@@ -145,7 +145,10 @@
 }
 if (instrumented || !methodCallExpr) {
 for (CallExpr::arg_iterator i = callExpr-arg_begin(); i != callExpr-arg_end(); ++i) {
-if (MemberExpr* memberExpr = dyn_castMemberExpr(*i))
+Expr* expr = *i;
+while (ImplicitCastExpr::classof(expr))
+expr = static_castImplicitCastExpr*(expr)-getSubExpr();
+if (MemberExpr* memberExpr = dyn_castMemberExpr(expr))
 m_instrumentedMembers.push_back(memberExpr-getMemberNameInfo().getAsString());
 }
 }
@@ -159,7 +162,7 @@
 if (fullLocation.isValid()) {
 AddMemberCallVisitor visitor;
 visitor.TraverseStmt(decl-getBody());
-CheckMembersCoverage(decl-getParent(), visitor.instrumentedMembers(), decl-getLocStart());
+checkMembersCoverage(decl-getParent(), visitor.instrumentedMembers(), decl-getLocStart());
 }
 }
 return true;
@@ -208,7 +211,7 @@
 return true;
 }
 
-void ReportMemoryUsageVisitor::CheckMembersCoverage(const CXXRecordDecl* instrumentedClass, const Strings instrumentedMembers, SourceLocation location)
+void ReportMemoryUsageVisitor::checkMembersCoverage(const CXXRecordDecl* instrumentedClass, const Strings instrumentedMembers, SourceLocation location)
 {
 for (CXXRecordDecl::field_iterator i = instrumentedClass-field_begin(); i != instrumentedClass-field_end(); ++i) {
 string fieldName = i-getNameAsString();






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138530] trunk/Tools

[loislo]

Title: [138530] trunk/Tools








Revision 138530
Author loi...@chromium.org
Date 2012-12-28 01:49:25 -0800 (Fri, 28 Dec 2012)


Log Message
Web Inspector: Native Memory Instrumentation. Update clang plugin according to the current state of memory instrumentation code.
https://bugs.webkit.org/show_bug.cgi?id=105800

Reviewed by Yury Semikhatsky.

* clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp:
(clang::ReportMemoryUsageConsumer::ReportMemoryUsageConsumer):
(clang):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp




Diff

Modified: trunk/Tools/ChangeLog (138529 => 138530)

--- trunk/Tools/ChangeLog	2012-12-28 09:43:56 UTC (rev 138529)
+++ trunk/Tools/ChangeLog	2012-12-28 09:49:25 UTC (rev 138530)
@@ -1,3 +1,14 @@
+2012-12-27  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation. Update clang plugin according to the current state of memory instrumentation code.
+https://bugs.webkit.org/show_bug.cgi?id=105800
+
+Reviewed by Yury Semikhatsky.
+
+* clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp:
+(clang::ReportMemoryUsageConsumer::ReportMemoryUsageConsumer):
+(clang):
+
 2012-12-27  Zan Dobersek  zandober...@gmail.com
 
 Create a GTK build system watchlist and add myself to it


Modified: trunk/Tools/clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp (138529 => 138530)

--- trunk/Tools/clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp	2012-12-28 09:43:56 UTC (rev 138529)
+++ trunk/Tools/clang/ReportMemoryUsagePlugin/ReportMemoryUsage.cpp	2012-12-28 09:49:25 UTC (rev 138530)
@@ -156,18 +156,9 @@
 : m_visitor(instance, context)
 {
 instrumentationMethods.push_back(addMember);
-instrumentationMethods.push_back(addInstrumentedMember);
-instrumentationMethods.push_back(addVector);
-instrumentationMethods.push_back(addVectorPtr);
-instrumentationMethods.push_back(addInstrumentedVector);
-instrumentationMethods.push_back(addInstrumentedVectorPtr);
-instrumentationMethods.push_back(addHashSet);
-instrumentationMethods.push_back(addInstrumentedHashSet);
-instrumentationMethods.push_back(addHashMap);
-instrumentationMethods.push_back(addInstrumentedHashMap);
-instrumentationMethods.push_back(addListHashSet);
 instrumentationMethods.push_back(addRawBuffer);
-instrumentationMethods.push_back(addString);
+instrumentationMethods.push_back(addWeakPointer);
+instrumentationMethods.push_back(ignoreMember);
 }
 
 virtual void HandleTranslationUnit(clang::ASTContext context)
@@ -200,18 +191,24 @@
 This plugin is checking native memory instrumentation code.\n
 The class is instrumented if it has reportMemoryUsage member function.\n
 Sample:\n
-class InstrumentedClass {\n
+class InstrumentedClass : public BaseInstrumentedClass {\n
 public:\n
 void reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const\n
 {\n
-MemoryClassInfoInstrumentedClass info(memoryObjectInfo, this, MemoryInstrumentation::DOM);\n
-info.addMember(m_notInstrumentedPtr);\n
-info.addInstrumentedMember(m_instrumentedObject);\n
+MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);\n
+BaseInstrumentedClass::reportMemoryUsage(memoryObjectInfo);\n
+info.addMember(m_notInstrumentedObject);\n
+info.addMember(m_instrumentedObject);\n
+info.addRawBuffer(m_pointer, m_length);\n
+info.ignoreMember(m_pointerToInternalField);\n
 }\n
 \n
 private:\n
 NotInstrumentedClass* m_notInstrumentedPtr;\n
 InstrumentedClass m_instrumentedObject;\n
+long m_length;\n
+double* m_pointer;\n
+Data* m_pointerToInternalField;\n
 }\n;
 
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138491] trunk/Tools

[loislo]

Title: [138491] trunk/Tools








Revision 138491
Author loi...@chromium.org
Date 2012-12-26 23:31:22 -0800 (Wed, 26 Dec 2012)


Log Message
Unreviewed. Replace find(Tools) with rfind(Tools) because base dir of WebKit may have Tools word.
As example /DevTools/src/third_party/WebKit

* Scripts/webkitpy/common/webkit_finder.py:
(WebKitFinder.webkit_base):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/webkit_finder.py




Diff

Modified: trunk/Tools/ChangeLog (138490 => 138491)

--- trunk/Tools/ChangeLog	2012-12-27 06:43:47 UTC (rev 138490)
+++ trunk/Tools/ChangeLog	2012-12-27 07:31:22 UTC (rev 138491)
@@ -1,3 +1,11 @@
+2012-12-26  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed. Replace find(Tools) with rfind(Tools) because base dir of WebKit may have Tools word.
+As example /DevTools/src/third_party/WebKit
+
+* Scripts/webkitpy/common/webkit_finder.py:
+(WebKitFinder.webkit_base):
+
 2012-12-25  Christophe Dumez  christophe.du...@intel.com
 
 [EFL][WK2] Refactor snapshot taking code


Modified: trunk/Tools/Scripts/webkitpy/common/webkit_finder.py (138490 => 138491)

--- trunk/Tools/Scripts/webkitpy/common/webkit_finder.py	2012-12-27 06:43:47 UTC (rev 138490)
+++ trunk/Tools/Scripts/webkitpy/common/webkit_finder.py	2012-12-27 07:31:22 UTC (rev 138491)
@@ -44,7 +44,7 @@
 if not self._webkit_base:
 self._webkit_base = self._webkit_base
 module_path = self._filesystem.path_to_module(self.__module__)
-tools_index = module_path.find('Tools')
+tools_index = module_path.rfind('Tools')
 assert tools_index != -1, could not find location of this checkout from %s % module_path
 self._webkit_base = self._filesystem.normpath(module_path[0:tools_index - 1])
 return self._webkit_base






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138456] trunk/Source/JavaScriptCore

[loislo]

Title: [138456] trunk/Source/_javascript_Core








Revision 138456
Author loi...@chromium.org
Date 2012-12-25 00:12:30 -0800 (Tue, 25 Dec 2012)


Log Message
Unreviewed follow-up for r138455.

* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (138455 => 138456)

--- trunk/Source/_javascript_Core/ChangeLog	2012-12-25 07:53:52 UTC (rev 138455)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-12-25 08:12:30 UTC (rev 138456)
@@ -1,3 +1,9 @@
+2012-12-25  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed follow-up for r138455.
+
+* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+
 2012-12-24  Ilya Tikhonovsky  loi...@chromium.org
 
 Unreviewed compilation fix for r138452.


Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (138455 => 138456)

--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2012-12-25 07:53:52 UTC (rev 138455)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2012-12-25 08:12:30 UTC (rev 138456)
@@ -306,6 +306,7 @@
 ?parseDoubleFromLongString@Internal@WTF@@YANPB_WIAAI@Z
 ?positiveInfiniteTime@MediaTime@WTF@@SAABV12@XZ 
 ?process@WrapperBase@MemoryInstrumentation@WTF@@QAEXPAV23@@Z
+?processPointer@WrapperBase@MemoryInstrumentation@WTF@@QAEXPAV23@_N@Z
 ?processRootObjectRef@WrapperBase@MemoryInstrumentation@WTF@@QAEXPAV23@@Z
 ?profiler@LegacyProfiler@JSC@@SAPAV12@XZ
 ?protect@Heap@JSC@@QAEXVJSValue@2@@Z
@@ -331,6 +332,7 @@
 ?removeBlock@MarkedAllocator@JSC@@QAEXPAVMarkedBlock@2@@Z
 ?removeDirect@JSObject@JSC@@QAE_NAAVJSGlobalData@2@VPropertyName@2@@Z
 ?reportAbandonedObjectGraph@Heap@JSC@@QAEXXZ
+?reportEdge@MemoryInstrumentation@WTF@@AAEXPBXPBDW4MemberType@2@@Z
 ?reportExtraMemoryCostSlowCase@Heap@JSC@@AAEXI@Z
 ?reportSuccess@HeapStatistics@JSC@@SAXXZ
 ?reserveAndCommit@OSAllocator@WTF@@SAPAXIW4Usage@12@_N11@Z






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138452] trunk

[loislo]

Title: [138452] trunk








Revision 138452
Author loi...@chromium.org
Date 2012-12-24 23:01:51 -0800 (Mon, 24 Dec 2012)


Log Message
Web Inspector: Native Memory Instrumentation: propagate member type as edge type to the serialized heap graph.
https://bugs.webkit.org/show_bug.cgi?id=105725

Reviewed by Yury Semikhatsky.

Source/WebCore:

MemoryOwningType was renamed to MemberType.
Source argument were removed from reportEdge, reportLeaf and other edge related methods because it is not necessary.
MemberType argument was propagated from MemoryInstrumentation down to HeapGraphSerializer.

* inspector/HeapGraphSerializer.cpp:
(WebCore::HeapGraphEdge::HeapGraphEdge):
(HeapGraphEdge):
(WebCore::HeapGraphSerializer::HeapGraphSerializer):
(WebCore::HeapGraphSerializer::reportEdge):
(WebCore::HeapGraphSerializer::reportLeaf):
(WebCore::HeapGraphSerializer::serialize):
* inspector/HeapGraphSerializer.h:
(HeapGraphSerializer):
* inspector/MemoryInstrumentationImpl.cpp:
(WebCore::MemoryInstrumentationClientImpl::reportEdge):
(WebCore::MemoryInstrumentationClientImpl::reportLeaf):
* inspector/MemoryInstrumentationImpl.h:
(MemoryInstrumentationClientImpl):

Source/WTF:

MemoryOwningType was renamed to MemberType.
Source argument were removed from reportEdge, reportLeaf and other edge related methods because it is not necessary.
MemberType argument was propagated from MemoryInstrumentation down to HeapGraphSerializer.

The changes covered by tests in TestWebKitAPI.

* wtf/MemoryInstrumentation.cpp:
(WTF::MemoryInstrumentation::reportEdge):
(WTF::MemoryInstrumentation::reportLinkToBuffer):
(WTF::MemoryClassInfo::addPrivateBuffer):
* wtf/MemoryInstrumentation.h:
(MemoryInstrumentationClient):
(MemoryInstrumentation):
(WTF::MemoryInstrumentation::addRawBuffer):
(WTF::MemoryInstrumentation::MemberTypeTraits::addObject):
(WTF::MemoryInstrumentation::addObjectImpl):

Tools:

MemberType value names were adjusted according to Style Guide.
Existing tests were extended with link type validation.

* TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MemoryInstrumentation.cpp
trunk/Source/WTF/wtf/MemoryInstrumentation.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
trunk/Source/WebCore/inspector/HeapGraphSerializer.h
trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.cpp
trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.h
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (138451 => 138452)

--- trunk/Source/WTF/ChangeLog	2012-12-25 06:16:43 UTC (rev 138451)
+++ trunk/Source/WTF/ChangeLog	2012-12-25 07:01:51 UTC (rev 138452)
@@ -1,3 +1,27 @@
+2012-12-24  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: propagate member type as edge type to the serialized heap graph.
+https://bugs.webkit.org/show_bug.cgi?id=105725
+
+Reviewed by Yury Semikhatsky.
+
+MemoryOwningType was renamed to MemberType.
+Source argument were removed from reportEdge, reportLeaf and other edge related methods because it is not necessary.
+MemberType argument was propagated from MemoryInstrumentation down to HeapGraphSerializer.
+
+The changes covered by tests in TestWebKitAPI.
+
+* wtf/MemoryInstrumentation.cpp:
+(WTF::MemoryInstrumentation::reportEdge):
+(WTF::MemoryInstrumentation::reportLinkToBuffer):
+(WTF::MemoryClassInfo::addPrivateBuffer):
+* wtf/MemoryInstrumentation.h:
+(MemoryInstrumentationClient):
+(MemoryInstrumentation):
+(WTF::MemoryInstrumentation::addRawBuffer):
+(WTF::MemoryInstrumentation::MemberTypeTraits::addObject):
+(WTF::MemoryInstrumentation::addObjectImpl):
+
 2012-12-21  Ilya Tikhonovsky  loi...@chromium.org
 
 Unreviewed. Another try to fix Apple Win Release build.


Modified: trunk/Source/WTF/wtf/MemoryInstrumentation.cpp (138451 => 138452)

--- trunk/Source/WTF/wtf/MemoryInstrumentation.cpp	2012-12-25 06:16:43 UTC (rev 138451)
+++ trunk/Source/WTF/wtf/MemoryInstrumentation.cpp	2012-12-25 07:01:51 UTC (rev 138452)
@@ -49,9 +49,9 @@
 {
 }
 
-void MemoryInstrumentation::reportEdge(MemoryObjectInfo* ownerObjectInfo, const void* target, const char* name)
+void MemoryInstrumentation::reportEdge(const void* target, const char* name, MemberType memberType)
 {
-m_client-reportEdge(ownerObjectInfo-reportedPointer(), target, name);
+m_client-reportEdge(target, name, memberType);
 }
 
 MemoryObjectType MemoryInstrumentation::getObjectType(MemoryObjectInfo* objectInfo)
@@ -64,12 +64,12 @@
 memoryObjectInfo-reportObjectInfo(pointer, objectType, objectSize);
 }
 
-void MemoryInstrumentation::reportLinkToBuffer(const void* owner, const void* buffer, MemoryObjectType ownerObjectType, size_t size, const char* nodeName, const char* edgeName)
+void 

[webkit-changes] [138455] trunk/Source/JavaScriptCore

[loislo]

Title: [138455] trunk/Source/_javascript_Core








Revision 138455
Author loi...@chromium.org
Date 2012-12-24 23:53:52 -0800 (Mon, 24 Dec 2012)


Log Message
Unreviewed compilation fix for r138452.

* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (138454 => 138455)

--- trunk/Source/_javascript_Core/ChangeLog	2012-12-25 07:41:08 UTC (rev 138454)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-12-25 07:53:52 UTC (rev 138455)
@@ -1,3 +1,9 @@
+2012-12-24  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed compilation fix for r138452.
+
+* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+
 2012-12-24  Laszlo Gombos  l.gom...@samsung.com
 
 Remove wtf/Platform.h includes from {c|cpp} files


Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (138454 => 138455)

--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2012-12-25 07:41:08 UTC (rev 138454)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2012-12-25 07:53:52 UTC (rev 138455)
@@ -331,7 +331,6 @@
 ?removeBlock@MarkedAllocator@JSC@@QAEXPAVMarkedBlock@2@@Z
 ?removeDirect@JSObject@JSC@@QAE_NAAVJSGlobalData@2@VPropertyName@2@@Z
 ?reportAbandonedObjectGraph@Heap@JSC@@QAEXXZ
-?reportEdge@MemoryInstrumentation@WTF@@AAEXPAVMemoryObjectInfo@2@PBXPBD@Z
 ?reportExtraMemoryCostSlowCase@Heap@JSC@@AAEXI@Z
 ?reportSuccess@HeapStatistics@JSC@@SAXXZ
 ?reserveAndCommit@OSAllocator@WTF@@SAPAXIW4Usage@12@_N11@Z






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138358] trunk

[loislo]

Title: [138358] trunk








Revision 138358
Author loi...@chromium.org
Date 2012-12-21 02:05:51 -0800 (Fri, 21 Dec 2012)


Log Message
Unreviewed, rolling out r138338.
http://trac.webkit.org/changeset/138338
https://bugs.webkit.org/show_bug.cgi?id=105621

speculative rollout because fast/dom/shadow/content-element-
distributed-nodes.html is crashing on linux debug. (Requested
by loislo on #webkit).

Patch by Sheriff Bot webkit.review@gmail.com on 2012-12-21

.:

* Source/autotools/symbols.filter:

Source/WebCore:

* WebCore.exp.in:
* dom/DocumentFragment.h:
* dom/Node.cpp:
(WebCore::Node::documentFragmentIsShadowRoot):
(WebCore):
* dom/Node.h:
(Node):
(WebCore::Node::isShadowRoot):
* dom/ShadowRoot.h:

Source/WebKit2:

* win/WebKit2.def.in:

Modified Paths

trunk/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/dom/DocumentFragment.h
trunk/Source/WebCore/dom/Node.cpp
trunk/Source/WebCore/dom/Node.h
trunk/Source/WebCore/dom/ShadowRoot.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/win/WebKit2.def.in
trunk/Source/autotools/symbols.filter




Diff

Modified: trunk/ChangeLog (138357 => 138358)

--- trunk/ChangeLog	2012-12-21 10:04:34 UTC (rev 138357)
+++ trunk/ChangeLog	2012-12-21 10:05:51 UTC (rev 138358)
@@ -1,3 +1,15 @@
+2012-12-21  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r138338.
+http://trac.webkit.org/changeset/138338
+https://bugs.webkit.org/show_bug.cgi?id=105621
+
+speculative rollout because fast/dom/shadow/content-element-
+distributed-nodes.html is crashing on linux debug. (Requested
+by loislo on #webkit).
+
+* Source/autotools/symbols.filter:
+
 2012-12-20  Elliott Sprehn  espr...@chromium.org
 
 Replace documentFragmentIsShadowRoot with isTreeScope


Modified: trunk/Source/WebCore/ChangeLog (138357 => 138358)

--- trunk/Source/WebCore/ChangeLog	2012-12-21 10:04:34 UTC (rev 138357)
+++ trunk/Source/WebCore/ChangeLog	2012-12-21 10:05:51 UTC (rev 138358)
@@ -1,3 +1,23 @@
+2012-12-21  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r138338.
+http://trac.webkit.org/changeset/138338
+https://bugs.webkit.org/show_bug.cgi?id=105621
+
+speculative rollout because fast/dom/shadow/content-element-
+distributed-nodes.html is crashing on linux debug. (Requested
+    by loislo on #webkit).
+
+* WebCore.exp.in:
+* dom/DocumentFragment.h:
+* dom/Node.cpp:
+(WebCore::Node::documentFragmentIsShadowRoot):
+(WebCore):
+* dom/Node.h:
+(Node):
+(WebCore::Node::isShadowRoot):
+* dom/ShadowRoot.h:
+
 2012-12-21  Adam Bergkvist  adam.bergkv...@ericsson.com
 
 MediaStream API: Update the MediaStream constructor


Modified: trunk/Source/WebCore/WebCore.exp.in (138357 => 138358)

--- trunk/Source/WebCore/WebCore.exp.in	2012-12-21 10:04:34 UTC (rev 138357)
+++ trunk/Source/WebCore/WebCore.exp.in	2012-12-21 10:05:51 UTC (rev 138358)
@@ -1369,7 +1369,6 @@
 __ZN7WebCore4Node12insertBeforeEN3WTF10PassRefPtrIS0_EEPS0_Rib
 __ZNK7WebCore4Node13ownerDocumentEv
 __ZNK7WebCore4Node14isDescendantOfEPKS0_
-__ZNK7WebCore4Node11isTreeScopeEv
 __ZNK7WebCore4Node18getSubresourceURLsERN3WTF11ListHashSetINS_4KURLELm256ENS_8KURLHashEEE
 __ZNK7WebCore4Node31numberOfScopedHTMLStyleChildrenEv
 __ZNK7WebCore4Node9nodeIndexEv


Modified: trunk/Source/WebCore/dom/DocumentFragment.h (138357 => 138358)

--- trunk/Source/WebCore/dom/DocumentFragment.h	2012-12-21 10:04:34 UTC (rev 138357)
+++ trunk/Source/WebCore/dom/DocumentFragment.h	2012-12-21 10:05:51 UTC (rev 138358)
@@ -46,6 +46,7 @@
 virtual NodeType nodeType() const;
 virtual PassRefPtrNode cloneNode(bool deep);
 virtual bool childTypeAllowed(NodeType) const;
+virtual bool documentFragmentIsShadowRoot() const OVERRIDE { return false; }
 };
 
 } //namespace


Modified: trunk/Source/WebCore/dom/Node.cpp (138357 => 138358)

--- trunk/Source/WebCore/dom/Node.cpp	2012-12-21 10:04:34 UTC (rev 138357)
+++ trunk/Source/WebCore/dom/Node.cpp	2012-12-21 10:05:51 UTC (rev 138358)
@@ -913,11 +913,6 @@
 return true;
 }
 
-bool Node::isTreeScope() const
-{
-return treeScope()-rootNode() == this;
-}
-
 bool Node::isKeyboardFocusable(KeyboardEvent*) const
 {
 return isFocusable()  tabIndex() = 0;
@@ -928,6 +923,12 @@
 return isFocusable();
 }
 
+bool Node::documentFragmentIsShadowRoot() const
+{
+ASSERT_NOT_REACHED();
+return false;
+}
+
 Node* Node::focusDelegate()
 {
 return this;


Modified: trunk/Source/WebCore/dom/Node.h (138357 => 138358)

--- trunk/Source/WebCore/dom/Node.h	2012-12-21 10:04:34 UTC (rev 138357)
+++ trunk/Source/WebCore/dom/Node.h	2012-12-21 10:05:51 UTC (rev 138358)
@@ -246,12 +246,12 @@
 virtual bool isCharacterDataNode() const { return false; }
 virtual bool isFrameOwnerElement() const { return false; }
 virtual bo

[webkit-changes] [138366] trunk/LayoutTests

[loislo]

Title: [138366] trunk/LayoutTests








Revision 138366
Author loi...@chromium.org
Date 2012-12-21 05:30:00 -0800 (Fri, 21 Dec 2012)


Log Message
Unreviewed gardening. Rebaseline after r138365.

* platform/chromium-mac-snowleopard/fast/forms/month-multiple-fields/month-multiple-fields-keyboard-events-expected.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/forms/month-multiple-fields/month-multiple-fields-keyboard-events-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (138365 => 138366)

--- trunk/LayoutTests/ChangeLog	2012-12-21 12:42:20 UTC (rev 138365)
+++ trunk/LayoutTests/ChangeLog	2012-12-21 13:30:00 UTC (rev 138366)
@@ -1,3 +1,9 @@
+2012-12-21  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed gardening. Rebaseline after r138365.
+
+* platform/chromium-mac-snowleopard/fast/forms/month-multiple-fields/month-multiple-fields-keyboard-events-expected.txt:
+
 2012-12-21  Keishi Hattori  kei...@webkit.org
 
 Fix typing zero into multiple field input


Modified: trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/forms/month-multiple-fields/month-multiple-fields-keyboard-events-expected.txt (138365 => 138366)

--- trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/forms/month-multiple-fields/month-multiple-fields-keyboard-events-expected.txt	2012-12-21 12:42:20 UTC (rev 138365)
+++ trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/forms/month-multiple-fields/month-multiple-fields-keyboard-events-expected.txt	2012-12-21 13:30:00 UTC (rev 138366)
@@ -13,7 +13,7 @@
 Backspace - Make value empty
   
 == Digit keys ==
-FAIL input.value should be 0012-09. Was 0112-09.
+PASS input.value is 0012-09
 == Left/Right keys ==
 PASS input.value is 0005-06
 PASS document.activeElement.id is input






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138372] trunk/LayoutTests

[loislo]

Title: [138372] trunk/LayoutTests








Revision 138372
Author loi...@chromium.org
Date 2012-12-21 07:19:47 -0800 (Fri, 21 Dec 2012)


Log Message
Unreviewed rebaseline.

* platform/chromium-win-xp/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-keyboard-events-expected.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium-win-xp/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-keyboard-events-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (138371 => 138372)

--- trunk/LayoutTests/ChangeLog	2012-12-21 15:08:30 UTC (rev 138371)
+++ trunk/LayoutTests/ChangeLog	2012-12-21 15:19:47 UTC (rev 138372)
@@ -1,3 +1,9 @@
+2012-12-21  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed rebaseline.
+
+* platform/chromium-win-xp/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-keyboard-events-expected.txt:
+
 2012-12-21  Sudarsana Nagineni  sudarsana.nagin...@intel.com
 
 Unreviewed EFL gardening.


Modified: trunk/LayoutTests/platform/chromium-win-xp/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-keyboard-events-expected.txt (138371 => 138372)

--- trunk/LayoutTests/platform/chromium-win-xp/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-keyboard-events-expected.txt	2012-12-21 15:08:30 UTC (rev 138371)
+++ trunk/LayoutTests/platform/chromium-win-xp/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-keyboard-events-expected.txt	2012-12-21 15:19:47 UTC (rev 138372)
@@ -14,6 +14,10 @@
   
 == Digit keys ==
 PASS input.value is 98765-09-20T07:56
+== Digit keys starting with zero ==
+PASS input.value is 0044-02-03T05:06
+== Digit keys and backspace key ==
+PASS input.value is 0008-05-06T09:10
 == Left/Right keys ==
 PASS input.value is 0004-09-05T19:05
 PASS document.activeElement.id is input






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138375] trunk/LayoutTests

[loislo]

Title: [138375] trunk/LayoutTests








Revision 138375
Author loi...@chromium.org
Date 2012-12-21 07:36:40 -0800 (Fri, 21 Dec 2012)


Log Message
Unreviewed rebaseline.

* platform/chromium-win-xp/fast/forms/date-multiple-fields/date-multiple-fields-keyboard-events-expected.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium-win-xp/fast/forms/date-multiple-fields/date-multiple-fields-keyboard-events-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (138374 => 138375)

--- trunk/LayoutTests/ChangeLog	2012-12-21 15:30:23 UTC (rev 138374)
+++ trunk/LayoutTests/ChangeLog	2012-12-21 15:36:40 UTC (rev 138375)
@@ -1,3 +1,9 @@
+2012-12-21  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed rebaseline.
+
+* platform/chromium-win-xp/fast/forms/date-multiple-fields/date-multiple-fields-keyboard-events-expected.txt:
+
 2012-12-21  Mihai Parparita  mih...@chromium.org
 
 Slow performance with select with many options and size = 2


Modified: trunk/LayoutTests/platform/chromium-win-xp/fast/forms/date-multiple-fields/date-multiple-fields-keyboard-events-expected.txt (138374 => 138375)

--- trunk/LayoutTests/platform/chromium-win-xp/fast/forms/date-multiple-fields/date-multiple-fields-keyboard-events-expected.txt	2012-12-21 15:30:23 UTC (rev 138374)
+++ trunk/LayoutTests/platform/chromium-win-xp/fast/forms/date-multiple-fields/date-multiple-fields-keyboard-events-expected.txt	2012-12-21 15:36:40 UTC (rev 138375)
@@ -14,6 +14,10 @@
   
 == Digit keys ==
 PASS input.value is 0012-09-20
+== Digit keys starting with zero ==
+PASS input.value is 0044-02-03
+== Digit keys and backspace key ==
+PASS input.value is 0008-05-06
 == Left/Right keys ==
 PASS input.value is 2012-09-06
 PASS document.activeElement.id is input






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138377] trunk/LayoutTests

[loislo]

Title: [138377] trunk/LayoutTests








Revision 138377
Author loi...@chromium.org
Date 2012-12-21 07:55:43 -0800 (Fri, 21 Dec 2012)


Log Message
Unreviewed. Add Crash test expectation to the media/track/ tests which have explicit expectations.
It needs to be removed after fixing https://bugs.webkit.org/show_bug.cgi?id=105606

* platform/chromium/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (138376 => 138377)

--- trunk/LayoutTests/ChangeLog	2012-12-21 15:44:51 UTC (rev 138376)
+++ trunk/LayoutTests/ChangeLog	2012-12-21 15:55:43 UTC (rev 138377)
@@ -1,3 +1,10 @@
+2012-12-21  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed. Add Crash test expectation to the media/track/ tests which have explicit expectations.
+It needs to be removed after fixing https://bugs.webkit.org/show_bug.cgi?id=105606
+
+* platform/chromium/TestExpectations:
+
 2012-12-21  Shinya Kawanaka  shin...@chromium.org
 
 [Shadow DOM]: ShadowRoot wrong nodeName attribute


Modified: trunk/LayoutTests/platform/chromium/TestExpectations (138376 => 138377)

--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-21 15:44:51 UTC (rev 138376)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-21 15:55:43 UTC (rev 138377)
@@ -2974,8 +2974,8 @@
 
 webkit.org/b/91944 platform/chromium/virtual/gpu/fast/canvas/canvas-transforms-fillRect-shadow.html [ Failure ]
 
-webkit.org/b/73865 media/track/text-track-cue-is-reachable.html [ Failure ]
-webkit.org/b/73865 media/track/text-track-is-reachable.html [ Failure ]
+webkit.org/b/73865 media/track/text-track-cue-is-reachable.html [ Failure Crash ]
+webkit.org/b/73865 media/track/text-track-is-reachable.html [ Failure Crash ]
 webkit.org/b/73865 media/track [ Crash Pass ]
 
 # Opera-submitted tests to W3C for track, a lot of failures still.
@@ -3544,7 +3544,7 @@
 # The test has its own notion of timeouts that manifest timeouts as FAIL.
 webkit.org/b/88833 [ Debug ] media/video-played-collapse.html [ Failure Pass ]
 
-webkit.org/b/88833 [ Win Debug ] media/track/track-kind.html [ Pass Timeout ]
+webkit.org/b/88833 [ Win Debug ] media/track/track-kind.html [ Pass Timeout Crash ]
 webkit.org/b/88833 http/tests/media/video-play-progress.html [ Pass Timeout ]
 
 webkit.org/b/88832 [ XP ] http/tests/xmlhttprequest/origin-exact-matching.html [ Pass Timeout ]
@@ -3832,7 +3832,7 @@
 crbug.com/145590 [ Android ] platform/chromium/compositing/video-frame-size-change.html [ Timeout ]
 crbug.com/145590 [ Android ] platform/chromium/media/video-frame-size-change.html [ Timeout ]
 
-webkit.org/b/89167 media/track/track-cue-rendering-snap-to-lines-not-set.html [ Failure Pass ]
+webkit.org/b/89167 media/track/track-cue-rendering-snap-to-lines-not-set.html [ Failure Pass Crash ]
 
 webkit.org/b/95588 [ Mac ] fast/dom/shadow/shadowdom-for-textarea-complex-shadow.html [ ImageOnlyFailure ]
 
@@ -3973,8 +3973,8 @@
 webkit.org/b/95959 css3/device-adapt [ Skip ]
 
 # Require rebaselining after webkit.org/b/97800
-webkit.org/b/89167 media/track/track-cue-rendering-horizontal.html [ Failure ]
-webkit.org/b/89167 media/track/track-cue-rendering-vertical.html [ Failure ]
+webkit.org/b/89167 media/track/track-cue-rendering-horizontal.html [ Failure Crash ]
+webkit.org/b/89167 media/track/track-cue-rendering-vertical.html [ Failure Crash ]
 # [Chromium-Android] Subtitles (and video) do not work on Android (Disabled to make linter happy)
 #webkit.org/b/98766 [ Android ] media/track/track-cue-rendering-vertical.html [ Failure ]
 #webkit.org/b/98766 [ Android ] media/track/track-cue-rendering-horizontal.html [ Failure ]






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138381] trunk/Source/WebCore

[loislo]

Title: [138381] trunk/Source/WebCore








Revision 138381
Author loi...@chromium.org
Date 2012-12-21 08:36:22 -0800 (Fri, 21 Dec 2012)


Log Message
Various tests in media/track are intermittently crashing.
https://bugs.webkit.org/show_bug.cgi?id=105606

Reviewed by Eric Seidel.

The root of problem is the fact that we update tracks even if we are in process of deleting the document.
Media element can stop doing that if the document informed the element via ::stop that it is going away.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::endIgnoringTrackDisplayUpdateRequests):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLMediaElement.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (138380 => 138381)

--- trunk/Source/WebCore/ChangeLog	2012-12-21 16:19:35 UTC (rev 138380)
+++ trunk/Source/WebCore/ChangeLog	2012-12-21 16:36:22 UTC (rev 138381)
@@ -1,3 +1,16 @@
+2012-12-21  Ilya Tikhonovsky  loi...@chromium.org
+
+Various tests in media/track are intermittently crashing.
+https://bugs.webkit.org/show_bug.cgi?id=105606
+
+Reviewed by Eric Seidel.
+
+The root of problem is the fact that we update tracks even if we are in process of deleting the document.
+Media element can stop doing that if the document informed the element via ::stop that it is going away.
+
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::endIgnoringTrackDisplayUpdateRequests):
+
 2012-12-21  Alexei Svitkine  asvitk...@chromium.org
 
 [Chromium/Mac] Don't send an onclick event from a ctrl-click


Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (138380 => 138381)

--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2012-12-21 16:19:35 UTC (rev 138380)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2012-12-21 16:36:22 UTC (rev 138381)
@@ -1380,7 +1380,7 @@
 {
 ASSERT(m_ignoreTrackDisplayUpdate);
 --m_ignoreTrackDisplayUpdate;
-if (!m_ignoreTrackDisplayUpdate)
+if (!m_ignoreTrackDisplayUpdate  m_inActiveDocument)
 updateActiveTextTrackCues(currentTime());
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138407] trunk/LayoutTests

[loislo]

Title: [138407] trunk/LayoutTests








Revision 138407
Author loi...@chromium.org
Date 2012-12-21 21:40:25 -0800 (Fri, 21 Dec 2012)


Log Message
Unreviewed. Remove Crash expectation from media/track tests after r138381.

* platform/chromium/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (138406 => 138407)

--- trunk/LayoutTests/ChangeLog	2012-12-22 02:12:37 UTC (rev 138406)
+++ trunk/LayoutTests/ChangeLog	2012-12-22 05:40:25 UTC (rev 138407)
@@ -1,3 +1,9 @@
+2012-12-21  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed. Remove Crash expectation from media/track tests after r138381.
+
+* platform/chromium/TestExpectations:
+
 2012-12-21  Ryosuke Niwa  rn...@webkit.org
 
 [Mountain Lion] platform/mac/editing/spelling/removing-underline-after-accepting-autocorrection-using-punctuation.html failing


Modified: trunk/LayoutTests/platform/chromium/TestExpectations (138406 => 138407)

--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-22 02:12:37 UTC (rev 138406)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-22 05:40:25 UTC (rev 138407)
@@ -2974,9 +2974,8 @@
 
 webkit.org/b/91944 platform/chromium/virtual/gpu/fast/canvas/canvas-transforms-fillRect-shadow.html [ Failure ]
 
-webkit.org/b/73865 media/track/text-track-cue-is-reachable.html [ Failure Crash ]
-webkit.org/b/73865 media/track/text-track-is-reachable.html [ Failure Crash ]
-webkit.org/b/73865 media/track [ Crash Pass ]
+webkit.org/b/73865 media/track/text-track-cue-is-reachable.html [ Failure ]
+webkit.org/b/73865 media/track/text-track-is-reachable.html [ Failure ]
 
 # Opera-submitted tests to W3C for track, a lot of failures still.
 webkit.org/b/103926 media/track/opera/idl/media-idl-tests.html [ Skip ]
@@ -3544,7 +3543,7 @@
 # The test has its own notion of timeouts that manifest timeouts as FAIL.
 webkit.org/b/88833 [ Debug ] media/video-played-collapse.html [ Failure Pass ]
 
-webkit.org/b/88833 [ Win Debug ] media/track/track-kind.html [ Pass Timeout Crash ]
+webkit.org/b/88833 [ Win Debug ] media/track/track-kind.html [ Pass Timeout ]
 webkit.org/b/88833 http/tests/media/video-play-progress.html [ Pass Timeout ]
 
 webkit.org/b/88832 [ XP ] http/tests/xmlhttprequest/origin-exact-matching.html [ Pass Timeout ]
@@ -3644,7 +3643,7 @@
 webkit.org/b/92570 [ Win Debug ] inspector/timeline/timeline-network-received-data.html [ Failure Pass Timeout ]
 webkit.org/b/92570 [ Win Debug ] inspector/timeline/timeline-start-time.html [ Failure Pass Timeout ]
 
-webkit.org/b/94242 [ Android Debug ] media/track/track-cues-sorted-before-dispatch.html [ Crash Pass Timeout ]
+webkit.org/b/94242 [ Android Debug ] media/track/track-cues-sorted-before-dispatch.html [ Pass Timeout ]
 
 # Chromium still has the CC toggle button, not the menu of tracks.
 webkit.org/b/101670 media/video-controls-captions-trackmenu.html [ Skip ]
@@ -3831,7 +3830,7 @@
 crbug.com/145590 [ Android ] platform/chromium/compositing/video-frame-size-change.html [ Timeout ]
 crbug.com/145590 [ Android ] platform/chromium/media/video-frame-size-change.html [ Timeout ]
 
-webkit.org/b/89167 media/track/track-cue-rendering-snap-to-lines-not-set.html [ Failure Pass Crash ]
+webkit.org/b/89167 media/track/track-cue-rendering-snap-to-lines-not-set.html [ Failure Pass ]
 
 webkit.org/b/95588 [ Mac ] fast/dom/shadow/shadowdom-for-textarea-complex-shadow.html [ ImageOnlyFailure ]
 
@@ -3972,8 +3971,8 @@
 webkit.org/b/95959 css3/device-adapt [ Skip ]
 
 # Require rebaselining after webkit.org/b/97800
-webkit.org/b/89167 media/track/track-cue-rendering-horizontal.html [ Failure Crash ]
-webkit.org/b/89167 media/track/track-cue-rendering-vertical.html [ Failure Crash ]
+webkit.org/b/89167 media/track/track-cue-rendering-horizontal.html [ Failure ]
+webkit.org/b/89167 media/track/track-cue-rendering-vertical.html [ Failure ]
 # [Chromium-Android] Subtitles (and video) do not work on Android (Disabled to make linter happy)
 #webkit.org/b/98766 [ Android ] media/track/track-cue-rendering-vertical.html [ Failure ]
 #webkit.org/b/98766 [ Android ] media/track/track-cue-rendering-horizontal.html [ Failure ]






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138408] trunk/Source/WTF

[loislo]

Title: [138408] trunk/Source/WTF








Revision 138408
Author loi...@chromium.org
Date 2012-12-21 22:06:55 -0800 (Fri, 21 Dec 2012)


Log Message
Unreviewed compilation fix for Apple Win Release after r138398.

* wtf/FastMalloc.cpp:
(WTF::ClassIndex):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/FastMalloc.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (138407 => 138408)

--- trunk/Source/WTF/ChangeLog	2012-12-22 05:40:25 UTC (rev 138407)
+++ trunk/Source/WTF/ChangeLog	2012-12-22 06:06:55 UTC (rev 138408)
@@ -1,3 +1,10 @@
+2012-12-21  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed compilation fix for Apple Win Release after r138398.
+
+* wtf/FastMalloc.cpp:
+(WTF::ClassIndex):
+
 2012-12-21  Oliver Hunt  oli...@apple.com
 
 Further harden FastMalloc


Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (138407 => 138408)

--- trunk/Source/WTF/wtf/FastMalloc.cpp	2012-12-22 05:40:25 UTC (rev 138407)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp	2012-12-22 06:06:55 UTC (rev 138408)
@@ -517,7 +517,7 @@
 #define ROTATE_VALUE(value, amount) (((value)  (amount)) | ((value)  (sizeof(value) * 8 - (amount
 #define XOR_MASK_PTR_WITH_KEY(ptr, key) (reinterpret_casttypeof(ptr)(reinterpret_castuintptr_t(ptr)^ROTATE_VALUE(reinterpret_castuintptr_t(key), MaskKeyShift)^ROTATE_VALUE(reinterpret_castuintptr_t(kLLHardeningMask), MaskAddrShift)))
 #else
-#define XOR_MASK_PTR(ptr, key) (ptr1)
+#define XOR_MASK_PTR_WITH_KEY(ptr, key) (ptr1)
 #endif
 
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138409] trunk/Source/WTF

[loislo]

Title: [138409] trunk/Source/WTF








Revision 138409
Author loi...@chromium.org
Date 2012-12-21 22:16:30 -0800 (Fri, 21 Dec 2012)


Log Message
Unreviewed. Another try to fix Apple Win Release build.

* wtf/FastMalloc.cpp:
(WTF::ClassIndex):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/FastMalloc.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (138408 => 138409)

--- trunk/Source/WTF/ChangeLog	2012-12-22 06:06:55 UTC (rev 138408)
+++ trunk/Source/WTF/ChangeLog	2012-12-22 06:16:30 UTC (rev 138409)
@@ -1,5 +1,12 @@
 2012-12-21  Ilya Tikhonovsky  loi...@chromium.org
 
+Unreviewed. Another try to fix Apple Win Release build.
+
+* wtf/FastMalloc.cpp:
+(WTF::ClassIndex):
+
+2012-12-21  Ilya Tikhonovsky  loi...@chromium.org
+
 Unreviewed compilation fix for Apple Win Release after r138398.
 
 * wtf/FastMalloc.cpp:


Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (138408 => 138409)

--- trunk/Source/WTF/wtf/FastMalloc.cpp	2012-12-22 06:06:55 UTC (rev 138408)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp	2012-12-22 06:16:30 UTC (rev 138409)
@@ -517,7 +517,7 @@
 #define ROTATE_VALUE(value, amount) (((value)  (amount)) | ((value)  (sizeof(value) * 8 - (amount
 #define XOR_MASK_PTR_WITH_KEY(ptr, key) (reinterpret_casttypeof(ptr)(reinterpret_castuintptr_t(ptr)^ROTATE_VALUE(reinterpret_castuintptr_t(key), MaskKeyShift)^ROTATE_VALUE(reinterpret_castuintptr_t(kLLHardeningMask), MaskAddrShift)))
 #else
-#define XOR_MASK_PTR_WITH_KEY(ptr, key) (ptr1)
+#define XOR_MASK_PTR_WITH_KEY(ptr, key) (ptr)
 #endif
 
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138230] trunk/Source/WebKit/mac

[loislo]

Title: [138230] trunk/Source/WebKit/mac








Revision 138230
Author loi...@chromium.org
Date 2012-12-20 00:49:58 -0800 (Thu, 20 Dec 2012)


Log Message
Unreviewed build fix for chromium mac after r138206.

* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface):

Modified Paths

trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm




Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (138229 => 138230)

--- trunk/Source/WebKit/mac/ChangeLog	2012-12-20 08:41:44 UTC (rev 138229)
+++ trunk/Source/WebKit/mac/ChangeLog	2012-12-20 08:49:58 UTC (rev 138230)
@@ -1,3 +1,10 @@
+2012-12-20  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed build fix for chromium mac after r138206.
+
+* WebCoreSupport/WebSystemInterface.mm:
+(InitWebCoreSystemInterface):
+
 2012-12-19  Alexey Proskuryakov  a...@apple.com
 
 rdar://problem/12890242 [WK2 NetworkProcess] Client doesn't receive SSL certificates


Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (138229 => 138230)

--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm	2012-12-20 08:41:44 UTC (rev 138229)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm	2012-12-20 08:49:58 UTC (rev 138230)
@@ -58,7 +58,9 @@
 INIT(CopyCFLocalizationPreferredName);
 INIT(CopyCONNECTProxyResponse);
 INIT(CopyNSURLResponseStatusLine);
+#if PLATFORM(MAC)
 INIT(CopyNSURLResponseCertificateChain);
+#endif
 INIT(CreateCustomCFReadStream);
 INIT(CreateNSURLConnectionDelegateProxy);
 INIT(DrawCapsLockIndicator);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138233] trunk/Source/WebKit/chromium

[loislo]

Title: [138233] trunk/Source/WebKit/chromium








Revision 138233
Author loi...@chromium.org
Date 2012-12-20 01:07:51 -0800 (Thu, 20 Dec 2012)


Log Message
Unreviewed, rolling out r138215.
http://trac.webkit.org/changeset/138215
https://bugs.webkit.org/show_bug.cgi?id=105505

it broke downstream compilation with clang (Requested by
loislo on #webkit).

Patch by Sheriff Bot webkit.review@gmail.com on 2012-12-20

* public/platform/WebKitPlatformSupport.h:
(WebKit):
(WebKitPlatformSupport):
(WebKit::WebKitPlatformSupport::sharedWorkerRepository):
* src/SharedWorkerRepository.cpp:
(WebKit::sharedWorkerRepository):
(WebCore::SharedWorkerRepository::isAvailable):

Modified Paths

trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h
trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp




Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (138232 => 138233)

--- trunk/Source/WebKit/chromium/ChangeLog	2012-12-20 09:00:43 UTC (rev 138232)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-12-20 09:07:51 UTC (rev 138233)
@@ -1,3 +1,20 @@
+2012-12-20  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r138215.
+http://trac.webkit.org/changeset/138215
+https://bugs.webkit.org/show_bug.cgi?id=105505
+
+it broke downstream compilation with clang (Requested by
+    loislo on #webkit).
+
+* public/platform/WebKitPlatformSupport.h:
+(WebKit):
+(WebKitPlatformSupport):
+(WebKit::WebKitPlatformSupport::sharedWorkerRepository):
+* src/SharedWorkerRepository.cpp:
+(WebKit::sharedWorkerRepository):
+(WebCore::SharedWorkerRepository::isAvailable):
+
 2012-12-19  Mark Pilgrim  pilg...@chromium.org
 
 [Chromium] Remove idbFactory from PlatformSupport


Modified: trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h (138232 => 138233)

--- trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h	2012-12-20 09:00:43 UTC (rev 138232)
+++ trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h	2012-12-20 09:07:51 UTC (rev 138233)
@@ -36,6 +36,7 @@
 namespace WebKit {
 
 class WebIDBFactory; // FIXME: Does this belong in platform?
+class WebSharedWorkerRepository; // FIXME: Does this belong in platform?
 
 // FIXME: Eventually all these API will need to move to WebKit::Platform.
 class WebKitPlatformSupport : public Platform {
@@ -44,6 +45,11 @@
 
 virtual WebIDBFactory* idbFactory() { return 0; }
 
+
+// Shared Workers --
+
+virtual WebSharedWorkerRepository* sharedWorkerRepository() { return 0; }
+
 protected:
 ~WebKitPlatformSupport() { }
 };


Modified: trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp (138232 => 138233)

--- trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp	2012-12-20 09:00:43 UTC (rev 138232)
+++ trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp	2012-12-20 09:07:51 UTC (rev 138233)
@@ -69,8 +69,15 @@
 
 static WebSharedWorkerRepository* sharedWorkerRepository()
 {
-// Will only be non-zero if the embedder has set the shared worker repository upon initialization. Nothing in WebKit sets this.
-return s_sharedWorkerRepository;
+WebSharedWorkerRepository* repository;
+
+repository = s_sharedWorkerRepository;
+if (!repository) {
+repository = webKitPlatformSupport()-sharedWorkerRepository();
+setSharedWorkerRepository(repository);
+}
+
+return repository;
 }
 
 }
@@ -211,6 +218,8 @@
 
 bool SharedWorkerRepository::isAvailable()
 {
+// Allow the WebKitPlatformSupport to determine if SharedWorkers
+// are available.
 return WebKit::sharedWorkerRepository();
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138240] trunk/LayoutTests

[loislo]

Title: [138240] trunk/LayoutTests








Revision 138240
Author loi...@chromium.org
Date 2012-12-20 03:00:13 -0800 (Thu, 20 Dec 2012)


Log Message
Unreviewed. Adjust TestExpectations for media/track tests.

* platform/chromium/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (138239 => 138240)

--- trunk/LayoutTests/ChangeLog	2012-12-20 10:39:42 UTC (rev 138239)
+++ trunk/LayoutTests/ChangeLog	2012-12-20 11:00:13 UTC (rev 138240)
@@ -1,3 +1,9 @@
+2012-12-20  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed. Adjust TestExpectations for media/track tests.
+
+* platform/chromium/TestExpectations:
+
 2012-12-20  Ryosuke Niwa  rn...@webkit.org
 
 Update Mac test expectations as suggested by Antoine Quint.


Modified: trunk/LayoutTests/platform/chromium/TestExpectations (138239 => 138240)

--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-20 10:39:42 UTC (rev 138239)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-20 11:00:13 UTC (rev 138240)
@@ -2938,6 +2938,7 @@
 
 webkit.org/b/73865 media/track/text-track-cue-is-reachable.html [ Failure ]
 webkit.org/b/73865 media/track/text-track-is-reachable.html [ Failure ]
+webkit.org/b/73865 media/track [ Crash Pass ]
 
 # Opera-submitted tests to W3C for track, a lot of failures still.
 webkit.org/b/103926 media/track/opera/idl/media-idl-tests.html [ Skip ]






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138347] trunk/LayoutTests

[loislo]

Title: [138347] trunk/LayoutTests








Revision 138347
Author loi...@chromium.org
Date 2012-12-20 21:37:52 -0800 (Thu, 20 Dec 2012)


Log Message
Unreviewed. Rollout Crash Pass expectation changes for media/track after rolling out r138320.

* platform/chromium/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (138346 => 138347)

--- trunk/LayoutTests/ChangeLog	2012-12-21 05:08:51 UTC (rev 138346)
+++ trunk/LayoutTests/ChangeLog	2012-12-21 05:37:52 UTC (rev 138347)
@@ -1,3 +1,9 @@
+2012-12-20  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed. Rollout Crash Pass expectation changes for media/track after rolling out r138320.
+
+* platform/chromium/TestExpectations:
+
 2012-12-20  Ryosuke Niwa  rn...@webkit.org
 
 Revert the wrong expectation update done in r138344 and fix a syntax error in TestExpectations for Mac.


Modified: trunk/LayoutTests/platform/chromium/TestExpectations (138346 => 138347)

--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-21 05:08:51 UTC (rev 138346)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-21 05:37:52 UTC (rev 138347)
@@ -2976,7 +2976,6 @@
 
 webkit.org/b/73865 media/track/text-track-cue-is-reachable.html [ Failure ]
 webkit.org/b/73865 media/track/text-track-is-reachable.html [ Failure ]
-webkit.org/b/73865 media/track [ Crash Pass ]
 
 # Opera-submitted tests to W3C for track, a lot of failures still.
 webkit.org/b/103926 media/track/opera/idl/media-idl-tests.html [ Skip ]






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138350] trunk/LayoutTests

[loislo]

Title: [138350] trunk/LayoutTests








Revision 138350
Author loi...@chromium.org
Date 2012-12-20 23:11:11 -0800 (Thu, 20 Dec 2012)


Log Message
Unreviewed, rolling out r138347.
http://trac.webkit.org/changeset/138347

media/track tests still failing

* platform/chromium/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (138349 => 138350)

--- trunk/LayoutTests/ChangeLog	2012-12-21 06:44:47 UTC (rev 138349)
+++ trunk/LayoutTests/ChangeLog	2012-12-21 07:11:11 UTC (rev 138350)
@@ -1,5 +1,14 @@
 2012-12-20  Ilya Tikhonovsky  loi...@chromium.org
 
+Unreviewed, rolling out r138347.
+http://trac.webkit.org/changeset/138347
+
+media/track tests still failing
+
+* platform/chromium/TestExpectations:
+
+2012-12-20  Ilya Tikhonovsky  loi...@chromium.org
+
 Unreviewed. Rollout Crash Pass expectation changes for media/track after rolling out r138320.
 
 * platform/chromium/TestExpectations:


Modified: trunk/LayoutTests/platform/chromium/TestExpectations (138349 => 138350)

--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-21 06:44:47 UTC (rev 138349)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-21 07:11:11 UTC (rev 138350)
@@ -2976,6 +2976,7 @@
 
 webkit.org/b/73865 media/track/text-track-cue-is-reachable.html [ Failure ]
 webkit.org/b/73865 media/track/text-track-is-reachable.html [ Failure ]
+webkit.org/b/73865 media/track [ Crash Pass ]
 
 # Opera-submitted tests to W3C for track, a lot of failures still.
 webkit.org/b/103926 media/track/opera/idl/media-idl-tests.html [ Skip ]






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138125] trunk/LayoutTests

[loislo]

Title: [138125] trunk/LayoutTests








Revision 138125
Author loi...@chromium.org
Date 2012-12-19 00:15:51 -0800 (Wed, 19 Dec 2012)


Log Message
Unreviewed gardening. Update expectation for mac and remove wrong expectation for win.

* platform/chromium-mac-snowleopard/fast/text/line-initial-and-final-swashes-expected.png: Added.
* platform/chromium-win/fast/text/line-initial-and-final-swashes-expected.png: Removed.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/text/line-initial-and-final-swashes-expected.png


Removed Paths

trunk/LayoutTests/platform/chromium-win/fast/text/line-initial-and-final-swashes-expected.png




Diff

Modified: trunk/LayoutTests/ChangeLog (138124 => 138125)

--- trunk/LayoutTests/ChangeLog	2012-12-19 07:57:33 UTC (rev 138124)
+++ trunk/LayoutTests/ChangeLog	2012-12-19 08:15:51 UTC (rev 138125)
@@ -1,3 +1,10 @@
+2012-12-19  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed gardening. Update expectation for mac and remove wrong expectation for win.
+
+* platform/chromium-mac-snowleopard/fast/text/line-initial-and-final-swashes-expected.png: Added.
+* platform/chromium-win/fast/text/line-initial-and-final-swashes-expected.png: Removed.
+
 2012-12-18  Dominic Mazzoni  dmazz...@google.com
 
 AX: radio-button-checkbox-size is Mac-specific and should be moved.


Added: trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/text/line-initial-and-final-swashes-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/text/line-initial-and-final-swashes-expected.png
___

Added: svn:mime-type

Deleted: trunk/LayoutTests/platform/chromium-win/fast/text/line-initial-and-final-swashes-expected.png

(Binary files differ)





___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138127] trunk/LayoutTests

[loislo]

Title: [138127] trunk/LayoutTests








Revision 138127
Author loi...@chromium.org
Date 2012-12-19 00:23:27 -0800 (Wed, 19 Dec 2012)


Log Message
Unreviewed gardening. Restore expectations for mac.

The tests still have problem with scroller image.

* platform/chromium/TestExpectations:
added: webkit.org/b/102294 [ Mac ] platform/chromium/virtual/deferred/fast/images/exif-orientation.html [ ImageOnlyFailure ]
added: webkit.org/b/102294 [ Mac ] platform/chromium/virtual/deferred/fast/images/exif-orientation-css.html [ ImageOnlyFailure ]
added: webkit.org/b/102294 [ Mac ] platform/chromium/virtual/deferred/fast/images/gray-scale-jpeg-with-color-profile.html [ ImageOnlyFailure ]

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (138126 => 138127)

--- trunk/LayoutTests/ChangeLog	2012-12-19 08:21:19 UTC (rev 138126)
+++ trunk/LayoutTests/ChangeLog	2012-12-19 08:23:27 UTC (rev 138127)
@@ -1,5 +1,16 @@
 2012-12-19  Ilya Tikhonovsky  loi...@chromium.org
 
+Unreviewed gardening. Restore expectations for mac.
+
+The tests still have problem with scroller image.
+
+* platform/chromium/TestExpectations:
+added: webkit.org/b/102294 [ Mac ] platform/chromium/virtual/deferred/fast/images/exif-orientation.html [ ImageOnlyFailure ]
+added: webkit.org/b/102294 [ Mac ] platform/chromium/virtual/deferred/fast/images/exif-orientation-css.html [ ImageOnlyFailure ]
+added: webkit.org/b/102294 [ Mac ] platform/chromium/virtual/deferred/fast/images/gray-scale-jpeg-with-color-profile.html [ ImageOnlyFailure ]
+
+2012-12-19  Ilya Tikhonovsky  loi...@chromium.org
+
 Unreviewed gardening. Update expectation for mac and remove wrong expectation for win.
 
 * platform/chromium-mac-snowleopard/fast/text/line-initial-and-final-swashes-expected.png: Added.


Modified: trunk/LayoutTests/platform/chromium/TestExpectations (138126 => 138127)

--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-19 08:21:19 UTC (rev 138126)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-19 08:23:27 UTC (rev 138127)
@@ -4115,6 +4115,9 @@
 webkit.org/b/102264 [ Debug ] css3/filters/custom/custom-filter-property-computed-style.html [ Pass Timeout ]
 webkit.org/b/102277 fast/events/frame-scroll-fake-mouse-move.html [ Pass Failure ]
 webkit.org/b/102277 fast/events/overflow-scroll-fake-mouse-move.html [ Pass Failure ]
+webkit.org/b/102294 [ Mac ] platform/chromium/virtual/deferred/fast/images/exif-orientation.html [ ImageOnlyFailure ]
+webkit.org/b/102294 [ Mac ] platform/chromium/virtual/deferred/fast/images/exif-orientation-css.html [ ImageOnlyFailure ]
+webkit.org/b/102294 [ Mac ] platform/chromium/virtual/deferred/fast/images/gray-scale-jpeg-with-color-profile.html [ ImageOnlyFailure ]
 
 # This test is consistently leaking state into the next test.
 webkit.org/b/85522 http/tests/security/sandboxed-iframe-form-top.html [ Skip ]






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138129] trunk

[loislo]

Title: [138129] trunk








Revision 138129
Author loi...@chromium.org
Date 2012-12-19 00:46:12 -0800 (Wed, 19 Dec 2012)


Log Message
Unreviewed, rolling out r138123.
http://trac.webkit.org/changeset/138123
https://bugs.webkit.org/show_bug.cgi?id=105399

It broke compositing/visibility/visibility-simple-video-
layer.html (Requested by loislo on #webkit).

Patch by Sheriff Bot webkit.review@gmail.com on 2012-12-19

Source/WebCore:

* dom/Element.cpp:
(WebCore::Element::insertedInto):
(WebCore::Element::removedFrom):
* dom/Element.h:
* dom/Node.cpp:
(WebCore::Node::insertedInto):
(WebCore):
(WebCore::Node::removedFrom):

LayoutTests:

* fast/dom/shadow/getelementbyid-shadow-expected.txt: Removed.
* fast/dom/shadow/getelementbyid-shadow.html: Removed.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Element.cpp
trunk/Source/WebCore/dom/Element.h
trunk/Source/WebCore/dom/Node.cpp


Removed Paths

trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow-expected.txt
trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow.html




Diff

Modified: trunk/LayoutTests/ChangeLog (138128 => 138129)

--- trunk/LayoutTests/ChangeLog	2012-12-19 08:41:02 UTC (rev 138128)
+++ trunk/LayoutTests/ChangeLog	2012-12-19 08:46:12 UTC (rev 138129)
@@ -1,3 +1,15 @@
+2012-12-19  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r138123.
+http://trac.webkit.org/changeset/138123
+https://bugs.webkit.org/show_bug.cgi?id=105399
+
+It broke compositing/visibility/visibility-simple-video-
+layer.html (Requested by loislo on #webkit).
+
+* fast/dom/shadow/getelementbyid-shadow-expected.txt: Removed.
+* fast/dom/shadow/getelementbyid-shadow.html: Removed.
+
 2012-12-19  Jussi Kukkonen  jussi.kukko...@intel.com
 
 transitions/interrupted-accelerated-transition.html should use pauseAPI


Deleted: trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow-expected.txt (138128 => 138129)

--- trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow-expected.txt	2012-12-19 08:41:02 UTC (rev 138128)
+++ trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow-expected.txt	2012-12-19 08:46:12 UTC (rev 138129)
@@ -1,37 +0,0 @@
-Tests to ensure ShadowRoot.getElementById works after complex DOM manipulation.
-
-On success, you will see a series of PASS messages, followed by TEST COMPLETE.
-
-
-PASS document.getElementById(A) is A
-PASS shadowRootA.getElementById(B) is B
-PASS shadowRootB.getElementById(C) is C
-PASS shadowRootC.getElementById(D) is D
-
-Remove C from shadowRootB
-PASS document.getElementById(A) is A
-PASS shadowRootA.getElementById(B) is B
-PASS shadowRootB.getElementById(C) is null
-PASS shadowRootC.getElementById(D) is D
-
-Append C to ShadowRootB, and remove A from document
-PASS document.getElementById(A) is null
-PASS shadowRootA.getElementById(B) is B
-PASS shadowRootB.getElementById(C) is C
-PASS shadowRootC.getElementById(D) is D
-
-Remove C from shadowRootB
-PASS document.getElementById(A) is null
-PASS shadowRootA.getElementById(B) is B
-PASS shadowRootB.getElementById(C) is null
-PASS shadowRootC.getElementById(D) is D
-
-Remove D from shadowRootC
-PASS document.getElementById(A) is null
-PASS shadowRootA.getElementById(B) is B
-PASS shadowRootB.getElementById(C) is null
-PASS shadowRootC.getElementById(D) is null
-PASS successfullyParsed is true
-
-TEST COMPLETE
-


Deleted: trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow.html (138128 => 138129)

--- trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow.html	2012-12-19 08:41:02 UTC (rev 138128)
+++ trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow.html	2012-12-19 08:46:12 UTC (rev 138129)
@@ -1,78 +0,0 @@
-!DOCTYPE html
-html
-body
-script src=""
-script src=""
-
-div id=container/div
-pre id=console/pre
-
-script
-description(Tests to ensure ShadowRoot.getElementById works after complex DOM manipulation.);
-
-function createDiv(id)
-{
-var div = document.createElement('div');
-div.id = id;
-return div;
-}
-
-var A = createDiv('A');
-var B = createDiv('B');
-var C = createDiv('C');
-var D = createDiv('D');
-var shadowRootA = A.webkitCreateShadowRoot();
-var shadowRootB = B.webkitCreateShadowRoot();
-var shadowRootC = C.webkitCreateShadowRoot();
-
-shadowRootA.appendChild(B);
-shadowRootB.appendChild(C);
-shadowRootC.appendChild(D);
-
-container.appendChild(A);
-shouldBe('document.getElementById(A)', 'A');
-shouldBe('shadowRootA.getElementById(B)', 'B');
-shouldBe('shadowRootB.getElementById(C)', 'C');
-shouldBe('shadowRootC.getElementById(D)', 'D');
-
-debug('');
-debug('Remove C from shadowRootB');
-shadowRootB.removeChild(C);
-
-shouldBe('document.getElementById(A)', 'A');
-shouldBe('shadowRootA.getElementById(B)', 'B');
-shouldBe('shadowRootB.getElementById(C)', 'null');
-shouldBe('shadowRootC.getElementById(D)', 'D');
-
-debug('');
-debug('Append C to ShadowRoot

[webkit-changes] [138131] trunk

[loislo]

Title: [138131] trunk








Revision 138131
Author loi...@chromium.org
Date 2012-12-19 01:56:33 -0800 (Wed, 19 Dec 2012)


Log Message
Unreviewed, rolling out r138129.
http://trac.webkit.org/changeset/138129
https://bugs.webkit.org/show_bug.cgi?id=105399

reapply patch r138123. The problem was on chromium side at r173875.

Source/WebCore:

* dom/Element.cpp:
(WebCore::Element::insertedInto):
(WebCore::Element::removedFrom):
* dom/Element.h:
(WebCore::Node::insertedInto):
(WebCore):
(WebCore::Node::removedFrom):
* dom/Node.cpp:

LayoutTests:

* fast/dom/shadow/getelementbyid-shadow-expected.txt: Added.
* fast/dom/shadow/getelementbyid-shadow.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Element.cpp
trunk/Source/WebCore/dom/Element.h
trunk/Source/WebCore/dom/Node.cpp


Added Paths

trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow-expected.txt
trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow.html




Diff

Modified: trunk/LayoutTests/ChangeLog (138130 => 138131)

--- trunk/LayoutTests/ChangeLog	2012-12-19 08:54:10 UTC (rev 138130)
+++ trunk/LayoutTests/ChangeLog	2012-12-19 09:56:33 UTC (rev 138131)
@@ -1,3 +1,14 @@
+2012-12-19  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed, rolling out r138129.
+http://trac.webkit.org/changeset/138129
+https://bugs.webkit.org/show_bug.cgi?id=105399
+
+reapply patch r138123. The problem was on chromium side at r173875.
+
+* fast/dom/shadow/getelementbyid-shadow-expected.txt: Added.
+* fast/dom/shadow/getelementbyid-shadow.html: Added.
+
 2012-12-19  Takashi Sakamoto  ta...@google.com
 
 [Shadow] TITLE elements in Shadow DOM should not affect document.title attribute


Added: trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow-expected.txt (0 => 138131)

--- trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow-expected.txt	(rev 0)
+++ trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow-expected.txt	2012-12-19 09:56:33 UTC (rev 138131)
@@ -0,0 +1,37 @@
+Tests to ensure ShadowRoot.getElementById works after complex DOM manipulation.
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS document.getElementById(A) is A
+PASS shadowRootA.getElementById(B) is B
+PASS shadowRootB.getElementById(C) is C
+PASS shadowRootC.getElementById(D) is D
+
+Remove C from shadowRootB
+PASS document.getElementById(A) is A
+PASS shadowRootA.getElementById(B) is B
+PASS shadowRootB.getElementById(C) is null
+PASS shadowRootC.getElementById(D) is D
+
+Append C to ShadowRootB, and remove A from document
+PASS document.getElementById(A) is null
+PASS shadowRootA.getElementById(B) is B
+PASS shadowRootB.getElementById(C) is C
+PASS shadowRootC.getElementById(D) is D
+
+Remove C from shadowRootB
+PASS document.getElementById(A) is null
+PASS shadowRootA.getElementById(B) is B
+PASS shadowRootB.getElementById(C) is null
+PASS shadowRootC.getElementById(D) is D
+
+Remove D from shadowRootC
+PASS document.getElementById(A) is null
+PASS shadowRootA.getElementById(B) is B
+PASS shadowRootB.getElementById(C) is null
+PASS shadowRootC.getElementById(D) is null
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Property changes on: trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow-expected.txt
___


Added: svn:eol-style

Added: trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow.html (0 => 138131)

--- trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow.html	(rev 0)
+++ trunk/LayoutTests/fast/dom/shadow/getelementbyid-shadow.html	2012-12-19 09:56:33 UTC (rev 138131)
@@ -0,0 +1,78 @@
+!DOCTYPE html
+html
+body
+script src=""
+script src=""
+
+div id=container/div
+pre id=console/pre
+
+script
+description(Tests to ensure ShadowRoot.getElementById works after complex DOM manipulation.);
+
+function createDiv(id)
+{
+var div = document.createElement('div');
+div.id = id;
+return div;
+}
+
+var A = createDiv('A');
+var B = createDiv('B');
+var C = createDiv('C');
+var D = createDiv('D');
+var shadowRootA = A.webkitCreateShadowRoot();
+var shadowRootB = B.webkitCreateShadowRoot();
+var shadowRootC = C.webkitCreateShadowRoot();
+
+shadowRootA.appendChild(B);
+shadowRootB.appendChild(C);
+shadowRootC.appendChild(D);
+
+container.appendChild(A);
+shouldBe('document.getElementById(A)', 'A');
+shouldBe('shadowRootA.getElementById(B)', 'B');
+shouldBe('shadowRootB.getElementById(C)', 'C');
+shouldBe('shadowRootC.getElementById(D)', 'D');
+
+debug('');
+debug('Remove C from shadowRootB');
+shadowRootB.removeChild(C);
+
+shouldBe('document.getElementById(A)', 'A');
+shouldBe('shadowRootA.getElementById(B)', 'B');
+shouldBe('shadowRootB.getElementById(C)', 'null');
+shouldBe('shadowRootC.getElementById(D)', 'D');
+
+debug('');
+debug('Append C to ShadowRootB, and remove A from document');

[webkit-changes] [138132] trunk/LayoutTests

[loislo]

Title: [138132] trunk/LayoutTests








Revision 138132
Author loi...@chromium.org
Date 2012-12-19 02:10:14 -0800 (Wed, 19 Dec 2012)


Log Message
Unreviewed gardening. Move chromium-mac image to chromium where it will also be used for win and linux.

* platform/chromium/fast/text/line-initial-and-final-swashes-expected.png: Renamed from LayoutTests/platform/chromium-mac/fast/text/line-initial-and-final-swashes-expected.png.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/chromium/fast/text/line-initial-and-final-swashes-expected.png


Removed Paths

trunk/LayoutTests/platform/chromium-mac/fast/text/line-initial-and-final-swashes-expected.png




Diff

Modified: trunk/LayoutTests/ChangeLog (138131 => 138132)

--- trunk/LayoutTests/ChangeLog	2012-12-19 09:56:33 UTC (rev 138131)
+++ trunk/LayoutTests/ChangeLog	2012-12-19 10:10:14 UTC (rev 138132)
@@ -1,5 +1,11 @@
 2012-12-19  Ilya Tikhonovsky  loi...@chromium.org
 
+Unreviewed gardening. Move chromium-mac image to chromium where it will also be used for win and linux.
+
+* platform/chromium/fast/text/line-initial-and-final-swashes-expected.png: Renamed from LayoutTests/platform/chromium-mac/fast/text/line-initial-and-final-swashes-expected.png.
+
+2012-12-19  Ilya Tikhonovsky  loi...@chromium.org
+
 Unreviewed, rolling out r138129.
 http://trac.webkit.org/changeset/138129
 https://bugs.webkit.org/show_bug.cgi?id=105399


Copied: trunk/LayoutTests/platform/chromium/fast/text/line-initial-and-final-swashes-expected.png (from rev 138131, trunk/LayoutTests/platform/chromium-mac/fast/text/line-initial-and-final-swashes-expected.png)

(Binary files differ)


Property changes: trunk/LayoutTests/platform/chromium/fast/text/line-initial-and-final-swashes-expected.png



Added: svn:mime-type

Deleted: trunk/LayoutTests/platform/chromium-mac/fast/text/line-initial-and-final-swashes-expected.png

(Binary files differ)





___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138010] trunk/LayoutTests

[loislo]

Title: [138010] trunk/LayoutTests








Revision 138010
Author loi...@chromium.org
Date 2012-12-18 04:49:10 -0800 (Tue, 18 Dec 2012)


Log Message
Unreviewed rebaseline new test introdiced at r138003

* inspector-protocol/media-query-listener-exception-expected.txt:
* platform/chromium/inspector-protocol/media-query-listener-exception-expected.txt: Copied from LayoutTests/inspector-protocol/media-query-listener-exception-expected.txt.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/inspector-protocol/media-query-listener-exception-expected.txt


Added Paths

trunk/LayoutTests/platform/chromium/inspector-protocol/media-query-listener-exception-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (138009 => 138010)

--- trunk/LayoutTests/ChangeLog	2012-12-18 12:19:49 UTC (rev 138009)
+++ trunk/LayoutTests/ChangeLog	2012-12-18 12:49:10 UTC (rev 138010)
@@ -1,3 +1,10 @@
+2012-12-18  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed rebaseline new test introdiced at r138003
+
+* inspector-protocol/media-query-listener-exception-expected.txt:
+* platform/chromium/inspector-protocol/media-query-listener-exception-expected.txt: Copied from LayoutTests/inspector-protocol/media-query-listener-exception-expected.txt.
+
 2012-12-18  Thiago Marcos P. Santos  thiago.san...@intel.com
 
 [EFL] Unreviewed gardening


Modified: trunk/LayoutTests/inspector-protocol/media-query-listener-exception-expected.txt (138009 => 138010)

--- trunk/LayoutTests/inspector-protocol/media-query-listener-exception-expected.txt	2012-12-18 12:19:49 UTC (rev 138009)
+++ trunk/LayoutTests/inspector-protocol/media-query-listener-exception-expected.txt	2012-12-18 12:49:10 UTC (rev 138010)
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: line 13: Uncaught ReferenceError: objectThatDoesNotExist is not defined
-CONSOLE MESSAGE: line 13: Uncaught ReferenceError: objectThatDoesNotExist is not defined
+CONSOLE MESSAGE: line 13: 
+CONSOLE MESSAGE: line 13: 
 Test that uncaught exception in MediaQueryListListener will be reported to the console. On success you should see two exceptions in the listener logged to the console (first time when the media type is overridden and second - when they are restored). Bug 105162.
 
 


Copied: trunk/LayoutTests/platform/chromium/inspector-protocol/media-query-listener-exception-expected.txt (from rev 138009, trunk/LayoutTests/inspector-protocol/media-query-listener-exception-expected.txt) (0 => 138010)

--- trunk/LayoutTests/platform/chromium/inspector-protocol/media-query-listener-exception-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/chromium/inspector-protocol/media-query-listener-exception-expected.txt	2012-12-18 12:49:10 UTC (rev 138010)
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 13: Uncaught ReferenceError: objectThatDoesNotExist is not defined
+CONSOLE MESSAGE: line 13: Uncaught ReferenceError: objectThatDoesNotExist is not defined
+Test that uncaught exception in MediaQueryListListener will be reported to the console. On success you should see two exceptions in the listener logged to the console (first time when the media type is overridden and second - when they are restored). Bug 105162.
+
+






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138114] trunk/Source/WebCore

[loislo]

Title: [138114] trunk/Source/WebCore








Revision 138114
Author loi...@chromium.org
Date 2012-12-18 21:41:10 -0800 (Tue, 18 Dec 2012)


Log Message
Unreviewed, rolling out r138097.
http://trac.webkit.org/changeset/138097
https://bugs.webkit.org/show_bug.cgi?id=105386

multiple crashes on media tests (Requested by loislo on
#webkit).

Patch by Sheriff Bot webkit.review@gmail.com on 2012-12-18

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::canPlayType):
(WebCore::createFileURLForApplicationCacheResource):
(WebCore::stringForNetworkState):
(WebCore::HTMLMediaElement::preload):
(WebCore::HTMLMediaElement::setLoop):
(WebCore::HTMLMediaElement::getPluginProxyParams):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLMediaElement.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (138113 => 138114)

--- trunk/Source/WebCore/ChangeLog	2012-12-19 05:19:53 UTC (rev 138113)
+++ trunk/Source/WebCore/ChangeLog	2012-12-19 05:41:10 UTC (rev 138114)
@@ -1,3 +1,20 @@
+2012-12-18  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r138097.
+http://trac.webkit.org/changeset/138097
+https://bugs.webkit.org/show_bug.cgi?id=105386
+
+multiple crashes on media tests (Requested by loislo on
+#webkit).
+
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::canPlayType):
+(WebCore::createFileURLForApplicationCacheResource):
+(WebCore::stringForNetworkState):
+(WebCore::HTMLMediaElement::preload):
+(WebCore::HTMLMediaElement::setLoop):
+(WebCore::HTMLMediaElement::getPluginProxyParams):
+
 2012-12-18  Julien Chaffraix  jchaffr...@webkit.org
 
 Free one bit in RenderObject


Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (138113 => 138114)

--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2012-12-19 05:19:53 UTC (rev 138113)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2012-12-19 05:41:10 UTC (rev 138114)
@@ -665,13 +665,13 @@
 switch (support)
 {
 case MediaPlayer::IsNotSupported:
-canPlay = ASCIILiteral();
+canPlay = ;
 break;
 case MediaPlayer::MayBeSupported:
-canPlay = ASCIILiteral(maybe);
+canPlay = maybe;
 break;
 case MediaPlayer::IsSupported:
-canPlay = ASCIILiteral(probably);
+canPlay = probably;
 break;
 }
 
@@ -929,7 +929,7 @@
 #else
 KURL url;
 
-url.setProtocol(ASCIILiteral(file));
+url.setProtocol(file);
 url.setPath(path);
 #endif
 return url;
@@ -1571,13 +1571,13 @@
 static String stringForNetworkState(MediaPlayer::NetworkState state)
 {
 switch (state) {
-case MediaPlayer::Empty: return ASCIILiteral(Empty);
-case MediaPlayer::Idle: return ASCIILiteral(Idle);
-case MediaPlayer::Loading: return ASCIILiteral(Loading);
-case MediaPlayer::Loaded: return ASCIILiteral(Loaded);
-case MediaPlayer::FormatError: return ASCIILiteral(FormatError);
-case MediaPlayer::NetworkError: return ASCIILiteral(NetworkError);
-case MediaPlayer::DecodeError: return ASCIILiteral(DecodeError);
+case MediaPlayer::Empty: return Empty;
+case MediaPlayer::Idle: return Idle;
+case MediaPlayer::Loading: return Loading;
+case MediaPlayer::Loaded: return Loaded;
+case MediaPlayer::FormatError: return FormatError;
+case MediaPlayer::NetworkError: return NetworkError;
+case MediaPlayer::DecodeError: return DecodeError;
 default: return emptyString();
 }
 }
@@ -2310,13 +2310,13 @@
 {
 switch (m_preload) {
 case MediaPlayer::None:
-return ASCIILiteral(none);
+return none;
 break;
 case MediaPlayer::MetaData:
-return ASCIILiteral(metadata);
+return metadata;
 break;
 case MediaPlayer::Auto:
-return ASCIILiteral(auto);
+return auto;
 break;
 }
 
@@ -2520,6 +2520,9 @@
 {
 LOG(Media, HTMLMediaElement::setLoop(%s), boolString(b));
 setBooleanAttribute(loopAttr, b);
+#if PLATFORM(MAC)
+updateDisableSleep();
+#endif
 }
 
 bool HTMLMediaElement::controls() const
@@ -3963,14 +3966,14 @@
 if (isVideo()) {
 KURL posterURL = getNonEmptyURLAttribute(posterAttr);
 if (!posterURL.isEmpty()  frame  frame-loader()-willLoadMediaElementURL(posterURL)) {
-names.append(ASCIILiteral(_media_element_poster_));
+names.append(_media_element_poster_);
 values.append(posterURL.string());
 }
 }
 
 if (controls()) {
-names.append(ASCIILiteral(_media_element_controls_));
-values.append(ASCIILiteral(true));
+names.append(_media_element_controls_);
+values.append(true);
 }
 
 url = ""
@@ -3979,7 +3982,7 @@
 
 m_currentSrc = url;
 if (url.isValid()  frame  frame-loader()-willLoadMediaElementURL(url)) {
-names.app

[webkit-changes] [138115] trunk/LayoutTests

[loislo]

Title: [138115] trunk/LayoutTests








Revision 138115
Author loi...@chromium.org
Date 2012-12-18 22:14:18 -0800 (Tue, 18 Dec 2012)


Log Message
Unreviewed gardening. Layout Test fast/events/touch/touch-input-element-change-documents.html is failing
https://bugs.webkit.org/show_bug.cgi?id=105388

wrong path to the js-test-pre.js

* fast/events/touch/touch-input-element-change-documents.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/events/touch/touch-input-element-change-documents.html




Diff

Modified: trunk/LayoutTests/ChangeLog (138114 => 138115)

--- trunk/LayoutTests/ChangeLog	2012-12-19 05:41:10 UTC (rev 138114)
+++ trunk/LayoutTests/ChangeLog	2012-12-19 06:14:18 UTC (rev 138115)
@@ -1,3 +1,12 @@
+2012-12-18  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed gardening. Layout Test fast/events/touch/touch-input-element-change-documents.html is failing
+https://bugs.webkit.org/show_bug.cgi?id=105388
+
+wrong path to the js-test-pre.js
+
+* fast/events/touch/touch-input-element-change-documents.html:
+
 2012-12-18  Dominic Mazzoni  dmazz...@google.com
 
 AX: aria-controls-with-tabs should run on Chromium


Modified: trunk/LayoutTests/fast/events/touch/touch-input-element-change-documents.html (138114 => 138115)

--- trunk/LayoutTests/fast/events/touch/touch-input-element-change-documents.html	2012-12-19 05:41:10 UTC (rev 138114)
+++ trunk/LayoutTests/fast/events/touch/touch-input-element-change-documents.html	2012-12-19 06:14:18 UTC (rev 138115)
@@ -1,4 +1,4 @@
-script src=""
+script src=""
 div id='container'/div
 script
 description(This test checks that we correctly update the touch event handler count when an Input element with default touch handlers changes documents.);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138116] trunk/LayoutTests

[loislo]

Title: [138116] trunk/LayoutTests








Revision 138116
Author loi...@chromium.org
Date 2012-12-18 22:26:11 -0800 (Tue, 18 Dec 2012)


Log Message
Unreviewed rebaseline.

* platform/chromium-linux-x86/fast/inline/justify-emphasis-inline-box-expected.txt: Added.
* platform/chromium-linux/fast/inline/justify-emphasis-inline-box-expected.png: Added.
* platform/chromium-linux/fast/inline/justify-emphasis-inline-box-expected.txt: Added.
* platform/chromium-win/fast/inline/justify-emphasis-inline-box-expected.png: Added.
* platform/chromium-win/fast/inline/justify-emphasis-inline-box-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/chromium-linux/fast/inline/justify-emphasis-inline-box-expected.png
trunk/LayoutTests/platform/chromium-linux/fast/inline/justify-emphasis-inline-box-expected.txt
trunk/LayoutTests/platform/chromium-linux-x86/fast/inline/justify-emphasis-inline-box-expected.txt
trunk/LayoutTests/platform/chromium-win/fast/inline/justify-emphasis-inline-box-expected.png
trunk/LayoutTests/platform/chromium-win/fast/inline/justify-emphasis-inline-box-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (138115 => 138116)

--- trunk/LayoutTests/ChangeLog	2012-12-19 06:14:18 UTC (rev 138115)
+++ trunk/LayoutTests/ChangeLog	2012-12-19 06:26:11 UTC (rev 138116)
@@ -1,5 +1,15 @@
 2012-12-18  Ilya Tikhonovsky  loi...@chromium.org
 
+Unreviewed rebaseline.
+
+* platform/chromium-linux-x86/fast/inline/justify-emphasis-inline-box-expected.txt: Added.
+* platform/chromium-linux/fast/inline/justify-emphasis-inline-box-expected.png: Added.
+* platform/chromium-linux/fast/inline/justify-emphasis-inline-box-expected.txt: Added.
+* platform/chromium-win/fast/inline/justify-emphasis-inline-box-expected.png: Added.
+* platform/chromium-win/fast/inline/justify-emphasis-inline-box-expected.txt: Added.
+
+2012-12-18  Ilya Tikhonovsky  loi...@chromium.org
+
 Unreviewed gardening. Layout Test fast/events/touch/touch-input-element-change-documents.html is failing
 https://bugs.webkit.org/show_bug.cgi?id=105388
 


Added: trunk/LayoutTests/platform/chromium-linux/fast/inline/justify-emphasis-inline-box-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/chromium-linux/fast/inline/justify-emphasis-inline-box-expected.png
___

Added: svn:mime-type

Added: trunk/LayoutTests/platform/chromium-linux/fast/inline/justify-emphasis-inline-box-expected.txt (0 => 138116)

--- trunk/LayoutTests/platform/chromium-linux/fast/inline/justify-emphasis-inline-box-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/chromium-linux/fast/inline/justify-emphasis-inline-box-expected.txt	2012-12-19 06:26:11 UTC (rev 138116)
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x64
+  RenderBlock {HTML} at (0,0) size 800x64
+RenderBody {BODY} at (8,8) size 784x48
+  RenderBlock {DIV} at (0,0) size 200x48
+RenderBlock {SPAN} at (0,21) size 0x0
+RenderText {#text} at (0,8) size 512x40
+  text run at (0,8) width 16: \x{3042}
+  text run at (0,32) width 512: 
Property changes on: trunk/LayoutTests/platform/chromium-linux/fast/inline/justify-emphasis-inline-box-expected.txt
___


Added: svn:eol-style

Added: trunk/LayoutTests/platform/chromium-linux-x86/fast/inline/justify-emphasis-inline-box-expected.txt (0 => 138116)

--- trunk/LayoutTests/platform/chromium-linux-x86/fast/inline/justify-emphasis-inline-box-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/chromium-linux-x86/fast/inline/justify-emphasis-inline-box-expected.txt	2012-12-19 06:26:11 UTC (rev 138116)
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x64
+  RenderBlock {HTML} at (0,0) size 800x64
+RenderBody {BODY} at (8,8) size 784x48
+  RenderBlock {DIV} at (0,0) size 200x48
+RenderBlock {SPAN} at (0,21) size 0x0
+RenderText {#text} at (0,8) size 512x40
+  text run at (0,8) width 16: \x{3042}
+  text run at (0,32) width 512: 
Property changes on: trunk/LayoutTests/platform/chromium-linux-x86/fast/inline/justify-emphasis-inline-box-expected.txt
___


Added: svn:eol-style

Added: trunk/LayoutTests/platform/chromium-win/fast/inline/justify-emphasis-inline-box-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/chromium-win/fast/inline/justify-emphasis-inline-box-expected.png
___

Added: svn:mime-type

Added: 

[webkit-changes] [138117] trunk/LayoutTests

[loislo]

Title: [138117] trunk/LayoutTests








Revision 138117
Author loi...@chromium.org
Date 2012-12-18 22:34:08 -0800 (Tue, 18 Dec 2012)


Log Message
Unreviewed rebaseline after r138075. Remove entries for passing tests and one bad expectation for a reftest by dpra...@chromium.org

* platform/chromium-linux/platform/chromium/virtual/gpu/compositedscrolling/scrollbars/scrollbars-on-positioned-content-expected.png: Added.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/compositedscrolling/
trunk/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/compositedscrolling/scrollbars/
trunk/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/compositedscrolling/scrollbars/scrollbars-on-positioned-content-expected.png




Diff

Modified: trunk/LayoutTests/ChangeLog (138116 => 138117)

--- trunk/LayoutTests/ChangeLog	2012-12-19 06:26:11 UTC (rev 138116)
+++ trunk/LayoutTests/ChangeLog	2012-12-19 06:34:08 UTC (rev 138117)
@@ -1,5 +1,11 @@
 2012-12-18  Ilya Tikhonovsky  loi...@chromium.org
 
+Unreviewed rebaseline after r138075. Remove entries for passing tests and one bad expectation for a reftest by dpra...@chromium.org
+
+* platform/chromium-linux/platform/chromium/virtual/gpu/compositedscrolling/scrollbars/scrollbars-on-positioned-content-expected.png: Added.
+
+2012-12-18  Ilya Tikhonovsky  loi...@chromium.org
+
 Unreviewed rebaseline.
 
 * platform/chromium-linux-x86/fast/inline/justify-emphasis-inline-box-expected.txt: Added.


Added: trunk/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/compositedscrolling/scrollbars/scrollbars-on-positioned-content-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/compositedscrolling/scrollbars/scrollbars-on-positioned-content-expected.png
___

Added: svn:mime-type




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [138121] trunk

[loislo]

Title: [138121] trunk








Revision 138121
Author loi...@chromium.org
Date 2012-12-18 23:36:39 -0800 (Tue, 18 Dec 2012)


Log Message
Unreviewed, rolling out r138061.
https://bugs.webkit.org/show_bug.cgi?id=105396

Original patch:
http://trac.webkit.org/changeset/138061
https://bugs.webkit.org/show_bug.cgi?id=97359

It is crashing on Debug bots

Source/WebKit/chromium:

* public/WebAccessibilityObject.h:
(WebAccessibilityObject):
* src/WebAccessibilityObject.cpp:

Tools:

* DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp:
(WebTestRunner::AccessibilityUIElement::AccessibilityUIElement):
(WebTestRunner::AccessibilityUIElement::elementAtPointCallback):
* DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.h:
(AccessibilityUIElement):

LayoutTests:

* accessibility/svg-bounds.html:
* accessibility/svg-remote-element-expected.txt:
* accessibility/svg-remote-element.html:
* platform/chromium/TestExpectations:
* platform/chromium/accessibility/svg-bounds-expected.txt: Copied from LayoutTests/accessibility/svg-bounds-expected.txt.
* platform/mac/accessibility/svg-bounds-expected.txt: Renamed from LayoutTests/accessibility/svg-bounds-expected.txt.
* platform/mac/accessibility/svg-remote-element-expected.txt: Copied from LayoutTests/accessibility/svg-remote-element-expected.txt.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/accessibility/svg-bounds.html
trunk/LayoutTests/accessibility/svg-remote-element-expected.txt
trunk/LayoutTests/accessibility/svg-remote-element.html
trunk/LayoutTests/platform/chromium/TestExpectations
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/WebAccessibilityObject.h
trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.h


Added Paths

trunk/LayoutTests/platform/chromium/accessibility/svg-bounds-expected.txt
trunk/LayoutTests/platform/mac/accessibility/svg-bounds-expected.txt
trunk/LayoutTests/platform/mac/accessibility/svg-remote-element-expected.txt


Removed Paths

trunk/LayoutTests/accessibility/svg-bounds-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (138120 => 138121)

--- trunk/LayoutTests/ChangeLog	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/LayoutTests/ChangeLog	2012-12-19 07:36:39 UTC (rev 138121)
@@ -1,3 +1,22 @@
+2012-12-18  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed, rolling out r138061.
+https://bugs.webkit.org/show_bug.cgi?id=105396
+
+Original patch:
+http://trac.webkit.org/changeset/138061
+https://bugs.webkit.org/show_bug.cgi?id=97359
+
+It is crashing on Debug bots
+
+* accessibility/svg-bounds.html:
+* accessibility/svg-remote-element-expected.txt:
+* accessibility/svg-remote-element.html:
+* platform/chromium/TestExpectations:
+* platform/chromium/accessibility/svg-bounds-expected.txt: Copied from LayoutTests/accessibility/svg-bounds-expected.txt.
+* platform/mac/accessibility/svg-bounds-expected.txt: Renamed from LayoutTests/accessibility/svg-bounds-expected.txt.
+* platform/mac/accessibility/svg-remote-element-expected.txt: Copied from LayoutTests/accessibility/svg-remote-element-expected.txt.
+
 2012-12-18  Csaba Osztrogonác  o...@webkit.org
 
 Unreviewed gardening, skip a new failing test.


Deleted: trunk/LayoutTests/accessibility/svg-bounds-expected.txt (138120 => 138121)

--- trunk/LayoutTests/accessibility/svg-bounds-expected.txt	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/LayoutTests/accessibility/svg-bounds-expected.txt	2012-12-19 07:36:39 UTC (rev 138121)
@@ -1,44 +0,0 @@
-Test
-This test ensures the accessibility bounds of embedded SVG objects are correct.
-
-On success, you will see a series of PASS messages, followed by TEST COMPLETE.
-
-
-container location: (607, 107)
-Face role: AXRole: AXButton
-Face label: AXDescription: face
-FaceX: 0
-FaceY: 0
-
-
-Eye role: AXRole: AXButton
-Eye label: AXDescription: left-eye
-EyeX: 103
-EyeY: 148
-
-
-Nose role: AXRole: AXButton
-Nose label: AXDescription: nose
-NoseX: 193
-NoseY: 206
-
-
-Mouth role: AXRole: AXButton
-Mouth label: AXDescription: smile
-MouthX: 115
-MouthY: 275
-
-
-Text role: AXRole: AXStaticText
-TextX/10: 15
-TextY/10: 11
-
-
-Image role: AXRole: AXImage
-Image label: AXDescription: Test Image
-ImageX: 21
-ImageY: 21
-PASS successfullyParsed is true
-
-TEST COMPLETE
-


Modified: trunk/LayoutTests/accessibility/svg-bounds.html (138120 => 138121)

--- trunk/LayoutTests/accessibility/svg-bounds.html	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/LayoutTests/accessibility/svg-bounds.html	2012-12-19 07:36:39 UTC (rev 138121)
@@ -3,17 +3,17 @@
 body
 script src=""
 
-div id=container style=position: relative; top: 100px; left: 600px; width:400px; height: 400px; role=group 

[webkit-changes] [137892] trunk

[loislo]

Title: [137892] trunk








Revision 137892
Author loi...@chromium.org
Date 2012-12-17 03:29:39 -0800 (Mon, 17 Dec 2012)


Log Message
Web Inspector: Native Memory Instrumentation: MemoryInstrumentation doesn't detect reportMemoryUsage method defined in a base class.
https://bugs.webkit.org/show_bug.cgi?id=105026

Reviewed by Yury Semikhatsky.

Old SFINAE test was replaced with new one based on this article:
http://stackoverflow.com/questions/1966362/sfinae-to-check-for-inherited-member-functions

Source/WTF:

* wtf/MemoryInstrumentation.h:
(MemoryInstrumentation):
(yes):
(IsInstrumented):
(no):
(WTF::MemoryInstrumentation::IsInstrumented::BaseMixin::reportMemoryUsage):
(WTF::MemoryInstrumentation::selectInstrumentationMethod):
(InstrumentationSelector):
(WTF):
(WTFreportObjectMemoryUsage):

Tools:

New test which covers this problem was added.

* TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MemoryInstrumentation.h
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (137891 => 137892)

--- trunk/Source/WTF/ChangeLog	2012-12-17 11:13:57 UTC (rev 137891)
+++ trunk/Source/WTF/ChangeLog	2012-12-17 11:29:39 UTC (rev 137892)
@@ -1,3 +1,24 @@
+2012-12-14  Ilya Tikhonovsky  loi...@chromium.org
+
+Web Inspector: Native Memory Instrumentation: MemoryInstrumentation doesn't detect reportMemoryUsage method defined in a base class.
+https://bugs.webkit.org/show_bug.cgi?id=105026
+
+Reviewed by Yury Semikhatsky.
+
+Old SFINAE test was replaced with new one based on this article:
+http://stackoverflow.com/questions/1966362/sfinae-to-check-for-inherited-member-functions
+
+* wtf/MemoryInstrumentation.h:
+(MemoryInstrumentation):
+(yes):
+(IsInstrumented):
+(no):
+(WTF::MemoryInstrumentation::IsInstrumented::BaseMixin::reportMemoryUsage):
+(WTF::MemoryInstrumentation::selectInstrumentationMethod):
+(InstrumentationSelector):
+(WTF):
+(WTFreportObjectMemoryUsage):
+
 2012-12-14  Yury Semikhatsky  yu...@chromium.org
 
 Web Inspector: add data grid for exploring native heap graph


Modified: trunk/Source/WTF/wtf/MemoryInstrumentation.h (137891 => 137892)

--- trunk/Source/WTF/wtf/MemoryInstrumentation.h	2012-12-17 11:13:57 UTC (rev 137891)
+++ trunk/Source/WTF/wtf/MemoryInstrumentation.h	2012-12-17 11:29:39 UTC (rev 137892)
@@ -116,25 +116,36 @@
 friend class MemoryClassInfo;
 templatetypename T friend void reportMemoryUsage(const T*, MemoryObjectInfo*);
 
-templatetypename T static void selectInstrumentationMethod(const T* object, MemoryObjectInfo* memoryObjectInfo)
-{
-// If there is reportMemoryUsage method on the object, call it.
-// Otherwise count only object's self size.
-reportObjectMemoryUsageT, void (T::*)(MemoryObjectInfo*) const(object, memoryObjectInfo, 0);
-}
+template typename Type
+class IsInstrumented {
+class yes {
+char m;
+};
 
-templatetypename Type, Type Ptr struct MemberHelperStruct;
-templatetypename T, typename Type
-static void reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo,  MemberHelperStructType, T::reportMemoryUsage*)
-{
-object-reportMemoryUsage(memoryObjectInfo);
-}
+class no {
+yes m[2];
+};
 
-templatetypename T, typename Type
-static void reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo, ...)
-{
-callReportObjectInfo(memoryObjectInfo, object, 0, sizeof(T));
-}
+struct Mixin {
+void reportMemoryUsage(MemoryObjectInfo*) const { }
+};
+
+struct Derived : public Type, public Mixin { };
+template typename T, T t class Helper { };
+
+template typename U static no deduce(U*, Helpervoid (Mixin::*)(MemoryObjectInfo*) const, U::reportMemoryUsage* = 0);
+static yes deduce(...);
+
+public:
+static const bool result = sizeof(yes) == sizeof(deduce((Derived*)(0)));
+
+};
+
+template bool
+struct InstrumentationSelector {
+template typename T static void reportObjectMemoryUsage(const T*, MemoryObjectInfo*);
+};
+
 WTF_EXPORT_PRIVATE static void callReportObjectInfo(MemoryObjectInfo*, const void* pointer, MemoryObjectType, size_t objectSize);
 
 templatetypename T class Wrapper : public WrapperBase {
@@ -189,6 +200,20 @@
 MemoryInstrumentationClient* m_client;
 };
 
+template 
+template typename T
+void MemoryInstrumentation::InstrumentationSelectortrue::reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo)
+{
+object-reportMemoryUsage(memoryObjectInfo);
+}
+
+template 
+template typename T
+void 

[webkit-changes] [137893] trunk

[loislo]

Title: [137893] trunk








Revision 137893
Author loi...@chromium.org
Date 2012-12-17 03:35:31 -0800 (Mon, 17 Dec 2012)


Log Message
Unreviewed, rolling out r137892.
http://trac.webkit.org/changeset/137892
https://bugs.webkit.org/show_bug.cgi?id=105026

it broke compilation on windows

Source/WTF:

* wtf/MemoryInstrumentation.h:
(WTF::MemoryInstrumentation::selectInstrumentationMethod):
(MemoryInstrumentation):
(WTF::MemoryInstrumentation::reportObjectMemoryUsage):
(WTF::reportMemoryUsage):

Tools:

* TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MemoryInstrumentation.h
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (137892 => 137893)

--- trunk/Source/WTF/ChangeLog	2012-12-17 11:29:39 UTC (rev 137892)
+++ trunk/Source/WTF/ChangeLog	2012-12-17 11:35:31 UTC (rev 137893)
@@ -1,3 +1,17 @@
+2012-12-17  Ilya Tikhonovsky  loi...@chromium.org
+
+Unreviewed, rolling out r137892.
+http://trac.webkit.org/changeset/137892
+https://bugs.webkit.org/show_bug.cgi?id=105026
+
+it broke compilation on windows
+
+* wtf/MemoryInstrumentation.h:
+(WTF::MemoryInstrumentation::selectInstrumentationMethod):
+(MemoryInstrumentation):
+(WTF::MemoryInstrumentation::reportObjectMemoryUsage):
+(WTF::reportMemoryUsage):
+
 2012-12-14  Ilya Tikhonovsky  loi...@chromium.org
 
 Web Inspector: Native Memory Instrumentation: MemoryInstrumentation doesn't detect reportMemoryUsage method defined in a base class.


Modified: trunk/Source/WTF/wtf/MemoryInstrumentation.h (137892 => 137893)

--- trunk/Source/WTF/wtf/MemoryInstrumentation.h	2012-12-17 11:29:39 UTC (rev 137892)
+++ trunk/Source/WTF/wtf/MemoryInstrumentation.h	2012-12-17 11:35:31 UTC (rev 137893)
@@ -116,36 +116,25 @@
 friend class MemoryClassInfo;
 templatetypename T friend void reportMemoryUsage(const T*, MemoryObjectInfo*);
 
-template typename Type
-class IsInstrumented {
-class yes {
-char m;
-};
+templatetypename T static void selectInstrumentationMethod(const T* object, MemoryObjectInfo* memoryObjectInfo)
+{
+// If there is reportMemoryUsage method on the object, call it.
+// Otherwise count only object's self size.
+reportObjectMemoryUsageT, void (T::*)(MemoryObjectInfo*) const(object, memoryObjectInfo, 0);
+}
 
-class no {
-yes m[2];
-};
+templatetypename Type, Type Ptr struct MemberHelperStruct;
+templatetypename T, typename Type
+static void reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo,  MemberHelperStructType, T::reportMemoryUsage*)
+{
+object-reportMemoryUsage(memoryObjectInfo);
+}
 
-struct Mixin {
-void reportMemoryUsage(MemoryObjectInfo*) const { }
-};
-
-struct Derived : public Type, public Mixin { };
-template typename T, T t class Helper { };
-
-template typename U static no deduce(U*, Helpervoid (Mixin::*)(MemoryObjectInfo*) const, U::reportMemoryUsage* = 0);
-static yes deduce(...);
-
-public:
-static const bool result = sizeof(yes) == sizeof(deduce((Derived*)(0)));
-
-};
-
-template bool
-struct InstrumentationSelector {
-template typename T static void reportObjectMemoryUsage(const T*, MemoryObjectInfo*);
-};
-
+templatetypename T, typename Type
+static void reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo, ...)
+{
+callReportObjectInfo(memoryObjectInfo, object, 0, sizeof(T));
+}
 WTF_EXPORT_PRIVATE static void callReportObjectInfo(MemoryObjectInfo*, const void* pointer, MemoryObjectType, size_t objectSize);
 
 templatetypename T class Wrapper : public WrapperBase {
@@ -200,20 +189,6 @@
 MemoryInstrumentationClient* m_client;
 };
 
-template 
-template typename T
-void MemoryInstrumentation::InstrumentationSelectortrue::reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo)
-{
-object-reportMemoryUsage(memoryObjectInfo);
-}
-
-template 
-template typename T
-void MemoryInstrumentation::InstrumentationSelectorfalse::reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo)
-{
-callReportObjectInfo(memoryObjectInfo, object, 0, sizeof(T));
-}
-
 class MemoryClassInfo {
 public:
 templatetypename T
@@ -249,7 +224,7 @@
 templatetypename T
 void reportMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo)
 {
-MemoryInstrumentation::InstrumentationSelectorMemoryInstrumentation::IsInstrumentedT::result::reportObjectMemoryUsage(object, memoryObjectInfo);
+MemoryInstrumentation::selectInstrumentationMethodT(object, memoryObjectInfo);
 }
 
 templatetypename T


Modified: trunk/Tools/ChangeLog (137892 => 137893)

--- trunk/Tools/ChangeLog	

[webkit-changes] [137911] trunk

[loislo]

Title: [137911] trunk








Revision 137911
Author loi...@chromium.org
Date 2012-12-17 08:31:14 -0800 (Mon, 17 Dec 2012)


Log Message
Web Inspector: Native Memory Instrumentation: MemoryInstrumentation doesn't detect reportMemoryUsage method defined in a base class.
https://bugs.webkit.org/show_bug.cgi?id=105026

Reviewed by Yury Semikhatsky.

Old SFINAE test was replaced with new one based on this article:
http://stackoverflow.com/questions/1966362/sfinae-to-check-for-inherited-member-functions

Source/WTF:

* wtf/MemoryInstrumentation.h:
(MemoryInstrumentation):
(yes):
(IsInstrumented):
(no):
(WTF::MemoryInstrumentation::IsInstrumented::BaseMixin::reportMemoryUsage):
(WTF::MemoryInstrumentation::selectInstrumentationMethod):
(InstrumentationSelector):
(WTF):
(WTFreportObjectMemoryUsage):

Tools:

New test which covers this problem was added.

* TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MemoryInstrumentation.h
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (137910 => 137911)

--- trunk/Source/WTF/ChangeLog	2012-12-17 16:22:31 UTC (rev 137910)
+++ trunk/Source/WTF/ChangeLog	2012-12-17 16:31:14 UTC (rev 137911)
@@ -1,5 +1,26 @@
 2012-12-17  Ilya Tikhonovsky  loi...@chromium.org
 
+Web Inspector: Native Memory Instrumentation: MemoryInstrumentation doesn't detect reportMemoryUsage method defined in a base class.
+https://bugs.webkit.org/show_bug.cgi?id=105026
+
+Reviewed by Yury Semikhatsky.
+
+Old SFINAE test was replaced with new one based on this article:
+http://stackoverflow.com/questions/1966362/sfinae-to-check-for-inherited-member-functions
+
+* wtf/MemoryInstrumentation.h:
+(MemoryInstrumentation):
+(yes):
+(IsInstrumented):
+(no):
+(WTF::MemoryInstrumentation::IsInstrumented::BaseMixin::reportMemoryUsage):
+(WTF::MemoryInstrumentation::selectInstrumentationMethod):
+(InstrumentationSelector):
+(WTF):
+(WTFreportObjectMemoryUsage):
+
+2012-12-17  Ilya Tikhonovsky  loi...@chromium.org
+
 Unreviewed, rolling out r137892.
 http://trac.webkit.org/changeset/137892
 https://bugs.webkit.org/show_bug.cgi?id=105026


Modified: trunk/Source/WTF/wtf/MemoryInstrumentation.h (137910 => 137911)

--- trunk/Source/WTF/wtf/MemoryInstrumentation.h	2012-12-17 16:22:31 UTC (rev 137910)
+++ trunk/Source/WTF/wtf/MemoryInstrumentation.h	2012-12-17 16:31:14 UTC (rev 137911)
@@ -116,25 +116,44 @@
 friend class MemoryClassInfo;
 templatetypename T friend void reportMemoryUsage(const T*, MemoryObjectInfo*);
 
-templatetypename T static void selectInstrumentationMethod(const T* object, MemoryObjectInfo* memoryObjectInfo)
-{
-// If there is reportMemoryUsage method on the object, call it.
-// Otherwise count only object's self size.
-reportObjectMemoryUsageT, void (T::*)(MemoryObjectInfo*) const(object, memoryObjectInfo, 0);
-}
+template typename Type
+class IsInstrumented {
+class yes {
+char m;
+};
 
-templatetypename Type, Type Ptr struct MemberHelperStruct;
-templatetypename T, typename Type
-static void reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo,  MemberHelperStructType, T::reportMemoryUsage*)
-{
-object-reportMemoryUsage(memoryObjectInfo);
-}
+class no {
+yes m[2];
+};
 
-templatetypename T, typename Type
-static void reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo, ...)
-{
-callReportObjectInfo(memoryObjectInfo, object, 0, sizeof(T));
-}
+struct BaseMixin {
+void reportMemoryUsage(MemoryObjectInfo*) const { }
+};
+
+#if COMPILER(MSVC)
+#pragma warning(push)
+#pragma warning(disable: 4624) // Disable warning: destructor could not be generated because a base class destructor is inaccessible.
+#endif
+struct Base : public Type, public BaseMixin { };
+#if COMPILER(MSVC)
+#pragma warning(pop)
+#endif
+
+template typename T, T t class Helper { };
+
+template typename U static no deduce(U*, Helpervoid (BaseMixin::*)(MemoryObjectInfo*) const, U::reportMemoryUsage* = 0);
+static yes deduce(...);
+
+public:
+static const bool result = sizeof(yes) == sizeof(deduce((Base*)(0)));
+
+};
+
+template int
+struct InstrumentationSelector {
+template typename T static void reportObjectMemoryUsage(const T*, MemoryObjectInfo*);
+};
+
 WTF_EXPORT_PRIVATE static void callReportObjectInfo(MemoryObjectInfo*, const void* pointer, MemoryObjectType, size_t objectSize);
 
 templatetypename T class Wrapper : public WrapperBase {
@@ -189,6 +208,20 @@
 MemoryInstrumentationClient* m_client;
 };
 
+template