2 files changed, 17 insertions, 12 deletions
diff --git a/Source/WebCore/platform/NotImplemented.h b/Source/WebCore/platform/NotImplemented.h
index 61e4424..a71e99c 100644
--- a/Source/WebCore/platform/NotImplemented.h
+++ b/Source/WebCore/platform/NotImplemented.h
@@ -38,19 +38,20 @@
     #define supressNotImplementedWarning() false
 #endif
 
-#if defined ANDROID
+#if OS(ANDROID)
+
+#include <cutils/log.h>
+#ifndef LOG_TAG
+#define LOG_TAG "WebCore"
+#endif
+#define notImplemented() do { \
+        static bool havePrinted = false; \
+        if (!havePrinted && !supressNotImplementedWarning()) { \
+            LOGV("%s: notImplemented", __PRETTY_FUNCTION__); \
+            havePrinted = true; \
+        } \
+    } while (0)
 
-    #if 1 && defined LOG_TAG
-        #ifndef _LIBS_UTILS_LOG_H
-            #undef LOG
-            #include <utils/Log.h>
-        #endif
-        #define notImplemented() LOGV("%s: notImplemented\n", __PRETTY_FUNCTION__)
-        #define lowPriority_notImplemented() //printf("%s\n", __PRETTY_FUNCTION__)
-        #define verifiedOk()    // not a problem that it's not implemented
-    #else
-        #define notImplemented() fprintf(stderr, "%s\n", __PRETTY_FUNCTION__)
-    #endif
 #elif defined(NDEBUG)
     #define notImplemented() ((void)0)
 #else
diff --git a/Source/WebCore/platform/graphics/android/RasterRenderer.cpp b/Source/WebCore/platform/graphics/android/RasterRenderer.cpp
index dc35cdd..35fc35a 100644
--- a/Source/WebCore/platform/graphics/android/RasterRenderer.cpp
+++ b/Source/WebCore/platform/graphics/android/RasterRenderer.cpp
@@ -90,6 +90,10 @@ void RasterRenderer::setupCanvas(const TileRenderInfo& renderInfo, SkCanvas* can
             renderInfo.invalRect->width(), renderInfo.invalRect->height());
     bitmap.allocPixels();
 
+    // Clear the bitmap to whiteness first.
+    bitmap.setIsOpaque(true);
+    bitmap.eraseARGB(255, 255, 255, 255);
+
     SkDevice* device = new SkDevice(NULL, bitmap, false);
 
     if (renderInfo.measurePerf) {