| 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 4504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4515 layoutViewItem.invalidatePaintForViewAndCompositedLayers(); | 4515 layoutViewItem.invalidatePaintForViewAndCompositedLayers(); |
| 4516 } | 4516 } |
| 4517 | 4517 |
| 4518 bool hasHandlers = m_frame->host() && | 4518 bool hasHandlers = m_frame->host() && |
| 4519 m_frame->host()->eventHandlerRegistry().hasEventHandlers( | 4519 m_frame->host()->eventHandlerRegistry().hasEventHandlers( |
| 4520 EventHandlerRegistry::TouchStartOrMoveEventBlocking); | 4520 EventHandlerRegistry::TouchStartOrMoveEventBlocking); |
| 4521 if (wasThrottled != canThrottleRendering() && scrollingCoordinator && | 4521 if (wasThrottled != canThrottleRendering() && scrollingCoordinator && |
| 4522 hasHandlers) | 4522 hasHandlers) |
| 4523 scrollingCoordinator->touchEventTargetRectsDidChange(); | 4523 scrollingCoordinator->touchEventTargetRectsDidChange(); |
| 4524 | 4524 |
| 4525 if (m_frame->frameScheduler()) { | |
| 4526 m_frame->frameScheduler()->setFrameVisible(!m_hiddenForThrottling); | |
| 4527 m_frame->frameScheduler()->setCrossOrigin(m_frame->isCrossOriginSubframe()); | |
| 4528 } | |
| 4529 | |
| 4530 #if DCHECK_IS_ON() | 4525 #if DCHECK_IS_ON() |
| 4531 // Make sure we never have an unthrottled frame inside a throttled one. | 4526 // Make sure we never have an unthrottled frame inside a throttled one. |
| 4532 FrameView* parent = parentFrameView(); | 4527 FrameView* parent = parentFrameView(); |
| 4533 while (parent) { | 4528 while (parent) { |
| 4534 DCHECK(canThrottleRendering() || !parent->canThrottleRendering()); | 4529 DCHECK(canThrottleRendering() || !parent->canThrottleRendering()); |
| 4535 parent = parent->parentFrameView(); | 4530 parent = parent->parentFrameView(); |
| 4536 } | 4531 } |
| 4537 #endif | 4532 #endif |
| 4538 } | 4533 } |
| 4539 | 4534 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4618 DCHECK(m_frame->isMainFrame()); | 4613 DCHECK(m_frame->isMainFrame()); |
| 4619 return m_initialViewportSize.width(); | 4614 return m_initialViewportSize.width(); |
| 4620 } | 4615 } |
| 4621 | 4616 |
| 4622 int FrameView::initialViewportHeight() const { | 4617 int FrameView::initialViewportHeight() const { |
| 4623 DCHECK(m_frame->isMainFrame()); | 4618 DCHECK(m_frame->isMainFrame()); |
| 4624 return m_initialViewportSize.height(); | 4619 return m_initialViewportSize.height(); |
| 4625 } | 4620 } |
| 4626 | 4621 |
| 4627 } // namespace blink | 4622 } // namespace blink |
| OLD | NEW |