Continue trying to fix the ASSERT-enabled Windows build after r103858.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 1 Jan 2012 02:19:07 +0000 (02:19 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 1 Jan 2012 02:19:07 +0000 (02:19 +0000)
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::drawRectToPDF):
(WebKit::WebPage::drawPagesToPDF):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@103871 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebPage/WebPage.cpp

index 46609e569a7076962ae7f58dfe194de574b80b43..d739714bb6905c1f29318d9de97c4ee2a4aa5723 100644 (file)
@@ -1,3 +1,11 @@
+2011-12-31  Dan Bernstein  <mitz@apple.com>
+
+        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  <mitz@apple.com>
 
         Start trying to fix the Windows build after r103858.
index 2bec55c2233afd7ad8a888ae80d8d07509895589..eb04c42b533ceae31dabdbd5b1da51c82aeab3bb 100644 (file)
@@ -2700,13 +2700,13 @@ void WebPage::drawRectToPDF(uint64_t frameID, const PrintInfo& printInfo, const
     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);
+
+        ASSERT(coreFrame->document()->printing());
+#else
+        ASSERT(coreFrame->document()->printing() || pdfDocumentForPrintingFrame(coreFrame));
 
-#if USE(CG)
         // FIXME: Use CGDataConsumerCreate with callbacks to avoid copying the data.
         RetainPtr<CGDataConsumerRef> pdfDataConsumer(AdoptCF, CGDataConsumerCreateWithCFData(pdfPageData.get()));
 
@@ -2739,8 +2739,6 @@ void WebPage::drawRectToPDF(uint64_t frameID, const PrintInfo& printInfo, const
 
         CGPDFContextEndPage(context.get());
         CGPDFContextClose(context.get());
-#else
-        UNUSED_PARAM(printInfo);
 #endif
     }
 
@@ -2756,13 +2754,11 @@ void WebPage::drawPagesToPDF(uint64_t frameID, const PrintInfo& printInfo, uint3
 
     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.