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

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

Issue 2743053003: [Reland #1] Don't create layout objects for children of display-none iframes. (Closed)
Patch Set: rebaseline. Created 3 years, 8 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 4778 matching lines...) Expand 10 before | Expand all | Expand 10 after
4789 } 4789 }
4790 4790
4791 // Don't throttle display:none frames (see updateRenderThrottlingStatus). 4791 // Don't throttle display:none frames (see updateRenderThrottlingStatus).
4792 HTMLFrameOwnerElement* ownerElement = m_frame->deprecatedLocalOwner(); 4792 HTMLFrameOwnerElement* ownerElement = m_frame->deprecatedLocalOwner();
4793 if (m_hiddenForThrottling && ownerElement && !ownerElement->layoutObject()) { 4793 if (m_hiddenForThrottling && ownerElement && !ownerElement->layoutObject()) {
4794 // No need to notify children because descendants of display:none frames 4794 // No need to notify children because descendants of display:none frames
4795 // should remain throttled. 4795 // should remain throttled.
4796 updateRenderThrottlingStatus(m_hiddenForThrottling, m_subtreeThrottled, 4796 updateRenderThrottlingStatus(m_hiddenForThrottling, m_subtreeThrottled,
4797 DontForceThrottlingInvalidation, 4797 DontForceThrottlingInvalidation,
4798 DontNotifyChildren); 4798 DontNotifyChildren);
4799 DCHECK(!canThrottleRendering());
4800 } 4799 }
4801 4800
4802 for (Frame* child = m_frame->tree().firstChild(); child; 4801 for (Frame* child = m_frame->tree().firstChild(); child;
4803 child = child->tree().nextSibling()) { 4802 child = child->tree().nextSibling()) {
4804 if (!child->isLocalFrame()) 4803 if (!child->isLocalFrame())
4805 continue; 4804 continue;
4806 if (FrameView* view = toLocalFrame(child)->view()) 4805 if (FrameView* view = toLocalFrame(child)->view())
4807 view->updateViewportIntersectionsForSubtree(targetState); 4806 view->updateViewportIntersectionsForSubtree(targetState);
4808 } 4807 }
4809 } 4808 }
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
5266 void FrameView::setAnimationHost( 5265 void FrameView::setAnimationHost(
5267 std::unique_ptr<CompositorAnimationHost> host) { 5266 std::unique_ptr<CompositorAnimationHost> host) {
5268 m_animationHost = std::move(host); 5267 m_animationHost = std::move(host);
5269 } 5268 }
5270 5269
5271 LayoutUnit FrameView::caretWidth() const { 5270 LayoutUnit FrameView::caretWidth() const {
5272 return LayoutUnit(getHostWindow()->windowToViewportScalar(1)); 5271 return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
5273 } 5272 }
5274 5273
5275 } // namespace blink 5274 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameOwner.h ('k') | third_party/WebKit/Source/core/frame/LocalFrameClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698