Title: [103871] trunk/Source/WebKit2
- Revision
- 103871
- Author
- [email protected]
- Date
- 2011-12-31 18:19:07 -0800 (Sat, 31 Dec 2011)
Log Message
Continue trying to fix the ASSERT-enabled Windows build after r103858.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::drawRectToPDF):
(WebKit::WebPage::drawPagesToPDF):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (103870 => 103871)
--- trunk/Source/WebKit2/ChangeLog 2012-01-01 02:07:23 UTC (rev 103870)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-01 02:19:07 UTC (rev 103871)
@@ -1,5 +1,13 @@
2011-12-31 Dan Bernstein <[email protected]>
+ Continue trying to fix the ASSERT-enabled Windows build after r103858.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::drawRectToPDF):
+ (WebKit::WebPage::drawPagesToPDF):
+
+2011-12-31 Dan Bernstein <[email protected]>
+
Start trying to fix the Windows build after r103858.
* WebProcess/WebPage/WebPage.cpp:
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (103870 => 103871)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-01-01 02:07:23 UTC (rev 103870)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-01-01 02:19:07 UTC (rev 103871)
@@ -2700,13 +2700,13 @@
RetainPtr<CFMutableDataRef> pdfPageData(AdoptCF, CFDataCreateMutable(0, 0));
if (coreFrame) {
- ASSERT(coreFrame->document()->printing()
-#if USE(CG)
- || pdfDocumentForPrintingFrame(coreFrame)
-#endif
- );
+#if !USE(GC)
+ UNUSED_PARAM(printInfo);
-#if USE(CG)
+ ASSERT(coreFrame->document()->printing());
+#else
+ ASSERT(coreFrame->document()->printing() || pdfDocumentForPrintingFrame(coreFrame));
+
// FIXME: Use CGDataConsumerCreate with callbacks to avoid copying the data.
RetainPtr<CGDataConsumerRef> pdfDataConsumer(AdoptCF, CGDataConsumerCreateWithCFData(pdfPageData.get()));
@@ -2739,8 +2739,6 @@
CGPDFContextEndPage(context.get());
CGPDFContextClose(context.get());
-#else
- UNUSED_PARAM(printInfo);
#endif
}
@@ -2756,13 +2754,11 @@
if (coreFrame) {
- ASSERT(coreFrame->document()->printing()
-#if USE(CG)
- || pdfDocumentForPrintingFrame(coreFrame)
-#endif
- );
+#if !USE(CG)
+ ASSERT(coreFrame->document()->printing());
+#else
+ ASSERT(coreFrame->document()->printing() || pdfDocumentForPrintingFrame(coreFrame));
-#if USE(CG)
RetainPtr<CGPDFDocumentRef> pdfDocument = pdfDocumentForPrintingFrame(coreFrame);
// FIXME: Use CGDataConsumerCreate with callbacks to avoid copying the data.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
