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

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

Issue 7982004: Merge 95506 - [chromium] ContentLayer's texture updater deleted during paint when compositing tur... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 3 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 virtual void cleanupResources(); 66 virtual void cleanupResources();
67 virtual void createTextureUpdater(const CCLayerTreeHost*); 67 virtual void createTextureUpdater(const CCLayerTreeHost*);
68 void setTilingOption(TilingOption); 68 void setTilingOption(TilingOption);
69 69
70 virtual LayerTextureUpdater* textureUpdater() const; 70 virtual LayerTextureUpdater* textureUpdater() const;
71 virtual IntSize contentBounds() const; 71 virtual IntSize contentBounds() const;
72 72
73 NativeImagePtr m_imageForCurrentFrame; 73 NativeImagePtr m_imageForCurrentFrame;
74 RefPtr<Image> m_contents; 74 RefPtr<Image> m_contents;
75 75
76 OwnPtr<ImageLayerTextureUpdater> m_textureUpdater; 76 RefPtr<ImageLayerTextureUpdater> m_textureUpdater;
77 }; 77 };
78 78
79 } 79 }
80 #endif // USE(ACCELERATED_COMPOSITING) 80 #endif // USE(ACCELERATED_COMPOSITING)
81 81
82 #endif 82 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698