diff options
| author | Steve Block <steveblock@google.com> | 2010-02-16 11:44:48 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-16 11:48:33 +0000 |
| commit | bbd750d5835fa1fcef2c3d076723d1305e045c39 (patch) | |
| tree | 475b3ba808374e22f6524a17d6e52c1045b9db8f /WebCore/platform | |
| parent | 48b7cc16e8edd7abbf40cbe17b1abbc8cf273929 (diff) | |
| download | external_webkit-bbd750d5835fa1fcef2c3d076723d1305e045c39.zip external_webkit-bbd750d5835fa1fcef2c3d076723d1305e045c39.tar.gz external_webkit-bbd750d5835fa1fcef2c3d076723d1305e045c39.tar.bz2 | |
Merge webkit.org at r54731 : Fix remaining merge conflicts
- AutoFillPopupMenuClient.h - Take theirs, git got confused
- PluginView.h - Conflict due to new OS macro
- Gradient.cpp - Conflict due to new argument due to setPlatformGradientSpaceTransform
- Android.derived.v8bindings.mk - Keep ours
- DragImage.h - Take both
- V8DocumentCustom.cpp - Take theirs
- XCode project - Take both to keep Android-addition of GeolocationPositionCache
Change-Id: I3f294a71af93fb4e02b57e0169bd25143132df15
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/DragImage.h | 7 | ||||
| -rw-r--r-- | WebCore/platform/graphics/Gradient.cpp | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/WebCore/platform/DragImage.h b/WebCore/platform/DragImage.h index 64b4f02..3045e03 100644 --- a/WebCore/platform/DragImage.h +++ b/WebCore/platform/DragImage.h @@ -78,13 +78,10 @@ namespace WebCore { typedef GdkPixbuf* DragImageRef; #elif PLATFORM(HAIKU) typedef BBitmap* DragImageRef; -<<<<<<< HEAD -#elif PLATFORM(ANDROID) - typedef void* DragImageRef; -======= #elif PLATFORM(BREWMP) typedef IImage* DragImageRef; ->>>>>>> webkit.org at r54731 +#elif PLATFORM(ANDROID) + typedef void* DragImageRef; #endif IntSize dragImageSize(DragImageRef); diff --git a/WebCore/platform/graphics/Gradient.cpp b/WebCore/platform/graphics/Gradient.cpp index 0a751ac..daf4754 100644 --- a/WebCore/platform/graphics/Gradient.cpp +++ b/WebCore/platform/graphics/Gradient.cpp @@ -195,13 +195,8 @@ void Gradient::setGradientSpaceTransform(const AffineTransform& gradientSpaceTra setPlatformGradientSpaceTransform(gradientSpaceTransformation); } -<<<<<<< HEAD #if !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) -void Gradient::setPlatformGradientSpaceTransform(const TransformationMatrix&) -======= -#if !PLATFORM(SKIA) void Gradient::setPlatformGradientSpaceTransform(const AffineTransform&) ->>>>>>> webkit.org at r54731 { } #endif |