Changeset 125145 in webkit


Ignore:
Timestamp:
Aug 8, 2012 8:51:20 PM (12 years ago)
Author:
tony@chromium.org
Message:

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 tonywork on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-08-08

  • 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:
Location:
trunk/Source/WebCore
Files:
1 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r125143 r125145  
     12012-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
    1212012-08-08  Huang Dongsung  <luxtella@company100.net>
    222

  • trunk/Source/WebCore/GNUmakefile.list.am

    r125143 r125145  
    32423242        Source/WebCore/platform/graphics/DashArray.h \
    32433243        Source/WebCore/platform/graphics/Extensions3D.h \
    3244         Source/WebCore/platform/graphics/NativeImagePtr.h \
    32453244        Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp \
    32463245        Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp \

  • trunk/Source/WebCore/Target.pri

    r125143 r125145  
    20872087    platform/graphics/IntRect.h \
    20882088    platform/graphics/MediaPlayer.h \
    2089     platform/graphics/NativeImagePtr.h \
    20902089    platform/graphics/opentype/OpenTypeVerticalData.h \
    20912090    platform/graphics/Path.h \

  • trunk/Source/WebCore/WebCore.gypi

    r125143 r125145  
    35333533            'platform/graphics/MediaPlayer.cpp',
    35343534            'platform/graphics/MediaPlayerPrivate.h',
    3535             'platform/graphics/NativeImagePtr.h' ,
    35363535            'platform/graphics/Path.cpp',
    35373536            'platform/graphics/PathTraversalState.cpp',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r125143 r125145  
    2955129551                                </File>
    2955229552                                <File
    29553                                         RelativePath="..\platform\graphics\NativeImagePtr.h"
    29554                                         >
    29555                                 </File>
    29556                                 <File
    2955729553                                        RelativePath="..\platform\graphics\Path.cpp"
    2955829554                                        >

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r125143 r125145  
    14301430                4B3480930EEF50D400AC1B41 /* ImageSourceCGMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3480910EEF50D400AC1B41 /* ImageSourceCGMac.mm */; };
    14311431                4B3480940EEF50D400AC1B41 /* ImageSourceCG.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3480920EEF50D400AC1B41 /* ImageSourceCG.h */; };
    1432                 6B3480940EEF50D400AC1B41 /* NativeImagePtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3480920EEF50D400AC1B41 /* NativeImagePtr.h */; };
    14331432                4B6FA6F40C39E48C00087011 /* SmartReplace.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B6FA6F20C39E48C00087011 /* SmartReplace.h */; settings = {ATTRIBUTES = (Private, ); }; };
    14341433                4B6FA6F50C39E48C00087011 /* SmartReplace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B6FA6F30C39E48C00087011 /* SmartReplace.cpp */; };
    … …  
    85618560                4B3480910EEF50D400AC1B41 /* ImageSourceCGMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ImageSourceCGMac.mm; sourceTree = "<group>"; };
    85628561                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>"; };
    85648562                4B6FA6F20C39E48C00087011 /* SmartReplace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartReplace.h; sourceTree = "<group>"; };
    85658563                4B6FA6F30C39E48C00087011 /* SmartReplace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartReplace.cpp; sourceTree = "<group>"; };
    … …  
    1967619674                                B27535330B053814002CE64F /* IntRectCG.cpp */,
    1967719675                                B27535340B053814002CE64F /* IntSizeCG.cpp */,
    19678                                 6B3480920EEF50D400AC1B41 /* NativeImagePtr.h */,
    1967919676                                B27535350B053814002CE64F /* PathCG.cpp */,
    1968019677                                A80A38FD0E50CC8200A25EBC /* PatternCG.cpp */,
    … …  
    2433024327                                A81872230977D3C0005826D9 /* NamedNodeMap.h in Headers */,
    2433124328                                A818721E0977D3C0005826D9 /* NameNodeList.h in Headers */,
    24332                                 6B3480940EEF50D400AC1B41 /* NativeImagePtr.h in Headers */,
    2433324329                                E10B9B6C0B747599003ED890 /* NativeXPathNSResolver.h in Headers */,
    2433424330                                93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */,

  • trunk/Source/WebCore/platform/graphics/BitmapImage.h

    r125143 r125145  
    3232#include "Color.h"
    3333#include "ImageOrientation.h"
    34 #include "ImageSource.h"
    3534#include "IntSize.h"
    3635

  • trunk/Source/WebCore/platform/graphics/Image.h

    r125143 r125145  
    3131#include "ColorSpace.h"
    3232#include "GraphicsTypes.h"
    33 #include "ImageOrientation.h"
     33#include "ImageSource.h"
    3434#include "IntRect.h"
    35 #include "NativeImagePtr.h"
    3635#include <wtf/PassRefPtr.h>
    3736#include <wtf/RefCounted.h>

  • trunk/Source/WebCore/platform/graphics/ImageSource.h

    r125143 r125145  
    2929
    3030#include "ImageOrientation.h"
    31 #include "NativeImagePtr.h"
    3231
    3332#include <wtf/Forward.h>
    … …  
    3534#include <wtf/Vector.h>
    3635
    37 #if USE(CG)
     36#if PLATFORM(WX)
     37class wxBitmap;
     38class wxGraphicsBitmap;
     39#elif USE(CG)
    3840typedef struct CGImageSource* CGImageSourceRef;
     41typedef struct CGImage* CGImageRef;
    3942typedef const struct __CFData* CFDataRef;
     43#elif PLATFORM(QT)
     44#include <qglobal.h>
     45QT_BEGIN_NAMESPACE
     46class QImage;
     47QT_END_NAMESPACE
     48#elif USE(CAIRO)
     49#include "NativeImageCairo.h"
     50#elif USE(SKIA)
     51namespace WebCore {
     52class NativeImageSkia;
     53}
     54#elif OS(WINCE)
     55#include "SharedBitmap.h"
    4056#endif
    4157
    … …  
    4965#if USE(CG)
    5066typedef CGImageSourceRef NativeImageSourcePtr;
     67typedef CGImageRef NativeImagePtr;
     68#elif PLATFORM(OPENVG)
     69class ImageDecoder;
     70class TiledImageOpenVG;
     71typedef ImageDecoder* NativeImageSourcePtr;
     72typedef TiledImageOpenVG* NativeImagePtr;
    5173#else
    5274class ImageDecoder;
    5375typedef ImageDecoder* NativeImageSourcePtr;
     76#if PLATFORM(WX)
     77#if USE(WXGC)
     78typedef wxGraphicsBitmap* NativeImagePtr;
     79#else
     80typedef wxBitmap* NativeImagePtr;
     81#endif
     82#elif USE(CAIRO)
     83typedef WebCore::NativeImageCairo* NativeImagePtr;
     84#elif USE(SKIA)
     85typedef WebCore::NativeImageSkia* NativeImagePtr;
     86#elif OS(WINCE)
     87typedef RefPtr<SharedBitmap> NativeImagePtr;
     88#elif PLATFORM(BLACKBERRY)
     89class ImageDecoder;
     90typedef ImageDecoder* NativeImageSourcePtr;
     91typedef void* NativeImagePtr;
     92#elif PLATFORM(QT)
     93typedef QImage* NativeImagePtr;
     94#endif
    5495#endif
    5596

  • trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp

    r125143 r125145  
    3434#include "GraphicsContext3DPrivate.h"
    3535#include "Image.h"
    36 #include "ImageSource.h"
    3736#include "NotImplemented.h"
    3837#include "OpenGLShims.h"
Note: See TracChangeset for help on using the changeset viewer.