diff options
| author | Ben Murdoch <benm@google.com> | 2010-06-15 19:52:12 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-06-18 11:04:26 +0100 |
| commit | ca10fba15464fd5625cec97cf2522d25674e9362 (patch) | |
| tree | edabd36ed0bc56e6b625a4b07dc13f42313038d4 /WebCore/platform/graphics/Gradient.cpp | |
| parent | 545e470e52f0ac6a3a072bf559c796b42c6066b6 (diff) | |
| download | external_webkit-ca10fba15464fd5625cec97cf2522d25674e9362.zip external_webkit-ca10fba15464fd5625cec97cf2522d25674e9362.tar.gz external_webkit-ca10fba15464fd5625cec97cf2522d25674e9362.tar.bz2 | |
Merge webkit.org at r61121: Fix conflicts.
Fix conflicts due to addition of m_pageinateDuringLayoutEnabled in Settings.cpp|h
See http://trac.webkit.org/changeset/60509
Fix conflicts in ImageSource.h due to new functions being added in the same spot as an un upstreamed Android addition.
See http://trac.webkit.org/changeset/60927
Fix conflicts due to addition of !PLATFORM(CAIRO) to guard Android has changed and not upstreamed.
See http://trac.webkit.org/changeset/60760
Fix conflicts due to a variable renaming colliding with an Android ifdef which is not upstream.
See http://trac.webkit.org/changeset/61106
Fix conflicts due to Android IDB makefile fix collising with addition of new IDB file.
See http://trac.webkit.org/changeset/61120
Fix conflicts due to un-upstreamed makefile edits colliding with an upstream change.
See http://trac.webkit.org/changeset/61000
Change-Id: I330e08850b96d7c9fb1d093663c5847b9140683d
Diffstat (limited to 'WebCore/platform/graphics/Gradient.cpp')
| -rw-r--r-- | WebCore/platform/graphics/Gradient.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/platform/graphics/Gradient.cpp b/WebCore/platform/graphics/Gradient.cpp index 198b41a..3d8dfc9 100644 --- a/WebCore/platform/graphics/Gradient.cpp +++ b/WebCore/platform/graphics/Gradient.cpp @@ -202,11 +202,7 @@ void Gradient::setGradientSpaceTransform(const AffineTransform& gradientSpaceTra setPlatformGradientSpaceTransform(gradientSpaceTransformation); } -<<<<<<< HEAD:WebCore/platform/graphics/Gradient.cpp -#if !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) -======= -#if !PLATFORM(SKIA) && !PLATFORM(CAIRO) ->>>>>>> Webkit.org at r61121:WebCore/platform/graphics/Gradient.cpp +#if !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(CAIRO) void Gradient::setPlatformGradientSpaceTransform(const AffineTransform&) { } |