| Index: cc/layer_tree_host_impl.cc
|
| diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
|
| index 26e1b3dc40d961978c4b35d5e5ca05b6d6750c94..bb57666c7bb80783ed2735e72e5b6c166255678b 100644
|
| --- a/cc/layer_tree_host_impl.cc
|
| +++ b/cc/layer_tree_host_impl.cc
|
| @@ -809,7 +809,7 @@ void LayerTreeHostImpl::setManagedMemoryPolicy(const ManagedMemoryPolicy& policy
|
| m_client->setNeedsCommitOnImplThread();
|
| }
|
|
|
| -void LayerTreeHostImpl::onVSyncParametersChanged(double monotonicTimebase, double intervalInSeconds)
|
| +void LayerTreeHostImpl::OnVSyncParametersChanged(double monotonicTimebase, double intervalInSeconds)
|
| {
|
| base::TimeTicks timebase = base::TimeTicks::FromInternalValue(monotonicTimebase * base::Time::kMicrosecondsPerSecond);
|
| base::TimeDelta interval = base::TimeDelta::FromMicroseconds(intervalInSeconds * base::Time::kMicrosecondsPerSecond);
|
| @@ -998,7 +998,7 @@ bool LayerTreeHostImpl::initializeRenderer(scoped_ptr<GraphicsContext> context)
|
| m_resourceProvider.reset();
|
| m_context.reset();
|
|
|
| - if (!context->bindToClient(this))
|
| + if (!context->BindToClient(this))
|
| return false;
|
|
|
| scoped_ptr<ResourceProvider> resourceProvider = ResourceProvider::create(context.get());
|
| @@ -1008,10 +1008,10 @@ bool LayerTreeHostImpl::initializeRenderer(scoped_ptr<GraphicsContext> context)
|
| if (m_settings.implSidePainting)
|
| m_tileManager.reset(new TileManager(this, resourceProvider.get()));
|
|
|
| - if (context->context3D())
|
| + if (context->Context3D())
|
| m_renderer = GLRenderer::create(this, resourceProvider.get());
|
| - else if (context->softwareDevice())
|
| - m_renderer = SoftwareRenderer::create(this, resourceProvider.get(), context->softwareDevice());
|
| + else if (context->SoftwareDevice())
|
| + m_renderer = SoftwareRenderer::create(this, resourceProvider.get(), context->SoftwareDevice());
|
| if (!m_renderer)
|
| return false;
|
|
|
|
|