From 815f1ed417bd26fbe2abbdf20ac5d3423b30796c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 23 Jul 2012 09:28:44 +0200
Subject: Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92
 (http://svn.webkit.org/repository/webkit/trunk@123308)

New snapshot with better configure tests
---
 Source/WebKit/chromium/src/WebFrameImpl.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Source/WebKit/chromium/src/WebFrameImpl.cpp')

diff --git a/Source/WebKit/chromium/src/WebFrameImpl.cpp b/Source/WebKit/chromium/src/WebFrameImpl.cpp
index 89189eea2..0cfbac209 100644
--- a/Source/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/Source/WebKit/chromium/src/WebFrameImpl.cpp
@@ -1529,6 +1529,7 @@ float WebFrameImpl::getPrintPageShrink(int page)
 
 float WebFrameImpl::printPage(int page, WebCanvas* canvas)
 {
+#if ENABLE(PRINTING)
     // Ensure correct state.
     if (!m_printContext || page < 0 || !frame() || !frame()->document()) {
         ASSERT_NOT_REACHED();
@@ -1540,6 +1541,9 @@ float WebFrameImpl::printPage(int page, WebCanvas* canvas)
     gc.platformContext()->setPrinting(true);
 
     return m_printContext->spoolPage(gc, page);
+#else
+    return 0;
+#endif
 }
 
 void WebFrameImpl::printEnd()
-- 
cgit v1.2.1