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

Side by Side Diff: cc/trees/layer_tree_host_unittest.cc

Issue 197883017: SkColorType instead of (deprecated) SkBitmap::Config (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
(...skipping 2025 matching lines...) Expand 10 before | Expand all | Expand 10 after
2036 private: 2036 private:
2037 EvictionTestLayer() : Layer() {} 2037 EvictionTestLayer() : Layer() {}
2038 virtual ~EvictionTestLayer() {} 2038 virtual ~EvictionTestLayer() {}
2039 2039
2040 void CreateTextureIfNeeded() { 2040 void CreateTextureIfNeeded() {
2041 if (texture_) 2041 if (texture_)
2042 return; 2042 return;
2043 texture_ = PrioritizedResource::Create( 2043 texture_ = PrioritizedResource::Create(
2044 layer_tree_host()->contents_texture_manager()); 2044 layer_tree_host()->contents_texture_manager());
2045 texture_->SetDimensions(gfx::Size(10, 10), RGBA_8888); 2045 texture_->SetDimensions(gfx::Size(10, 10), RGBA_8888);
2046 bitmap_.setConfig(SkBitmap::kARGB_8888_Config, 10, 10); 2046 bitmap_.allocN32Pixels(10, 10);
2047 bitmap_.allocPixels();
2048 } 2047 }
2049 2048
2050 scoped_ptr<PrioritizedResource> texture_; 2049 scoped_ptr<PrioritizedResource> texture_;
2051 SkBitmap bitmap_; 2050 SkBitmap bitmap_;
2052 }; 2051 };
2053 2052
2054 class EvictionTestLayerImpl : public LayerImpl { 2053 class EvictionTestLayerImpl : public LayerImpl {
2055 public: 2054 public:
2056 static scoped_ptr<EvictionTestLayerImpl> Create(LayerTreeImpl* tree_impl, 2055 static scoped_ptr<EvictionTestLayerImpl> Create(LayerTreeImpl* tree_impl,
2057 int id) { 2056 int id) {
(...skipping 3134 matching lines...) Expand 10 before | Expand all | Expand 10 after
5192 } 5191 }
5193 5192
5194 virtual void AfterTest() OVERRIDE {} 5193 virtual void AfterTest() OVERRIDE {}
5195 5194
5196 FakeContentLayerClient client_; 5195 FakeContentLayerClient client_;
5197 }; 5196 };
5198 5197
5199 MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterizationSetting); 5198 MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterizationSetting);
5200 5199
5201 } // namespace cc 5200 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698