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

Side by Side Diff: cc/CCLayerTilingData.cpp

Issue 10947047: Fix remaining cc files to compile with Clang (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix FakeCCDelayBasedTimeSource Created 8 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 | Annotate | Revision Log
« no previous file with comments | « cc/CCLayerTilingData.h ('k') | cc/CCScopedThreadProxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 5
6 #include "config.h" 6 #include "config.h"
7 7
8 #if USE(ACCELERATED_COMPOSITING) 8 #if USE(ACCELERATED_COMPOSITING)
9 9
10 #include "CCLayerTilingData.h" 10 #include "CCLayerTilingData.h"
11 11
12 using namespace std; 12 using namespace std;
13 13
14 namespace cc { 14 namespace cc {
15 15
16 PassOwnPtr<CCLayerTilingData> CCLayerTilingData::create(const IntSize& tileSize, BorderTexelOption border) 16 PassOwnPtr<CCLayerTilingData> CCLayerTilingData::create(const IntSize& tileSize, BorderTexelOption border)
17 { 17 {
18 return adoptPtr(new CCLayerTilingData(tileSize, border)); 18 return adoptPtr(new CCLayerTilingData(tileSize, border));
19 } 19 }
20 20
21 CCLayerTilingData::CCLayerTilingData(const IntSize& tileSize, BorderTexelOption border) 21 CCLayerTilingData::CCLayerTilingData(const IntSize& tileSize, BorderTexelOption border)
22 : m_tilingData(tileSize, IntSize(), border == HasBorderTexels) 22 : m_tilingData(tileSize, IntSize(), border == HasBorderTexels)
23 { 23 {
24 setTileSize(tileSize); 24 setTileSize(tileSize);
25 } 25 }
26 26
27 CCLayerTilingData::~CCLayerTilingData()
28 {
29 }
30
27 void CCLayerTilingData::setTileSize(const IntSize& size) 31 void CCLayerTilingData::setTileSize(const IntSize& size)
28 { 32 {
29 if (tileSize() == size) 33 if (tileSize() == size)
30 return; 34 return;
31 35
32 reset(); 36 reset();
33 37
34 m_tilingData.setMaxTextureSize(size); 38 m_tilingData.setMaxTextureSize(size);
35 } 39 }
36 40
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 } 149 }
146 150
147 IntSize CCLayerTilingData::bounds() const 151 IntSize CCLayerTilingData::bounds() const
148 { 152 {
149 return m_tilingData.totalSize(); 153 return m_tilingData.totalSize();
150 } 154 }
151 155
152 } // namespace cc 156 } // namespace cc
153 157
154 #endif // USE(ACCELERATED_COMPOSITING) 158 #endif // USE(ACCELERATED_COMPOSITING)
OLDNEW
« no previous file with comments | « cc/CCLayerTilingData.h ('k') | cc/CCScopedThreadProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698