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

Side by Side Diff: Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdateController.h

Issue 10836250: Merge 125577 - [chromium] race between CCLayerTreeHostImpl::releaseContentsTextures and CCThreadPro… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 bool hasMoreUpdates() const; 50 bool hasMoreUpdates() const;
51 void updateMoreTextures(); 51 void updateMoreTextures();
52 52
53 // Virtual for testing. 53 // Virtual for testing.
54 virtual size_t updateMoreTexturesSize() const; 54 virtual size_t updateMoreTexturesSize() const;
55 55
56 protected: 56 protected:
57 CCTextureUpdateController(PassOwnPtr<CCTextureUpdateQueue>, CCResourceProvid er*, TextureCopier*, TextureUploader*); 57 CCTextureUpdateController(PassOwnPtr<CCTextureUpdateQueue>, CCResourceProvid er*, TextureCopier*, TextureUploader*);
58 58
59 OwnPtr<CCTextureUpdateQueue> m_queue; 59 OwnPtr<CCTextureUpdateQueue> m_queue;
60 bool m_contentsTexturesPurged;
60 CCResourceProvider* m_resourceProvider; 61 CCResourceProvider* m_resourceProvider;
61 TextureCopier* m_copier; 62 TextureCopier* m_copier;
62 TextureUploader* m_uploader; 63 TextureUploader* m_uploader;
63 }; 64 };
64 65
65 } 66 }
66 67
67 #endif // CCTextureUpdateController_h 68 #endif // CCTextureUpdateController_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698