cc: Move contentsSwizzled property from LayerTextureUpdater to CCPrioritizedTexture class.

The contentsSwizzled property is true when we upload BGRA contents to
a RGBA texture. Instead of having the LayerTextureUpdater (which is
not responsible for texture uploads) determine the value of this property
set it in CCPrioritizedTexture::upload() when an upload takes place.
This will also allow us to remove the
FrameBufferSkPictureCanvasLayerTextureUpdater class, which currently
only exists so contentsSwizzled is set correctly.

BUG=
TEST=manual

Review URL: https://codereview.chromium.org/11232028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163347 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 2 deletions

diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h
index fa701e0..fcba110 100644
--- a/cc/tiled_layer.h
+++ b/cc/tiled_layer.h
@@ -48,7 +48,6 @@ protected:
     void setTileSize(const IntSize&);
     void setTextureFormat(GLenum textureFormat) { m_textureFormat = textureFormat; }
     void setBorderTexelOption(CCLayerTilingData::BorderTexelOption);
-    void setSampledTexelFormat(LayerTextureUpdater::SampledTexelFormat sampledTexelFormat) { m_sampledTexelFormat = sampledTexelFormat; }
     size_t numPaintedTiles() { return m_tiler->tiles().size(); }
 
     virtual LayerTextureUpdater* textureUpdater() const = 0;
@@ -91,7 +90,6 @@ private:
     GLenum m_textureFormat;
     bool m_skipsDraw;
     bool m_failedUpdate;
-    LayerTextureUpdater::SampledTexelFormat m_sampledTexelFormat;
 
     TilingOption m_tilingOption;
     scoped_ptr<CCLayerTilingData> m_tiler;