diff options
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp | 1 | ||||
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerCompositor.cpp | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp index 43275a7..429a125 100644 --- a/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp @@ -771,6 +771,7 @@ void GraphicsContext::fillRoundedRect(const IntRect& rect, const IntSize& topLef path.addRoundRect(rect, radii); m_data->setupPaintFill(&paint); + paint.setColor(color.rgb()); GC2CANVAS(this)->drawPath(path, paint); } diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp index 786f806..66dcf40 100644 --- a/Source/WebCore/rendering/RenderLayerCompositor.cpp +++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp @@ -1520,6 +1520,15 @@ bool RenderLayerCompositor::needsContentsCompositingLayer(const RenderLayer* lay bool RenderLayerCompositor::requiresScrollLayer(RootLayerAttachment attachment) const { +#if PLATFORM(ANDROID) + // Recently, RenderLayerCompositor is changed to be a subclass of + // GraphicsLayerClient, and it is used for iframe. + // http://trac.webkit.org/changeset/75262 + // We have our own support for iframe, before we embrace this new approach, + // we will disable it. + // TODO: Investigate how to utilize this way to support iframe. + return false; +#endif // We need to handle our own scrolling if we're: return !m_renderView->frameView()->platformWidget() // viewless (i.e. non-Mac, or Mac in WebKit2) || attachment == RootLayerAttachedViaEnclosingFrame; // a composited frame on Mac |