| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 #include "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "cc/tiled_layer.h" | 7 #include "cc/tiled_layer.h" |
| 8 | 8 |
| 9 #include "CCLayerImpl.h" | 9 #include "CCLayerImpl.h" |
| 10 #include "CCLayerTreeHost.h" | 10 #include "CCLayerTreeHost.h" |
| 11 #include "CCOverdrawMetrics.h" | 11 #include "CCOverdrawMetrics.h" |
| 12 #include "CCTextureUpdateQueue.h" | 12 #include "CCTextureUpdateQueue.h" |
| 13 #include "CCTiledLayerImpl.h" | 13 #include "CCTiledLayerImpl.h" |
| 14 #include "Region.h" | 14 #include "Region.h" |
| 15 #include "base/basictypes.h" | 15 #include "base/basictypes.h" |
| 16 #include "third_party/khronos/GLES2/gl2.h" |
| 16 | 17 |
| 17 using namespace std; | 18 using namespace std; |
| 18 using WebKit::WebTransformationMatrix; | 19 using WebKit::WebTransformationMatrix; |
| 19 | 20 |
| 20 namespace cc { | 21 namespace cc { |
| 21 | 22 |
| 22 class UpdatableTile : public CCLayerTilingData::Tile { | 23 class UpdatableTile : public CCLayerTilingData::Tile { |
| 23 public: | 24 public: |
| 24 static scoped_ptr<UpdatableTile> create(scoped_ptr<LayerTextureUpdater::Text
ure> texture) | 25 static scoped_ptr<UpdatableTile> create(scoped_ptr<LayerTextureUpdater::Text
ure> texture) |
| 25 { | 26 { |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 { | 71 { |
| 71 } | 72 } |
| 72 | 73 |
| 73 scoped_ptr<LayerTextureUpdater::Texture> m_texture; | 74 scoped_ptr<LayerTextureUpdater::Texture> m_texture; |
| 74 | 75 |
| 75 DISALLOW_COPY_AND_ASSIGN(UpdatableTile); | 76 DISALLOW_COPY_AND_ASSIGN(UpdatableTile); |
| 76 }; | 77 }; |
| 77 | 78 |
| 78 TiledLayerChromium::TiledLayerChromium() | 79 TiledLayerChromium::TiledLayerChromium() |
| 79 : LayerChromium() | 80 : LayerChromium() |
| 80 , m_textureFormat(GraphicsContext3D::INVALID_ENUM) | 81 , m_textureFormat(GL_INVALID_ENUM) |
| 81 , m_skipsDraw(false) | 82 , m_skipsDraw(false) |
| 82 , m_failedUpdate(false) | 83 , m_failedUpdate(false) |
| 83 , m_sampledTexelFormat(LayerTextureUpdater::SampledTexelFormatInvalid) | 84 , m_sampledTexelFormat(LayerTextureUpdater::SampledTexelFormatInvalid) |
| 84 , m_tilingOption(AutoTile) | 85 , m_tilingOption(AutoTile) |
| 85 { | 86 { |
| 86 m_tiler = CCLayerTilingData::create(IntSize(), CCLayerTilingData::HasBorderT
exels); | 87 m_tiler = CCLayerTilingData::create(IntSize(), CCLayerTilingData::HasBorderT
exels); |
| 87 } | 88 } |
| 88 | 89 |
| 89 TiledLayerChromium::~TiledLayerChromium() | 90 TiledLayerChromium::~TiledLayerChromium() |
| 90 { | 91 { |
| (...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 779 IntRect prepaintRect = visibleContentRect(); | 780 IntRect prepaintRect = visibleContentRect(); |
| 780 prepaintRect.inflateX(m_tiler->tileSize().width()); | 781 prepaintRect.inflateX(m_tiler->tileSize().width()); |
| 781 prepaintRect.inflateY(m_tiler->tileSize().height() * 2); | 782 prepaintRect.inflateY(m_tiler->tileSize().height() * 2); |
| 782 IntRect contentRect(IntPoint::zero(), contentBounds()); | 783 IntRect contentRect(IntPoint::zero(), contentBounds()); |
| 783 prepaintRect.intersect(contentRect); | 784 prepaintRect.intersect(contentRect); |
| 784 | 785 |
| 785 return prepaintRect; | 786 return prepaintRect; |
| 786 } | 787 } |
| 787 | 788 |
| 788 } | 789 } |
| OLD | NEW |