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

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

Issue 423823004: Add support for SVG Clip paths in HTML (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Changed LayoutTests and Aligned with review comments Created 6 years, 4 months 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 2849 matching lines...) Expand 10 before | Expand all | Expand 10 after
2860 } 2860 }
2861 2861
2862 const Vector<RefPtr<FrameView> >::iterator end = frameViews.end(); 2862 const Vector<RefPtr<FrameView> >::iterator end = frameViews.end();
2863 for (Vector<RefPtr<FrameView> >::iterator it = frameViews.begin(); it != end ; ++it) 2863 for (Vector<RefPtr<FrameView> >::iterator it = frameViews.begin(); it != end ; ++it)
2864 (*it)->updateLayoutAndStyleIfNeededRecursive(); 2864 (*it)->updateLayoutAndStyleIfNeededRecursive();
2865 2865
2866 // When an <iframe> gets composited, it triggers an extra style recalc in it s containing FrameView. 2866 // When an <iframe> gets composited, it triggers an extra style recalc in it s containing FrameView.
2867 // To avoid pushing an invalid tree for display, we have to check for this c ase and do another 2867 // To avoid pushing an invalid tree for display, we have to check for this c ase and do another
2868 // style recalc. The extra style recalc needs to happen after our child <ifr ames> were updated. 2868 // style recalc. The extra style recalc needs to happen after our child <ifr ames> were updated.
2869 // FIXME: We shouldn't be triggering an extra style recalc in the first plac e. 2869 // FIXME: We shouldn't be triggering an extra style recalc in the first plac e.
2870 if (m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate()) { 2870 if (m_frame->document()->hasSVGEffectsElementsRequiringLayerUpdate()) {
2871 m_frame->document()->updateRenderTreeIfNeeded(); 2871 m_frame->document()->updateRenderTreeIfNeeded();
2872 2872
2873 if (needsLayout()) 2873 if (needsLayout())
2874 layout(); 2874 layout();
2875 } 2875 }
2876 2876
2877 // These asserts ensure that parent frames are clean, when child frames fini shed updating layout and style. 2877 // These asserts ensure that parent frames are clean, when child frames fini shed updating layout and style.
2878 ASSERT(!needsLayout()); 2878 ASSERT(!needsLayout());
2879 ASSERT(!m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate()); 2879 ASSERT(!m_frame->document()->hasSVGEffectsElementsRequiringLayerUpdate());
2880 #if ENABLE(ASSERT) 2880 #if ENABLE(ASSERT)
2881 m_frame->document()->renderView()->assertRendererLaidOut(); 2881 m_frame->document()->renderView()->assertRendererLaidOut();
2882 #endif 2882 #endif
2883 2883
2884 } 2884 }
2885 2885
2886 void FrameView::invalidateTreeIfNeededRecursive() 2886 void FrameView::invalidateTreeIfNeededRecursive()
2887 { 2887 {
2888 // FIXME: We should be more aggressive at cutting tree traversals. 2888 // FIXME: We should be more aggressive at cutting tree traversals.
2889 lifecycle().advanceTo(DocumentLifecycle::InPaintInvalidation); 2889 lifecycle().advanceTo(DocumentLifecycle::InPaintInvalidation);
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
3288 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3288 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3289 { 3289 {
3290 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3290 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3291 if (AXObjectCache* cache = axObjectCache()) { 3291 if (AXObjectCache* cache = axObjectCache()) {
3292 cache->remove(scrollbar); 3292 cache->remove(scrollbar);
3293 cache->handleScrollbarUpdate(this); 3293 cache->handleScrollbarUpdate(this);
3294 } 3294 }
3295 } 3295 }
3296 3296
3297 } // namespace blink 3297 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698