diff options
| author | Nicolas Roard <nicolas@android.com> | 2009-08-12 14:56:59 +0100 |
|---|---|---|
| committer | Nicolas Roard <nicolas@android.com> | 2009-08-12 15:38:58 +0100 |
| commit | 95e3d862bbab761f8caaf1d1b54065f67b9a5148 (patch) | |
| tree | a68c7eaeb75b06d7b1fee2b1b8a44f5e4cd0a04a /WebCore/platform/wx | |
| parent | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (diff) | |
| download | external_webkit-95e3d862bbab761f8caaf1d1b54065f67b9a5148.zip external_webkit-95e3d862bbab761f8caaf1d1b54065f67b9a5148.tar.gz external_webkit-95e3d862bbab761f8caaf1d1b54065f67b9a5148.tar.bz2 | |
Fix merges and add #if PLATFORM(ANDROID)
Diffstat (limited to 'WebCore/platform/wx')
| -rw-r--r-- | WebCore/platform/wx/TemporaryLinkStubs.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/platform/wx/TemporaryLinkStubs.cpp b/WebCore/platform/wx/TemporaryLinkStubs.cpp index 9f2cd91..2403527 100644 --- a/WebCore/platform/wx/TemporaryLinkStubs.cpp +++ b/WebCore/platform/wx/TemporaryLinkStubs.cpp @@ -118,13 +118,7 @@ void GraphicsContext::setLineJoin(LineJoin) { notImplemented(); } void GraphicsContext::setMiterLimit(float) { notImplemented(); } void GraphicsContext::setAlpha(float) { notImplemented(); } -#ifdef MANUAL_MERGE_REQUIRED -Color WebCore::focusRingColor() { return 0xFF0000FF; } - -void Image::drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, CompositeOperator, const FloatRect& destRect) { notImplemented(); } -#else // MANUAL_MERGE_REQUIRED void Image::drawPattern(GraphicsContext*, const FloatRect& srcRect, const TransformationMatrix& patternTransform, const FloatPoint& phase, CompositeOperator, const FloatRect& destRect) { notImplemented(); } -#endif // MANUAL_MERGE_REQUIRED ScrollbarTheme* ScrollbarTheme::nativeTheme() { notImplemented(); static ScrollbarTheme theme; return &theme; } |