Index: cc/trees/layer_tree_host_impl.cc |
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc |
index 8a603fae1c2a3f4b3ee3e65c311883c8f1091ad4..86c12b27c092e5f9ebccaf7282a71095539fe547 100644 |
--- a/cc/trees/layer_tree_host_impl.cc |
+++ b/cc/trees/layer_tree_host_impl.cc |
@@ -156,10 +156,11 @@ size_t GetMaxStagingResourceCount() { |
} // namespace |
-LayerTreeHostImpl::FrameData::FrameData() : has_no_damage(false) { |
+FrameData::FrameData() : has_no_damage(false) { |
} |
-LayerTreeHostImpl::FrameData::~FrameData() {} |
+FrameData::~FrameData() { |
+} |
scoped_ptr<LayerTreeHostImpl> LayerTreeHostImpl::Create( |
const LayerTreeSettings& settings, |
@@ -549,8 +550,7 @@ void LayerTreeHostImpl::TrackDamageForAllSurfaces( |
} |
} |
-void LayerTreeHostImpl::FrameData::AsValueInto( |
- base::trace_event::TracedValue* value) const { |
+void FrameData::AsValueInto(base::trace_event::TracedValue* value) const { |
value->SetBoolean("has_no_damage", has_no_damage); |
// Quad data can be quite large, so only dump render passes if we select |
@@ -569,8 +569,7 @@ void LayerTreeHostImpl::FrameData::AsValueInto( |
} |
} |
-void LayerTreeHostImpl::FrameData::AppendRenderPass( |
- scoped_ptr<RenderPass> render_pass) { |
+void FrameData::AppendRenderPass(scoped_ptr<RenderPass> render_pass) { |
render_passes_by_id[render_pass->id] = render_pass.get(); |
render_passes.push_back(render_pass.Pass()); |
} |
@@ -949,16 +948,15 @@ void LayerTreeHostImpl::SetViewportDamage(const gfx::Rect& damage_rect) { |
viewport_damage_rect_.Union(damage_rect); |
} |
-static inline RenderPass* FindRenderPassById( |
- RenderPassId render_pass_id, |
- const LayerTreeHostImpl::FrameData& frame) { |
+static inline RenderPass* FindRenderPassById(RenderPassId render_pass_id, |
+ const FrameData& frame) { |
RenderPassIdHashMap::const_iterator it = |
frame.render_passes_by_id.find(render_pass_id); |
return it != frame.render_passes_by_id.end() ? it->second : NULL; |
} |
static void RemoveRenderPassesRecursive(RenderPassId remove_render_pass_id, |
- LayerTreeHostImpl::FrameData* frame) { |
+ FrameData* frame) { |
RenderPass* remove_render_pass = |
FindRenderPassById(remove_render_pass_id, *frame); |
// The pass was already removed by another quad - probably the original, and |
@@ -1629,7 +1627,7 @@ LayerTreeHostImpl::GetRendererCapabilities() const { |
return renderer_->Capabilities(); |
} |
-bool LayerTreeHostImpl::SwapBuffers(const LayerTreeHostImpl::FrameData& frame) { |
+bool LayerTreeHostImpl::SwapBuffers(const FrameData& frame) { |
ResetRequiresHighResToDraw(); |
if (frame.has_no_damage) { |
active_tree()->BreakSwapPromises(SwapPromise::SWAP_FAILS); |