summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/src/WebFrameImpl.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-07-23 09:28:44 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-07-23 09:28:44 +0200
commit815f1ed417bd26fbe2abbdf20ac5d3423b30796c (patch)
tree923c9a9e2834ccab60f5caecfb8f0ac410c1dd9e /Source/WebKit/chromium/src/WebFrameImpl.cpp
parentb4ad5d9d2b96baacd0180ead50de5195ca78af2d (diff)
downloadqtwebkit-815f1ed417bd26fbe2abbdf20ac5d3423b30796c.tar.gz
Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92 (http://svn.webkit.org/repository/webkit/trunk@123308)
New snapshot with better configure tests
Diffstat (limited to 'Source/WebKit/chromium/src/WebFrameImpl.cpp')
-rw-r--r--Source/WebKit/chromium/src/WebFrameImpl.cpp4
1 files changed, 4 insertions, 0 deletions
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()