3 files changed, 6 insertions, 9 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontAndroid.cpp b/Source/WebCore/platform/graphics/android/FontAndroid.cpp
index af2edc7..d6fe10c 100644
--- a/Source/WebCore/platform/graphics/android/FontAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/FontAndroid.cpp
@@ -99,6 +99,7 @@ static bool setupForText(SkPaint* paint, GraphicsContext* gc,
         SkLayerDrawLooper::LayerInfo info;
         info.fPaintBits = SkLayerDrawLooper::kEntirePaint_Bits;
         info.fColorMode = SkXfermode::kSrc_Mode;
+        info.fFlagsMask = SkPaint::kAllFlags;
 
         // The paint is only valid until the looper receives another call to
         // addLayer(). Therefore, we must cache certain state for later use.
diff --git a/Source/WebCore/plugins/android/PluginViewAndroid.cpp b/Source/WebCore/plugins/android/PluginViewAndroid.cpp
index 8b737ea..78d0217 100644
--- a/Source/WebCore/plugins/android/PluginViewAndroid.cpp
+++ b/Source/WebCore/plugins/android/PluginViewAndroid.cpp
@@ -106,6 +106,7 @@ extern void ANPSurfaceInterfaceV0_Init(ANPInterface* value);
 extern void ANPTypefaceInterfaceV0_Init(ANPInterface* value);
 extern void ANPWindowInterfaceV0_Init(ANPInterface* value);
 extern void ANPWindowInterfaceV1_Init(ANPInterface* value);
+extern void ANPWindowInterfaceV2_Init(ANPInterface* value);
 extern void ANPSystemInterfaceV0_Init(ANPInterface* value);
 extern void ANPSystemInterfaceV1_Init(ANPInterface* value);
 extern void ANPSystemInterfaceV2_Init(ANPInterface* value);
@@ -135,6 +136,7 @@ static const VarProcPair gVarProcs[] = {
     { VARPROCLINE(TypefaceInterfaceV0)      },
     { VARPROCLINE(WindowInterfaceV0)        },
     { VARPROCLINE(WindowInterfaceV1)        },
+    { VARPROCLINE(WindowInterfaceV2)        },
     { VARPROCLINE(SystemInterfaceV0)        },
     { VARPROCLINE(SystemInterfaceV1)        },
     { VARPROCLINE(SystemInterfaceV2)        },
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
index 5f32933..bc0d440 100644
--- a/Source/WebCore/rendering/RenderLayer.cpp
+++ b/Source/WebCore/rendering/RenderLayer.cpp
@@ -2633,16 +2633,10 @@ void RenderLayer::paintPaginatedChildLayer(RenderLayer* childLayer, RenderLayer*
     Vector<RenderLayer*> columnLayers;
     RenderLayer* ancestorLayer = isNormalFlowOnly() ? parent() : stackingContext();
     for (RenderLayer* curr = childLayer->parent(); curr; curr = curr->parent()) {
-        if (curr->renderer()->hasColumns())
+        if (curr->renderer()->hasColumns() && checkContainingBlockChainForPagination(childLayer->renderer(), curr->renderBox()))
             columnLayers.append(curr);
-#ifdef ANDROID
-        // Bug filed: 56107
         if (curr == ancestorLayer)
             break;
-#else
-        if (curr == ancestorLayer || (curr->parent() && curr->parent()->renderer()->isPositioned()))
-            break;
-#endif
     }
 
     ASSERT(columnLayers.size());
@@ -3122,9 +3116,9 @@ RenderLayer* RenderLayer::hitTestPaginatedChildLayer(RenderLayer* childLayer, Re
     Vector<RenderLayer*> columnLayers;
     RenderLayer* ancestorLayer = isNormalFlowOnly() ? parent() : stackingContext();
     for (RenderLayer* curr = childLayer->parent(); curr; curr = curr->parent()) {
-        if (curr->renderer()->hasColumns())
+        if (curr->renderer()->hasColumns() && checkContainingBlockChainForPagination(childLayer->renderer(), curr->renderBox()))
             columnLayers.append(curr);
-        if (curr == ancestorLayer || (curr->parent() && curr->parent()->renderer()->isPositioned()))
+        if (curr == ancestorLayer)
             break;
     }