| 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 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1202 IntervalArena* RenderView::intervalArena() | 1202 IntervalArena* RenderView::intervalArena() |
| 1203 { | 1203 { |
| 1204 if (!m_intervalArena) | 1204 if (!m_intervalArena) |
| 1205 m_intervalArena = IntervalArena::create(); | 1205 m_intervalArena = IntervalArena::create(); |
| 1206 return m_intervalArena.get(); | 1206 return m_intervalArena.get(); |
| 1207 } | 1207 } |
| 1208 | 1208 |
| 1209 bool RenderView::backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const | 1209 bool RenderView::backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const |
| 1210 { | 1210 { |
| 1211 // FIXME: Remove this main frame check. Same concept applies to subframes to
o. | 1211 // FIXME: Remove this main frame check. Same concept applies to subframes to
o. |
| 1212 Page* page = document().page(); | 1212 if (!m_frameView || !m_frameView->isMainFrame()) |
| 1213 Frame* mainFrame = page ? page->mainFrame() : 0; | |
| 1214 if (!m_frameView || &m_frameView->frame() != mainFrame) | |
| 1215 return false; | 1213 return false; |
| 1216 | 1214 |
| 1217 return m_frameView->hasOpaqueBackground(); | 1215 return m_frameView->hasOpaqueBackground(); |
| 1218 } | 1216 } |
| 1219 | 1217 |
| 1220 LayoutUnit RenderView::viewportPercentageWidth(float percentage) const | 1218 LayoutUnit RenderView::viewportPercentageWidth(float percentage) const |
| 1221 { | 1219 { |
| 1222 return viewLogicalWidth(ScrollableArea::IncludeScrollbars) * percentage / 10
0.f; | 1220 return viewLogicalWidth(ScrollableArea::IncludeScrollbars) * percentage / 10
0.f; |
| 1223 } | 1221 } |
| 1224 | 1222 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1271 #endif | 1269 #endif |
| 1272 | 1270 |
| 1273 if (layoutState) | 1271 if (layoutState) |
| 1274 layoutState->m_isPaginated = m_fragmenting; | 1272 layoutState->m_isPaginated = m_fragmenting; |
| 1275 | 1273 |
| 1276 if (m_flowThreadState != RenderObject::NotInsideFlowThread) | 1274 if (m_flowThreadState != RenderObject::NotInsideFlowThread) |
| 1277 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); | 1275 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); |
| 1278 } | 1276 } |
| 1279 | 1277 |
| 1280 } // namespace WebCore | 1278 } // namespace WebCore |
| OLD | NEW |