Diff
Modified: trunk/LayoutTests/ChangeLog (94731 => 94732)
--- trunk/LayoutTests/ChangeLog 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/LayoutTests/ChangeLog 2011-09-07 23:51:15 UTC (rev 94732)
@@ -1,3 +1,20 @@
+2011-09-07 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r94714 and r94723.
+ http://trac.webkit.org/changeset/94714
+ http://trac.webkit.org/changeset/94723
+ https://bugs.webkit.org/show_bug.cgi?id=67746
+
+ breaks gtk-linux tests with assertion failure (Requested by
+ thorton on #webkit).
+
+ * platform/chromium-linux/svg/custom/simple-text-double-shadow.png: Removed.
+ * platform/chromium-mac/svg/custom/simple-text-double-shadow.png: Removed.
+ * platform/chromium-win/svg/custom/simple-text-double-shadow.png: Removed.
+ * platform/mac/svg/custom/simple-text-double-shadow-expected.png: Removed.
+ * platform/mac/svg/custom/simple-text-double-shadow-expected.txt: Removed.
+ * svg/custom/simple-text-double-shadow.svg: Removed.
+
2011-09-07 Adam Barth <[email protected]>
Update results. The actual results are only off by a fraction of a
Deleted: trunk/LayoutTests/platform/chromium-linux/svg/custom/simple-text-double-shadow.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-mac/svg/custom/simple-text-double-shadow.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/svg/custom/simple-text-double-shadow.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/svg/custom/simple-text-double-shadow-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/svg/custom/simple-text-double-shadow-expected.txt (94731 => 94732)
--- trunk/LayoutTests/platform/mac/svg/custom/simple-text-double-shadow-expected.txt 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/LayoutTests/platform/mac/svg/custom/simple-text-double-shadow-expected.txt 2011-09-07 23:51:15 UTC (rev 94732)
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (20,26) size 380x194
- RenderSVGText {text} at (20,26) size 217x18 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 217x18
- chunk 1 text run 1 at (20.00,40.00) startOffset 0 endOffset 34 width 217.00: "This text should appear only twice"
- RenderSVGPath {rect} at (100,100) size 250x70 [fill={[type=SOLID] [color=#0000FF]}] [x=100.00] [y=100.00] [width=200.00] [height=20.00]
Deleted: trunk/LayoutTests/svg/custom/simple-text-double-shadow.svg (94731 => 94732)
--- trunk/LayoutTests/svg/custom/simple-text-double-shadow.svg 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/LayoutTests/svg/custom/simple-text-double-shadow.svg 2011-09-07 23:51:15 UTC (rev 94732)
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="asdf" style="-webkit-svg-shadow: 50px 50px 0px red;">
-<text x="20" y="40" fill="black">This text should appear only twice</text>
-<rect x="100" y="100" height="20" width="200" fill="blue" />
-</svg>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (94731 => 94732)
--- trunk/Source/WebCore/ChangeLog 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/ChangeLog 2011-09-07 23:51:15 UTC (rev 94732)
@@ -1,3 +1,71 @@
+2011-09-07 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r94714 and r94723.
+ http://trac.webkit.org/changeset/94714
+ http://trac.webkit.org/changeset/94723
+ https://bugs.webkit.org/show_bug.cgi?id=67746
+
+ breaks gtk-linux tests with assertion failure (Requested by
+ thorton on #webkit).
+
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::GraphicsContext):
+ (WebCore::GraphicsContext::~GraphicsContext):
+ * platform/graphics/GraphicsContext.h:
+ (WebCore::GraphicsContext::inTransparencyLayer):
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::GraphicsContext::beginTransparencyLayer):
+ (WebCore::GraphicsContext::endTransparencyLayer):
+ * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
+ (WebCore::GraphicsContextPlatformPrivate::beginTransparencyLayer):
+ (WebCore::GraphicsContextPlatformPrivate::endTransparencyLayer):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::beginTransparencyLayer):
+ (WebCore::GraphicsContext::endTransparencyLayer):
+ * platform/graphics/cg/GraphicsContextPlatformPrivateCG.h:
+ (WebCore::GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate):
+ (WebCore::GraphicsContextPlatformPrivate::~GraphicsContextPlatformPrivate):
+ (WebCore::GraphicsContextPlatformPrivate::beginTransparencyLayer):
+ (WebCore::GraphicsContextPlatformPrivate::endTransparencyLayer):
+ * platform/graphics/haiku/GraphicsContextHaiku.cpp:
+ (WebCore::GraphicsContext::beginTransparencyLayer):
+ (WebCore::GraphicsContext::endTransparencyLayer):
+ * platform/graphics/mac/FontMac.mm:
+ (WebCore::Font::drawGlyphs):
+ * platform/graphics/openvg/GraphicsContextOpenVG.cpp:
+ (WebCore::GraphicsContext::beginTransparencyLayer):
+ (WebCore::GraphicsContext::endTransparencyLayer):
+ * platform/graphics/qt/GraphicsContextQt.cpp:
+ (WebCore::GraphicsContext::inTransparencyLayer):
+ (WebCore::GraphicsContext::beginTransparencyLayer):
+ (WebCore::GraphicsContext::endTransparencyLayer):
+ * platform/graphics/skia/GraphicsContextSkia.cpp:
+ (WebCore::GraphicsContext::beginTransparencyLayer):
+ (WebCore::GraphicsContext::endTransparencyLayer):
+ * platform/graphics/win/FontCGWin.cpp:
+ (WebCore::drawGDIGlyphs):
+ * platform/graphics/win/GraphicsContextCGWin.cpp:
+ (WebCore::GraphicsContext::releaseWindowsContext):
+ * platform/graphics/win/GraphicsContextCairoWin.cpp:
+ (WebCore::GraphicsContext::releaseWindowsContext):
+ * platform/graphics/win/GraphicsContextWin.cpp:
+ (WebCore::GraphicsContext::inTransparencyLayer):
+ (WebCore::GraphicsContext::getWindowsContext):
+ * platform/graphics/wince/GraphicsContextWinCE.cpp:
+ (WebCore::GraphicsContext::beginTransparencyLayer):
+ (WebCore::GraphicsContext::endTransparencyLayer):
+ * platform/graphics/wx/GraphicsContextWx.cpp:
+ (WebCore::GraphicsContext::beginTransparencyLayer):
+ (WebCore::GraphicsContext::endTransparencyLayer):
+ * platform/win/ScrollbarThemeWin.cpp:
+ (WebCore::ScrollbarThemeWin::paintTrackPiece):
+ (WebCore::ScrollbarThemeWin::paintButton):
+ (WebCore::ScrollbarThemeWin::paintThumb):
+ * plugins/win/PluginViewWin.cpp:
+ (WebCore::PluginView::paint):
+ * rendering/RenderThemeWin.cpp:
+ (WebCore::drawControl):
+
2011-09-07 Chris Fleizach <[email protected]>
Changes to aria-hidden don't change VO navigation
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -78,7 +78,6 @@
GraphicsContext::GraphicsContext(PlatformGraphicsContext* platformGraphicsContext)
: m_updatingControlTints(false)
- , m_transparencyCount(0)
{
platformInit(platformGraphicsContext);
}
@@ -86,7 +85,6 @@
GraphicsContext::~GraphicsContext()
{
ASSERT(m_stack.isEmpty());
- ASSERT(!m_transparencyCount);
platformDestroy();
}
@@ -332,26 +330,6 @@
return m_state.shadowsIgnoreTransforms;
}
-void GraphicsContext::beginTransparencyLayer(float opacity)
-{
- beginPlatformTransparencyLayer(opacity);
- ++m_transparencyCount;
-}
-
-void GraphicsContext::endTransparencyLayer()
-{
- endPlatformTransparencyLayer();
- ASSERT(m_transparencyCount > 0);
- --m_transparencyCount;
-}
-
-#if !PLATFORM(QT)
-bool GraphicsContext::isInTransparencyLayer() const
-{
- return (m_transparencyCount > 0) && supportsTransparencyLayers();
-}
-#endif
-
bool GraphicsContext::updatingControlTints() const
{
return m_updatingControlTints;
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2011-09-07 23:51:15 UTC (rev 94732)
@@ -370,7 +370,6 @@
void beginTransparencyLayer(float opacity);
void endTransparencyLayer();
- bool isInTransparencyLayer() const;
bool hasShadow() const;
void setShadow(const FloatSize&, float blur, const Color&, ColorSpace);
@@ -426,11 +425,13 @@
void drawBitmap(SharedBitmap*, const IntRect& dstRect, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp);
void drawBitmapPattern(SharedBitmap*, const FloatRect& tileRectIn, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, const IntSize& origSourceSize);
void drawIcon(HICON icon, const IntRect& dstRect, UINT flags);
+ bool inTransparencyLayer() const { return false; }
HDC getWindowsContext(const IntRect&, bool supportAlphaBlend = false, bool mayCreateBitmap = true); // The passed in rect is used to create a bitmap for compositing inside transparency layers.
void releaseWindowsContext(HDC, const IntRect&, bool supportAlphaBlend = false, bool mayCreateBitmap = true); // The passed in HDC should be the one handed back by getWindowsContext.
void drawRoundCorner(bool newClip, RECT clipRect, RECT rectWin, HDC dc, int width, int height);
#elif PLATFORM(WIN)
GraphicsContext(HDC, bool hasAlpha = false); // FIXME: To be removed.
+ bool inTransparencyLayer() const;
HDC getWindowsContext(const IntRect&, bool supportAlphaBlend = true, bool mayCreateBitmap = true); // The passed in rect is used to create a bitmap for compositing inside transparency layers.
void releaseWindowsContext(HDC, const IntRect&, bool supportAlphaBlend = true, bool mayCreateBitmap = true); // The passed in HDC should be the one handed back by getWindowsContext.
@@ -480,9 +481,11 @@
// This is needed because of a bug whereby getting an HDC from a GDI+ context
// loses the scale operations applied to the context.
FloatSize currentScale();
+ bool inTransparencyLayer() const { return false; }
#endif
#if PLATFORM(QT)
+ bool inTransparencyLayer() const;
void pushTransparencyLayerInternal(const QRect &rect, qreal opacity, QPixmap& alphaMask);
void takeOwnershipOfPlatformContext();
#endif
@@ -535,16 +538,11 @@
void setPlatformCompositeOperation(CompositeOperator);
- void beginPlatformTransparencyLayer(float opacity);
- void endPlatformTransparencyLayer();
- static bool supportsTransparencyLayers();
-
GraphicsContextPlatformPrivate* m_data;
GraphicsContextState m_state;
Vector<GraphicsContextState> m_stack;
bool m_updatingControlTints;
- unsigned m_transparencyCount;
};
class GraphicsContextStateSaver {
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -879,7 +879,7 @@
platformContext()->shadowBlur().clear();
}
-void GraphicsContext::beginPlatformTransparencyLayer(float opacity)
+void GraphicsContext::beginTransparencyLayer(float opacity)
{
if (paintingDisabled())
return;
@@ -887,9 +887,10 @@
cairo_t* cr = platformContext()->cr();
cairo_push_group(cr);
m_data->layers.append(opacity);
+ m_data->beginTransparencyLayer();
}
-void GraphicsContext::endPlatformTransparencyLayer()
+void GraphicsContext::endTransparencyLayer()
{
if (paintingDisabled())
return;
@@ -899,13 +900,9 @@
cairo_pop_group_to_source(cr);
cairo_paint_with_alpha(cr, m_data->layers.last());
m_data->layers.removeLast();
+ m_data->endTransparencyLayer();
}
-bool GraphicsContext::supportsTransparencyLayers()
-{
- return true;
-}
-
void GraphicsContext::clearRect(const FloatRect& rect)
{
if (paintingDisabled())
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h 2011-09-07 23:51:15 UTC (rev 94732)
@@ -77,6 +77,8 @@
void translate(float, float);
void concatCTM(const AffineTransform&);
void setCTM(const AffineTransform&);
+ void beginTransparencyLayer() { m_transparencyCount++; }
+ void endTransparencyLayer() { m_transparencyCount--; }
void syncContext(cairo_t* cr);
#else
// On everything else, we do nothing.
@@ -90,6 +92,8 @@
void translate(float, float) {}
void concatCTM(const AffineTransform&) {}
void setCTM(const AffineTransform&) {}
+ void beginTransparencyLayer() {}
+ void endTransparencyLayer() {}
void syncContext(cairo_t* cr) {}
#endif
@@ -101,6 +105,7 @@
GdkEventExpose* expose;
#elif PLATFORM(WIN)
HDC m_hdc;
+ unsigned m_transparencyCount;
bool m_shouldIncludeChildWindows;
#endif
};
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -963,7 +963,7 @@
CGContextEOClip(context);
}
-void GraphicsContext::beginPlatformTransparencyLayer(float opacity)
+void GraphicsContext::beginTransparencyLayer(float opacity)
{
if (paintingDisabled())
return;
@@ -973,24 +973,21 @@
CGContextRef context = platformContext();
CGContextSetAlpha(context, opacity);
CGContextBeginTransparencyLayer(context, 0);
+ m_data->beginTransparencyLayer();
m_data->m_userToDeviceTransformKnownToBeIdentity = false;
}
-void GraphicsContext::endPlatformTransparencyLayer()
+void GraphicsContext::endTransparencyLayer()
{
if (paintingDisabled())
return;
CGContextRef context = platformContext();
CGContextEndTransparencyLayer(context);
+ m_data->endTransparencyLayer();
restore();
}
-bool GraphicsContext::supportsTransparencyLayers()
-{
- return true;
-}
-
void GraphicsContext::setPlatformShadow(const FloatSize& offset, float blur, const Color& color, ColorSpace colorSpace)
{
if (paintingDisabled())
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h 2011-09-07 23:51:15 UTC (rev 94732)
@@ -46,10 +46,18 @@
, m_hdc(0)
, m_shouldIncludeChildWindows(false)
#endif
+#if PLATFORM(WIN) || !ASSERT_DISABLED
+ , m_transparencyCount(0)
+#endif
, m_userToDeviceTransformKnownToBeIdentity(false)
, m_contextFlags(flags)
{
}
+
+ ~GraphicsContextPlatformPrivate()
+ {
+ ASSERT(!m_transparencyCount);
+ }
#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
// These methods do nothing on Mac.
@@ -82,7 +90,24 @@
bool m_shouldIncludeChildWindows;
#endif
+ void beginTransparencyLayer()
+ {
+#if PLATFORM(WIN) || !ASSERT_DISABLED
+ m_transparencyCount++;
+#endif
+ }
+ void endTransparencyLayer()
+ {
+#if PLATFORM(WIN) || !ASSERT_DISABLED
+ ASSERT(m_transparencyCount > 0);
+ m_transparencyCount--;
+#endif
+ }
+
RetainPtr<CGContextRef> m_cgContext;
+#if PLATFORM(WIN) || !ASSERT_DISABLED
+ int m_transparencyCount;
+#endif
bool m_userToDeviceTransformKnownToBeIdentity;
GraphicsContextCGFlags m_contextFlags;
};
Modified: trunk/Source/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -249,7 +249,7 @@
return rect;
}
-void GraphicsContext::beginPlatformTransparencyLayer(float opacity)
+void GraphicsContext::beginTransparencyLayer(float opacity)
{
if (paintingDisabled())
return;
@@ -257,7 +257,7 @@
notImplemented();
}
-void GraphicsContext::endPlatformTransparencyLayer()
+void GraphicsContext::endTransparencyLayer()
{
if (paintingDisabled())
return;
@@ -265,11 +265,6 @@
notImplemented();
}
-bool GraphicsContext::supportsTransparencyLayers()
-{
- return false;
-}
-
void GraphicsContext::clearRect(const FloatRect& rect)
{
if (paintingDisabled())
Modified: trunk/Source/WebCore/platform/graphics/mac/FontMac.mm (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2011-09-07 23:51:15 UTC (rev 94732)
@@ -222,7 +222,7 @@
ColorSpace fillColorSpace = context->fillColorSpace();
context->getShadow(shadowOffset, shadowBlur, shadowColor, shadowColorSpace);
- bool hasSimpleShadow = context->textDrawingMode() == TextModeFill && shadowColor.isValid() && !shadowBlur && !platformData.isColorBitmapFont() && (!context->shadowsIgnoreTransforms() || context->getCTM().isIdentityOrTranslationOrFlipped()) && !context->isInTransparencyLayer();
+ bool hasSimpleShadow = context->textDrawingMode() == TextModeFill && shadowColor.isValid() && !shadowBlur && !platformData.isColorBitmapFont() && (!context->shadowsIgnoreTransforms() || context->getCTM().isIdentityOrTranslationOrFlipped());
if (hasSimpleShadow) {
// Paint simple shadows ourselves instead of relying on CG shadows, to avoid losing subpixel antialiasing.
context->clearShadow();
Modified: trunk/Source/WebCore/platform/graphics/openvg/GraphicsContextOpenVG.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/openvg/GraphicsContextOpenVG.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/openvg/GraphicsContextOpenVG.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -285,7 +285,7 @@
notImplemented();
}
-void GraphicsContext::beginPlatformTransparencyLayer(float opacity)
+void GraphicsContext::beginTransparencyLayer(float opacity)
{
if (paintingDisabled())
return;
@@ -294,7 +294,7 @@
UNUSED_PARAM(opacity);
}
-void GraphicsContext::endPlatformTransparencyLayer()
+void GraphicsContext::endTransparencyLayer()
{
if (paintingDisabled())
return;
@@ -302,11 +302,6 @@
notImplemented();
}
-bool GraphicsContext::supportsTransparencyLayers()
-{
- return false;
-}
-
void GraphicsContext::clearRect(const FloatRect& rect)
{
if (paintingDisabled())
Modified: trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -186,7 +186,7 @@
bool antiAliasingForRectsAndLines;
QStack<TransparencyLayer*> layers;
- // Counting real layers. Required by isInTransparencyLayer() calls
+ // Counting real layers. Required by inTransparencyLayer() calls
// For example, layers with valid alphaMask are not real layers
int layerCount;
@@ -763,7 +763,7 @@
p->fillPath(path.platformPath(), QColor(color));
}
-bool GraphicsContext::isInTransparencyLayer() const
+bool GraphicsContext::inTransparencyLayer() const
{
return m_data->layerCount;
}
@@ -1060,7 +1060,7 @@
m_data->layers.push(new TransparencyLayer(p, deviceClip, 1.0, alphaMask));
}
-void GraphicsContext::beginPlatformTransparencyLayer(float opacity)
+void GraphicsContext::beginTransparencyLayer(float opacity)
{
if (paintingDisabled())
return;
@@ -1084,7 +1084,7 @@
++m_data->layerCount;
}
-void GraphicsContext::endPlatformTransparencyLayer()
+void GraphicsContext::endTransparencyLayer()
{
if (paintingDisabled())
return;
@@ -1108,11 +1108,6 @@
delete layer;
}
-bool GraphicsContext::supportsTransparencyLayers()
-{
- return true;
-}
-
void GraphicsContext::clearRect(const FloatRect& rect)
{
if (paintingDisabled())
Modified: trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -262,7 +262,7 @@
platformContext()->restore();
}
-void GraphicsContext::beginPlatformTransparencyLayer(float opacity)
+void GraphicsContext::beginTransparencyLayer(float opacity)
{
if (paintingDisabled())
return;
@@ -283,18 +283,13 @@
SkCanvas::kFullColorLayer_SaveFlag));
}
-void GraphicsContext::endPlatformTransparencyLayer()
+void GraphicsContext::endTransparencyLayer()
{
if (paintingDisabled())
return;
platformContext()->canvas()->restore();
}
-bool GraphicsContext::supportsTransparencyLayers()
-{
- return true;
-}
-
// Graphics primitives ---------------------------------------------------------
void GraphicsContext::addInnerRoundedRectClip(const IntRect& rect, int thickness)
Modified: trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -138,7 +138,7 @@
if (!fillColor.alpha())
return;
- drawIntoBitmap = fillColor.alpha() != 255 || graphicsContext->isInTransparencyLayer();
+ drawIntoBitmap = fillColor.alpha() != 255 || graphicsContext->inTransparencyLayer();
if (!drawIntoBitmap) {
FloatSize offset;
float blur;
Modified: trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -89,7 +89,7 @@
// suitable for all clients?
void GraphicsContext::releaseWindowsContext(HDC hdc, const IntRect& dstRect, bool supportAlphaBlend, bool mayCreateBitmap)
{
- bool createdBitmap = mayCreateBitmap && (!m_data->m_hdc || isInTransparencyLayer());
+ bool createdBitmap = mayCreateBitmap && (!m_data->m_hdc || inTransparencyLayer());
if (!createdBitmap) {
m_data->restore();
return;
Modified: trunk/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -122,7 +122,7 @@
void GraphicsContext::releaseWindowsContext(HDC hdc, const IntRect& dstRect, bool supportAlphaBlend, bool mayCreateBitmap)
{
- bool createdBitmap = mayCreateBitmap && (!m_data->m_hdc || isInTransparencyLayer());
+ bool createdBitmap = mayCreateBitmap && (!m_data->m_hdc || inTransparencyLayer());
if (!hdc || !createdBitmap) {
m_data->restore();
return;
Modified: trunk/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -51,6 +51,8 @@
memset(bmpInfo.bmBits, 0, bufferSize);
}
+bool GraphicsContext::inTransparencyLayer() const { return m_data->m_transparencyCount; }
+
void GraphicsContext::setShouldIncludeChildWindows(bool include)
{
m_data->m_shouldIncludeChildWindows = include;
@@ -98,7 +100,7 @@
HDC GraphicsContext::getWindowsContext(const IntRect& dstRect, bool supportAlphaBlend, bool mayCreateBitmap)
{
// FIXME: Should a bitmap be created also when a shadow is set?
- if (mayCreateBitmap && (!m_data->m_hdc || isInTransparencyLayer())) {
+ if (mayCreateBitmap && (!m_data->m_hdc || inTransparencyLayer())) {
if (dstRect.isEmpty())
return 0;
Modified: trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -1113,22 +1113,17 @@
SelectObject(dc, oldPen);
}
-void GraphicsContext::beginPlatformTransparencyLayer(float opacity)
+void GraphicsContext::beginTransparencyLayer(float opacity)
{
m_data->save();
m_data->m_opacity *= opacity;
}
-void GraphicsContext::endPlatformTransparencyLayer()
+void GraphicsContext::endTransparencyLayer()
{
m_data->restore();
}
-bool GraphicsContext::supportsTransparencyLayers()
-{
- return true;
-}
-
void GraphicsContext::concatCTM(const AffineTransform& transform)
{
m_data->concatCTM(transform);
Modified: trunk/Source/WebCore/platform/graphics/wx/GraphicsContextWx.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/graphics/wx/GraphicsContextWx.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/graphics/wx/GraphicsContextWx.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -665,21 +665,16 @@
notImplemented();
}
-void GraphicsContext::beginPlatformTransparencyLayer(float)
+void GraphicsContext::beginTransparencyLayer(float)
{
notImplemented();
}
-void GraphicsContext::endPlatformTransparencyLayer()
+void GraphicsContext::endTransparencyLayer()
{
notImplemented();
}
-bool GraphicsContext::supportsTransparencyLayers()
-{
- return false;
-}
-
void GraphicsContext::clearRect(const FloatRect&)
{
notImplemented();
Modified: trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp (94731 => 94732)
--- trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -271,7 +271,7 @@
}
#if !OS(WINCE)
- if (!alphaBlend && !context->isInTransparencyLayer())
+ if (!alphaBlend && !context->inTransparencyLayer())
DIBPixelData::setRGBABitmapAlpha(windowsContext.hdc(), rect, 255);
#endif
}
@@ -325,7 +325,7 @@
::DrawFrameControl(windowsContext.hdc(), &themeRect, DFC_SCROLL, classicState);
#if !OS(WINCE)
- if (!alphaBlend && !context->isInTransparencyLayer())
+ if (!alphaBlend && !context->inTransparencyLayer())
DIBPixelData::setRGBABitmapAlpha(windowsContext.hdc(), rect, 255);
#endif
}
@@ -384,7 +384,7 @@
::DrawEdge(hdc, &themeRect, EDGE_RAISED, BF_RECT | BF_MIDDLE);
#if !OS(WINCE)
- if (!alphaBlend && !context->isInTransparencyLayer())
+ if (!alphaBlend && !context->inTransparencyLayer())
DIBPixelData::setRGBABitmapAlpha(hdc, rect, 255);
#endif
context->releaseWindowsContext(hdc, rect, alphaBlend);
Modified: trunk/Source/WebCore/plugins/win/PluginViewWin.cpp (94731 => 94732)
--- trunk/Source/WebCore/plugins/win/PluginViewWin.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/plugins/win/PluginViewWin.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -636,7 +636,7 @@
// In the Qt port we always draw in an offscreen buffer and therefore need to preserve
// the translation set in getWindowsContext.
#if !PLATFORM(QT) && !OS(WINCE)
- if (!context->isInTransparencyLayer()) {
+ if (!context->inTransparencyLayer()) {
XFORM transform;
GetWorldTransform(windowsContext.hdc(), &transform);
transform.eDx = 0;
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (94731 => 94732)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2011-09-07 23:48:54 UTC (rev 94731)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2011-09-07 23:51:15 UTC (rev 94732)
@@ -674,7 +674,7 @@
#if !OS(WINCE)
- if (!alphaBlend && !context->isInTransparencyLayer())
+ if (!alphaBlend && !context->inTransparencyLayer())
DIBPixelData::setRGBABitmapAlpha(windowsContext.hdc(), r, 255);
#endif
}
