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

Unified Diff: components/html_viewer/setup.h

Issue 1189833005: Revert of Support impl-side painting in Mandoline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « components/html_viewer/html_document.cc ('k') | components/html_viewer/web_layer_tree_view_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/setup.h
diff --git a/components/html_viewer/setup.h b/components/html_viewer/setup.h
index 941f3182468d8f008c38bb61a43e95744c1bf324..305ef14dcb1e9341d72d1dcd21c84e6e3c2ff2f8 100644
--- a/components/html_viewer/setup.h
+++ b/components/html_viewer/setup.h
@@ -10,8 +10,6 @@
#include "base/threading/thread.h"
#include "components/html_viewer/discardable_memory_allocator.h"
#include "components/resource_provider/public/cpp/resource_loader.h"
-#include "components/view_manager/gles2/mojo_gpu_memory_buffer_manager.h"
-#include "components/view_manager/gles2/raster_thread_helper.h"
#include "ui/gfx/geometry/size.h"
namespace mojo {
@@ -60,14 +58,6 @@
return compositor_thread_.task_runner();
}
- gles2::RasterThreadHelper* raster_thread_helper() {
- return &raster_thread_helper_;
- }
-
- gles2::MojoGpuMemoryBufferManager* gpu_memory_buffer_manager() {
- return &gpu_memory_buffer_manager_;
- }
-
MediaFactory* media_factory() { return media_factory_.get(); }
private:
@@ -100,8 +90,6 @@
scoped_ptr<scheduler::RendererScheduler> renderer_scheduler_;
scoped_ptr<BlinkPlatformImpl> blink_platform_;
base::Thread compositor_thread_;
- gles2::RasterThreadHelper raster_thread_helper_;
- gles2::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
scoped_ptr<MediaFactory> media_factory_;
DISALLOW_COPY_AND_ASSIGN(Setup);
« no previous file with comments | « components/html_viewer/html_document.cc ('k') | components/html_viewer/web_layer_tree_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698