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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/picture_image_layer.h

Issue 12328153: Merge 184464 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/debug_colors.cc ('k') | cc/picture_image_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/picture_image_layer.h
===================================================================
--- cc/picture_image_layer.h (revision 185037)
+++ cc/picture_image_layer.h (working copy)
@@ -20,10 +20,9 @@
void setBitmap(const SkBitmap& image);
// Layer implementation.
- virtual void update(
- ResourceUpdateQueue& queue,
- const OcclusionTracker* tracker,
- RenderingStats* stats) OVERRIDE;
+ virtual scoped_ptr<LayerImpl> createLayerImpl(
+ LayerTreeImpl* treeImpl) OVERRIDE;
+ virtual bool drawsContent() const OVERRIDE;
// ContentLayerClient implementation.
virtual void paintContents(
@@ -36,7 +35,6 @@
virtual ~PictureImageLayer();
SkBitmap bitmap_;
- gfx::Size bounds_;
};
} // namespace cc
« no previous file with comments | « cc/debug_colors.cc ('k') | cc/picture_image_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698