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

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

Issue 202523004: Fully update compositing information for *layerTreeAsText calls (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Assert that the compositor is up to date in layerTreeAsText Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/rendering/compositing/RenderLayerCompositor.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 418
419 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { 419 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
420 ++totalObjects; 420 ++totalObjects;
421 if (o->needsLayout()) 421 if (o->needsLayout())
422 ++needsLayoutObjects; 422 ++needsLayoutObjects;
423 } 423 }
424 } 424 }
425 425
426 String LocalFrame::layerTreeAsText(unsigned flags) const 426 String LocalFrame::layerTreeAsText(unsigned flags) const
427 { 427 {
428 document()->updateLayout();
429
430 if (!contentRenderer()) 428 if (!contentRenderer())
431 return String(); 429 return String();
432 430
431 ASSERT(document()->lifecycle().state() >= DocumentLifecycle::CompositingClea n);
432
433 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre eFlags>(flags)); 433 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre eFlags>(flags));
434 } 434 }
435 435
436 String LocalFrame::trackedRepaintRectsAsText() const 436 String LocalFrame::trackedRepaintRectsAsText() const
437 { 437 {
438 if (!m_view) 438 if (!m_view)
439 return String(); 439 return String();
440 return m_view->trackedRepaintRectsAsText(); 440 return m_view->trackedRepaintRectsAsText();
441 } 441 }
442 442
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 { 632 {
633 if (!m_host) 633 if (!m_host)
634 return 0; 634 return 0;
635 635
636 double ratio = m_host->deviceScaleFactor(); 636 double ratio = m_host->deviceScaleFactor();
637 ratio *= pageZoomFactor(); 637 ratio *= pageZoomFactor();
638 return ratio; 638 return ratio;
639 } 639 }
640 640
641 } // namespace WebCore 641 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/compositing/RenderLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698