2010-09-10 Kwang Yul Seo <skyul@company100.net>

        Reviewed by James Robinson.

        Make sure skia is not Chromium specific
        https://bugs.webkit.org/show_bug.cgi?id=39672

        Move Image::loadPlatformResource to platform/graphics/chromium/ImageChromium.cpp.
        Other ports can use ImageSkia.cpp.

        No new tests because this is pure refacotring.

        * WebCore.gyp/WebCore.gyp:
        * WebCore.gypi:
        * platform/graphics/chromium/ImageChromium.cpp: Added.
        (WebCore::Image::loadPlatformResource):
        * platform/graphics/skia/ImageSkia.cpp:

Canonical link: https://commits.webkit.org/57923@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@67187 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

@@ -1,3 +1,21 @@
+2010-09-10  Kwang Yul Seo  <skyul@company100.net>
+
+        Reviewed by James Robinson.
+
+        Make sure skia is not Chromium specific
+        https://bugs.webkit.org/show_bug.cgi?id=39672
+
+        Move Image::loadPlatformResource to platform/graphics/chromium/ImageChromium.cpp.
+        Other ports can use ImageSkia.cpp.
+
+        No new tests because this is pure refacotring.
+
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * platform/graphics/chromium/ImageChromium.cpp: Added.
+        (WebCore::Image::loadPlatformResource):
+        * platform/graphics/skia/ImageSkia.cpp:
+
 2010-09-09  Ilya Tikhonovsky  <loislo@chromium.org>
 
         Reviewed by Joseph Pecoraro.

WebCore/WebCore.gyp/WebCore.gyp

@@ -1229,6 +1229,10 @@
             # related to ScrollbarThemeChromium.cpp.
             '../platform/chromium/ScrollbarThemeChromium.cpp',
 
+            # The Mac currently uses ImageChromiumMac.mm from
+            # platform/graphics/chromium, included by regex above, instead.
+            '../platform/graphics/chromium/ImageChromium.cpp',
+
             # The Mac uses ImageSourceCG.cpp from platform/graphics/cg, included
             # by regex above, instead.
             '../platform/graphics/ImageSource.cpp',

WebCore/WebCore.gypi

@@ -2315,6 +2315,7 @@
             'platform/graphics/chromium/IconChromiumMac.cpp',
             'platform/graphics/chromium/IconChromiumWin.cpp',
             'platform/graphics/chromium/ImageBufferData.h',
+            'platform/graphics/chromium/ImageChromium.cpp',
             'platform/graphics/chromium/ImageChromiumMac.mm',
             'platform/graphics/chromium/ImageLayerChromium.cpp',
             'platform/graphics/chromium/ImageLayerChromium.h',

WebCore/platform/graphics/chromium/ImageChromium.cpp

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2008-2010, 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:
+ * 
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * 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.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER OR 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.
+ */
+
+#include "config.h"
+#include "Image.h"
+
+#include "ChromiumBridge.h"
+
+namespace WebCore {
+
+// Other Image methods are implemented in ImageSkia.cpp
+
+PassRefPtr<Image> Image::loadPlatformResource(const char *name)
+{
+    return ChromiumBridge::loadPlatformImageResource(name);
+}
+
+} // namespace WebCore

WebCore/platform/graphics/skia/ImageSkia.cpp

@@ -33,7 +33,6 @@
 #include "AffineTransform.h"
 #include "BitmapImage.h"
 #include "BitmapImageSingleFrameSkia.h"
-#include "ChromiumBridge.h"
 #include "FloatConversion.h"
 #include "FloatRect.h"
 #include "GLES2Canvas.h"
@@ -311,11 +310,6 @@ bool FrameData::clear(bool clearMetadata)
     return false;
 }
 
-PassRefPtr<Image> Image::loadPlatformResource(const char *name)
-{
-    return ChromiumBridge::loadPlatformImageResource(name);
-}
-
 void Image::drawPattern(GraphicsContext* context,
                         const FloatRect& floatSrcRect,
                         const AffineTransform& patternTransform,