Changeset 125145 in webkit
- Timestamp:
- Aug 8, 2012 8:51:20 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 1 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r125143 r125145 1 2012-08-08 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r125143. 4 http://trac.webkit.org/changeset/125143 5 https://bugs.webkit.org/show_bug.cgi?id=93573 6 7 Doesn't compile on Mac (Requested by tony^work on #webkit). 8 9 * GNUmakefile.list.am: 10 * Target.pri: 11 * WebCore.gypi: 12 * WebCore.vcproj/WebCore.vcproj: 13 * WebCore.xcodeproj/project.pbxproj: 14 * platform/graphics/BitmapImage.h: 15 * platform/graphics/Image.h: 16 * platform/graphics/ImageSource.h: 17 (WebCore): 18 * platform/graphics/NativeImagePtr.h: Removed. 19 * platform/graphics/cairo/GraphicsContext3DCairo.cpp: 20 1 21 2012-08-08 Huang Dongsung <luxtella@company100.net> 2 22 -
trunk/Source/WebCore/GNUmakefile.list.am
r125143 r125145 3242 3242 Source/WebCore/platform/graphics/DashArray.h \ 3243 3243 Source/WebCore/platform/graphics/Extensions3D.h \ 3244 Source/WebCore/platform/graphics/NativeImagePtr.h \3245 3244 Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp \ 3246 3245 Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp \ -
trunk/Source/WebCore/Target.pri
r125143 r125145 2087 2087 platform/graphics/IntRect.h \ 2088 2088 platform/graphics/MediaPlayer.h \ 2089 platform/graphics/NativeImagePtr.h \2090 2089 platform/graphics/opentype/OpenTypeVerticalData.h \ 2091 2090 platform/graphics/Path.h \ -
trunk/Source/WebCore/WebCore.gypi
r125143 r125145 3533 3533 'platform/graphics/MediaPlayer.cpp', 3534 3534 'platform/graphics/MediaPlayerPrivate.h', 3535 'platform/graphics/NativeImagePtr.h' ,3536 3535 'platform/graphics/Path.cpp', 3537 3536 'platform/graphics/PathTraversalState.cpp', -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r125143 r125145 29551 29551 </File> 29552 29552 <File 29553 RelativePath="..\platform\graphics\NativeImagePtr.h"29554 >29555 </File>29556 <File29557 29553 RelativePath="..\platform\graphics\Path.cpp" 29558 29554 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r125143 r125145 1430 1430 4B3480930EEF50D400AC1B41 /* ImageSourceCGMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3480910EEF50D400AC1B41 /* ImageSourceCGMac.mm */; }; 1431 1431 4B3480940EEF50D400AC1B41 /* ImageSourceCG.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3480920EEF50D400AC1B41 /* ImageSourceCG.h */; }; 1432 6B3480940EEF50D400AC1B41 /* NativeImagePtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3480920EEF50D400AC1B41 /* NativeImagePtr.h */; };1433 1432 4B6FA6F40C39E48C00087011 /* SmartReplace.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B6FA6F20C39E48C00087011 /* SmartReplace.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1434 1433 4B6FA6F50C39E48C00087011 /* SmartReplace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B6FA6F30C39E48C00087011 /* SmartReplace.cpp */; }; … … 8561 8560 4B3480910EEF50D400AC1B41 /* ImageSourceCGMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ImageSourceCGMac.mm; sourceTree = "<group>"; }; 8562 8561 4B3480920EEF50D400AC1B41 /* ImageSourceCG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageSourceCG.h; sourceTree = "<group>"; }; 8563 6B3480920EEF50D400AC1B41 /* NativeImagePtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeImagePtr.h; sourceTree = "<group>"; };8564 8562 4B6FA6F20C39E48C00087011 /* SmartReplace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartReplace.h; sourceTree = "<group>"; }; 8565 8563 4B6FA6F30C39E48C00087011 /* SmartReplace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartReplace.cpp; sourceTree = "<group>"; }; … … 19676 19674 B27535330B053814002CE64F /* IntRectCG.cpp */, 19677 19675 B27535340B053814002CE64F /* IntSizeCG.cpp */, 19678 6B3480920EEF50D400AC1B41 /* NativeImagePtr.h */,19679 19676 B27535350B053814002CE64F /* PathCG.cpp */, 19680 19677 A80A38FD0E50CC8200A25EBC /* PatternCG.cpp */, … … 24330 24327 A81872230977D3C0005826D9 /* NamedNodeMap.h in Headers */, 24331 24328 A818721E0977D3C0005826D9 /* NameNodeList.h in Headers */, 24332 6B3480940EEF50D400AC1B41 /* NativeImagePtr.h in Headers */,24333 24329 E10B9B6C0B747599003ED890 /* NativeXPathNSResolver.h in Headers */, 24334 24330 93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */, -
trunk/Source/WebCore/platform/graphics/BitmapImage.h
r125143 r125145 32 32 #include "Color.h" 33 33 #include "ImageOrientation.h" 34 #include "ImageSource.h"35 34 #include "IntSize.h" 36 35 -
trunk/Source/WebCore/platform/graphics/Image.h
r125143 r125145 31 31 #include "ColorSpace.h" 32 32 #include "GraphicsTypes.h" 33 #include "Image Orientation.h"33 #include "ImageSource.h" 34 34 #include "IntRect.h" 35 #include "NativeImagePtr.h"36 35 #include <wtf/PassRefPtr.h> 37 36 #include <wtf/RefCounted.h> -
trunk/Source/WebCore/platform/graphics/ImageSource.h
r125143 r125145 29 29 30 30 #include "ImageOrientation.h" 31 #include "NativeImagePtr.h"32 31 33 32 #include <wtf/Forward.h> … … 35 34 #include <wtf/Vector.h> 36 35 37 #if USE(CG) 36 #if PLATFORM(WX) 37 class wxBitmap; 38 class wxGraphicsBitmap; 39 #elif USE(CG) 38 40 typedef struct CGImageSource* CGImageSourceRef; 41 typedef struct CGImage* CGImageRef; 39 42 typedef const struct __CFData* CFDataRef; 43 #elif PLATFORM(QT) 44 #include <qglobal.h> 45 QT_BEGIN_NAMESPACE 46 class QImage; 47 QT_END_NAMESPACE 48 #elif USE(CAIRO) 49 #include "NativeImageCairo.h" 50 #elif USE(SKIA) 51 namespace WebCore { 52 class NativeImageSkia; 53 } 54 #elif OS(WINCE) 55 #include "SharedBitmap.h" 40 56 #endif 41 57 … … 49 65 #if USE(CG) 50 66 typedef CGImageSourceRef NativeImageSourcePtr; 67 typedef CGImageRef NativeImagePtr; 68 #elif PLATFORM(OPENVG) 69 class ImageDecoder; 70 class TiledImageOpenVG; 71 typedef ImageDecoder* NativeImageSourcePtr; 72 typedef TiledImageOpenVG* NativeImagePtr; 51 73 #else 52 74 class ImageDecoder; 53 75 typedef ImageDecoder* NativeImageSourcePtr; 76 #if PLATFORM(WX) 77 #if USE(WXGC) 78 typedef wxGraphicsBitmap* NativeImagePtr; 79 #else 80 typedef wxBitmap* NativeImagePtr; 81 #endif 82 #elif USE(CAIRO) 83 typedef WebCore::NativeImageCairo* NativeImagePtr; 84 #elif USE(SKIA) 85 typedef WebCore::NativeImageSkia* NativeImagePtr; 86 #elif OS(WINCE) 87 typedef RefPtr<SharedBitmap> NativeImagePtr; 88 #elif PLATFORM(BLACKBERRY) 89 class ImageDecoder; 90 typedef ImageDecoder* NativeImageSourcePtr; 91 typedef void* NativeImagePtr; 92 #elif PLATFORM(QT) 93 typedef QImage* NativeImagePtr; 94 #endif 54 95 #endif 55 96 -
trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp
r125143 r125145 34 34 #include "GraphicsContext3DPrivate.h" 35 35 #include "Image.h" 36 #include "ImageSource.h"37 36 #include "NotImplemented.h" 38 37 #include "OpenGLShims.h"
Note: See TracChangeset
for help on using the changeset viewer.