Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(219)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2490163002: Reland of "Tracking reference filter mutation via SVGElementProxy" (Closed)
Patch Set: Fix double observer unregistration; simplify scope selection; add tests Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 3024 matching lines...) Expand 10 before | Expand all | Expand 10 after
3035 child = child->tree().nextSibling()) { 3035 child = child->tree().nextSibling()) {
3036 if (!child->isLocalFrame()) 3036 if (!child->isLocalFrame())
3037 continue; 3037 continue;
3038 if (FrameView* view = toLocalFrame(child)->view()) 3038 if (FrameView* view = toLocalFrame(child)->view())
3039 frameViews.append(view); 3039 frameViews.append(view);
3040 } 3040 }
3041 3041
3042 for (const auto& frameView : frameViews) 3042 for (const auto& frameView : frameViews)
3043 frameView->updateStyleAndLayoutIfNeededRecursiveInternal(); 3043 frameView->updateStyleAndLayoutIfNeededRecursiveInternal();
3044 3044
3045 checkDoesNotNeedLayout();
3046
3047 // When SVG filters are invalidated using
3048 // Document::scheduleSVGFilterLayerUpdateHack() they may trigger an extra
3049 // style recalc. See PaintLayer::filterNeedsPaintInvalidation().
3050 if (m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate()) {
3051 m_frame->document()->updateStyleAndLayoutTree();
3052
3053 if (needsLayout())
3054 layout();
3055 }
3056
3057 // These asserts ensure that parent frames are clean, when child frames 3045 // These asserts ensure that parent frames are clean, when child frames
3058 // finished updating layout and style. 3046 // finished updating layout and style.
3059 checkDoesNotNeedLayout(); 3047 checkDoesNotNeedLayout();
3060 ASSERT(!m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate());
3061 #if ENABLE(ASSERT) 3048 #if ENABLE(ASSERT)
3062 m_frame->document()->layoutView()->assertLaidOut(); 3049 m_frame->document()->layoutView()->assertLaidOut();
3063 #endif 3050 #endif
3064 3051
3065 updateWidgetGeometriesIfNeeded(); 3052 updateWidgetGeometriesIfNeeded();
3066 3053
3067 if (lifecycle().state() < DocumentLifecycle::LayoutClean) 3054 if (lifecycle().state() < DocumentLifecycle::LayoutClean)
3068 lifecycle().advanceTo(DocumentLifecycle::LayoutClean); 3055 lifecycle().advanceTo(DocumentLifecycle::LayoutClean);
3069 3056
3070 // Ensure that we become visually non-empty eventually. 3057 // Ensure that we become visually non-empty eventually.
(...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after
4578 DCHECK(m_frame->isMainFrame()); 4565 DCHECK(m_frame->isMainFrame());
4579 return m_initialViewportSize.width(); 4566 return m_initialViewportSize.width();
4580 } 4567 }
4581 4568
4582 int FrameView::initialViewportHeight() const { 4569 int FrameView::initialViewportHeight() const {
4583 DCHECK(m_frame->isMainFrame()); 4570 DCHECK(m_frame->isMainFrame());
4584 return m_initialViewportSize.height(); 4571 return m_initialViewportSize.height();
4585 } 4572 }
4586 4573
4587 } // namespace blink 4574 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698