Fix some errors in platform/graphics/android.
diff --git a/Android.v8.mk b/Android.v8.mk
index 531f3b0..e9cad06 100644
--- a/Android.v8.mk
+++ b/Android.v8.mk
@@ -164,6 +164,7 @@
$(base_intermediates)/WebCore/bindings \
$(base_intermediates)/WebCore/css \
$(base_intermediates)/WebCore/html \
+ $(base_intermediates)/WebCore/platform \
$(base_intermediates)/JavaScriptCore
ifeq ($(ENABLE_SVG), true)
diff --git a/WebCore/page/android/EventHandlerAndroid.cpp b/WebCore/page/android/EventHandlerAndroid.cpp
index ddbcdf0..48f35c3 100644
--- a/WebCore/page/android/EventHandlerAndroid.cpp
+++ b/WebCore/page/android/EventHandlerAndroid.cpp
@@ -39,8 +39,6 @@
namespace WebCore {
-unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey;
-
bool EventHandler::tabsToAllControls(KeyboardEvent*) const
{
return true;
diff --git a/WebCore/platform/PlatformKeyboardEvent.h b/WebCore/platform/PlatformKeyboardEvent.h
index 75922fa..248f399 100644
--- a/WebCore/platform/PlatformKeyboardEvent.h
+++ b/WebCore/platform/PlatformKeyboardEvent.h
@@ -140,8 +140,7 @@
#endif
#if PLATFORM(ANDROID)
- PlatformKeyboardEvent(int keyCode, UChar32 unichar, int repeatCount,
- bool down, bool cap, bool alt, bool sym);
+ PlatformKeyboardEvent(int keyCode, UChar32 unichar, Type type, int repeatCount, ModifierKey modifier);
UChar32 unichar() const { return m_unichar; }
int repeatCount() const { return m_repeatCount; }
#endif
diff --git a/WebCore/platform/android/GeolocationServiceAndroid.cpp b/WebCore/platform/android/GeolocationServiceAndroid.cpp
index 9c6cb81..cd33bc6 100644
--- a/WebCore/platform/android/GeolocationServiceAndroid.cpp
+++ b/WebCore/platform/android/GeolocationServiceAndroid.cpp
@@ -23,6 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "config.h"
+
#include "GeolocationService.h"
namespace WebCore {
diff --git a/WebCore/platform/graphics/FloatPoint.h b/WebCore/platform/graphics/FloatPoint.h
index 157c1e7..0c97c49 100644
--- a/WebCore/platform/graphics/FloatPoint.h
+++ b/WebCore/platform/graphics/FloatPoint.h
@@ -90,7 +90,7 @@
operator QPointF() const;
#endif
-#if PLATFORM(SKIA)
+#if (PLATFORM(SKIA) || PLATFORM(SGL))
operator SkPoint() const;
FloatPoint(const SkPoint&);
#endif
diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index b112230..c1a94b9 100644
--- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -898,7 +898,7 @@
void GraphicsContext::setCompositeOperation(CompositeOperator op)
{
- m_data->mState->mMode = WebCoreCompositeToSkiaMode(op);
+ m_data->mState->mMode = WebCoreCompositeToSkiaComposite(op);
}
void GraphicsContext::clearRect(const FloatRect& rect)
diff --git a/WebCore/platform/graphics/android/ImageAndroid.cpp b/WebCore/platform/graphics/android/ImageAndroid.cpp
index 3561796..93aacbc 100644
--- a/WebCore/platform/graphics/android/ImageAndroid.cpp
+++ b/WebCore/platform/graphics/android/ImageAndroid.cpp
@@ -213,7 +213,7 @@
ctxt->setupFillPaint(&paint); // need global alpha among other things
paint.setFilterBitmap(true);
- paint.setXfermodeMode(WebCoreCompositeToSkiaMode(compositeOp));
+ paint.setXfermodeMode(WebCoreCompositeToSkiaComposite(compositeOp));
canvas->drawBitmapRect(bitmap, &srcR, dstR, &paint);
#ifdef TRACE_SUBSAMPLED_BITMAPS
@@ -285,7 +285,7 @@
SkShader::kRepeat_TileMode);
paint.setShader(shader)->unref();
// now paint is the only owner of shader
- paint.setXfermodeMode(WebCoreCompositeToSkiaMode(compositeOp));
+ paint.setXfermodeMode(WebCoreCompositeToSkiaComposite(compositeOp));
paint.setFilterBitmap(true);
SkMatrix matrix(patternTransform);
diff --git a/WebCore/platform/graphics/skia/SkiaUtils.cpp b/WebCore/platform/graphics/skia/SkiaUtils.cpp
index acb3669..662ea5c 100644
--- a/WebCore/platform/graphics/skia/SkiaUtils.cpp
+++ b/WebCore/platform/graphics/skia/SkiaUtils.cpp
@@ -64,7 +64,7 @@
{ CompositePlusLighter, SkXfermode::kPlus_Mode }
};
-SkXfermode::Mode WebCoreCompositeToSkiaMode(CompositeOperator op)
+SkXfermode::Mode WebCoreCompositeToSkiaCOmposite(CompositeOperator op)
{
const CompositOpToSkiaMode* table = gMapCompositOpsToSkiaModes;
