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

Side by Side Diff: cc/resource_provider.h

Issue 11363207: Remove crash instrumentation, since we haven't seen a crash in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « cc/layer_tree_host.cc ('k') | cc/resource_provider.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 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 #ifndef CC_RESOURCE_PROVIDER_H_ 5 #ifndef CC_RESOURCE_PROVIDER_H_
6 #define CC_RESOURCE_PROVIDER_H_ 6 #define CC_RESOURCE_PROVIDER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/hash_tables.h" 9 #include "base/hash_tables.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 190
191 private: 191 private:
192 ResourceProvider* m_resourceProvider; 192 ResourceProvider* m_resourceProvider;
193 ResourceProvider::ResourceId m_resourceId; 193 ResourceProvider::ResourceId m_resourceId;
194 SkBitmap m_skBitmap; 194 SkBitmap m_skBitmap;
195 scoped_ptr<SkCanvas> m_skCanvas; 195 scoped_ptr<SkCanvas> m_skCanvas;
196 196
197 DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockSoftware); 197 DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockSoftware);
198 }; 198 };
199 199
200 // Temporary functions for debugging crashes in issue 151428 in canary.
201 // Do not use these!
202 static void debugNotifyEnterZone(unsigned int index);
203 static void debugNotifyLeaveZone();
204
205 private: 200 private:
206 struct Resource { 201 struct Resource {
207 Resource(); 202 Resource();
208 Resource(unsigned textureId, int pool, const gfx::Size& size, GLenum for mat); 203 Resource(unsigned textureId, int pool, const gfx::Size& size, GLenum for mat);
209 Resource(uint8_t* pixels, int pool, const gfx::Size& size, GLenum format ); 204 Resource(uint8_t* pixels, int pool, const gfx::Size& size, GLenum format );
210 205
211 unsigned glId; 206 unsigned glId;
212 Mailbox mailbox; 207 Mailbox mailbox;
213 uint8_t* pixels; 208 uint8_t* pixels;
214 int pool; 209 int pool;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 int m_maxTextureSize; 254 int m_maxTextureSize;
260 255
261 base::ThreadChecker m_threadChecker; 256 base::ThreadChecker m_threadChecker;
262 257
263 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); 258 DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
264 }; 259 };
265 260
266 } 261 }
267 262
268 #endif // CC_RESOURCE_PROVIDER_H_ 263 #endif // CC_RESOURCE_PROVIDER_H_
OLDNEW
« no previous file with comments | « cc/layer_tree_host.cc ('k') | cc/resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698