Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Side by Side Diff: content/renderer/gpu/render_widget_compositor.h

Issue 1412923004: Revert of Move gpu memory calculations to Compositor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « content/common/gpu/gpu_messages.h ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ 5 #ifndef CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
6 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ 6 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "cc/input/top_controls_state.h" 12 #include "cc/input/top_controls_state.h"
13 #include "cc/output/managed_memory_policy.h"
14 #include "cc/output/swap_promise.h" 13 #include "cc/output/swap_promise.h"
15 #include "cc/trees/layer_tree_host_client.h" 14 #include "cc/trees/layer_tree_host_client.h"
16 #include "cc/trees/layer_tree_host_single_thread_client.h" 15 #include "cc/trees/layer_tree_host_single_thread_client.h"
17 #include "cc/trees/layer_tree_settings.h" 16 #include "cc/trees/layer_tree_settings.h"
18 #include "cc/trees/swap_promise_monitor.h" 17 #include "cc/trees/swap_promise_monitor.h"
19 #include "content/common/content_export.h" 18 #include "content/common/content_export.h"
20 #include "content/renderer/gpu/compositor_dependencies.h" 19 #include "content/renderer/gpu/compositor_dependencies.h"
21 #include "third_party/WebKit/public/platform/WebLayerTreeView.h" 20 #include "third_party/WebKit/public/platform/WebLayerTreeView.h"
22 #include "third_party/skia/include/core/SkBitmap.h" 21 #include "third_party/skia/include/core/SkBitmap.h"
23 #include "ui/gfx/geometry/rect.h" 22 #include "ui/gfx/geometry/rect.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 void SetNeedsUpdateLayers(); 71 void SetNeedsUpdateLayers();
73 void SetNeedsCommit(); 72 void SetNeedsCommit();
74 void NotifyInputThrottledUntilCommit(); 73 void NotifyInputThrottledUntilCommit();
75 const cc::Layer* GetRootLayer() const; 74 const cc::Layer* GetRootLayer() const;
76 int ScheduleMicroBenchmark( 75 int ScheduleMicroBenchmark(
77 const std::string& name, 76 const std::string& name,
78 scoped_ptr<base::Value> value, 77 scoped_ptr<base::Value> value,
79 const base::Callback<void(scoped_ptr<base::Value>)>& callback); 78 const base::Callback<void(scoped_ptr<base::Value>)>& callback);
80 bool SendMessageToMicroBenchmark(int id, scoped_ptr<base::Value> value); 79 bool SendMessageToMicroBenchmark(int id, scoped_ptr<base::Value> value);
81 void SetSurfaceIdNamespace(uint32_t surface_id_namespace); 80 void SetSurfaceIdNamespace(uint32_t surface_id_namespace);
82 cc::ManagedMemoryPolicy GetGpuMemoryPolicy(
83 const cc::ManagedMemoryPolicy& policy);
84 81
85 // WebLayerTreeView implementation. 82 // WebLayerTreeView implementation.
86 void setRootLayer(const blink::WebLayer& layer) override; 83 void setRootLayer(const blink::WebLayer& layer) override;
87 void clearRootLayer() override; 84 void clearRootLayer() override;
88 void attachCompositorAnimationTimeline( 85 void attachCompositorAnimationTimeline(
89 blink::WebCompositorAnimationTimeline* compositor_timeline) override; 86 blink::WebCompositorAnimationTimeline* compositor_timeline) override;
90 void detachCompositorAnimationTimeline( 87 void detachCompositorAnimationTimeline(
91 blink::WebCompositorAnimationTimeline* compositor_timeline) override; 88 blink::WebCompositorAnimationTimeline* compositor_timeline) override;
92 virtual void setViewportSize( 89 virtual void setViewportSize(
93 const blink::WebSize& unused_deprecated, 90 const blink::WebSize& unused_deprecated,
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 189
193 blink::WebLayoutAndPaintAsyncCallback* layout_and_paint_async_callback_; 190 blink::WebLayoutAndPaintAsyncCallback* layout_and_paint_async_callback_;
194 scoped_ptr<cc::CopyOutputRequest> temporary_copy_output_request_; 191 scoped_ptr<cc::CopyOutputRequest> temporary_copy_output_request_;
195 192
196 base::WeakPtrFactory<RenderWidgetCompositor> weak_factory_; 193 base::WeakPtrFactory<RenderWidgetCompositor> weak_factory_;
197 }; 194 };
198 195
199 } // namespace content 196 } // namespace content
200 197
201 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ 198 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_messages.h ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698