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

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

Issue 140733004: Remove LayoutIndicator which is basically dead code (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/rendering/LayoutIndicator.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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "core/loader/FrameLoader.h" 48 #include "core/loader/FrameLoader.h"
49 #include "core/loader/FrameLoaderClient.h" 49 #include "core/loader/FrameLoaderClient.h"
50 #include "core/page/Chrome.h" 50 #include "core/page/Chrome.h"
51 #include "core/page/ChromeClient.h" 51 #include "core/page/ChromeClient.h"
52 #include "core/page/EventHandler.h" 52 #include "core/page/EventHandler.h"
53 #include "core/page/FocusController.h" 53 #include "core/page/FocusController.h"
54 #include "core/page/FrameTree.h" 54 #include "core/page/FrameTree.h"
55 #include "core/page/scrolling/ScrollingCoordinator.h" 55 #include "core/page/scrolling/ScrollingCoordinator.h"
56 #include "core/rendering/CompositedLayerMapping.h" 56 #include "core/rendering/CompositedLayerMapping.h"
57 #include "core/rendering/FastTextAutosizer.h" 57 #include "core/rendering/FastTextAutosizer.h"
58 #include "core/rendering/LayoutIndicator.h"
59 #include "core/rendering/RenderCounter.h" 58 #include "core/rendering/RenderCounter.h"
60 #include "core/rendering/RenderEmbeddedObject.h" 59 #include "core/rendering/RenderEmbeddedObject.h"
61 #include "core/rendering/RenderLayer.h" 60 #include "core/rendering/RenderLayer.h"
62 #include "core/rendering/RenderLayerCompositor.h" 61 #include "core/rendering/RenderLayerCompositor.h"
63 #include "core/rendering/RenderPart.h" 62 #include "core/rendering/RenderPart.h"
64 #include "core/rendering/RenderScrollbar.h" 63 #include "core/rendering/RenderScrollbar.h"
65 #include "core/rendering/RenderScrollbarPart.h" 64 #include "core/rendering/RenderScrollbarPart.h"
66 #include "core/rendering/RenderTheme.h" 65 #include "core/rendering/RenderTheme.h"
67 #include "core/rendering/RenderView.h" 66 #include "core/rendering/RenderView.h"
68 #include "core/rendering/TextAutosizer.h" 67 #include "core/rendering/TextAutosizer.h"
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 LayoutStateDisabler layoutStateDisabler(disableLayoutState ? rootForThis Layout->view() : 0); 907 LayoutStateDisabler layoutStateDisabler(disableLayoutState ? rootForThis Layout->view() : 0);
909 908
910 m_inLayout = true; 909 m_inLayout = true;
911 910
912 forceLayoutParentViewIfNeeded(); 911 forceLayoutParentViewIfNeeded();
913 912
914 // Text Autosizing requires two-pass layout which is incompatible with p artial layout. 913 // Text Autosizing requires two-pass layout which is incompatible with p artial layout.
915 // If enabled, only do partial layout for the second layout. 914 // If enabled, only do partial layout for the second layout.
916 // FIXME (crbug.com/256657): Do not do two layouts for text autosizing. 915 // FIXME (crbug.com/256657): Do not do two layouts for text autosizing.
917 PartialLayoutDisabler partialLayoutDisabler(partialLayout(), m_frame->se ttings() && m_frame->settings()->textAutosizingEnabled()); 916 PartialLayoutDisabler partialLayoutDisabler(partialLayout(), m_frame->se ttings() && m_frame->settings()->textAutosizingEnabled());
918
919 LayoutIndicator layoutIndicator;
920 rootForThisLayout->layout(); 917 rootForThisLayout->layout();
921 gatherDebugLayoutRects(rootForThisLayout); 918 gatherDebugLayoutRects(rootForThisLayout);
922 919
923 ResourceLoadPriorityOptimizer modifier; 920 ResourceLoadPriorityOptimizer modifier;
924 rootForThisLayout->didLayout(modifier); 921 rootForThisLayout->didLayout(modifier);
925 } 922 }
926 923
927 TextAutosizer* textAutosizer = frame().document()->textAutosizer(); 924 TextAutosizer* textAutosizer = frame().document()->textAutosizer();
928 bool autosized = textAutosizer && textAutosizer->processSubtree(rootForThisL ayout); 925 bool autosized = textAutosizer && textAutosizer->processSubtree(rootForThisL ayout);
929 if (autosized && rootForThisLayout->needsLayout()) { 926 if (autosized && rootForThisLayout->needsLayout()) {
930 TRACE_EVENT0("webkit", "2nd layout due to Text Autosizing"); 927 TRACE_EVENT0("webkit", "2nd layout due to Text Autosizing");
931 LayoutIndicator layoutIndicator;
932 rootForThisLayout->layout(); 928 rootForThisLayout->layout();
933 gatherDebugLayoutRects(rootForThisLayout); 929 gatherDebugLayoutRects(rootForThisLayout);
934 930
935 ResourceLoadPriorityOptimizer modifier; 931 ResourceLoadPriorityOptimizer modifier;
936 rootForThisLayout->didLayout(modifier); 932 rootForThisLayout->didLayout(modifier);
937 } 933 }
938 934
939 m_inLayout = false; 935 m_inLayout = false;
940 936
941 if (inSubtreeLayout) 937 if (inSubtreeLayout)
(...skipping 2568 matching lines...) Expand 10 before | Expand all | Expand 10 after
3510 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3506 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3511 { 3507 {
3512 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3508 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3513 if (AXObjectCache* cache = axObjectCache()) { 3509 if (AXObjectCache* cache = axObjectCache()) {
3514 cache->remove(scrollbar); 3510 cache->remove(scrollbar);
3515 cache->handleScrollbarUpdate(this); 3511 cache->handleScrollbarUpdate(this);
3516 } 3512 }
3517 } 3513 }
3518 3514
3519 } // namespace WebCore 3515 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/rendering/LayoutIndicator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698