summaryrefslogtreecommitdiffstats
path: root/ui/compositor
diff options
context:
space:
mode:
authormlamouri <mlamouri@chromium.org>2015-07-24 16:31:22 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-24 23:32:04 +0000
commit0570e9bab6c91b34ae3329383f3ae1097a98c29d (patch)
tree00110225a92dbef5934c9017986fb754797a8692 /ui/compositor
parentb25899d3a756307c8c320472b484e7fbb56295c3 (diff)
downloadchromium_src-0570e9bab6c91b34ae3329383f3ae1097a98c29d.zip
chromium_src-0570e9bab6c91b34ae3329383f3ae1097a98c29d.tar.gz
chromium_src-0570e9bab6c91b34ae3329383f3ae1097a98c29d.tar.bz2
Remove unused private fields in ui/compositor/.
This needed in order to use "= delete" for DISALLOW_COPY_AND_ASSIGN. BUG=447445 Review URL: https://codereview.chromium.org/1242603002 Cr-Commit-Position: refs/heads/master@{#340377}
Diffstat (limited to 'ui/compositor')
-rw-r--r--ui/compositor/test/in_process_context_factory.cc6
-rw-r--r--ui/compositor/test/in_process_context_provider.cc10
-rw-r--r--ui/compositor/test/in_process_context_provider.h6
3 files changed, 4 insertions, 18 deletions
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index d606f5b..a6620e7 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -105,12 +105,10 @@ void InProcessContextFactory::CreateOutputSurface(
attribs.sample_buffers = 0;
attribs.fail_if_major_perf_caveat = false;
attribs.bind_generates_resource = false;
- bool lose_context_when_out_of_memory = true;
scoped_refptr<InProcessContextProvider> context_provider =
InProcessContextProvider::Create(attribs, &gpu_memory_buffer_manager_,
&image_factory_,
- lose_context_when_out_of_memory,
compositor->widget(), "UICompositor");
scoped_ptr<cc::OutputSurface> real_output_surface;
@@ -161,10 +159,8 @@ InProcessContextFactory::SharedMainThreadContextProvider() {
!shared_main_thread_contexts_->DestroyedOnMainThread())
return shared_main_thread_contexts_;
- bool lose_context_when_out_of_memory = false;
shared_main_thread_contexts_ = InProcessContextProvider::CreateOffscreen(
- &gpu_memory_buffer_manager_, &image_factory_,
- lose_context_when_out_of_memory);
+ &gpu_memory_buffer_manager_, &image_factory_);
if (shared_main_thread_contexts_.get() &&
!shared_main_thread_contexts_->BindToCurrentThread())
shared_main_thread_contexts_ = NULL;
diff --git a/ui/compositor/test/in_process_context_provider.cc b/ui/compositor/test/in_process_context_provider.cc
index a29bb9d..c5f950f 100644
--- a/ui/compositor/test/in_process_context_provider.cc
+++ b/ui/compositor/test/in_process_context_provider.cc
@@ -42,20 +42,17 @@ scoped_refptr<InProcessContextProvider> InProcessContextProvider::Create(
const gpu::gles2::ContextCreationAttribHelper& attribs,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
gpu::ImageFactory* image_factory,
- bool lose_context_when_out_of_memory,
gfx::AcceleratedWidget window,
const std::string& debug_name) {
return new InProcessContextProvider(
- attribs, gpu_memory_buffer_manager, image_factory,
- lose_context_when_out_of_memory, window, debug_name);
+ attribs, gpu_memory_buffer_manager, image_factory, window, debug_name);
}
// static
scoped_refptr<InProcessContextProvider>
InProcessContextProvider::CreateOffscreen(
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
- gpu::ImageFactory* image_factory,
- bool lose_context_when_out_of_memory) {
+ gpu::ImageFactory* image_factory) {
gpu::gles2::ContextCreationAttribHelper attribs;
attribs.alpha_size = 8;
attribs.blue_size = 8;
@@ -69,7 +66,6 @@ InProcessContextProvider::CreateOffscreen(
attribs.bind_generates_resource = false;
return new InProcessContextProvider(attribs, gpu_memory_buffer_manager,
image_factory,
- lose_context_when_out_of_memory,
gfx::kNullAcceleratedWidget, "Offscreen");
}
@@ -77,13 +73,11 @@ InProcessContextProvider::InProcessContextProvider(
const gpu::gles2::ContextCreationAttribHelper& attribs,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
gpu::ImageFactory* image_factory,
- bool lose_context_when_out_of_memory,
gfx::AcceleratedWidget window,
const std::string& debug_name)
: attribs_(attribs),
gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
image_factory_(image_factory),
- lose_context_when_out_of_memory_(lose_context_when_out_of_memory),
window_(window),
debug_name_(debug_name),
destroyed_(false) {
diff --git a/ui/compositor/test/in_process_context_provider.h b/ui/compositor/test/in_process_context_provider.h
index 4edc464..bc3e494 100644
--- a/ui/compositor/test/in_process_context_provider.h
+++ b/ui/compositor/test/in_process_context_provider.h
@@ -30,22 +30,19 @@ class InProcessContextProvider : public cc::ContextProvider {
const gpu::gles2::ContextCreationAttribHelper& attribs,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
gpu::ImageFactory* image_factory,
- bool lose_context_when_out_of_memory,
gfx::AcceleratedWidget window,
const std::string& debug_name);
// Uses default attributes for creating an offscreen context.
static scoped_refptr<InProcessContextProvider> CreateOffscreen(
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
- gpu::ImageFactory* image_factory,
- bool lose_context_when_out_of_memory);
+ gpu::ImageFactory* image_factory);
private:
InProcessContextProvider(
const gpu::gles2::ContextCreationAttribHelper& attribs,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
gpu::ImageFactory* image_factory,
- bool lose_context_when_out_of_memory,
gfx::AcceleratedWidget window,
const std::string& debug_name);
~InProcessContextProvider() override;
@@ -79,7 +76,6 @@ class InProcessContextProvider : public cc::ContextProvider {
gpu::gles2::ContextCreationAttribHelper attribs_;
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
gpu::ImageFactory* image_factory_;
- bool lose_context_when_out_of_memory_;
gfx::AcceleratedWidget window_;
std::string debug_name_;
cc::ContextProvider::Capabilities capabilities_;