Move PlatformCanvas and PlatformDevice from base/gfx to webkit/port. I left h...

webkit/port/platform/graphics/skia/public/PlatformCanvasMac.h

 // Copyright (c) 2006-2008 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 BASE_GFX_PLATFORM_CANVAS_MAC_H__
-#define BASE_GFX_PLATFORM_CANVAS_MAC_H__
+#ifndef PlatformCanvasMac_h
+#define PlatformCanvasMac_h
 
-#include "base/gfx/platform_device_mac.h"
-#include "base/basictypes.h"
+#include "PlatformDeviceMac.h"
 
-#import "SkCanvas.h"
+#include "SkCanvas.h"
 
 namespace gfx {
 
 // This class is a specialization of the regular SkCanvas that is designed to
 // work with a gfx::PlatformDevice to manage platform-specific drawing. It
 // allows using both Skia operations and platform-specific operations.
 class PlatformCanvasMac : public SkCanvas {
  public:
   // Set is_opaque if you are going to erase the bitmap and not use
   // tranparency: this will enable some optimizations.  The shared_section
@@ skipping 16 matching lines @@
   virtual CGContextRef beginPlatformPaint();
   virtual void endPlatformPaint();
 
   // Returns the platform device pointer of the topmost rect with a non-empty
   // clip. In practice, this is usually either the top layer or nothing, since
   // we usually set the clip to new layers when we make them.
   //
   // If there is no layer that is not all clipped out, this will return a
   // dummy device so callers do not have to check. If you are concerned about
   // performance, check the clip before doing any painting.
-  //  
+  //
   // This is different than SkCanvas' getDevice, because that returns the
   // bottommost device.
   //
   // Danger: the resulting device should not be saved. It will be invalidated
   // by the next call to save() or restore().
   PlatformDeviceMac& getTopPlatformDevice() const;
 
   // Allow callers to see the non-virtual function even though we have an
   // override of a virtual one.
   using SkCanvas::clipRect;
@@ skipping 12 matching lines @@
 
  private:
   // Unimplemented. This is to try to prevent people from calling this function
   // on SkCanvas. SkCanvas' version is not virtual, so we can't prevent this
   // 100%, but hopefully this will make people notice and not use the function.
   // Calling SkCanvas' version will create a new device which is not compatible
   // with us and we will crash if somebody tries to draw into it with
   // CoreGraphics.
   SkDevice* setBitmapDevice(const SkBitmap& bitmap);
 
-  DISALLOW_COPY_AND_ASSIGN(PlatformCanvasMac);
+  // Disallow copy and assign.
+  PlatformCanvasMac(const PlatformCanvasMac&);
+  PlatformCanvasMac& operator=(const PlatformCanvasMac&);
 };
 
 }  // namespace gfx
 
-#endif  // BASE_GFX_PLATFORM_CANVAS_MAC_H__
+#endif  // PlatformCanvasMac_h