Index: Source/core/inspector/InspectorLayerTreeAgent.cpp |
diff --git a/Source/core/inspector/InspectorLayerTreeAgent.cpp b/Source/core/inspector/InspectorLayerTreeAgent.cpp |
index ab6a25ea8b101b36fef0d0c06a572782ab17bdc8..5202502c72cb4be6b920dc7b99adb7fe46160cc8 100644 |
--- a/Source/core/inspector/InspectorLayerTreeAgent.cpp |
+++ b/Source/core/inspector/InspectorLayerTreeAgent.cpp |
@@ -80,9 +80,9 @@ static PassRefPtr<TypeBuilder::LayerTree::ScrollRect> buildScrollRect(const blin |
return scrollRectObject.release(); |
} |
-static PassRefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect> > buildScrollRectsForLayer(GraphicsLayer* graphicsLayer) |
+static PassRefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect>> buildScrollRectsForLayer(GraphicsLayer* graphicsLayer) |
{ |
- RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect> > scrollRects = TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect>::create(); |
+ RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect>> scrollRects = TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect>::create(); |
blink::WebLayer* webLayer = graphicsLayer->platformLayer(); |
for (size_t i = 0; i < webLayer->nonFastScrollableRegion().size(); ++i) { |
scrollRects->addItem(buildScrollRect(webLayer->nonFastScrollableRegion()[i], TypeBuilder::LayerTree::ScrollRect::Type::RepaintsOnScroll)); |
@@ -122,7 +122,7 @@ static PassRefPtr<TypeBuilder::LayerTree::Layer> buildObjectForLayer(GraphicsLay |
if (!transform.isIdentity()) { |
TransformationMatrix::FloatMatrix4 flattenedMatrix; |
transform.toColumnMajorFloatArray(flattenedMatrix); |
- RefPtr<TypeBuilder::Array<double> > transformArray = TypeBuilder::Array<double>::create(); |
+ RefPtr<TypeBuilder::Array<double>> transformArray = TypeBuilder::Array<double>::create(); |
for (size_t i = 0; i < WTF_ARRAY_LENGTH(flattenedMatrix); ++i) |
transformArray->addItem(flattenedMatrix[i]); |
layerObject->setTransform(transformArray); |
@@ -138,7 +138,7 @@ static PassRefPtr<TypeBuilder::LayerTree::Layer> buildObjectForLayer(GraphicsLay |
layerObject->setAnchorY(0.0); |
layerObject->setAnchorZ(transformOrigin.z()); |
} |
- RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect> > scrollRects = buildScrollRectsForLayer(graphicsLayer); |
+ RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect>> scrollRects = buildScrollRectsForLayer(graphicsLayer); |
if (scrollRects) |
layerObject->setScrollRects(scrollRects.release()); |
return layerObject; |
@@ -215,14 +215,14 @@ void InspectorLayerTreeAgent::didPaint(RenderObject*, const GraphicsLayer* graph |
m_frontend->layerPainted(idForLayer(graphicsLayer), domRect.release()); |
} |
-PassRefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer> > InspectorLayerTreeAgent::buildLayerTree() |
+PassRefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer>> InspectorLayerTreeAgent::buildLayerTree() |
{ |
RenderLayerCompositor* compositor = renderLayerCompositor(); |
if (!compositor || !compositor->inCompositingMode()) |
return nullptr; |
LayerIdToNodeIdMap layerIdToNodeIdMap; |
- RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer> > layers = TypeBuilder::Array<TypeBuilder::LayerTree::Layer>::create(); |
+ RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer>> layers = TypeBuilder::Array<TypeBuilder::LayerTree::Layer>::create(); |
buildLayerIdToNodeIdMap(compositor->rootRenderLayer(), layerIdToNodeIdMap); |
gatherGraphicsLayers(rootGraphicsLayer(), layerIdToNodeIdMap, layers); |
return layers.release(); |
@@ -247,7 +247,7 @@ void InspectorLayerTreeAgent::buildLayerIdToNodeIdMap(RenderLayer* root, LayerId |
} |
} |
-void InspectorLayerTreeAgent::gatherGraphicsLayers(GraphicsLayer* root, HashMap<int, int>& layerIdToNodeIdMap, RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer> >& layers) |
+void InspectorLayerTreeAgent::gatherGraphicsLayers(GraphicsLayer* root, HashMap<int, int>& layerIdToNodeIdMap, RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer>>& layers) |
{ |
int layerId = root->platformLayer()->id(); |
if (m_pageOverlayLayerIds.find(layerId) != WTF::kNotFound) |
@@ -314,7 +314,7 @@ GraphicsLayer* InspectorLayerTreeAgent::layerById(ErrorString* errorString, cons |
return result; |
} |
-void InspectorLayerTreeAgent::compositingReasons(ErrorString* errorString, const String& layerId, RefPtr<TypeBuilder::Array<String> >& reasonStrings) |
+void InspectorLayerTreeAgent::compositingReasons(ErrorString* errorString, const String& layerId, RefPtr<TypeBuilder::Array<String>>& reasonStrings) |
{ |
const GraphicsLayer* graphicsLayer = layerById(errorString, layerId); |
if (!graphicsLayer) |
@@ -370,7 +370,7 @@ void InspectorLayerTreeAgent::loadSnapshot(ErrorString* errorString, const RefPt |
*errorString = "Invalid argument, no tiles provided"; |
return; |
} |
- Vector<RefPtr<PictureSnapshot::TilePictureStream> > decodedTiles; |
+ Vector<RefPtr<PictureSnapshot::TilePictureStream>> decodedTiles; |
decodedTiles.grow(tiles->length()); |
for (size_t i = 0; i < tiles->length(); ++i) { |
RefPtr<JSONObject> item; |
@@ -427,7 +427,7 @@ void InspectorLayerTreeAgent::replaySnapshot(ErrorString* errorString, const Str |
const PictureSnapshot* snapshot = snapshotById(errorString, snapshotId); |
if (!snapshot) |
return; |
- OwnPtr<Vector<char> > base64Data = snapshot->replay(fromStep ? *fromStep : 0, toStep ? *toStep : 0, scale ? *scale : 1.0); |
+ OwnPtr<Vector<char>> base64Data = snapshot->replay(fromStep ? *fromStep : 0, toStep ? *toStep : 0, scale ? *scale : 1.0); |
if (!base64Data) { |
*errorString = "Image encoding failed"; |
return; |
@@ -449,7 +449,7 @@ static bool parseRect(const JSONObject& object, FloatRect* rect) |
return true; |
} |
-void InspectorLayerTreeAgent::profileSnapshot(ErrorString* errorString, const String& snapshotId, const int* minRepeatCount, const double* minDuration, const RefPtr<JSONObject>* clipRect, RefPtr<TypeBuilder::Array<TypeBuilder::Array<double> > >& outTimings) |
+void InspectorLayerTreeAgent::profileSnapshot(ErrorString* errorString, const String& snapshotId, const int* minRepeatCount, const double* minDuration, const RefPtr<JSONObject>* clipRect, RefPtr<TypeBuilder::Array<TypeBuilder::Array<double>>>& outTimings) |
{ |
const PictureSnapshot* snapshot = snapshotById(errorString, snapshotId); |
if (!snapshot) |
@@ -460,17 +460,17 @@ void InspectorLayerTreeAgent::profileSnapshot(ErrorString* errorString, const St |
return; |
} |
OwnPtr<PictureSnapshot::Timings> timings = snapshot->profile(minRepeatCount ? *minRepeatCount : 1, minDuration ? *minDuration : 0, clipRect ? &rect : 0); |
- outTimings = TypeBuilder::Array<TypeBuilder::Array<double> >::create(); |
+ outTimings = TypeBuilder::Array<TypeBuilder::Array<double>>::create(); |
for (size_t i = 0; i < timings->size(); ++i) { |
const Vector<double>& row = (*timings)[i]; |
- RefPtr<TypeBuilder::Array<double> > outRow = TypeBuilder::Array<double>::create(); |
+ RefPtr<TypeBuilder::Array<double>> outRow = TypeBuilder::Array<double>::create(); |
for (size_t j = 0; j < row.size(); ++j) |
outRow->addItem(row[j]); |
outTimings->addItem(outRow.release()); |
} |
} |
-void InspectorLayerTreeAgent::snapshotCommandLog(ErrorString* errorString, const String& snapshotId, RefPtr<TypeBuilder::Array<JSONObject> >& commandLog) |
+void InspectorLayerTreeAgent::snapshotCommandLog(ErrorString* errorString, const String& snapshotId, RefPtr<TypeBuilder::Array<JSONObject>>& commandLog) |
{ |
const PictureSnapshot* snapshot = snapshotById(errorString, snapshotId); |
if (!snapshot) |