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 825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
836 // Don't schedule more layouts, we're in one. | 836 // Don't schedule more layouts, we're in one. |
837 TemporaryChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, fal
se); | 837 TemporaryChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, fal
se); |
838 | 838 |
839 if (!m_nestedLayoutCount && !m_inSynchronousPostLayout && m_postLayoutTasksT
imer.isActive() && !frame().document()->shouldDisplaySeamlesslyWithParent()) { | 839 if (!m_nestedLayoutCount && !m_inSynchronousPostLayout && m_postLayoutTasksT
imer.isActive() && !frame().document()->shouldDisplaySeamlesslyWithParent()) { |
840 // This is a new top-level layout. If there are any remaining tasks from
the previous layout, finish them now. | 840 // This is a new top-level layout. If there are any remaining tasks from
the previous layout, finish them now. |
841 m_inSynchronousPostLayout = true; | 841 m_inSynchronousPostLayout = true; |
842 performPostLayoutTasks(); | 842 performPostLayoutTasks(); |
843 m_inSynchronousPostLayout = false; | 843 m_inSynchronousPostLayout = false; |
844 } | 844 } |
845 | 845 |
| 846 Document* document = m_frame->document(); |
| 847 document->notifyResizeForViewportUnits(); |
| 848 |
846 // Viewport-dependent media queries may cause us to need completely differen
t style information. | 849 // Viewport-dependent media queries may cause us to need completely differen
t style information. |
847 Document* document = m_frame->document(); | 850 if (!document->styleResolver() || document->styleResolver()->mediaQueryAffec
tedByViewportChange()) { |
848 if (!document->styleResolver() || document->styleResolver()->affectedByViewp
ortChange()) { | |
849 document->styleResolverChanged(RecalcStyleDeferred); | 851 document->styleResolverChanged(RecalcStyleDeferred); |
850 document->mediaQueryAffectingValueChanged(); | 852 document->mediaQueryAffectingValueChanged(); |
851 | 853 |
852 // FIXME: This instrumentation event is not strictly accurate since cach
ed media query results | 854 // FIXME: This instrumentation event is not strictly accurate since cach
ed media query results |
853 // do not persist across StyleResolver rebuilds. | 855 // do not persist across StyleResolver rebuilds. |
854 InspectorInstrumentation::mediaQueryResultChanged(document); | 856 InspectorInstrumentation::mediaQueryResultChanged(document); |
855 } else { | 857 } else { |
856 document->evaluateMediaQueryList(); | 858 document->evaluateMediaQueryList(); |
857 } | 859 } |
858 | 860 |
(...skipping 2618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3477 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3479 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3478 { | 3480 { |
3479 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3481 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3480 if (AXObjectCache* cache = axObjectCache()) { | 3482 if (AXObjectCache* cache = axObjectCache()) { |
3481 cache->remove(scrollbar); | 3483 cache->remove(scrollbar); |
3482 cache->handleScrollbarUpdate(this); | 3484 cache->handleScrollbarUpdate(this); |
3483 } | 3485 } |
3484 } | 3486 } |
3485 | 3487 |
3486 } // namespace WebCore | 3488 } // namespace WebCore |
OLD | NEW |