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

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

Issue 1215103007: Remove remaining HTML elements (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « sky/engine/core/fetch/ResourceFetcher.cpp ('k') | sky/engine/core/frame/ImageBitmap.h » ('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 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 18 matching lines...) Expand all
29 #include "gen/sky/platform/RuntimeEnabledFeatures.h" 29 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
30 #include "sky/engine/core/animation/DocumentAnimations.h" 30 #include "sky/engine/core/animation/DocumentAnimations.h"
31 #include "sky/engine/core/css/FontFaceSet.h" 31 #include "sky/engine/core/css/FontFaceSet.h"
32 #include "sky/engine/core/css/resolver/StyleResolver.h" 32 #include "sky/engine/core/css/resolver/StyleResolver.h"
33 #include "sky/engine/core/dom/DocumentMarkerController.h" 33 #include "sky/engine/core/dom/DocumentMarkerController.h"
34 #include "sky/engine/core/editing/FrameSelection.h" 34 #include "sky/engine/core/editing/FrameSelection.h"
35 #include "sky/engine/core/fetch/ResourceFetcher.h" 35 #include "sky/engine/core/fetch/ResourceFetcher.h"
36 #include "sky/engine/core/frame/FrameHost.h" 36 #include "sky/engine/core/frame/FrameHost.h"
37 #include "sky/engine/core/frame/LocalFrame.h" 37 #include "sky/engine/core/frame/LocalFrame.h"
38 #include "sky/engine/core/frame/Settings.h" 38 #include "sky/engine/core/frame/Settings.h"
39 #include "sky/engine/core/html/parser/TextResourceDecoder.h"
40 #include "sky/engine/core/loader/FrameLoaderClient.h" 39 #include "sky/engine/core/loader/FrameLoaderClient.h"
41 #include "sky/engine/core/page/ChromeClient.h" 40 #include "sky/engine/core/page/ChromeClient.h"
42 #include "sky/engine/core/page/EventHandler.h" 41 #include "sky/engine/core/page/EventHandler.h"
43 #include "sky/engine/core/page/FocusController.h" 42 #include "sky/engine/core/page/FocusController.h"
44 #include "sky/engine/core/page/Page.h" 43 #include "sky/engine/core/page/Page.h"
45 #include "sky/engine/core/rendering/RenderLayer.h" 44 #include "sky/engine/core/rendering/RenderLayer.h"
46 #include "sky/engine/core/rendering/RenderView.h" 45 #include "sky/engine/core/rendering/RenderView.h"
47 #include "sky/engine/core/rendering/style/RenderStyle.h" 46 #include "sky/engine/core/rendering/style/RenderStyle.h"
48 #include "sky/engine/platform/ScriptForbiddenScope.h" 47 #include "sky/engine/platform/ScriptForbiddenScope.h"
49 #include "sky/engine/platform/TraceEvent.h" 48 #include "sky/engine/platform/TraceEvent.h"
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 return m_isPainting; 663 return m_isPainting;
665 } 664 }
666 665
667 void FrameView::updateLayoutAndStyleForPainting() 666 void FrameView::updateLayoutAndStyleForPainting()
668 { 667 {
669 // Updating layout can run script, which can tear down the FrameView. 668 // Updating layout can run script, which can tear down the FrameView.
670 RefPtr<FrameView> protector(this); 669 RefPtr<FrameView> protector(this);
671 670
672 updateLayoutAndStyleIfNeededRecursive(); 671 updateLayoutAndStyleIfNeededRecursive();
673 672
674 if (RenderView* view = renderView())
675 view->updateIFramesAfterLayout();
676
677 // TODO(ojan): Get rid of this and just have the LayoutClean state. 673 // TODO(ojan): Get rid of this and just have the LayoutClean state.
678 lifecycle().advanceTo(DocumentLifecycle::StyleAndLayoutClean); 674 lifecycle().advanceTo(DocumentLifecycle::StyleAndLayoutClean);
679 675
680 DocumentAnimations::startPendingAnimations(*m_frame->document()); 676 DocumentAnimations::startPendingAnimations(*m_frame->document());
681 } 677 }
682 678
683 void FrameView::updateLayoutAndStyleIfNeededRecursive() 679 void FrameView::updateLayoutAndStyleIfNeededRecursive()
684 { 680 {
685 // We have to crawl our entire tree looking for any FrameViews that need 681 // We have to crawl our entire tree looking for any FrameViews that need
686 // layout and make sure they are up to date. 682 // layout and make sure they are up to date.
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 totalObjects = 0; 764 totalObjects = 0;
769 765
770 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { 766 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
771 ++totalObjects; 767 ++totalObjects;
772 if (o->needsLayout()) 768 if (o->needsLayout())
773 ++needsLayoutObjects; 769 ++needsLayoutObjects;
774 } 770 }
775 } 771 }
776 772
777 } // namespace blink 773 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/fetch/ResourceFetcher.cpp ('k') | sky/engine/core/frame/ImageBitmap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698