Title: [105115] branches/safari-534.54-branch/Source/WebKit2
Diff
Modified: branches/safari-534.54-branch/Source/WebKit2/ChangeLog (105114 => 105115)
--- branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-17 01:21:36 UTC (rev 105114)
+++ branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-17 01:21:40 UTC (rev 105115)
@@ -1,5 +1,17 @@
2012-01-16 Mark Rowe <[email protected]>
+ Merge r103871.
+
+ 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):
+
+2012-01-16 Mark Rowe <[email protected]>
+
Merge r103869.
2011-12-31 Dan Bernstein <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (105114 => 105115)
--- branches/safari-534.54-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-01-17 01:21:36 UTC (rev 105114)
+++ branches/safari-534.54-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-01-17 01:21:40 UTC (rev 105115)
@@ -2384,13 +2384,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()));
@@ -2423,8 +2423,6 @@
CGPDFContextEndPage(context.get());
CGPDFContextClose(context.get());
-#else
- UNUSED_PARAM(printInfo);
#endif
}
@@ -2440,13 +2438,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
