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

Side by Side Diff: cc/resources/resource_provider.cc

Issue 41903003: cc: Fix incomplete changes to add ETC1 support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased and moved pixel ref class to public cc Created 7 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #include "cc/resources/resource_provider.h" 5 #include "cc/resources/resource_provider.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 : output_surface_(output_surface), 869 : output_surface_(output_surface),
870 shared_bitmap_manager_(shared_bitmap_manager), 870 shared_bitmap_manager_(shared_bitmap_manager),
871 lost_output_surface_(false), 871 lost_output_surface_(false),
872 highp_threshold_min_(highp_threshold_min), 872 highp_threshold_min_(highp_threshold_min),
873 next_id_(1), 873 next_id_(1),
874 next_child_(1), 874 next_child_(1),
875 default_resource_type_(InvalidType), 875 default_resource_type_(InvalidType),
876 use_texture_storage_ext_(false), 876 use_texture_storage_ext_(false),
877 use_texture_usage_hint_(false), 877 use_texture_usage_hint_(false),
878 use_shallow_flush_(false), 878 use_shallow_flush_(false),
879 use_compressed_texture_etc1_(false),
879 max_texture_size_(0), 880 max_texture_size_(0),
880 best_texture_format_(RGBA_8888), 881 best_texture_format_(RGBA_8888),
881 use_rgba_4444_texture_format_(use_rgba_4444_texture_format), 882 use_rgba_4444_texture_format_(use_rgba_4444_texture_format),
882 id_allocation_chunk_size_(id_allocation_chunk_size) { 883 id_allocation_chunk_size_(id_allocation_chunk_size) {
883 DCHECK(output_surface_->HasClient()); 884 DCHECK(output_surface_->HasClient());
884 DCHECK(id_allocation_chunk_size_); 885 DCHECK(id_allocation_chunk_size_);
885 } 886 }
886 887
887 void ResourceProvider::InitializeSoftware() { 888 void ResourceProvider::InitializeSoftware() {
888 DCHECK(thread_checker_.CalledOnValidThread()); 889 DCHECK(thread_checker_.CalledOnValidThread());
(...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after
1809 context->getIntegerv(GL_ACTIVE_TEXTURE, &active_unit); 1810 context->getIntegerv(GL_ACTIVE_TEXTURE, &active_unit);
1810 return active_unit; 1811 return active_unit;
1811 } 1812 }
1812 1813
1813 blink::WebGraphicsContext3D* ResourceProvider::Context3d() const { 1814 blink::WebGraphicsContext3D* ResourceProvider::Context3d() const {
1814 ContextProvider* context_provider = output_surface_->context_provider(); 1815 ContextProvider* context_provider = output_surface_->context_provider();
1815 return context_provider ? context_provider->Context3d() : NULL; 1816 return context_provider ? context_provider->Context3d() : NULL;
1816 } 1817 }
1817 1818
1818 } // namespace cc 1819 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698