Diff
Modified: trunk/Source/WebCore/ChangeLog (189164 => 189165)
--- trunk/Source/WebCore/ChangeLog 2015-08-31 08:33:21 UTC (rev 189164)
+++ trunk/Source/WebCore/ChangeLog 2015-08-31 08:51:07 UTC (rev 189165)
@@ -1,3 +1,18 @@
+2015-08-31 Sungmann Cho <[email protected]>
+
+ Fix the WinCairo build after landing of webkit.org/b/148561.
+ https://bugs.webkit.org/show_bug.cgi?id=148627
+
+ Reviewed by Myles C. Maxfield.
+
+ No new tests, no behavior change.
+
+ * platform/graphics/win/ImageCairoWin.cpp:
+ (WebCore::BitmapImage::getHBITMAPOfSize):
+ * platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:
+ (WebCore::MediaPlayerPrivateMediaFoundation::paint):
+ * platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:
+
2015-08-31 Antti Koivisto <[email protected]>
REGRESSION (r188820): fast/dom/HTMLObjectElement/object-as-frame.html is flaky
Modified: trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp (189164 => 189165)
--- trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp 2015-08-31 08:33:21 UTC (rev 189164)
+++ trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp 2015-08-31 08:51:07 UTC (rev 189165)
@@ -81,7 +81,7 @@
if (size)
drawFrameMatchingSourceSize(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), *size, ColorSpaceDeviceRGB, CompositeCopy);
else
- draw(&gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal, ImageOrientationDescription());
+ draw(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal, ImageOrientationDescription());
// Do cleanup
cairo_destroy(targetRef);
Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp (189164 => 189165)
--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp 2015-08-31 08:33:21 UTC (rev 189164)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp 2015-08-31 08:51:07 UTC (rev 189165)
@@ -251,9 +251,9 @@
m_videoDisplay->SetVideoPosition(nullptr, &rc);
}
-void MediaPlayerPrivateMediaFoundation::paint(GraphicsContext* context, const FloatRect& rect)
+void MediaPlayerPrivateMediaFoundation::paint(GraphicsContext& context, const FloatRect& rect)
{
- if (context->paintingDisabled()
+ if (context.paintingDisabled()
|| !m_player->visible())
return;
Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h (189164 => 189165)
--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h 2015-08-31 08:33:21 UTC (rev 189164)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h 2015-08-31 08:51:07 UTC (rev 189165)
@@ -75,7 +75,7 @@
virtual void setSize(const IntSize&);
- virtual void paint(GraphicsContext*, const FloatRect&);
+ virtual void paint(GraphicsContext&, const FloatRect&) override;
private:
MediaPlayer* m_player;
Modified: trunk/Source/WebKit/win/ChangeLog (189164 => 189165)
--- trunk/Source/WebKit/win/ChangeLog 2015-08-31 08:33:21 UTC (rev 189164)
+++ trunk/Source/WebKit/win/ChangeLog 2015-08-31 08:51:07 UTC (rev 189165)
@@ -1,3 +1,13 @@
+2015-08-31 Sungmann Cho <[email protected]>
+
+ Fix the WinCairo build after landing of webkit.org/b/148561.
+ https://bugs.webkit.org/show_bug.cgi?id=148627
+
+ Reviewed by Myles C. Maxfield.
+
+ * WebCoreSupport/AcceleratedCompositingContext.cpp:
+ (AcceleratedCompositingContext::paintContents):
+
2015-08-28 Myles C. Maxfield <[email protected]>
Fix the Windows build more after r189144
Modified: trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp (189164 => 189165)
--- trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2015-08-31 08:33:21 UTC (rev 189164)
+++ trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2015-08-31 08:51:07 UTC (rev 189165)
@@ -406,7 +406,7 @@
{
context.save();
context.clip(rectToPaint);
- core(&m_webView)->mainFrame().view()->paint(&context, enclosingIntRect(rectToPaint));
+ core(&m_webView)->mainFrame().view()->paint(context, enclosingIntRect(rectToPaint));
context.restore();
}
