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

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

Issue 884483003: Rename/move counter rendering code to layout. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/layout/CounterNode.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 29 matching lines...) Expand all
40 #include "core/fetch/ResourceFetcher.h" 40 #include "core/fetch/ResourceFetcher.h"
41 #include "core/fetch/ResourceLoadPriorityOptimizer.h" 41 #include "core/fetch/ResourceLoadPriorityOptimizer.h"
42 #include "core/frame/FrameHost.h" 42 #include "core/frame/FrameHost.h"
43 #include "core/frame/LocalFrame.h" 43 #include "core/frame/LocalFrame.h"
44 #include "core/frame/Settings.h" 44 #include "core/frame/Settings.h"
45 #include "core/html/HTMLFrameElement.h" 45 #include "core/html/HTMLFrameElement.h"
46 #include "core/html/HTMLPlugInElement.h" 46 #include "core/html/HTMLPlugInElement.h"
47 #include "core/html/parser/TextResourceDecoder.h" 47 #include "core/html/parser/TextResourceDecoder.h"
48 #include "core/inspector/InspectorInstrumentation.h" 48 #include "core/inspector/InspectorInstrumentation.h"
49 #include "core/inspector/InspectorTraceEvents.h" 49 #include "core/inspector/InspectorTraceEvents.h"
50 #include "core/layout/LayoutCounter.h"
50 #include "core/layout/LayoutTheme.h" 51 #include "core/layout/LayoutTheme.h"
51 #include "core/loader/FrameLoader.h" 52 #include "core/loader/FrameLoader.h"
52 #include "core/loader/FrameLoaderClient.h" 53 #include "core/loader/FrameLoaderClient.h"
53 #include "core/page/Chrome.h" 54 #include "core/page/Chrome.h"
54 #include "core/page/ChromeClient.h" 55 #include "core/page/ChromeClient.h"
55 #include "core/page/EventHandler.h" 56 #include "core/page/EventHandler.h"
56 #include "core/page/FocusController.h" 57 #include "core/page/FocusController.h"
57 #include "core/page/FrameTree.h" 58 #include "core/page/FrameTree.h"
58 #include "core/page/Page.h" 59 #include "core/page/Page.h"
59 #include "core/page/scrolling/ScrollingCoordinator.h" 60 #include "core/page/scrolling/ScrollingCoordinator.h"
60 #include "core/paint/FramePainter.h" 61 #include "core/paint/FramePainter.h"
61 #include "core/rendering/RenderCounter.h"
62 #include "core/rendering/RenderEmbeddedObject.h" 62 #include "core/rendering/RenderEmbeddedObject.h"
63 #include "core/rendering/RenderLayer.h" 63 #include "core/rendering/RenderLayer.h"
64 #include "core/rendering/RenderListBox.h" 64 #include "core/rendering/RenderListBox.h"
65 #include "core/rendering/RenderPart.h" 65 #include "core/rendering/RenderPart.h"
66 #include "core/rendering/RenderScrollbar.h" 66 #include "core/rendering/RenderScrollbar.h"
67 #include "core/rendering/RenderScrollbarPart.h" 67 #include "core/rendering/RenderScrollbarPart.h"
68 #include "core/rendering/RenderView.h" 68 #include "core/rendering/RenderView.h"
69 #include "core/rendering/TextAutosizer.h" 69 #include "core/rendering/TextAutosizer.h"
70 #include "core/rendering/compositing/CompositedLayerMapping.h" 70 #include "core/rendering/compositing/CompositedLayerMapping.h"
71 #include "core/rendering/compositing/CompositedSelectionBound.h" 71 #include "core/rendering/compositing/CompositedSelectionBound.h"
(...skipping 2078 matching lines...) Expand 10 before | Expand all | Expand 10 after
2150 } 2150 }
2151 2151
2152 void FrameView::postLayoutTimerFired(Timer<FrameView>*) 2152 void FrameView::postLayoutTimerFired(Timer<FrameView>*)
2153 { 2153 {
2154 performPostLayoutTasks(); 2154 performPostLayoutTasks();
2155 } 2155 }
2156 2156
2157 void FrameView::updateCounters() 2157 void FrameView::updateCounters()
2158 { 2158 {
2159 RenderView* view = renderView(); 2159 RenderView* view = renderView();
2160 if (!view->hasRenderCounters()) 2160 if (!view->hasLayoutCounters())
2161 return; 2161 return;
2162 2162
2163 for (RenderObject* renderer = view; renderer; renderer = renderer->nextInPre Order()) { 2163 for (RenderObject* renderer = view; renderer; renderer = renderer->nextInPre Order()) {
2164 if (!renderer->isCounter()) 2164 if (!renderer->isCounter())
2165 continue; 2165 continue;
2166 2166
2167 toRenderCounter(renderer)->updateCounter(); 2167 toLayoutCounter(renderer)->updateCounter();
2168 } 2168 }
2169 } 2169 }
2170 2170
2171 void FrameView::updateOverflowStatus(bool horizontalOverflow, bool verticalOverf low) 2171 void FrameView::updateOverflowStatus(bool horizontalOverflow, bool verticalOverf low)
2172 { 2172 {
2173 if (!m_viewportRenderer) 2173 if (!m_viewportRenderer)
2174 return; 2174 return;
2175 2175
2176 if (m_overflowStatusDirty) { 2176 if (m_overflowStatusDirty) {
2177 m_horizontalOverflow = horizontalOverflow; 2177 m_horizontalOverflow = horizontalOverflow;
(...skipping 1850 matching lines...) Expand 10 before | Expand all | Expand 10 after
4028 return; 4028 return;
4029 4029
4030 ScrollableArea::setScrollOrigin(origin); 4030 ScrollableArea::setScrollOrigin(origin);
4031 4031
4032 // Update if the scroll origin changes, since our position will be different if the content size did not change. 4032 // Update if the scroll origin changes, since our position will be different if the content size did not change.
4033 if (updatePositionAtAll && updatePositionSynchronously) 4033 if (updatePositionAtAll && updatePositionSynchronously)
4034 updateScrollbars(scrollOffsetDouble()); 4034 updateScrollbars(scrollOffsetDouble());
4035 } 4035 }
4036 4036
4037 } // namespace blink 4037 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/layout/CounterNode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698