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

Side by Side Diff: sky/engine/core/frame/FrameView.cpp

Issue 787293002: Remove the straggling DisableCompositingQueryAsserts. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 // http/tests/inspector/elements/html-link-import.html and many other 662 // http/tests/inspector/elements/html-link-import.html and many other
663 // tests hit that case. 663 // tests hit that case.
664 // We should ASSERT(isActive()); or at least return early if we can! 664 // We should ASSERT(isActive()); or at least return early if we can!
665 ASSERT(!isInPerformLayout()); // Always before or after performLayout(), par t of the highest-level layout() call. 665 ASSERT(!isInPerformLayout()); // Always before or after performLayout(), par t of the highest-level layout() call.
666 TRACE_EVENT0("blink", "FrameView::performPostLayoutTasks"); 666 TRACE_EVENT0("blink", "FrameView::performPostLayoutTasks");
667 RefPtr<FrameView> protect(this); 667 RefPtr<FrameView> protect(this);
668 668
669 m_postLayoutTasksTimer.stop(); 669 m_postLayoutTasksTimer.stop();
670 670
671 m_frame->selection().setCaretRectNeedsUpdate(); 671 m_frame->selection().setCaretRectNeedsUpdate();
672 672 m_frame->selection().updateAppearance();
673 {
674 // Hits in compositing/overflow/do-not-repaint-if-scrolling-composited-l ayers.html
675 DisableCompositingQueryAsserts disabler;
676 m_frame->selection().updateAppearance();
677 }
678 673
679 ASSERT(m_frame->document()); 674 ASSERT(m_frame->document());
680 if (m_nestedLayoutCount <= 1) { 675 if (m_nestedLayoutCount <= 1) {
681 if (m_firstLayoutCallbackPending) 676 if (m_firstLayoutCallbackPending)
682 m_firstLayoutCallbackPending = false; 677 m_firstLayoutCallbackPending = false;
683 } 678 }
684 679
685 FontFaceSet::didLayout(*m_frame->document()); 680 FontFaceSet::didLayout(*m_frame->document());
686 681
687 sendResizeEventIfNeeded(); 682 sendResizeEventIfNeeded();
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 totalObjects = 0; 1011 totalObjects = 0;
1017 1012
1018 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { 1013 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
1019 ++totalObjects; 1014 ++totalObjects;
1020 if (o->needsLayout()) 1015 if (o->needsLayout())
1021 ++needsLayoutObjects; 1016 ++needsLayoutObjects;
1022 } 1017 }
1023 } 1018 }
1024 1019
1025 } // namespace blink 1020 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/editing/FrameSelection.cpp ('k') | sky/engine/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698