Diff
Modified: trunk/Source/WebCore/ChangeLog (137047 => 137048)
--- trunk/Source/WebCore/ChangeLog 2012-12-08 21:19:56 UTC (rev 137047)
+++ trunk/Source/WebCore/ChangeLog 2012-12-08 21:47:56 UTC (rev 137048)
@@ -1,3 +1,22 @@
+2012-12-08 Patrick Gansterer <[email protected]>
+
+ Build fix for WinCE after r137011.
+
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/wince/GraphicsContextWinCE.cpp:
+ (WebCore::GraphicsContext::setPlatformCompositeOperation):
+ (WebCore::GraphicsContext::drawBitmap):
+ * platform/graphics/wince/ImageBufferWinCE.cpp:
+ (WebCore::BufferedImage::draw):
+ (WebCore::ImageBuffer::draw):
+ * platform/graphics/wince/ImageWinCE.cpp:
+ (WebCore::BitmapImage::getHBITMAPOfSize):
+ (WebCore::BitmapImage::drawFrameMatchingSourceSize):
+ (WebCore::BitmapImage::draw):
+ * platform/graphics/wince/SharedBitmap.cpp:
+ (WebCore::SharedBitmap::draw):
+ * platform/graphics/wince/SharedBitmap.h:
+
2012-12-08 Gavin Peters <[email protected]>
Add status events on <link rel=prerender> elements.
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (137047 => 137048)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2012-12-08 21:19:56 UTC (rev 137047)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2012-12-08 21:47:56 UTC (rev 137048)
@@ -459,7 +459,7 @@
void drawFrameControl(const IntRect& rect, unsigned type, unsigned state);
void drawFocusRect(const IntRect& rect);
void paintTextField(const IntRect& rect, unsigned state);
- void drawBitmap(SharedBitmap*, const IntRect& dstRect, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp);
+ void drawBitmap(SharedBitmap*, const IntRect& dstRect, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode);
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);
void drawRoundCorner(bool newClip, RECT clipRect, RECT rectWin, HDC dc, int width, int height);
Modified: trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp (137047 => 137048)
--- trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp 2012-12-08 21:19:56 UTC (rev 137047)
+++ trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp 2012-12-08 21:47:56 UTC (rev 137048)
@@ -1193,7 +1193,7 @@
m_data->m_opacity = alpha;
}
-void GraphicsContext::setPlatformCompositeOperation(CompositeOperator op)
+void GraphicsContext::setPlatformCompositeOperation(CompositeOperator op, BlendMode blendMode)
{
notImplemented();
}
@@ -1829,7 +1829,7 @@
FillRect(dc, &rectWin, reinterpret_cast<HBRUSH>(((state & DFCS_INACTIVE) ? COLOR_BTNFACE : COLOR_WINDOW) + 1));
}
-void GraphicsContext::drawBitmap(SharedBitmap* bmp, const IntRect& dstRectIn, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp)
+void GraphicsContext::drawBitmap(SharedBitmap* bmp, const IntRect& dstRectIn, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode)
{
if (!m_data->m_opacity)
return;
@@ -1845,7 +1845,7 @@
return;
dstRect.move(transparentDC.toShift());
- bmp->draw(dc, dstRect, srcRect, compositeOp);
+ bmp->draw(dc, dstRect, srcRect, compositeOp, blendMode);
if (bmp->is16bit())
transparentDC.fillAlphaChannel();
Modified: trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp (137047 => 137048)
--- trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp 2012-12-08 21:19:56 UTC (rev 137047)
+++ trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp 2012-12-08 21:47:56 UTC (rev 137048)
@@ -41,18 +41,18 @@
virtual IntSize size() const { return IntSize(m_data->m_bitmap->width(), m_data->m_bitmap->height()); }
virtual void destroyDecodedData(bool destroyAll = true) {}
virtual unsigned decodedSize() const { return 0; }
- virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator);
+ virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode);
virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect);
const ImageBufferData* m_data;
};
-void BufferedImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp)
+void BufferedImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode)
{
IntRect intDstRect = enclosingIntRect(dstRect);
IntRect intSrcRect(srcRect);
- m_data->m_bitmap->draw(ctxt, intDstRect, intSrcRect, styleColorSpace, compositeOp);
+ m_data->m_bitmap->draw(ctxt, intDstRect, intSrcRect, styleColorSpace, compositeOp, blendMode);
}
void BufferedImage::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
@@ -106,10 +106,10 @@
}
void ImageBuffer::draw(GraphicsContext* context, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect,
- CompositeOperator op , bool useLowQualityScale)
+ CompositeOperator op, BlendMode blendMode, bool useLowQualityScale)
{
RefPtr<Image> imageCopy = copyImage(CopyBackingStore);
- context->drawImage(imageCopy.get(), styleColorSpace, destRect, srcRect, op, DoNotRespectImageOrientation, useLowQualityScale);
+ context->drawImage(imageCopy.get(), styleColorSpace, destRect, srcRect, op, blendMode, DoNotRespectImageOrientation, useLowQualityScale);
}
void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform,
Modified: trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp (137047 => 137048)
--- trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp 2012-12-08 21:19:56 UTC (rev 137047)
+++ trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp 2012-12-08 21:47:56 UTC (rev 137048)
@@ -80,7 +80,7 @@
if (size)
drawFrameMatchingSourceSize(&gc, FloatRect(0, 0, bmpInfo.bmWidth, bmpInfo.bmHeight), IntSize(*size), ColorSpaceDeviceRGB, CompositeCopy);
else
- draw(&gc, FloatRect(0, 0, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0, 0, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy);
+ draw(&gc, FloatRect(0, 0, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0, 0, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal);
}
SelectObject(hdc.get(), hOldBmp);
@@ -98,17 +98,17 @@
size_t currentFrame = m_currentFrame;
m_currentFrame = i;
- draw(ctxt, dstRect, FloatRect(0, 0, srcSize.width(), srcSize.height()), styleColorSpace, compositeOp);
+ draw(ctxt, dstRect, FloatRect(0, 0, srcSize.width(), srcSize.height()), styleColorSpace, compositeOp, BlendModeNormal);
m_currentFrame = currentFrame;
return;
}
// No image of the correct size was found, fallback to drawing the current frame
IntSize imageSize = BitmapImage::size();
- draw(ctxt, dstRect, FloatRect(0, 0, imageSize.width(), imageSize.height()), styleColorSpace, compositeOp);
+ draw(ctxt, dstRect, FloatRect(0, 0, imageSize.width(), imageSize.height()), styleColorSpace, compositeOp, BlendModeNormal);
}
-void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRectIn, ColorSpace styleColorSpace, CompositeOperator compositeOp)
+void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRectIn, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode)
{
if (!m_source.initialized())
return;
@@ -127,7 +127,7 @@
intSrcRect.setY(stableRound(srcRectIn.y() * scaleFactor));
intSrcRect.setHeight(stableRound(srcRectIn.height() * scaleFactor));
}
- bmp->draw(ctxt, enclosingIntRect(dstRect), intSrcRect, styleColorSpace, compositeOp);
+ bmp->draw(ctxt, enclosingIntRect(dstRect), intSrcRect, styleColorSpace, compositeOp, blendMode);
}
}
Modified: trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.cpp (137047 => 137048)
--- trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.cpp 2012-12-08 21:19:56 UTC (rev 137047)
+++ trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.cpp 2012-12-08 21:47:56 UTC (rev 137048)
@@ -235,14 +235,14 @@
return true;
}
-void SharedBitmap::draw(GraphicsContext* ctxt, const IntRect& dstRect, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp)
+void SharedBitmap::draw(GraphicsContext* ctxt, const IntRect& dstRect, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode)
{
if (!m_pixels)
return;
- ctxt->drawBitmap(this, dstRect, srcRect, styleColorSpace, compositeOp);
+ ctxt->drawBitmap(this, dstRect, srcRect, styleColorSpace, compositeOp, blendMode);
}
-void SharedBitmap::draw(HDC hdc, const IntRect& dstRect, const IntRect& srcRect, CompositeOperator compositeOp)
+void SharedBitmap::draw(HDC hdc, const IntRect& dstRect, const IntRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode)
{
if (!m_pixels)
return;
Modified: trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.h (137047 => 137048)
--- trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.h 2012-12-08 21:19:56 UTC (rev 137047)
+++ trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.h 2012-12-08 21:47:56 UTC (rev 137048)
@@ -81,10 +81,10 @@
PassRefPtr<SharedBitmap> clipBitmap(const IntRect& rect, bool useAlpha);
- void draw(GraphicsContext* ctxt, const IntRect& dstRect, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp);
+ void draw(GraphicsContext* ctxt, const IntRect& dstRect, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode);
void drawPattern(GraphicsContext* ctxt, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, const IntSize& origSourceSize);
- void draw(HDC, const IntRect& dstRect, const IntRect& srcRect, CompositeOperator compositeOp);
+ void draw(HDC, const IntRect& dstRect, const IntRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode);
void drawPattern(HDC, const AffineTransform&, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, const IntSize& origSourceSize);
