| Index: Source/core/inspector/InspectorLayerTreeAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorLayerTreeAgent.cpp b/Source/core/inspector/InspectorLayerTreeAgent.cpp
|
| index 9a154ee625d69cce116cdcb587a4c2985c4ce232..36683403dfca7416b2b010f9459bb0a35c127950 100644
|
| --- a/Source/core/inspector/InspectorLayerTreeAgent.cpp
|
| +++ b/Source/core/inspector/InspectorLayerTreeAgent.cpp
|
| @@ -67,7 +67,7 @@ inline String idForLayer(const GraphicsLayer* graphicsLayer)
|
| return String::number(graphicsLayer->platformLayer()->id());
|
| }
|
|
|
| -static PassRefPtr<TypeBuilder::LayerTree::ScrollRect> buildScrollRect(const blink::WebRect& rect, const TypeBuilder::LayerTree::ScrollRect::Type::Enum& type)
|
| +static PassRefPtr<TypeBuilder::LayerTree::ScrollRect> buildScrollRect(const WebRect& rect, const TypeBuilder::LayerTree::ScrollRect::Type::Enum& type)
|
| {
|
| RefPtr<TypeBuilder::DOM::Rect> rectObject = TypeBuilder::DOM::Rect::create()
|
| .setX(rect.x)
|
| @@ -83,7 +83,7 @@ static PassRefPtr<TypeBuilder::LayerTree::ScrollRect> buildScrollRect(const blin
|
| static PassRefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect> > buildScrollRectsForLayer(GraphicsLayer* graphicsLayer)
|
| {
|
| RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect> > scrollRects = TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect>::create();
|
| - blink::WebLayer* webLayer = graphicsLayer->platformLayer();
|
| + 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));
|
| }
|
| @@ -91,7 +91,7 @@ static PassRefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect> > build
|
| scrollRects->addItem(buildScrollRect(webLayer->touchEventHandlerRegion()[i], TypeBuilder::LayerTree::ScrollRect::Type::TouchEventHandler));
|
| }
|
| if (webLayer->haveWheelEventHandlers()) {
|
| - blink::WebRect webRect(webLayer->position().x, webLayer->position().y, webLayer->bounds().width, webLayer->bounds().height);
|
| + WebRect webRect(webLayer->position().x, webLayer->position().y, webLayer->bounds().width, webLayer->bounds().height);
|
| scrollRects->addItem(buildScrollRect(webRect, TypeBuilder::LayerTree::ScrollRect::Type::WheelEventHandler));
|
| }
|
| return scrollRects->length() ? scrollRects.release() : nullptr;
|
| @@ -99,7 +99,7 @@ static PassRefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect> > build
|
|
|
| static PassRefPtr<TypeBuilder::LayerTree::Layer> buildObjectForLayer(GraphicsLayer* graphicsLayer, int nodeId)
|
| {
|
| - blink::WebLayer* webLayer = graphicsLayer->platformLayer();
|
| + WebLayer* webLayer = graphicsLayer->platformLayer();
|
| RefPtr<TypeBuilder::LayerTree::Layer> layerObject = TypeBuilder::LayerTree::Layer::create()
|
| .setLayerId(idForLayer(graphicsLayer))
|
| .setOffsetX(webLayer->position().x)
|
|
|