Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / layers / nine_patch_layer.h

diff --git a/src/cc/layers/nine_patch_layer.h b/src/cc/layers/nine_patch_layer.h
index dc9f81f..9054610 100644 (file)
--- a/src/cc/layers/nine_patch_layer.h
+++ b/src/cc/layers/nine_patch_layer.h
@@ -10,7 +10,7 @@
 #include "cc/layers/layer.h"
 #include "cc/layers/ui_resource_layer.h"
 #include "cc/resources/ui_resource_client.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 
@@ -21,14 +21,14 @@ class CC_EXPORT NinePatchLayer : public UIResourceLayer {
  public:
   static scoped_refptr<NinePatchLayer> Create();
 
-  virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
+  void PushPropertiesTo(LayerImpl* layer) override;
 
   // |border| is the space around the center rectangular region in layer space
   // (known as aperture in image space).  |border.x()| and |border.y()| are the
   // size of the left and top boundary, respectively.
   // |border.width()-border.x()| and |border.height()-border.y()| are the size
   // of the right and bottom boundary, respectively.
-  void SetBorder(gfx::Rect border);
+  void SetBorder(const gfx::Rect& border);
 
   // aperture is in the pixel space of the bitmap resource and refers to
   // the center patch of the ninepatch (which is unused in this
@@ -36,14 +36,13 @@ class CC_EXPORT NinePatchLayer : public UIResourceLayer {
   // on the edges of the layer. The corners are unscaled, the top and bottom
   // rects are x-stretched to fit, and the left and right rects are
   // y-stretched to fit.
-  void SetAperture(gfx::Rect aperture);
+  void SetAperture(const gfx::Rect& aperture);
   void SetFillCenter(bool fill_center);
 
  private:
   NinePatchLayer();
-  virtual ~NinePatchLayer();
-  virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
-      OVERRIDE;
+  ~NinePatchLayer() override;
+  scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
 
   gfx::Rect border_;
   bool fill_center_;