[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:17:21 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6d23290e59e092362f822344ccda7ba87d93d6c0
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 10 10:57:49 2010 +0000
2010-09-10 Kwang Yul Seo <skyul at 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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67187 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 603d42c..497ba90 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-10 Kwang Yul Seo <skyul at 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 at chromium.org>
Reviewed by Joseph Pecoraro.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index 6282530..7e2e6c2 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/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',
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 88f0149..aaef136 100644
--- a/WebCore/WebCore.gypi
+++ b/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',
diff --git a/WebCore/platform/graphics/chromium/ImageChromium.cpp b/WebCore/platform/graphics/chromium/ImageChromium.cpp
new file mode 100644
index 0000000..e90d566
--- /dev/null
+++ b/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
diff --git a/WebCore/platform/graphics/skia/ImageSkia.cpp b/WebCore/platform/graphics/skia/ImageSkia.cpp
index 9625b34..0b96d80 100644
--- a/WebCore/platform/graphics/skia/ImageSkia.cpp
+++ b/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,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list