ui/compositor: use cc/ directly instead of webkit

cc/layer.h

 // Copyright 2010 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_H_
 #define CC_LAYER_H_
 
 #include "base/memory/ref_counted.h"
 #include "cc/cc_export.h"
 #include "cc/layer_animation_controller.h"
@@ skipping 167 matching lines @@
 
     virtual void setLayerTreeHost(LayerTreeHost*);
 
     bool hasContributingDelegatedRenderPasses() const { return false; }
 
     void setIsDrawable(bool);
 
     void setReplicaLayer(Layer*);
     Layer* replicaLayer() const { return m_replicaLayer.get(); }
 
-    bool hasMask() const { return m_maskLayer; }
-    bool hasReplica() const { return m_replicaLayer; }
+    bool hasMask() const { return !!m_maskLayer; }
+    bool hasReplica() const { return !!m_replicaLayer; }
     bool replicaHasMask() const { return m_replicaLayer && (m_maskLayer || m_replicaLayer->m_maskLayer); }
 
     // These methods typically need to be overwritten by derived classes.
     virtual bool drawsContent() const;
     virtual void update(ResourceUpdateQueue&, const OcclusionTracker*, RenderingStats&) { }
     virtual bool needMoreUpdates();
     virtual void setIsMask(bool) { }
     virtual void bindContentsTexture() { }
 
     void setDebugName(const std::string&);
@@ skipping 203 matching lines @@
 
     WebKit::WebAnimationDelegate* m_layerAnimationDelegate;
     WebKit::WebLayerScrollClient* m_layerScrollClient;
 };
 
 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped_refptr<Layer> >::iterator, void*);
 
 }  // namespace cc
 
 #endif  // CC_LAYER_H_