ui/compositor: use cc/ directly instead of webkit

cc/layer_tiling_data.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 #ifndef CC_LAYER_TILING_DATA_H_
 #define CC_LAYER_TILING_DATA_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 18 matching lines @@
     int numTilesX() const { return m_tilingData.num_tiles_x(); }
     int numTilesY() const { return m_tilingData.num_tiles_y(); }
     gfx::Rect tileBounds(int i, int j) const { return m_tilingData.TileBounds(i, j); }
     gfx::Vector2d textureOffset(int xIndex, int yIndex) const { return m_tilingData.TextureOffset(xIndex, yIndex); }
 
     // Change the tile size. This may invalidate all the existing tiles.
     void setTileSize(const gfx::Size&);
     gfx::Size tileSize() const;
     // Change the border texel setting. This may invalidate all existing tiles.
     void setBorderTexelOption(BorderTexelOption);
-    bool hasBorderTexels() const { return m_tilingData.border_texels(); }
+    bool hasBorderTexels() const { return !!m_tilingData.border_texels(); }
 
     bool isEmpty() const { return hasEmptyBounds() || !tiles().size(); }
 
     const LayerTilingData& operator=(const LayerTilingData&);
 
     class Tile {
     public:
         Tile() : m_i(-1), m_j(-1) { }
         virtual ~Tile() { }
 
@@ skipping 30 matching lines @@
 protected:
     LayerTilingData(const gfx::Size& tileSize, BorderTexelOption);
 
     TileMap m_tiles;
     TilingData m_tilingData;
 };
 
 }
 
 #endif  // CC_LAYER_TILING_DATA_H_