Chromium Code Reviews| Index: Source/devtools/front_end/Layers3DView.js |
| diff --git a/Source/devtools/front_end/Layers3DView.js b/Source/devtools/front_end/Layers3DView.js |
| index 0ba03ccf3652e9198f5530eba4362e9a849770e6..99662f6d30e9c38275bdafc64dc5e18873251c02 100644 |
| --- a/Source/devtools/front_end/Layers3DView.js |
| +++ b/Source/devtools/front_end/Layers3DView.js |
| @@ -50,6 +50,7 @@ WebInspector.Layers3DView = function(model) |
| this.element.addEventListener("dblclick", this._onDoubleClick.bind(this), false); |
| this.element.addEventListener("click", this._onClick.bind(this), false); |
| this._elementsByLayerId = {}; |
| + this._scrollRectElementsByLayerId = {} |
| this._rotateX = 0; |
| this._rotateY = 0; |
| this._scaleAdjustmentStylesheet = this.element.ownerDocument.head.createChild("style"); |
| @@ -82,6 +83,15 @@ WebInspector.Layers3DView.PaintRectColors = [ |
| WebInspector.Color.fromRGBA([0, 0xFF, 0, 0x3F]) |
| ] |
| +/** |
| + * @enum {string} |
| + */ |
| +WebInspector.Layers3DView.ScrollRectTitles = { |
| + NonFastScrollable: WebInspector.UIString("repaints on scroll"), |
| + TouchEventHandler: WebInspector.UIString("touch event listener"), |
| + WheelEventHandler: WebInspector.UIString("mousewheel event listener") |
| +} |
| + |
| WebInspector.Layers3DView.prototype = { |
| onResize: function() |
| { |
| @@ -211,6 +221,7 @@ WebInspector.Layers3DView.prototype = { |
| } |
| this._scaleToFit(); |
| this._model.forEachLayer(updateLayer.bind(this), this._model.contentRoot()); |
| + this._paintScrollRects(); |
| this._needsUpdate = false; |
| }, |
| @@ -284,6 +295,59 @@ WebInspector.Layers3DView.prototype = { |
| } |
| }, |
| + _createScrollRectElement: function(scrollRect) |
| + { |
| + var element = document.createElement("div"); |
| + var style = element.style; |
| + var parentLayerElement = this._model._layersById[scrollRect.layerId].nodeId() ? this._elementsByLayerId[scrollRect.layerId] : |
| + this._elementsByLayerId[this._model.contentRoot().id()]; |
|
caseq
2014/02/20 16:30:45
Let's split into something like
var parentLayerId
malch
2014/02/21 12:22:15
Done.
|
| + element.className = "scroll-rect"; |
| + element.title = WebInspector.Layers3DView.ScrollRectTitles[scrollRect.type]; |
| + style.width = scrollRect.width + "px"; |
| + style.height = scrollRect.height + "px"; |
| + style.left = scrollRect.x + "px"; |
| + style.top = scrollRect.y + "px"; |
| + parentLayerElement.appendChild(element); |
| + element.__scrollRect = scrollRect; |
| + return element; |
| + }, |
| + |
| + _paintScrollRectsForLayer: function(newScrollRects, oldScrollRects) |
| + { |
| + for (var i = 0; i < newScrollRects.length; ++i) { |
| + if (i >= oldScrollRects.length) { |
| + oldScrollRects.push(this._createScrollRectElement(newScrollRects[i])); |
| + } else if (newScrollRects[i] != oldScrollRects[i].__scrollRect) { |
| + oldScrollRects[i].remove(); |
| + oldScrollRects[i] = this._createScrollRectElement(newScrollRects[i]); |
| + } |
| + } |
| + }, |
| + |
| + _paintScrollRects: function() |
|
caseq
2014/02/20 16:30:45
s/paint/update/
malch
2014/02/21 12:22:15
Done.
|
| + { |
| + function removeElement(element) |
| + { |
| + element.remove() |
| + } |
| + |
| + for (var layerId in this._scrollRectElementsByLayerId) { |
| + if (!this._model._scrollRectsByLayerId[layerId]) { |
| + this._scrollRectElementsByLayerId[layerId].forEach(removeElement); |
| + delete this._scrollRectElementsByLayerId[layerId]; |
| + } |
| + } |
| + for (var layerId in this._model._scrollRectsByLayerId) { |
| + if (!this._scrollRectElementsByLayerId[layerId]) |
| + this._scrollRectElementsByLayerId[layerId] = []; |
| + this._paintScrollRectsForLayer(this._model._scrollRectsByLayerId[layerId], |
| + this._scrollRectElementsByLayerId[layerId]); |
| + this._scrollRectElementsByLayerId[layerId] |
| + .splice(this._model._scrollRectsByLayerId[layerId].length) |
| + .forEach(removeElement); |
| + } |
| + }, |
| + |
| _updatePaintRect: function(element) |
| { |
| var details = element.__layerDetails; |