| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 4329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4340 m_viewportIntersection = frameRect(); | 4340 m_viewportIntersection = frameRect(); |
| 4341 return; | 4341 return; |
| 4342 } | 4342 } |
| 4343 ASSERT(!parent->m_needsUpdateViewportIntersection); | 4343 ASSERT(!parent->m_needsUpdateViewportIntersection); |
| 4344 | 4344 |
| 4345 bool parentLoaded = parent->frame().document()->wouldLoadReason() > Created; | 4345 bool parentLoaded = parent->frame().document()->wouldLoadReason() > Created; |
| 4346 // If the parent wasn't loaded, the children won't be either. | 4346 // If the parent wasn't loaded, the children won't be either. |
| 4347 if (parentLoaded) { | 4347 if (parentLoaded) { |
| 4348 if (frameRect().isEmpty()) | 4348 if (frameRect().isEmpty()) |
| 4349 frame().document()->maybeRecordLoadReason(WouldLoadZeroByZero); | 4349 frame().document()->maybeRecordLoadReason(WouldLoadZeroByZero); |
| 4350 else if (frameRect().maxY() < 0 && frameRect().maxX() < 0) |
| 4351 frame().document()->maybeRecordLoadReason(WouldLoadAboveAndLeft); |
| 4350 else if (frameRect().maxY() < 0) | 4352 else if (frameRect().maxY() < 0) |
| 4351 frame().document()->maybeRecordLoadReason(WouldLoadAbove); | 4353 frame().document()->maybeRecordLoadReason(WouldLoadAbove); |
| 4352 else if (frameRect().maxX() < 0) | 4354 else if (frameRect().maxX() < 0) |
| 4353 frame().document()->maybeRecordLoadReason(WouldLoadLeft); | 4355 frame().document()->maybeRecordLoadReason(WouldLoadLeft); |
| 4354 } | 4356 } |
| 4355 | 4357 |
| 4356 // If our parent is hidden, then we are too. | 4358 // If our parent is hidden, then we are too. |
| 4357 if (parent->m_viewportIntersection.isEmpty()) { | 4359 if (parent->m_viewportIntersection.isEmpty()) { |
| 4358 m_viewportIntersection = parent->m_viewportIntersection; | 4360 m_viewportIntersection = parent->m_viewportIntersection; |
| 4359 return; | 4361 return; |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4530 DCHECK(m_frame->isMainFrame()); | 4532 DCHECK(m_frame->isMainFrame()); |
| 4531 return m_initialViewportSize.width(); | 4533 return m_initialViewportSize.width(); |
| 4532 } | 4534 } |
| 4533 | 4535 |
| 4534 int FrameView::initialViewportHeight() const { | 4536 int FrameView::initialViewportHeight() const { |
| 4535 DCHECK(m_frame->isMainFrame()); | 4537 DCHECK(m_frame->isMainFrame()); |
| 4536 return m_initialViewportSize.height(); | 4538 return m_initialViewportSize.height(); |
| 4537 } | 4539 } |
| 4538 | 4540 |
| 4539 } // namespace blink | 4541 } // namespace blink |
| OLD | NEW |