OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge WebKit at r84325: Initial merge by git.
[android-x86/external-webkit.git]
/
Source
/
WebCore
/
platform
/
graphics
/
chromium
/
GraphicsLayerChromium.cpp
diff --git
a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
b/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
index
067c54d
..
2301ca3
100644
(file)
--- a/
Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
+++ b/
Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
@@
-283,6
+283,8
@@
void GraphicsLayerChromium::setMaskLayer(GraphicsLayer* maskLayer)
GraphicsLayer::setMaskLayer(maskLayer);
LayerChromium* maskLayerChromium = m_maskLayer ? m_maskLayer->platformLayer() : 0;
+ if (maskLayerChromium)
+ maskLayerChromium->setIsMask(true);
m_layer->setMaskLayer(maskLayerChromium);
}