cc/layer_tree_host_impl.cc - Issue 12774006: cc: Chromify Layer and LayerImpl classes.

Unified Diff: cc/layer_tree_host_impl.cc

Issue 12774006: cc: Chromify Layer and LayerImpl classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: MoreAndroidCompilings Created 7 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: cc/layer_tree_host_impl.cc

diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc

index cf88717df3ef30089abb0c6040590cdd2c71e5f1..cc3475d44df8f5e69d1c7bf078b8e2b12e73e6f7 100644

--- a/cc/layer_tree_host_impl.cc

+++ b/cc/layer_tree_host_impl.cc

@@ -288,7 +288,7 @@ void LayerTreeHostImpl::startPageScaleAnimation(gfx::Vector2d targetOffset, bool

if (!rootScrollLayer())

return;

- gfx::Vector2dF scrollTotal = rootScrollLayer()->scrollOffset() + rootScrollLayer()->scrollDelta();

+ gfx::Vector2dF scrollTotal = rootScrollLayer()->scroll_offset() + rootScrollLayer()->scroll_delta();

gfx::SizeF scaledScrollableSize = activeTree()->ScrollableSize();

gfx::SizeF viewportSize = gfx::ScaleSize(m_deviceViewportSize, 1 / m_deviceScaleFactor);

@@ -341,9 +341,9 @@ void LayerTreeHostImpl::trackDamageForAllSurfaces(LayerImpl* rootDrawLayer, cons

for (int surfaceIndex = renderSurfaceLayerList.size() - 1; surfaceIndex >= 0 ; --surfaceIndex) {

LayerImpl* renderSurfaceLayer = renderSurfaceLayerList[surfaceIndex];

- RenderSurfaceImpl* renderSurface = renderSurfaceLayer->renderSurface();

+ RenderSurfaceImpl* renderSurface = renderSurfaceLayer->render_surface();

DCHECK(renderSurface);

- renderSurface->damage_tracker()->UpdateDamageTrackingState(renderSurface->layer_list(), renderSurfaceLayer->id(), renderSurface->SurfacePropertyChangedOnlyFromDescendant(), renderSurface->content_rect(), renderSurfaceLayer->maskLayer(), renderSurfaceLayer->filters(), renderSurfaceLayer->filter().get());

+ renderSurface->damage_tracker()->UpdateDamageTrackingState(renderSurface->layer_list(), renderSurfaceLayer->id(), renderSurface->SurfacePropertyChangedOnlyFromDescendant(), renderSurface->content_rect(), renderSurfaceLayer->mask_layer(), renderSurfaceLayer->filters(), renderSurfaceLayer->filter().get());

}

@@ -360,9 +360,9 @@ static void appendQuadsForLayer(RenderPass* targetRenderPass, LayerImpl* layer,

targetRenderPass->shared_quad_state_list,

layer,

occlusionTracker,

- layer->showDebugBorders(),

+ layer->ShowDebugBorders(),

forSurface);

- layer->appendQuads(quadCuller, appendQuadsData);

+ layer->AppendQuads(&quadCuller, &appendQuadsData);

}

static void appendQuadsForRenderSurfaceLayer(RenderPass* targetRenderPass, LayerImpl* layer, const RenderPass* contributingRenderPass, OcclusionTrackerImpl& occlusionTracker, AppendQuadsData& appendQuadsData)

@@ -372,22 +372,22 @@ static void appendQuadsForRenderSurfaceLayer(RenderPass* targetRenderPass, Layer

targetRenderPass->shared_quad_state_list,

layer,

occlusionTracker,

- layer->showDebugBorders(),

+ layer->ShowDebugBorders(),

forSurface);

bool isReplica = false;

- layer->renderSurface()->AppendQuads(&quadCuller,

- &appendQuadsData,

- isReplica,

- contributingRenderPass->id);

+ layer->render_surface()->AppendQuads(&quadCuller,

+ &appendQuadsData,

+ isReplica,

+ contributingRenderPass->id);

// Add replica after the surface so that it appears below the surface.

- if (layer->hasReplica()) {

+ if (layer->has_replica()) {

isReplica = true;

- layer->renderSurface()->AppendQuads(&quadCuller,

- &appendQuadsData,

- isReplica,

- contributingRenderPass->id);

+ layer->render_surface()->AppendQuads(&quadCuller,

+ &appendQuadsData,

+ isReplica,

+ contributingRenderPass->id);

}

@@ -405,17 +405,17 @@ static void appendQuadsToFillScreen(RenderPass* targetRenderPass, LayerImpl* roo

targetRenderPass->shared_quad_state_list,

rootLayer,

occlusionTracker,

- rootLayer->showDebugBorders(),

+ rootLayer->ShowDebugBorders(),

forSurface);

// Manually create the quad state for the gutter quads, as the root layer

// doesn't have any bounds and so can't generate this itself.

// FIXME: Make the gutter quads generated by the solid color layer (make it smarter about generating quads to fill unoccluded areas).

- gfx::Rect rootTargetRect = rootLayer->renderSurface()->content_rect();

+ gfx::Rect rootTargetRect = rootLayer->render_surface()->content_rect();

float opacity = 1;

SharedQuadState* sharedQuadState = quadCuller.useSharedQuadState(SharedQuadState::Create());

- sharedQuadState->SetAll(rootLayer->drawTransform(),

+ sharedQuadState->SetAll(rootLayer->draw_transform(),

rootTargetRect.size(),

rootTargetRect,

@@ -425,7 +425,7 @@ static void appendQuadsToFillScreen(RenderPass* targetRenderPass, LayerImpl* roo

AppendQuadsData appendQuadsData;

gfx::Transform transformToLayerSpace(gfx::Transform::kSkipInitialization);

- bool didInvert = rootLayer->screenSpaceTransform().GetInverse(&transformToLayerSpace);

+ bool didInvert = rootLayer->screen_space_transform().GetInverse(&transformToLayerSpace);

DCHECK(didInvert);

for (Region::Iterator fillRects(fillRegion); fillRects.has_rect(); fillRects.next()) {

// The root layer transform is composed of translations and scales only,

@@ -435,7 +435,7 @@ static void appendQuadsToFillScreen(RenderPass* targetRenderPass, LayerImpl* roo

// occlusion checks.

scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create();

quad->SetNew(sharedQuadState, layerRect, screenBackgroundColor);

- quadCuller.append(quad.PassAs<DrawQuad>(), appendQuadsData);

+ quadCuller.append(quad.PassAs<DrawQuad>(), &appendQuadsData);

}

@@ -453,11 +453,11 @@ bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)

// Create the render passes in dependency order.

for (int surfaceIndex = frame.renderSurfaceLayerList->size() - 1; surfaceIndex >= 0 ; --surfaceIndex) {

LayerImpl* renderSurfaceLayer = (*frame.renderSurfaceLayerList)[surfaceIndex];

- renderSurfaceLayer->renderSurface()->AppendRenderPasses(&frame);

+ renderSurfaceLayer->render_surface()->AppendRenderPasses(&frame);

}

bool recordMetricsForFrame = m_settings.showOverdrawInTracing && base::debug::TraceLog::GetInstance() && base::debug::TraceLog::GetInstance()->IsEnabled();

- OcclusionTrackerImpl occlusionTracker(rootLayer()->renderSurface()->content_rect(), recordMetricsForFrame);

+ OcclusionTrackerImpl occlusionTracker(rootLayer()->render_surface()->content_rect(), recordMetricsForFrame);

occlusionTracker.set_minimum_tracking_size(m_settings.minimumOcclusionTrackingSize);

if (m_debugState.showOccludingRects)

@@ -475,7 +475,7 @@ bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)

LayerIteratorType end = LayerIteratorType::end(frame.renderSurfaceLayerList);

for (LayerIteratorType it = LayerIteratorType::begin(frame.renderSurfaceLayerList); it != end; ++it) {

- RenderPass::Id targetRenderPassId = it.targetRenderSurfaceLayer()->renderSurface()->RenderPassId();

+ RenderPass::Id targetRenderPassId = it.targetRenderSurfaceLayer()->render_surface()->RenderPassId();

RenderPass* targetRenderPass = frame.renderPassesById[targetRenderPassId];

occlusionTracker.EnterLayer(it);

@@ -483,28 +483,28 @@ bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)

AppendQuadsData appendQuadsData(targetRenderPass->id);

if (it.representsContributingRenderSurface()) {

- RenderPass::Id contributingRenderPassId = it->renderSurface()->RenderPassId();

+ RenderPass::Id contributingRenderPassId = it->render_surface()->RenderPassId();

RenderPass* contributingRenderPass = frame.renderPassesById[contributingRenderPassId];

appendQuadsForRenderSurfaceLayer(targetRenderPass, *it, contributingRenderPass, occlusionTracker, appendQuadsData);

- } else if (it.representsItself() && !it->visibleContentRect().IsEmpty()) {

+ } else if (it.representsItself() && !it->visible_content_rect().IsEmpty()) {

bool hasOcclusionFromOutsideTargetSurface;

bool implDrawTransformIsUnknown = false;

- if (occlusionTracker.Occluded(it->renderTarget(), it->visibleContentRect(), it->drawTransform(), implDrawTransformIsUnknown, it->isClipped(), it->clipRect(), &hasOcclusionFromOutsideTargetSurface))

+ if (occlusionTracker.Occluded(it->render_target(), it->visible_content_rect(), it->draw_transform(), implDrawTransformIsUnknown, it->is_clipped(), it->clip_rect(), &hasOcclusionFromOutsideTargetSurface))

appendQuadsData.hadOcclusionFromOutsideTargetSurface |= hasOcclusionFromOutsideTargetSurface;

else {

- DCHECK_EQ(activeTree(), it->layerTreeImpl());

- it->willDraw(m_resourceProvider.get());

+ DCHECK_EQ(activeTree(), it->layer_tree_impl());

+ it->WillDraw(m_resourceProvider.get());

frame.willDrawLayers.push_back(*it);

- if (it->hasContributingDelegatedRenderPasses()) {

- RenderPass::Id contributingRenderPassId = it->firstContributingRenderPassId();

+ if (it->HasContributingDelegatedRenderPasses()) {

+ RenderPass::Id contributingRenderPassId = it->FirstContributingRenderPassId();

while (frame.renderPassesById.find(contributingRenderPassId) != frame.renderPassesById.end()) {

RenderPass* renderPass = frame.renderPassesById[contributingRenderPassId];

AppendQuadsData appendQuadsData(renderPass->id);

appendQuadsForLayer(renderPass, *it, occlusionTracker, appendQuadsData);

- contributingRenderPassId = it->nextContributingRenderPassId(contributingRenderPassId);

+ contributingRenderPassId = it->NextContributingRenderPassId(contributingRenderPassId);

}

@@ -519,7 +519,7 @@ bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)

if (appendQuadsData.numMissingTiles) {

m_cumulativeNumMissingTiles += appendQuadsData.numMissingTiles;

- bool layerHasAnimatingTransform = it->screenSpaceTransformIsAnimating() || it->drawTransformIsAnimating();

+ bool layerHasAnimatingTransform = it->screen_space_transform_is_animating() || it->draw_transform_is_animating();

if (layerHasAnimatingTransform)

drawFrame = false;

}

@@ -789,7 +789,7 @@ CompositorFrameMetadata LayerTreeHostImpl::MakeCompositorFrameMetadata() const

if (!rootScrollLayer())

return metadata;

- metadata.root_scroll_offset = rootScrollLayer()->scrollOffset() + rootScrollLayer()->scrollDelta();

+ metadata.root_scroll_offset = rootScrollLayer()->scroll_offset() + rootScrollLayer()->scroll_delta();

return metadata;

}

@@ -830,15 +830,15 @@ void LayerTreeHostImpl::drawLayers(FrameData& frame)

// The next frame should start by assuming nothing has changed, and changes are noted as they occur.

for (unsigned int i = 0; i < frame.renderSurfaceLayerList->size(); i++)

- (*frame.renderSurfaceLayerList)[i]->renderSurface()->damage_tracker()->DidDrawDamagedArea();

- rootLayer()->resetAllChangeTrackingForSubtree();

+ (*frame.renderSurfaceLayerList)[i]->render_surface()->damage_tracker()->DidDrawDamagedArea();

+ rootLayer()->ResetAllChangeTrackingForSubtree();

updateAnimationState();

}

void LayerTreeHostImpl::didDrawAllLayers(const FrameData& frame)

{

for (size_t i = 0; i < frame.willDrawLayers.size(); ++i)

- frame.willDrawLayers[i]->didDraw(m_resourceProvider.get());

+ frame.willDrawLayers[i]->DidDraw(m_resourceProvider.get());

// Once all layers have been drawn, pending texture uploads should no

// longer block future uploads.

@@ -901,7 +901,7 @@ bool LayerTreeHostImpl::haveRootScrollLayer() const {

float LayerTreeHostImpl::rootScrollLayerTotalScrollY() const {

if (LayerImpl* layer = rootScrollLayer())

- return layer->scrollOffset().y() + layer->scrollDelta().y();

+ return layer->scroll_offset().y() + layer->scroll_delta().y();

return 0.0f;

}

@@ -931,7 +931,7 @@ static LayerImpl* findScrollLayerForContentLayer(LayerImpl* layerImpl)

if (layerImpl->scrollable())

return layerImpl;

- if (layerImpl->drawsContent() && layerImpl->parent() && layerImpl->parent()->scrollable())

+ if (layerImpl->DrawsContent() && layerImpl->parent() && layerImpl->parent()->scrollable())

return layerImpl->parent();

return 0;

@@ -1005,7 +1005,7 @@ void LayerTreeHostImpl::activatePendingTree()

TreeSynchronizer::pushProperties(m_pendingTree->RootLayer(), m_activeTree->RootLayer());

DCHECK(!m_recycleTree);

- m_pendingTree->pushPropertiesTo(m_activeTree.get());

+ m_pendingTree->PushPropertiesTo(m_activeTree.get());

// Now that we've synced everything from the pending tree to the active

// tree, rename the pending tree the recycle tree so we can reuse it on the

@@ -1138,9 +1138,9 @@ static void adjustScrollsForPageScaleChange(LayerImpl* layerImpl, float pageScal

if (layerImpl->scrollable()) {

// We need to convert impl-side scroll deltas to pageScale space.

- gfx::Vector2dF scrollDelta = layerImpl->scrollDelta();

+ gfx::Vector2dF scrollDelta = layerImpl->scroll_delta();

scrollDelta.Scale(pageScaleChange);

- layerImpl->setScrollDelta(scrollDelta);

+ layerImpl->SetScrollDelta(scrollDelta);

}

for (size_t i = 0; i < layerImpl->children().size(); ++i)

@@ -1200,7 +1200,7 @@ InputHandlerClient::ScrollStatus LayerTreeHostImpl::scrollBegin(gfx::Point viewp

LayerImpl* potentiallyScrollingLayerImpl = 0;

for (; layerImpl; layerImpl = layerImpl->parent()) {

// The content layer can also block attempts to scroll outside the main thread.

- if (layerImpl->tryScroll(deviceViewportPoint, type) == ScrollOnMainThread) {

+ if (layerImpl->TryScroll(deviceViewportPoint, type) == ScrollOnMainThread) {

m_numMainThreadScrolls++;

UMA_HISTOGRAM_BOOLEAN("TryScroll.SlowScroll", true);

return ScrollOnMainThread;

@@ -1210,7 +1210,7 @@ InputHandlerClient::ScrollStatus LayerTreeHostImpl::scrollBegin(gfx::Point viewp

if (!scrollLayerImpl)

continue;

- ScrollStatus status = scrollLayerImpl->tryScroll(deviceViewportPoint, type);

+ ScrollStatus status = scrollLayerImpl->TryScroll(deviceViewportPoint, type);

// If any layer wants to divert the scroll event to the main thread, abort.

if (status == ScrollOnMainThread) {

@@ -1247,9 +1247,9 @@ gfx::Vector2dF LayerTreeHostImpl::scrollLayerWithViewportSpaceDelta(LayerImpl* l

{

// Layers with non-invertible screen space transforms should not have passed the scroll hit

// test in the first place.

- DCHECK(layerImpl->screenSpaceTransform().IsInvertible());

+ DCHECK(layerImpl->screen_space_transform().IsInvertible());

gfx::Transform inverseScreenSpaceTransform(gfx::Transform::kSkipInitialization);

- bool didInvert = layerImpl->screenSpaceTransform().GetInverse(&inverseScreenSpaceTransform);

+ bool didInvert = layerImpl->screen_space_transform().GetInverse(&inverseScreenSpaceTransform);

// TODO: With the advent of impl-side crolling for non-root layers, we may

// need to explicitly handle uninvertible transforms here.

DCHECK(didInvert);

@@ -1273,21 +1273,21 @@ gfx::Vector2dF LayerTreeHostImpl::scrollLayerWithViewportSpaceDelta(LayerImpl* l

return gfx::Vector2dF();

// localStartPoint and localEndPoint are in content space but we want to move them to layer space for scrolling.

- float widthScale = 1 / layerImpl->contentsScaleX();

- float heightScale = 1 / layerImpl->contentsScaleY();

+ float widthScale = 1.f / layerImpl->contents_scale_x();

+ float heightScale = 1.f / layerImpl->contents_scale_y();

localStartPoint.Scale(widthScale, heightScale);

localEndPoint.Scale(widthScale, heightScale);

// Apply the scroll delta.

- gfx::Vector2dF previousDelta = layerImpl->scrollDelta();

- layerImpl->scrollBy(localEndPoint - localStartPoint);

+ gfx::Vector2dF previousDelta = layerImpl->scroll_delta();

+ layerImpl->ScrollBy(localEndPoint - localStartPoint);

// Get the end point in the layer's content space so we can apply its screenSpaceTransform.

- gfx::PointF actualLocalEndPoint = localStartPoint + layerImpl->scrollDelta() - previousDelta;

+ gfx::PointF actualLocalEndPoint = localStartPoint + layerImpl->scroll_delta() - previousDelta;

gfx::PointF actualLocalContentEndPoint = gfx::ScalePoint(actualLocalEndPoint, 1 / widthScale, 1 / heightScale);

// Calculate the applied scroll delta in viewport space coordinates.

- gfx::PointF actualScreenSpaceEndPoint = MathUtil::mapPoint(layerImpl->screenSpaceTransform(), actualLocalContentEndPoint, endClipped);

+ gfx::PointF actualScreenSpaceEndPoint = MathUtil::mapPoint(layerImpl->screen_space_transform(), actualLocalContentEndPoint, endClipped);

DCHECK(!endClipped);

if (endClipped)

return gfx::Vector2dF();

@@ -1297,9 +1297,9 @@ gfx::Vector2dF LayerTreeHostImpl::scrollLayerWithViewportSpaceDelta(LayerImpl* l

static gfx::Vector2dF scrollLayerWithLocalDelta(LayerImpl& layerImpl, gfx::Vector2dF localDelta)

{

- gfx::Vector2dF previousDelta(layerImpl.scrollDelta());

- layerImpl.scrollBy(localDelta);

- return layerImpl.scrollDelta() - previousDelta;

+ gfx::Vector2dF previousDelta(layerImpl.scroll_delta());

+ layerImpl.ScrollBy(localDelta);

+ return layerImpl.scroll_delta() - previousDelta;

}

bool LayerTreeHostImpl::scrollBy(const gfx::Point& viewportPoint,

@@ -1409,10 +1409,10 @@ void LayerTreeHostImpl::pinchGestureUpdate(float magnifyDelta, gfx::Point anchor

move.Scale(1 / activeTree()->page_scale_factor());

- rootScrollLayer()->scrollBy(move);

+ rootScrollLayer()->ScrollBy(move);

- if (rootScrollLayer()->scrollbarAnimationController())

- rootScrollLayer()->scrollbarAnimationController()->didPinchGestureUpdate(base::TimeTicks::Now());

+ if (rootScrollLayer()->scrollbar_animation_controller())

+ rootScrollLayer()->scrollbar_animation_controller()->didPinchGestureUpdate(base::TimeTicks::Now());

m_client->setNeedsCommitOnImplThread();

m_client->setNeedsRedrawOnImplThread();

@@ -1423,8 +1423,8 @@ void LayerTreeHostImpl::pinchGestureEnd()

{

m_pinchGestureActive = false;

- if (rootScrollLayer() && rootScrollLayer()->scrollbarAnimationController())

- rootScrollLayer()->scrollbarAnimationController()->didPinchGestureEnd(base::TimeTicks::Now());

+ if (rootScrollLayer() && rootScrollLayer()->scrollbar_animation_controller())

+ rootScrollLayer()->scrollbar_animation_controller()->didPinchGestureEnd(base::TimeTicks::Now());

m_client->setNeedsCommitOnImplThread();

}

@@ -1434,13 +1434,13 @@ static void collectScrollDeltas(ScrollAndScaleSet* scrollInfo, LayerImpl* layerI

if (!layerImpl)

return;

- gfx::Vector2d scrollDelta = gfx::ToFlooredVector2d(layerImpl->scrollDelta());

+ gfx::Vector2d scrollDelta = gfx::ToFlooredVector2d(layerImpl->scroll_delta());

if (!scrollDelta.IsZero()) {

LayerTreeHostCommon::ScrollUpdateInfo scroll;

scroll.layerId = layerImpl->id();

scroll.scrollDelta = scrollDelta;

scrollInfo->scrolls.push_back(scroll);

- layerImpl->setSentScrollDelta(scrollDelta);

+ layerImpl->SetSentScrollDelta(scrollDelta);

}

for (size_t i = 0; i < layerImpl->children().size(); ++i)

@@ -1461,7 +1461,7 @@ scoped_ptr<ScrollAndScaleSet> LayerTreeHostImpl::processScrollDeltas()

void LayerTreeHostImpl::SetFullRootLayerDamage()

{

if (rootLayer()) {

- RenderSurfaceImpl* renderSurface = rootLayer()->renderSurface();

+ RenderSurfaceImpl* renderSurface = rootLayer()->render_surface();

if (renderSurface)

renderSurface->damage_tracker()->ForceFullDamageNextUpdate();

}

@@ -1473,12 +1473,12 @@ void LayerTreeHostImpl::animatePageScale(base::TimeTicks time)

return;

double monotonicTime = (time - base::TimeTicks()).InSecondsF();

- gfx::Vector2dF scrollTotal = rootScrollLayer()->scrollOffset() + rootScrollLayer()->scrollDelta();

+ gfx::Vector2dF scrollTotal = rootScrollLayer()->scroll_offset() + rootScrollLayer()->scroll_delta();

activeTree()->SetPageScaleDelta(m_pageScaleAnimation->PageScaleFactorAtTime(monotonicTime) / activeTree()->page_scale_factor());

gfx::Vector2dF nextScroll = m_pageScaleAnimation->ScrollOffsetAtTime(monotonicTime);

- rootScrollLayer()->scrollBy(nextScroll - scrollTotal);

+ rootScrollLayer()->ScrollBy(nextScroll - scrollTotal);

m_client->setNeedsRedrawOnImplThread();

if (m_pageScaleAnimation->IsAnimationCompleteAtTime(monotonicTime)) {

@@ -1529,11 +1529,11 @@ base::TimeDelta LayerTreeHostImpl::lowFrequencyAnimationInterval() const

void LayerTreeHostImpl::sendDidLoseOutputSurfaceRecursive(LayerImpl* current)

{

DCHECK(current);

- current->didLoseOutputSurface();

- if (current->maskLayer())

- sendDidLoseOutputSurfaceRecursive(current->maskLayer());

- if (current->replicaLayer())

- sendDidLoseOutputSurfaceRecursive(current->replicaLayer());

+ current->DidLoseOutputSurface();

+ if (current->mask_layer())

+ sendDidLoseOutputSurfaceRecursive(current->mask_layer());

+ if (current->replica_layer())

+ sendDidLoseOutputSurfaceRecursive(current->replica_layer());

for (size_t i = 0; i < current->children().size(); ++i)

sendDidLoseOutputSurfaceRecursive(current->children()[i]);

}

@@ -1549,7 +1549,7 @@ std::string LayerTreeHostImpl::layerTreeAsText() const

{

std::string str;

if (rootLayer()) {

- str = rootLayer()->layerTreeAsText();

+ str = rootLayer()->LayerTreeAsText();

str += "RenderSurfaces:\n";

dumpRenderSurfaces(&str, 1, rootLayer());

}

@@ -1560,7 +1560,7 @@ std::string LayerTreeHostImpl::layerTreeAsJson() const

{

std::string str;

if (rootLayer()) {

- scoped_ptr<base::Value> json(rootLayer()->layerTreeAsJson());

+ scoped_ptr<base::Value> json(rootLayer()->LayerTreeAsJson());

base::JSONWriter::WriteWithOptions(

json.get(), base::JSONWriter::OPTIONS_PRETTY_PRINT, &str);

}

@@ -1569,8 +1569,8 @@ std::string LayerTreeHostImpl::layerTreeAsJson() const

void LayerTreeHostImpl::dumpRenderSurfaces(std::string* str, int indent, const LayerImpl* layer) const

{

- if (layer->renderSurface())

- layer->renderSurface()->DumpSurface(str, indent);

+ if (layer->render_surface())

+ layer->render_surface()->DumpSurface(str, indent);

for (size_t i = 0; i < layer->children().size(); ++i)

dumpRenderSurfaces(str, indent, layer->children()[i]);

@@ -1632,7 +1632,7 @@ void LayerTreeHostImpl::animateScrollbarsRecursive(LayerImpl* layer, base::TimeT

if (!layer)

return;

- ScrollbarAnimationController* scrollbarController = layer->scrollbarAnimationController();

+ ScrollbarAnimationController* scrollbarController = layer->scrollbar_animation_controller();

if (scrollbarController && scrollbarController->animate(time))

m_client->setNeedsRedrawOnImplThread();

@@ -1699,7 +1699,7 @@ LayerImpl* LayerTreeHostImpl::getNonCompositedContentLayerRecursive(LayerImpl* l

if (!layer)

return NULL;

- if (layer->drawsContent())

+ if (layer->DrawsContent())

return layer;

for (LayerImpl::LayerList::const_iterator it = layer->children().begin();

@@ -1716,7 +1716,7 @@ skia::RefPtr<SkPicture> LayerTreeHostImpl::capturePicture()

{

LayerTreeImpl* tree = pendingTree() ? pendingTree() : activeTree();

LayerImpl* layer = getNonCompositedContentLayerRecursive(tree->RootLayer());

- return layer ? layer->getPicture() : skia::RefPtr<SkPicture>();

+ return layer ? layer->GetPicture() : skia::RefPtr<SkPicture>();

}

void LayerTreeHostImpl::setDebugState(const LayerTreeDebugState& debugState)

« no previous file with comments | « cc/layer_tree_host_common_unittest.cc ('k') | cc/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »