Diff
Modified: trunk/Source/WebCore/ChangeLog (125144 => 125145)
--- trunk/Source/WebCore/ChangeLog 2012-08-09 02:53:23 UTC (rev 125144)
+++ trunk/Source/WebCore/ChangeLog 2012-08-09 03:51:20 UTC (rev 125145)
@@ -1,3 +1,23 @@
+2012-08-08 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r125143.
+ http://trac.webkit.org/changeset/125143
+ https://bugs.webkit.org/show_bug.cgi?id=93573
+
+ Doesn't compile on Mac (Requested by tony^work on #webkit).
+
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/graphics/BitmapImage.h:
+ * platform/graphics/Image.h:
+ * platform/graphics/ImageSource.h:
+ (WebCore):
+ * platform/graphics/NativeImagePtr.h: Removed.
+ * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+
2012-08-08 Huang Dongsung <[email protected]>
Extract the definition of NativeImagePtr from ImageSource.h into NativeImagePtr.h.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (125144 => 125145)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-08-09 02:53:23 UTC (rev 125144)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-08-09 03:51:20 UTC (rev 125145)
@@ -3241,7 +3241,6 @@
Source/WebCore/platform/graphics/ColorSpace.h \
Source/WebCore/platform/graphics/DashArray.h \
Source/WebCore/platform/graphics/Extensions3D.h \
- Source/WebCore/platform/graphics/NativeImagePtr.h \
Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp \
Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp \
Source/WebCore/platform/graphics/cairo/CairoUtilities.h \
Modified: trunk/Source/WebCore/Target.pri (125144 => 125145)
--- trunk/Source/WebCore/Target.pri 2012-08-09 02:53:23 UTC (rev 125144)
+++ trunk/Source/WebCore/Target.pri 2012-08-09 03:51:20 UTC (rev 125145)
@@ -2086,7 +2086,6 @@
platform/graphics/IntPointHash.h \
platform/graphics/IntRect.h \
platform/graphics/MediaPlayer.h \
- platform/graphics/NativeImagePtr.h \
platform/graphics/opentype/OpenTypeVerticalData.h \
platform/graphics/Path.h \
platform/graphics/PathTraversalState.h \
Modified: trunk/Source/WebCore/WebCore.gypi (125144 => 125145)
--- trunk/Source/WebCore/WebCore.gypi 2012-08-09 02:53:23 UTC (rev 125144)
+++ trunk/Source/WebCore/WebCore.gypi 2012-08-09 03:51:20 UTC (rev 125145)
@@ -3532,7 +3532,6 @@
'platform/graphics/IntRect.cpp',
'platform/graphics/MediaPlayer.cpp',
'platform/graphics/MediaPlayerPrivate.h',
- 'platform/graphics/NativeImagePtr.h' ,
'platform/graphics/Path.cpp',
'platform/graphics/PathTraversalState.cpp',
'platform/graphics/PathTraversalState.h',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (125144 => 125145)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-08-09 02:53:23 UTC (rev 125144)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-08-09 03:51:20 UTC (rev 125145)
@@ -29550,10 +29550,6 @@
>
</File>
<File
- RelativePath="..\platform\graphics\NativeImagePtr.h"
- >
- </File>
- <File
RelativePath="..\platform\graphics\Path.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (125144 => 125145)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-08-09 02:53:23 UTC (rev 125144)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-08-09 03:51:20 UTC (rev 125145)
@@ -1429,7 +1429,6 @@
4B3043CD0AE0373B00A82647 /* Editor.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3043CB0AE0373B00A82647 /* Editor.h */; settings = {ATTRIBUTES = (Private, ); }; };
4B3480930EEF50D400AC1B41 /* ImageSourceCGMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3480910EEF50D400AC1B41 /* ImageSourceCGMac.mm */; };
4B3480940EEF50D400AC1B41 /* ImageSourceCG.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3480920EEF50D400AC1B41 /* ImageSourceCG.h */; };
- 6B3480940EEF50D400AC1B41 /* NativeImagePtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3480920EEF50D400AC1B41 /* NativeImagePtr.h */; };
4B6FA6F40C39E48C00087011 /* SmartReplace.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B6FA6F20C39E48C00087011 /* SmartReplace.h */; settings = {ATTRIBUTES = (Private, ); }; };
4B6FA6F50C39E48C00087011 /* SmartReplace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B6FA6F30C39E48C00087011 /* SmartReplace.cpp */; };
4B6FA6F70C39E4A100087011 /* SmartReplaceCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B6FA6F60C39E4A100087011 /* SmartReplaceCF.cpp */; };
@@ -8560,7 +8559,6 @@
4B3043CB0AE0373B00A82647 /* Editor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Editor.h; sourceTree = "<group>"; };
4B3480910EEF50D400AC1B41 /* ImageSourceCGMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ImageSourceCGMac.mm; sourceTree = "<group>"; };
4B3480920EEF50D400AC1B41 /* ImageSourceCG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageSourceCG.h; sourceTree = "<group>"; };
- 6B3480920EEF50D400AC1B41 /* NativeImagePtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeImagePtr.h; sourceTree = "<group>"; };
4B6FA6F20C39E48C00087011 /* SmartReplace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartReplace.h; sourceTree = "<group>"; };
4B6FA6F30C39E48C00087011 /* SmartReplace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartReplace.cpp; sourceTree = "<group>"; };
4B6FA6F60C39E4A100087011 /* SmartReplaceCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartReplaceCF.cpp; sourceTree = "<group>"; };
@@ -19675,7 +19673,6 @@
B27535320B053814002CE64F /* IntPointCG.cpp */,
B27535330B053814002CE64F /* IntRectCG.cpp */,
B27535340B053814002CE64F /* IntSizeCG.cpp */,
- 6B3480920EEF50D400AC1B41 /* NativeImagePtr.h */,
B27535350B053814002CE64F /* PathCG.cpp */,
A80A38FD0E50CC8200A25EBC /* PatternCG.cpp */,
B27535360B053814002CE64F /* PDFDocumentImage.cpp */,
@@ -24329,7 +24326,6 @@
C6F08FBD1430FE8F00685849 /* MutationRecord.h in Headers */,
A81872230977D3C0005826D9 /* NamedNodeMap.h in Headers */,
A818721E0977D3C0005826D9 /* NameNodeList.h in Headers */,
- 6B3480940EEF50D400AC1B41 /* NativeImagePtr.h in Headers */,
E10B9B6C0B747599003ED890 /* NativeXPathNSResolver.h in Headers */,
93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */,
979F43D41075E44A0000F83B /* NavigationScheduler.h in Headers */,
Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (125144 => 125145)
--- trunk/Source/WebCore/platform/graphics/BitmapImage.h 2012-08-09 02:53:23 UTC (rev 125144)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h 2012-08-09 03:51:20 UTC (rev 125145)
@@ -31,7 +31,6 @@
#include "Image.h"
#include "Color.h"
#include "ImageOrientation.h"
-#include "ImageSource.h"
#include "IntSize.h"
#if PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/graphics/Image.h (125144 => 125145)
--- trunk/Source/WebCore/platform/graphics/Image.h 2012-08-09 02:53:23 UTC (rev 125144)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2012-08-09 03:51:20 UTC (rev 125145)
@@ -30,9 +30,8 @@
#include "Color.h"
#include "ColorSpace.h"
#include "GraphicsTypes.h"
-#include "ImageOrientation.h"
+#include "ImageSource.h"
#include "IntRect.h"
-#include "NativeImagePtr.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
Modified: trunk/Source/WebCore/platform/graphics/ImageSource.h (125144 => 125145)
--- trunk/Source/WebCore/platform/graphics/ImageSource.h 2012-08-09 02:53:23 UTC (rev 125144)
+++ trunk/Source/WebCore/platform/graphics/ImageSource.h 2012-08-09 03:51:20 UTC (rev 125145)
@@ -28,15 +28,31 @@
#define ImageSource_h
#include "ImageOrientation.h"
-#include "NativeImagePtr.h"
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
#include <wtf/Vector.h>
-#if USE(CG)
+#if PLATFORM(WX)
+class wxBitmap;
+class wxGraphicsBitmap;
+#elif USE(CG)
typedef struct CGImageSource* CGImageSourceRef;
+typedef struct CGImage* CGImageRef;
typedef const struct __CFData* CFDataRef;
+#elif PLATFORM(QT)
+#include <qglobal.h>
+QT_BEGIN_NAMESPACE
+class QImage;
+QT_END_NAMESPACE
+#elif USE(CAIRO)
+#include "NativeImageCairo.h"
+#elif USE(SKIA)
+namespace WebCore {
+class NativeImageSkia;
+}
+#elif OS(WINCE)
+#include "SharedBitmap.h"
#endif
namespace WebCore {
@@ -48,10 +64,35 @@
#if USE(CG)
typedef CGImageSourceRef NativeImageSourcePtr;
+typedef CGImageRef NativeImagePtr;
+#elif PLATFORM(OPENVG)
+class ImageDecoder;
+class TiledImageOpenVG;
+typedef ImageDecoder* NativeImageSourcePtr;
+typedef TiledImageOpenVG* NativeImagePtr;
#else
class ImageDecoder;
typedef ImageDecoder* NativeImageSourcePtr;
+#if PLATFORM(WX)
+#if USE(WXGC)
+typedef wxGraphicsBitmap* NativeImagePtr;
+#else
+typedef wxBitmap* NativeImagePtr;
#endif
+#elif USE(CAIRO)
+typedef WebCore::NativeImageCairo* NativeImagePtr;
+#elif USE(SKIA)
+typedef WebCore::NativeImageSkia* NativeImagePtr;
+#elif OS(WINCE)
+typedef RefPtr<SharedBitmap> NativeImagePtr;
+#elif PLATFORM(BLACKBERRY)
+class ImageDecoder;
+typedef ImageDecoder* NativeImageSourcePtr;
+typedef void* NativeImagePtr;
+#elif PLATFORM(QT)
+typedef QImage* NativeImagePtr;
+#endif
+#endif
// Right now GIFs are the only recognized image format that supports animation.
// The animation system and the constants below are designed with this in mind.
Deleted: trunk/Source/WebCore/platform/graphics/NativeImagePtr.h (125144 => 125145)
--- trunk/Source/WebCore/platform/graphics/NativeImagePtr.h 2012-08-09 02:53:23 UTC (rev 125144)
+++ trunk/Source/WebCore/platform/graphics/NativeImagePtr.h 2012-08-09 03:51:20 UTC (rev 125145)
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved.
- * Copyright (C) 2007-2008 Torch Mobile, Inc.
- * Copyright (C) 2012 Company 100 Inc.
- *
- * 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 COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-#ifndef NativeImagePtr_h
-#define NativeImagePtr_h
-
-#if PLATFORM(WX)
-class wxBitmap;
-class wxGraphicsBitmap;
-#elif USE(CG)
-typedef struct CGImage* CGImageRef;
-#elif PLATFORM(QT)
-#include <qglobal.h>
-QT_BEGIN_NAMESPACE
-class QImage;
-QT_END_NAMESPACE
-#elif USE(CAIRO)
-#include "NativeImageCairo.h"
-#elif USE(SKIA)
-namespace WebCore {
-class NativeImageSkia;
-}
-#elif OS(WINCE)
-#include "SharedBitmap.h"
-#endif
-
-namespace WebCore {
-
-#if USE(CG)
-typedef CGImageRef NativeImagePtr;
-#elif PLATFORM(OPENVG)
-class TiledImageOpenVG;
-typedef TiledImageOpenVG* NativeImagePtr;
-#elif PLATFORM(WX)
-#if USE(WXGC)
-typedef wxGraphicsBitmap* NativeImagePtr;
-#else
-typedef wxBitmap* NativeImagePtr;
-#endif
-#elif USE(CAIRO)
-typedef WebCore::NativeImageCairo* NativeImagePtr;
-#elif USE(SKIA)
-typedef WebCore::NativeImageSkia* NativeImagePtr;
-#elif OS(WINCE)
-typedef RefPtr<SharedBitmap> NativeImagePtr;
-#elif PLATFORM(BLACKBERRY)
-typedef void* NativeImagePtr;
-#elif PLATFORM(QT)
-typedef QImage* NativeImagePtr;
-#endif
-
-}
-
-#endif
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp (125144 => 125145)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2012-08-09 02:53:23 UTC (rev 125144)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2012-08-09 03:51:20 UTC (rev 125145)
@@ -33,7 +33,6 @@
#include "Extensions3DOpenGL.h"
#include "GraphicsContext3DPrivate.h"
#include "Image.h"
-#include "ImageSource.h"
#include "NotImplemented.h"
#include "OpenGLShims.h"
#include "PlatformContextCairo.h"
