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 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
855 // Don't schedule more layouts, we're in one. | 855 // Don't schedule more layouts, we're in one. |
856 TemporaryChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, fal
se); | 856 TemporaryChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, fal
se); |
857 | 857 |
858 if (!m_nestedLayoutCount && !m_inSynchronousPostLayout && m_postLayoutTasksT
imer.isActive() && !frame().document()->shouldDisplaySeamlesslyWithParent()) { | 858 if (!m_nestedLayoutCount && !m_inSynchronousPostLayout && m_postLayoutTasksT
imer.isActive() && !frame().document()->shouldDisplaySeamlesslyWithParent()) { |
859 // This is a new top-level layout. If there are any remaining tasks from
the previous layout, finish them now. | 859 // This is a new top-level layout. If there are any remaining tasks from
the previous layout, finish them now. |
860 m_inSynchronousPostLayout = true; | 860 m_inSynchronousPostLayout = true; |
861 performPostLayoutTasks(); | 861 performPostLayoutTasks(); |
862 m_inSynchronousPostLayout = false; | 862 m_inSynchronousPostLayout = false; |
863 } | 863 } |
864 | 864 |
| 865 Document* document = m_frame->document(); |
| 866 document->notifyResizeForViewportUnits(); |
| 867 |
865 // Viewport-dependent media queries may cause us to need completely differen
t style information. | 868 // Viewport-dependent media queries may cause us to need completely differen
t style information. |
866 Document* document = m_frame->document(); | 869 if (!document->styleResolver() || document->styleResolver()->mediaQueryAffec
tedByViewportChange()) { |
867 if (!document->styleResolver() || document->styleResolver()->affectedByViewp
ortChange()) { | |
868 document->styleResolverChanged(RecalcStyleDeferred); | 870 document->styleResolverChanged(RecalcStyleDeferred); |
869 document->mediaQueryAffectingValueChanged(); | 871 document->mediaQueryAffectingValueChanged(); |
870 | 872 |
871 // FIXME: This instrumentation event is not strictly accurate since cach
ed media query results | 873 // FIXME: This instrumentation event is not strictly accurate since cach
ed media query results |
872 // do not persist across StyleResolver rebuilds. | 874 // do not persist across StyleResolver rebuilds. |
873 InspectorInstrumentation::mediaQueryResultChanged(document); | 875 InspectorInstrumentation::mediaQueryResultChanged(document); |
874 } else { | 876 } else { |
875 document->evaluateMediaQueryList(); | 877 document->evaluateMediaQueryList(); |
876 } | 878 } |
877 | 879 |
(...skipping 2625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3503 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3505 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3504 { | 3506 { |
3505 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3507 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3506 if (AXObjectCache* cache = axObjectCache()) { | 3508 if (AXObjectCache* cache = axObjectCache()) { |
3507 cache->remove(scrollbar); | 3509 cache->remove(scrollbar); |
3508 cache->handleScrollbarUpdate(this); | 3510 cache->handleScrollbarUpdate(this); |
3509 } | 3511 } |
3510 } | 3512 } |
3511 | 3513 |
3512 } // namespace WebCore | 3514 } // namespace WebCore |
OLD | NEW |