Merge r120507 to chromium 1132 branch.

WebCore/platform/graphics/chromium/PlatformImage.h

Index: WebCore/platform/graphics/chromium/PlatformImage.h
===================================================================
--- WebCore/platform/graphics/chromium/PlatformImage.h	(revision 120960)
+++ WebCore/platform/graphics/chromium/PlatformImage.h	(working copy)
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PlatformImage_h
-#define PlatformImage_h
-
-#include "ImageSource.h"
-#include "IntSize.h"
-#include <stdint.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/OwnArrayPtr.h>
-
-namespace WebCore {
-
-class PlatformImage {
-    WTF_MAKE_NONCOPYABLE(PlatformImage);
-public:
-    PlatformImage();
-
-    void updateFromImage(NativeImagePtr);
-    const uint8_t* pixels() const { return m_pixelData ? &m_pixelData[0] : 0; }
-    IntSize size() const { return m_size; }
-
-private:
-    OwnArrayPtr<uint8_t> m_pixelData;
-    IntSize m_size;
-};
-
-} // namespace WebCore
-
-#endif