| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 867 | 867 |
| 868 bool RenderView::printing() const | 868 bool RenderView::printing() const |
| 869 { | 869 { |
| 870 return document()->printing(); | 870 return document()->printing(); |
| 871 } | 871 } |
| 872 | 872 |
| 873 bool RenderView::shouldUsePrintingLayout() const | 873 bool RenderView::shouldUsePrintingLayout() const |
| 874 { | 874 { |
| 875 if (!printing() || !m_frameView) | 875 if (!printing() || !m_frameView) |
| 876 return false; | 876 return false; |
| 877 Frame* frame = m_frameView->frame(); | 877 return m_frameView->frame()->shouldUsePrintingLayout(); |
| 878 return frame && frame->shouldUsePrintingLayout(); | |
| 879 } | 878 } |
| 880 | 879 |
| 881 size_t RenderView::getRetainedWidgets(Vector<RenderWidget*>& renderWidgets) | 880 size_t RenderView::getRetainedWidgets(Vector<RenderWidget*>& renderWidgets) |
| 882 { | 881 { |
| 883 size_t size = m_widgets.size(); | 882 size_t size = m_widgets.size(); |
| 884 | 883 |
| 885 renderWidgets.reserveCapacity(size); | 884 renderWidgets.reserveCapacity(size); |
| 886 | 885 |
| 887 RenderWidgetSet::const_iterator end = m_widgets.end(); | 886 RenderWidgetSet::const_iterator end = m_widgets.end(); |
| 888 for (RenderWidgetSet::const_iterator it = m_widgets.begin(); it != end; ++it
) { | 887 for (RenderWidgetSet::const_iterator it = m_widgets.begin(); it != end; ++it
) { |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1004 if (hasColumns() && !style()->hasInlineColumnAxis()) { | 1003 if (hasColumns() && !style()->hasInlineColumnAxis()) { |
| 1005 if (int pageLength = m_frameView->pagination().pageLength) | 1004 if (int pageLength = m_frameView->pagination().pageLength) |
| 1006 height = pageLength; | 1005 height = pageLength; |
| 1007 } | 1006 } |
| 1008 | 1007 |
| 1009 return height; | 1008 return height; |
| 1010 } | 1009 } |
| 1011 | 1010 |
| 1012 float RenderView::zoomFactor() const | 1011 float RenderView::zoomFactor() const |
| 1013 { | 1012 { |
| 1014 Frame* frame = m_frameView->frame(); | 1013 return m_frameView->frame()->pageZoomFactor(); |
| 1015 return frame ? frame->pageZoomFactor() : 1; | |
| 1016 } | 1014 } |
| 1017 | 1015 |
| 1018 void RenderView::pushLayoutState(RenderObject* root) | 1016 void RenderView::pushLayoutState(RenderObject* root) |
| 1019 { | 1017 { |
| 1020 ASSERT(m_layoutStateDisableCount == 0); | 1018 ASSERT(m_layoutStateDisableCount == 0); |
| 1021 ASSERT(m_layoutState == 0); | 1019 ASSERT(m_layoutState == 0); |
| 1022 | 1020 |
| 1023 m_layoutState = new LayoutState(root); | 1021 m_layoutState = new LayoutState(root); |
| 1024 } | 1022 } |
| 1025 | 1023 |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1153 #endif | 1151 #endif |
| 1154 | 1152 |
| 1155 if (layoutState) | 1153 if (layoutState) |
| 1156 layoutState->m_isPaginated = m_fragmenting; | 1154 layoutState->m_isPaginated = m_fragmenting; |
| 1157 | 1155 |
| 1158 if (m_flowThreadState != RenderObject::NotInsideFlowThread) | 1156 if (m_flowThreadState != RenderObject::NotInsideFlowThread) |
| 1159 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); | 1157 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); |
| 1160 } | 1158 } |
| 1161 | 1159 |
| 1162 } // namespace WebCore | 1160 } // namespace WebCore |
| OLD | NEW |