From bbd750d5835fa1fcef2c3d076723d1305e045c39 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 16 Feb 2010 11:44:48 +0000 Subject: 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 --- WebCore/platform/graphics/Gradient.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'WebCore/platform/graphics/Gradient.cpp') 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 -- cgit v1.1