Title: [101536] trunk/Source/WebKit/wx
- Revision
- 101536
- Author
- kev...@webkit.org
- Date
- 2011-11-30 11:27:59 -0800 (Wed, 30 Nov 2011)
Log Message
Use the wxGCDC(wxGraphicsContext) constructor on Mac as well
to avoid issues with the wxGCDC(wxPrinterDC) constructor.
https://bugs.webkit.org/show_bug.cgi?id=73463
Reviewed by Kevin Ollivier.
Modified Paths
Diff
Modified: trunk/Source/WebKit/wx/ChangeLog (101535 => 101536)
--- trunk/Source/WebKit/wx/ChangeLog 2011-11-30 19:25:24 UTC (rev 101535)
+++ trunk/Source/WebKit/wx/ChangeLog 2011-11-30 19:27:59 UTC (rev 101536)
@@ -1,3 +1,14 @@
+2011-11-30 Robin Dunn <ro...@alldunn.com>
+
+ Use the wxGCDC(wxGraphicsContext) constructor on Mac as well
+ to avoid issues with the wxGCDC(wxPrinterDC) constructor.
+ https://bugs.webkit.org/show_bug.cgi?id=73463
+
+ Reviewed by Kevin Ollivier.
+
+ * WebFrame.cpp:
+ (wxWebFramePrintout::OnPrintPage):
+
2011-11-26 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r101193.
Modified: trunk/Source/WebKit/wx/WebFrame.cpp (101535 => 101536)
--- trunk/Source/WebKit/wx/WebFrame.cpp 2011-11-30 19:25:24 UTC (rev 101535)
+++ trunk/Source/WebKit/wx/WebFrame.cpp 2011-11-30 19:27:59 UTC (rev 101536)
@@ -158,15 +158,15 @@
bool OnPrintPage(int pageNum)
{
wxPrinterDC* pdc = dynamic_cast<wxPrinterDC*>(GetDC());
+ wxGraphicsRenderer* renderer = 0;
#if wxCHECK_VERSION(2, 9, 2) && defined(wxUSE_CAIRO) && wxUSE_CAIRO
- wxGraphicsRenderer* renderer = wxGraphicsRenderer::GetCairoRenderer();
+ renderer = wxGraphicsRenderer::GetCairoRenderer();
+#endif
if (!renderer)
renderer = wxGraphicsRenderer::GetDefaultRenderer();
+ ASSERT(renderer);
wxGraphicsContext* context = renderer->CreateContext(*pdc);
wxGCDC gcdc(context);
-#else
- wxGCDC gcdc(pdc);
-#endif
if (!gcdc.IsOk())
return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
