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

Side by Side Diff: Source/core/rendering/RenderObject.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 30 matching lines...) Expand all
41 #include "core/frame/EventHandlerRegistry.h" 41 #include "core/frame/EventHandlerRegistry.h"
42 #include "core/frame/FrameView.h" 42 #include "core/frame/FrameView.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/frame/UseCounter.h" 45 #include "core/frame/UseCounter.h"
46 #include "core/html/HTMLAnchorElement.h" 46 #include "core/html/HTMLAnchorElement.h"
47 #include "core/html/HTMLElement.h" 47 #include "core/html/HTMLElement.h"
48 #include "core/html/HTMLHtmlElement.h" 48 #include "core/html/HTMLHtmlElement.h"
49 #include "core/html/HTMLTableCellElement.h" 49 #include "core/html/HTMLTableCellElement.h"
50 #include "core/html/HTMLTableElement.h" 50 #include "core/html/HTMLTableElement.h"
51 #include "core/layout/LayoutCounter.h"
51 #include "core/layout/LayoutTableCaption.h" 52 #include "core/layout/LayoutTableCaption.h"
52 #include "core/layout/LayoutTableCell.h" 53 #include "core/layout/LayoutTableCell.h"
53 #include "core/layout/LayoutTableCol.h" 54 #include "core/layout/LayoutTableCol.h"
54 #include "core/layout/LayoutTableRow.h" 55 #include "core/layout/LayoutTableRow.h"
55 #include "core/layout/LayoutTheme.h" 56 #include "core/layout/LayoutTheme.h"
56 #include "core/page/AutoscrollController.h" 57 #include "core/page/AutoscrollController.h"
57 #include "core/page/EventHandler.h" 58 #include "core/page/EventHandler.h"
58 #include "core/page/Page.h" 59 #include "core/page/Page.h"
59 #include "core/paint/ObjectPainter.h" 60 #include "core/paint/ObjectPainter.h"
60 #include "core/rendering/HitTestResult.h" 61 #include "core/rendering/HitTestResult.h"
61 #include "core/rendering/RenderCounter.h"
62 #include "core/rendering/RenderDeprecatedFlexibleBox.h" 62 #include "core/rendering/RenderDeprecatedFlexibleBox.h"
63 #include "core/rendering/RenderFlexibleBox.h" 63 #include "core/rendering/RenderFlexibleBox.h"
64 #include "core/rendering/RenderFlowThread.h" 64 #include "core/rendering/RenderFlowThread.h"
65 #include "core/rendering/RenderGeometryMap.h" 65 #include "core/rendering/RenderGeometryMap.h"
66 #include "core/rendering/RenderGrid.h" 66 #include "core/rendering/RenderGrid.h"
67 #include "core/rendering/RenderImage.h" 67 #include "core/rendering/RenderImage.h"
68 #include "core/rendering/RenderImageResourceStyleImage.h" 68 #include "core/rendering/RenderImageResourceStyleImage.h"
69 #include "core/rendering/RenderInline.h" 69 #include "core/rendering/RenderInline.h"
70 #include "core/rendering/RenderLayer.h" 70 #include "core/rendering/RenderLayer.h"
71 #include "core/rendering/RenderListItem.h" 71 #include "core/rendering/RenderListItem.h"
(...skipping 1723 matching lines...) Expand 10 before | Expand all | Expand 10 after
1795 1795
1796 void RenderObject::styleDidChange(StyleDifference diff, const RenderStyle* oldSt yle) 1796 void RenderObject::styleDidChange(StyleDifference diff, const RenderStyle* oldSt yle)
1797 { 1797 {
1798 if (s_affectsParentBlock) 1798 if (s_affectsParentBlock)
1799 handleDynamicFloatPositionChange(); 1799 handleDynamicFloatPositionChange();
1800 1800
1801 if (!m_parent) 1801 if (!m_parent)
1802 return; 1802 return;
1803 1803
1804 if (diff.needsFullLayout()) { 1804 if (diff.needsFullLayout()) {
1805 RenderCounter::rendererStyleChanged(*this, oldStyle, m_style.get()); 1805 LayoutCounter::rendererStyleChanged(*this, oldStyle, m_style.get());
1806 1806
1807 // If the object already needs layout, then setNeedsLayout won't do 1807 // If the object already needs layout, then setNeedsLayout won't do
1808 // any work. But if the containing block has changed, then we may need 1808 // any work. But if the containing block has changed, then we may need
1809 // to mark the new containing blocks for layout. The change that can 1809 // to mark the new containing blocks for layout. The change that can
1810 // directly affect the containing block of this object is a change to 1810 // directly affect the containing block of this object is a change to
1811 // the position style. 1811 // the position style.
1812 if (needsLayout() && oldStyle->position() != m_style->position()) 1812 if (needsLayout() && oldStyle->position() != m_style->position())
1813 markContainingBlocksForLayout(); 1813 markContainingBlocksForLayout();
1814 1814
1815 // Ditto. 1815 // Ditto.
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
2311 // object for this renderer. So we remove the AX render object now, after th e renderer is removed. 2311 // object for this renderer. So we remove the AX render object now, after th e renderer is removed.
2312 if (AXObjectCache* cache = document().existingAXObjectCache()) 2312 if (AXObjectCache* cache = document().existingAXObjectCache())
2313 cache->remove(this); 2313 cache->remove(this);
2314 2314
2315 // If this renderer had a parent, remove should have destroyed any counters 2315 // If this renderer had a parent, remove should have destroyed any counters
2316 // attached to this renderer and marked the affected other counters for 2316 // attached to this renderer and marked the affected other counters for
2317 // reevaluation. This apparently redundant check is here for the case when 2317 // reevaluation. This apparently redundant check is here for the case when
2318 // this renderer had no parent at the time remove() was called. 2318 // this renderer had no parent at the time remove() was called.
2319 2319
2320 if (hasCounterNodeMap()) 2320 if (hasCounterNodeMap())
2321 RenderCounter::destroyCounterNodes(*this); 2321 LayoutCounter::destroyCounterNodes(*this);
2322 2322
2323 // Remove the handler if node had touch-action set. Handlers are not added 2323 // Remove the handler if node had touch-action set. Handlers are not added
2324 // for text nodes so don't try removing for one too. Need to check if 2324 // for text nodes so don't try removing for one too. Need to check if
2325 // m_style is null in cases of partial construction. Any handler we added 2325 // m_style is null in cases of partial construction. Any handler we added
2326 // previously may have already been removed by the Document independently. 2326 // previously may have already been removed by the Document independently.
2327 if (node() && !node()->isTextNode() && m_style && m_style->touchAction() != TouchActionAuto) { 2327 if (node() && !node()->isTextNode() && m_style && m_style->touchAction() != TouchActionAuto) {
2328 EventHandlerRegistry& registry = document().frameHost()->eventHandlerReg istry(); 2328 EventHandlerRegistry& registry = document().frameHost()->eventHandlerReg istry();
2329 if (registry.eventHandlerTargets(EventHandlerRegistry::TouchEvent)->cont ains(node())) 2329 if (registry.eventHandlerTargets(EventHandlerRegistry::TouchEvent)->cont ains(node()))
2330 registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchE vent); 2330 registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchE vent);
2331 } 2331 }
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
3158 { 3158 {
3159 if (object1) { 3159 if (object1) {
3160 const blink::RenderObject* root = object1; 3160 const blink::RenderObject* root = object1;
3161 while (root->parent()) 3161 while (root->parent())
3162 root = root->parent(); 3162 root = root->parent();
3163 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3163 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3164 } 3164 }
3165 } 3165 }
3166 3166
3167 #endif 3167 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderCounter.cpp ('k') | Source/core/rendering/RenderObjectChildList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698