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

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

Issue 791023006: Delete invalidateTreeIfNeeded. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove unneeded call Created 5 years, 11 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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 // FIXME: It should be not possible to remove the FrameView from the frame/p age during layout 392 // FIXME: It should be not possible to remove the FrameView from the frame/p age during layout
393 // however m_inPerformLayout is not set for most of this function, so none o f our RELEASE_ASSERTS 393 // however m_inPerformLayout is not set for most of this function, so none o f our RELEASE_ASSERTS
394 // in LocalFrame/Page will fire. One of the post-layout tasks is disconnecti ng the LocalFrame from 394 // in LocalFrame/Page will fire. One of the post-layout tasks is disconnecti ng the LocalFrame from
395 // the page in fast/frames/crash-remove-iframe-during-object-beforeload-2.ht ml 395 // the page in fast/frames/crash-remove-iframe-during-object-beforeload-2.ht ml
396 // necessitating this check here. 396 // necessitating this check here.
397 // ASSERT(frame()->page()); 397 // ASSERT(frame()->page());
398 if (frame().page()) 398 if (frame().page())
399 frame().page()->chrome().client().layoutUpdated(m_frame.get()); 399 frame().page()->chrome().client().layoutUpdated(m_frame.get());
400 } 400 }
401 401
402 // FIXME(sky): Remove
402 void FrameView::invalidateTreeIfNeeded() 403 void FrameView::invalidateTreeIfNeeded()
403 { 404 {
404 lifecycle().advanceTo(DocumentLifecycle::InPaintInvalidation); 405 lifecycle().advanceTo(DocumentLifecycle::InPaintInvalidation);
405
406 ASSERT(renderView());
407 RenderView& rootForPaintInvalidation = *renderView();
408 ASSERT(!rootForPaintInvalidation.needsLayout());
409
410 PaintInvalidationState rootPaintInvalidationState(rootForPaintInvalidation);
411
412 rootForPaintInvalidation.invalidateTreeIfNeeded(rootPaintInvalidationState);
413
414 m_doFullPaintInvalidation = false; 406 m_doFullPaintInvalidation = false;
415 #ifndef NDEBUG
416 renderView()->assertSubtreeClearedPaintInvalidationState();
417 #endif
418
419 lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean); 407 lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean);
420 } 408 }
421 409
422 DocumentLifecycle& FrameView::lifecycle() const 410 DocumentLifecycle& FrameView::lifecycle() const
423 { 411 {
424 return m_frame->document()->lifecycle(); 412 return m_frame->document()->lifecycle();
425 } 413 }
426 414
427 void FrameView::setMediaType(const AtomicString& mediaType) 415 void FrameView::setMediaType(const AtomicString& mediaType)
428 { 416 {
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 totalObjects = 0; 934 totalObjects = 0;
947 935
948 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { 936 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
949 ++totalObjects; 937 ++totalObjects;
950 if (o->needsLayout()) 938 if (o->needsLayout())
951 ++needsLayoutObjects; 939 ++needsLayoutObjects;
952 } 940 }
953 } 941 }
954 942
955 } // namespace blink 943 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/editing/InputMethodController.cpp ('k') | sky/engine/core/html/HTMLCanvasElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698