Diff
Modified: trunk/Source/WebCore/ChangeLog (149055 => 149056)
--- trunk/Source/WebCore/ChangeLog 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/ChangeLog 2013-04-24 19:38:08 UTC (rev 149056)
@@ -1,5 +1,52 @@
2013-04-24 Benjamin Poulain <benja...@webkit.org>
+ Remove wxWebKit #ifdefs from WebCore/platform/graphics
+ https://bugs.webkit.org/show_bug.cgi?id=115081
+
+ Reviewed by Geoffrey Garen.
+
+ * platform/graphics/BitmapImage.h:
+ (BitmapImage):
+ * platform/graphics/Color.h:
+ (Color):
+ * platform/graphics/FloatRect.h:
+ (FloatRect):
+ * platform/graphics/FloatSize.h:
+ (FloatSize):
+ * platform/graphics/FontPlatformData.h:
+ * platform/graphics/GlyphBuffer.h:
+ (WebCore):
+ (WebCore::GlyphBuffer::glyphAt):
+ (WebCore::GlyphBuffer::add):
+ * platform/graphics/Gradient.h:
+ * platform/graphics/GraphicsContext.h:
+ (GraphicsContext):
+ * platform/graphics/Image.cpp:
+ (WebCore::Image::drawTiled):
+ * platform/graphics/ImageBufferData.h:
+ * platform/graphics/IntPoint.h:
+ (IntPoint):
+ * platform/graphics/IntRect.h:
+ * platform/graphics/IntSize.h:
+ (IntSize):
+ * platform/graphics/NativeImagePtr.h:
+ (WebCore):
+ * platform/graphics/Path.h:
+ * platform/graphics/Pattern.h:
+ * platform/graphics/SimpleFontData.h:
+ (SimpleFontData):
+ (WebCore::SimpleFontData::widthForGlyph):
+ * platform/graphics/mac/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::collectComplexTextRuns):
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+ (WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
+ * platform/graphics/transforms/AffineTransform.h:
+ (AffineTransform):
+ * platform/graphics/transforms/TransformationMatrix.h:
+ (TransformationMatrix):
+
+2013-04-24 Benjamin Poulain <benja...@webkit.org>
+
Remove wxWebKit #ifdefs from WebCore/plugins
https://bugs.webkit.org/show_bug.cgi?id=115080
Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/BitmapImage.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -43,10 +43,6 @@
typedef struct HBITMAP__ *HBITMAP;
#endif
-#if PLATFORM(WX)
-class wxBitmap;
-#endif
-
namespace WebCore {
struct FrameData;
}
@@ -152,12 +148,6 @@
#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS))
static PassRefPtr<BitmapImage> create(HBITMAP);
#endif
-#if PLATFORM(WX)
- static PassRefPtr<BitmapImage> create(const wxBitmap& bitmap)
- {
- return adoptRef(new BitmapImage(bitmap));
- }
-#endif
#if PLATFORM(WIN)
virtual bool getHBITMAP(HBITMAP);
virtual bool getHBITMAPOfSize(HBITMAP, LPSIZE);
@@ -195,9 +185,6 @@
BitmapImage(PassNativeImagePtr, ImageObserver* = 0);
BitmapImage(ImageObserver* = 0);
-#if PLATFORM(WX)
- BitmapImage(const wxBitmap&);
-#endif
#if PLATFORM(WIN)
virtual void drawFrameMatchingSourceSize(GraphicsContext*, const FloatRect& dstRect, const IntSize& srcSize, ColorSpace styleColorSpace, CompositeOperator);
Modified: trunk/Source/WebCore/platform/graphics/Color.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/Color.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/Color.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -50,10 +50,6 @@
#endif
#endif
-#if PLATFORM(WX)
-class wxColour;
-#endif
-
namespace WebCore {
class Color;
@@ -147,11 +143,6 @@
#endif
#endif
-#if PLATFORM(WX)
- Color(const wxColour&);
- operator wxColour() const;
-#endif
-
#if USE(CG)
Color(CGColorRef);
#endif
Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/FloatRect.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -48,10 +48,6 @@
QT_END_NAMESPACE
#endif
-#if PLATFORM(WX) && USE(WXGC)
-class wxRect2DDouble;
-#endif
-
#if PLATFORM(BLACKBERRY)
namespace BlackBerry {
namespace Platform {
@@ -207,11 +203,6 @@
FloatRect normalized() const;
#endif
-#if PLATFORM(WX) && USE(WXGC)
- FloatRect(const wxRect2DDouble&);
- operator wxRect2DDouble() const;
-#endif
-
#if USE(SKIA)
FloatRect(const SkRect&);
operator SkRect() const;
Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/FloatSize.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -45,7 +45,7 @@
}
#endif
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN))
+#if USE(CG)
typedef struct CGSize CGSize;
#endif
@@ -130,7 +130,7 @@
operator BlackBerry::Platform::FloatSize() const;
#endif
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN))
+#if USE(CG)
explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy
operator CGSize() const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -29,8 +29,6 @@
#include "qt/FontPlatformData.h"
#elif PLATFORM(WIN) && OS(WINCE)
#include "wince/FontPlatformData.h"
-#elif PLATFORM(WX)
-#include "wx/FontPlatformData.h"
#elif PLATFORM(EFL) || PLATFORM(GTK)
#include "freetype/FontPlatformData.h"
#else
Modified: trunk/Source/WebCore/platform/graphics/GlyphBuffer.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -39,11 +39,7 @@
#include <CoreGraphics/CGGeometry.h>
#endif
-#if OS(DARWIN) && PLATFORM(WX)
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-
-#if USE(CAIRO) || (PLATFORM(WX) && defined(wxUSE_CAIRO) && wxUSE_CAIRO)
+#if USE(CAIRO)
#include <cairo.h>
#endif
@@ -51,7 +47,7 @@
class SimpleFontData;
-#if USE(CAIRO) || (PLATFORM(WX) && defined(wxUSE_CAIRO) && wxUSE_CAIRO)
+#if USE(CAIRO)
// FIXME: Why does Cairo use such a huge struct instead of just an offset into an array?
typedef cairo_glyph_t GlyphBufferGlyph;
#elif OS(WINCE)
@@ -64,7 +60,7 @@
// CG uses CGSize instead of FloatSize so that the result of advances()
// can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm
-#if USE(CG) || (OS(DARWIN) && PLATFORM(WX))
+#if USE(CG)
struct GlyphBufferAdvance : CGSize {
public:
GlyphBufferAdvance() : CGSize(CGSizeZero) { }
@@ -120,7 +116,7 @@
Glyph glyphAt(int index) const
{
-#if USE(CAIRO) || (PLATFORM(WX) && defined(wxUSE_CAIRO) && wxUSE_CAIRO)
+#if USE(CAIRO)
return m_glyphs[index].index;
#else
return m_glyphs[index];
@@ -146,7 +142,7 @@
{
m_fontData.append(font);
-#if USE(CAIRO) || (PLATFORM(WX) && defined(wxUSE_CAIRO) && wxUSE_CAIRO)
+#if USE(CAIRO)
cairo_glyph_t cairoGlyph;
cairoGlyph.index = glyph;
m_glyphs.append(cairoGlyph);
@@ -154,7 +150,7 @@
m_glyphs.append(glyph);
#endif
-#if USE(CG) || (OS(DARWIN) && PLATFORM(WX))
+#if USE(CG)
CGSize advance = { width, 0 };
m_advances.append(advance);
#elif PLATFORM(QT)
@@ -177,7 +173,7 @@
void add(Glyph glyph, const SimpleFontData* font, GlyphBufferAdvance advance)
{
m_fontData.append(font);
-#if USE(CAIRO) || (PLATFORM(WX) && defined(wxUSE_CAIRO) && wxUSE_CAIRO)
+#if USE(CAIRO)
cairo_glyph_t cairoGlyph;
cairoGlyph.index = glyph;
m_glyphs.append(cairoGlyph);
Modified: trunk/Source/WebCore/platform/graphics/Gradient.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/Gradient.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/Gradient.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -54,9 +54,6 @@
class SkShader;
typedef class SkShader* PlatformGradient;
typedef class SkShader* PlatformPattern;
-#elif PLATFORM(WX)
-class wxGraphicsBrush;
-typedef wxGraphicsBrush* PlatformGradient;
#elif PLATFORM(BLACKBERRY)
namespace BlackBerry {
namespace Platform {
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -49,25 +49,6 @@
#elif PLATFORM(QT)
#include <QPainter>
typedef QPainter PlatformGraphicsContext;
-#elif PLATFORM(WX)
-class wxGCDC;
-class wxWindowDC;
-
-// wxGraphicsContext allows us to support Path, etc.
-// but on some platforms, e.g. Linux, it requires fairly
-// new software.
-#if USE(WXGC)
-// On OS X, wxGCDC is just a typedef for wxDC, so use wxDC explicitly to make
-// the linker happy.
-#ifdef __APPLE__
- class wxDC;
- typedef wxDC PlatformGraphicsContext;
-#else
- typedef wxGCDC PlatformGraphicsContext;
-#endif
-#else
- typedef wxWindowDC PlatformGraphicsContext;
-#endif
#elif USE(SKIA)
namespace WebCore {
class PlatformContextSkia;
@@ -503,12 +484,6 @@
#endif // PLATFORM(WIN)
#endif // OS(WINDOWS)
-#if PLATFORM(WX)
- // This is needed because of a bug whereby getting an HDC from a GDI+ context
- // loses the scale operations applied to the context.
- FloatSize currentScale();
-#endif
-
#if PLATFORM(QT)
void pushTransparencyLayerInternal(const QRect&, qreal, QPixmap&);
void takeOwnershipOfPlatformContext();
Modified: trunk/Source/WebCore/platform/graphics/Image.cpp (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/Image.cpp 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/Image.cpp 2013-04-24 19:38:08 UTC (rev 149056)
@@ -102,10 +102,7 @@
return;
}
- // See <https://webkit.org/b/59043>.
-#if !PLATFORM(WX)
ASSERT(!isBitmapImage() || notSolidColor());
-#endif
FloatSize intrinsicTileSize = size();
if (hasRelativeWidth())
Modified: trunk/Source/WebCore/platform/graphics/ImageBufferData.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/ImageBufferData.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/ImageBufferData.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -33,6 +33,4 @@
#include "ImageBufferDataSkia.h"
#elif OS(WINCE)
#include "ImageBufferDataWince.h"
-#elif PLATFORM(WX)
-#include "ImageBufferDataWx.h"
#endif
Modified: trunk/Source/WebCore/platform/graphics/IntPoint.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/IntPoint.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/IntPoint.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -61,10 +61,6 @@
typedef struct _Evas_Point Evas_Point;
#endif
-#if PLATFORM(WX)
-class wxPoint;
-#endif
-
#if USE(SKIA)
struct SkPoint;
struct SkIPoint;
@@ -148,11 +144,6 @@
operator Evas_Point() const;
#endif
-#if PLATFORM(WX)
- IntPoint(const wxPoint&);
- operator wxPoint() const;
-#endif
-
#if USE(SKIA)
IntPoint(const SkIPoint&);
operator SkIPoint() const;
Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/IntRect.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -65,10 +65,6 @@
typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
#endif
-#if PLATFORM(WX)
-class wxRect;
-#endif
-
#if USE(SKIA)
struct SkRect;
struct SkIRect;
@@ -194,11 +190,6 @@
IntRect transposedRect() const { return IntRect(m_location.transposedPoint(), m_size.transposedSize()); }
-#if PLATFORM(WX)
- IntRect(const wxRect&);
- operator wxRect() const;
-#endif
-
#if PLATFORM(WIN)
IntRect(const RECT&);
operator RECT() const;
Modified: trunk/Source/WebCore/platform/graphics/IntSize.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/IntSize.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/IntSize.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -53,10 +53,6 @@
}
#endif
-#if PLATFORM(WX)
-class wxSize;
-#endif
-
namespace WebCore {
class IntSize {
@@ -152,11 +148,6 @@
operator QSize() const;
#endif
-#if PLATFORM(WX)
- IntSize(const wxSize&);
- operator wxSize() const;
-#endif
-
#if PLATFORM(BLACKBERRY)
IntSize(const BlackBerry::Platform::IntSize&);
operator BlackBerry::Platform::IntSize() const;
Modified: trunk/Source/WebCore/platform/graphics/NativeImagePtr.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/NativeImagePtr.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/NativeImagePtr.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -28,10 +28,7 @@
#ifndef NativeImagePtr_h
#define NativeImagePtr_h
-#if PLATFORM(WX)
-class wxBitmap;
-class wxGraphicsBitmap;
-#elif USE(CG)
+#if USE(CG)
typedef struct CGImage* CGImageRef;
#elif PLATFORM(QT)
#include "NativeImageQt.h"
@@ -58,12 +55,6 @@
typedef CGImageRef NativeImagePtr;
#elif PLATFORM(QT)
typedef QPixmap* NativeImagePtr;
-#elif PLATFORM(WX)
-#if USE(WXGC)
-typedef wxGraphicsBitmap* NativeImagePtr;
-#else
-typedef wxBitmap* NativeImagePtr;
-#endif
#elif USE(CAIRO)
typedef RefPtr<cairo_surface_t> NativeImagePtr;
typedef PassRefPtr<cairo_surface_t> PassNativeImagePtr;
Modified: trunk/Source/WebCore/platform/graphics/Path.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/Path.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/Path.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -37,9 +37,6 @@
#elif PLATFORM(QT)
#include <qpainterpath.h>
typedef QPainterPath PlatformPath;
-#elif PLATFORM(WX) && USE(WXGC)
-class wxGraphicsPath;
-typedef wxGraphicsPath PlatformPath;
#elif USE(CAIRO)
namespace WebCore {
class CairoPath;
Modified: trunk/Source/WebCore/platform/graphics/Pattern.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/Pattern.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/Pattern.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -46,14 +46,6 @@
#elif PLATFORM(QT)
#include <QBrush>
typedef QBrush PlatformPatternPtr;
-#elif PLATFORM(WX)
-#if USE(WXGC)
-class wxGraphicsBrush;
-typedef wxGraphicsBrush* PlatformPatternPtr;
-#else
-class wxBrush;
-typedef wxBrush* PlatformPatternPtr;
-#endif // USE(WXGC)
#elif OS(WINCE)
typedef void* PlatformPatternPtr;
#endif
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -45,12 +45,11 @@
#include "WebCoreSystemInterface.h"
#endif
-#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN))
+#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
#endif
-#if (PLATFORM(WIN) && !OS(WINCE)) \
- || (OS(WINDOWS) && PLATFORM(WX))
+#if (PLATFORM(WIN) && !OS(WINCE))
#include <usp10.h>
#endif
@@ -151,7 +150,7 @@
float adjustedSpaceWidth() const { return m_adjustedSpaceWidth; }
void setSpaceWidth(float spaceWidth) { m_spaceWidth = spaceWidth; }
-#if USE(CG) || USE(CAIRO) || PLATFORM(WX)
+#if USE(CG) || USE(CAIRO)
float syntheticBoldOffset() const { return m_syntheticBoldOffset; }
#endif
@@ -188,16 +187,13 @@
#if PLATFORM(MAC)
const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
NSFont* getNSFont() const { return m_platformData.font(); }
-#elif (PLATFORM(WX) && OS(DARWIN))
- const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
- NSFont* getNSFont() const { return m_platformData.nsFont(); }
#endif
-#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN))
+#if PLATFORM(MAC)
CFDictionaryRef getCFStringAttributes(TypesettingFeatures, FontOrientation) const;
#endif
-#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN)) || USE(HARFBUZZ)
+#if PLATFORM(MAC) || USE(HARFBUZZ)
bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
#endif
@@ -222,7 +218,7 @@
QRawFont getQtRawFont() const { return m_platformData.rawFont(); }
#endif
-#if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX))
+#if PLATFORM(WIN)
bool isSystemFont() const { return m_isSystemFont; }
#if !OS(WINCE) // disable unused members to save space
SCRIPT_FONTPROPERTIES* scriptFontProperties() const;
@@ -233,10 +229,6 @@
static float ascentConsideringMacAscentHack(const WCHAR*, float ascent, float descent);
#endif
-#if PLATFORM(WX)
- wxFont* getWxFont() const { return m_platformData.font(); }
-#endif
-
private:
SimpleFontData(const FontPlatformData&, bool isCustomFont = false, bool isLoading = false, bool isTextOrientationFallback = false);
@@ -252,8 +244,7 @@
PassRefPtr<SimpleFontData> createScaledFontData(const FontDescription&, float scaleFactor) const;
PassRefPtr<SimpleFontData> platformCreateScaledFontData(const FontDescription&, float scaleFactor) const;
-#if (PLATFORM(WIN) && !OS(WINCE)) \
- || (OS(WINDOWS) && PLATFORM(WX))
+#if (PLATFORM(WIN) && !OS(WINCE))
void initGDIFont();
void platformCommonDestroy();
FloatRect boundsForGDIGlyph(Glyph glyph) const;
@@ -313,19 +304,19 @@
mutable OwnPtr<DerivedFontData> m_derivedFontData;
-#if USE(CG) || USE(CAIRO) || PLATFORM(WX)
+#if USE(CG) || USE(CAIRO)
float m_syntheticBoldOffset;
#endif
-#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN))
+#if PLATFORM(MAC)
mutable HashMap<unsigned, RetainPtr<CFDictionaryRef> > m_CFStringAttributes;
#endif
-#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN)) || USE(HARFBUZZ)
+#if PLATFORM(MAC) || USE(HARFBUZZ)
mutable OwnPtr<HashMap<String, bool> > m_combiningCharacterSequenceSupport;
#endif
-#if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX))
+#if PLATFORM(WIN)
bool m_isSystemFont;
#if !OS(WINCE) // disable unused members to save space
mutable SCRIPT_CACHE m_scriptCache;
@@ -366,7 +357,7 @@
width = m_fontData->widthForSVGGlyph(glyph, m_platformData.size());
#if ENABLE(OPENTYPE_VERTICAL)
else if (m_verticalData)
-#if USE(CG) || USE(CAIRO) || PLATFORM(WX)
+#if USE(CG) || USE(CAIRO)
width = m_verticalData->advanceHeight(this, glyph) + m_syntheticBoldOffset;
#else
width = m_verticalData->advanceHeight(this, glyph);
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2013-04-24 19:38:08 UTC (rev 149056)
@@ -335,11 +335,9 @@
}
nextIsMissingGlyph = false;
-#if !PLATFORM(WX)
nextFontData = m_font.fontDataForCombiningCharacterSequence(sequenceStart, curr - sequenceStart, nextIsSmallCaps ? SmallCapsVariant : NormalVariant);
if (!nextFontData)
nextIsMissingGlyph = true;
-#endif
while (curr < end) {
fontData = nextFontData;
@@ -362,13 +360,11 @@
nextIsMissingGlyph = false;
if (baseCharacter == zeroWidthJoiner)
nextFontData = fontData;
-#if !PLATFORM(WX)
else {
nextFontData = m_font.fontDataForCombiningCharacterSequence(cp + index, curr - cp - index, nextIsSmallCaps ? SmallCapsVariant : NormalVariant);
if (!nextFontData)
nextIsMissingGlyph = true;
}
-#endif
if (nextFontData != fontData || nextIsMissingGlyph != isMissingGlyph) {
int itemStart = static_cast<int>(indexOfFontTransition);
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2013-04-24 19:38:08 UTC (rev 149056)
@@ -272,17 +272,12 @@
continue;
}
runFontData = fontCache()->getCachedFontData(m_font.fontDescription(), fontName.get(), false, FontCache::DoNotRetain).get();
-#if !PLATFORM(WX)
// Core Text may have used a font that is not known to NSFontManager. In that case, fall back on
// using the font as returned, even though it may not have the best NSFontRenderingMode.
if (!runFontData) {
FontPlatformData runFontPlatformData((NSFont *)runFont, CTFontGetSize(runFont), m_font.fontDescription().usePrinterFont());
runFontData = fontCache()->getCachedFontData(&runFontPlatformData, FontCache::DoNotRetain).get();
}
-#else
- // just assert for now, until we can devise a better fix that works with wx.
- ASSERT(runFontData);
-#endif
}
if (m_fallbackFonts && runFontData != m_font.primaryFont())
m_fallbackFonts->add(runFontData);
Modified: trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -38,8 +38,6 @@
#include <QTransform>
#elif USE(SKIA)
#include <SkMatrix.h>
-#elif PLATFORM(WX) && USE(WXGC)
-#include <wx/graphics.h>
#endif
namespace WebCore {
@@ -176,8 +174,6 @@
operator QTransform() const;
#elif USE(SKIA)
operator SkMatrix() const;
-#elif PLATFORM(WX) && USE(WXGC)
- operator wxGraphicsMatrix() const;
#endif
static AffineTransform translation(double x, double y)
Modified: trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h (149055 => 149056)
--- trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h 2013-04-24 19:36:17 UTC (rev 149055)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h 2013-04-24 19:38:08 UTC (rev 149056)
@@ -47,11 +47,9 @@
#include <QTransform>
#elif USE(SKIA)
#include <SkMatrix.h>
-#elif PLATFORM(WX) && USE(WXGC)
-#include <wx/graphics.h>
#endif
-#if PLATFORM(WIN) || (PLATFORM(GTK) && OS(WINDOWS)) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(WX) && OS(WINDOWS))
+#if PLATFORM(WIN) || (PLATFORM(GTK) && OS(WINDOWS)) || (PLATFORM(QT) && OS(WINDOWS))
#if COMPILER(MINGW) && !COMPILER(MINGW64)
typedef struct _XFORM XFORM;
#else
@@ -352,11 +350,9 @@
operator QMatrix4x4() const;
#elif USE(SKIA)
operator SkMatrix() const;
-#elif PLATFORM(WX) && USE(WXGC)
- operator wxGraphicsMatrix() const;
#endif
-#if PLATFORM(WIN) || (PLATFORM(GTK) && OS(WINDOWS)) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(WX) && OS(WINDOWS))
+#if PLATFORM(WIN) || (PLATFORM(GTK) && OS(WINDOWS)) || (PLATFORM(QT) && OS(WINDOWS))
operator XFORM() const;
#endif
