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

Side by Side Diff: Source/core/layout/LayoutObject.cpp

Issue 948343003: Move rendering/RenderGrid to layout/LayoutGrid (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/layout/LayoutObject.h ('k') | Source/core/paint/GridPainter.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) 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/HitTestResult.h" 51 #include "core/layout/HitTestResult.h"
52 #include "core/layout/Layer.h" 52 #include "core/layout/Layer.h"
53 #include "core/layout/LayoutCounter.h" 53 #include "core/layout/LayoutCounter.h"
54 #include "core/layout/LayoutFlowThread.h" 54 #include "core/layout/LayoutFlowThread.h"
55 #include "core/layout/LayoutGeometryMap.h" 55 #include "core/layout/LayoutGeometryMap.h"
56 #include "core/layout/LayoutGrid.h"
56 #include "core/layout/LayoutImage.h" 57 #include "core/layout/LayoutImage.h"
57 #include "core/layout/LayoutImageResourceStyleImage.h" 58 #include "core/layout/LayoutImageResourceStyleImage.h"
58 #include "core/layout/LayoutListItem.h" 59 #include "core/layout/LayoutListItem.h"
59 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h" 60 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
60 #include "core/layout/LayoutObjectInlines.h" 61 #include "core/layout/LayoutObjectInlines.h"
61 #include "core/layout/LayoutPart.h" 62 #include "core/layout/LayoutPart.h"
62 #include "core/layout/LayoutScrollbarPart.h" 63 #include "core/layout/LayoutScrollbarPart.h"
63 #include "core/layout/LayoutTableCaption.h" 64 #include "core/layout/LayoutTableCaption.h"
64 #include "core/layout/LayoutTableCell.h" 65 #include "core/layout/LayoutTableCell.h"
65 #include "core/layout/LayoutTableCol.h" 66 #include "core/layout/LayoutTableCol.h"
66 #include "core/layout/LayoutTableRow.h" 67 #include "core/layout/LayoutTableRow.h"
67 #include "core/layout/LayoutTheme.h" 68 #include "core/layout/LayoutTheme.h"
68 #include "core/layout/compositing/CompositedLayerMapping.h" 69 #include "core/layout/compositing/CompositedLayerMapping.h"
69 #include "core/layout/compositing/LayerCompositor.h" 70 #include "core/layout/compositing/LayerCompositor.h"
70 #include "core/layout/style/ContentData.h" 71 #include "core/layout/style/ContentData.h"
71 #include "core/layout/style/ShadowList.h" 72 #include "core/layout/style/ShadowList.h"
72 #include "core/page/AutoscrollController.h" 73 #include "core/page/AutoscrollController.h"
73 #include "core/page/EventHandler.h" 74 #include "core/page/EventHandler.h"
74 #include "core/page/Page.h" 75 #include "core/page/Page.h"
75 #include "core/paint/ObjectPainter.h" 76 #include "core/paint/ObjectPainter.h"
76 #include "core/rendering/RenderDeprecatedFlexibleBox.h" 77 #include "core/rendering/RenderDeprecatedFlexibleBox.h"
77 #include "core/rendering/RenderFlexibleBox.h" 78 #include "core/rendering/RenderFlexibleBox.h"
78 #include "core/rendering/RenderGrid.h"
79 #include "core/rendering/RenderInline.h" 79 #include "core/rendering/RenderInline.h"
80 #include "core/rendering/RenderView.h" 80 #include "core/rendering/RenderView.h"
81 #include "platform/JSONValues.h" 81 #include "platform/JSONValues.h"
82 #include "platform/Partitions.h" 82 #include "platform/Partitions.h"
83 #include "platform/RuntimeEnabledFeatures.h" 83 #include "platform/RuntimeEnabledFeatures.h"
84 #include "platform/TraceEvent.h" 84 #include "platform/TraceEvent.h"
85 #include "platform/TracedValue.h" 85 #include "platform/TracedValue.h"
86 #include "platform/geometry/TransformState.h" 86 #include "platform/geometry/TransformState.h"
87 #include "platform/graphics/GraphicsContext.h" 87 #include "platform/graphics/GraphicsContext.h"
88 #include "platform/graphics/paint/DisplayItemList.h" 88 #include "platform/graphics/paint/DisplayItemList.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 case TABLE_CAPTION: 203 case TABLE_CAPTION:
204 return new LayoutTableCaption(element); 204 return new LayoutTableCaption(element);
205 case BOX: 205 case BOX:
206 case INLINE_BOX: 206 case INLINE_BOX:
207 return new RenderDeprecatedFlexibleBox(*element); 207 return new RenderDeprecatedFlexibleBox(*element);
208 case FLEX: 208 case FLEX:
209 case INLINE_FLEX: 209 case INLINE_FLEX:
210 return new RenderFlexibleBox(element); 210 return new RenderFlexibleBox(element);
211 case GRID: 211 case GRID:
212 case INLINE_GRID: 212 case INLINE_GRID:
213 return new RenderGrid(element); 213 return new LayoutGrid(element);
214 } 214 }
215 215
216 return 0; 216 return 0;
217 } 217 }
218 218
219 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, layoutObjectCounter, ("Layo utObject")); 219 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, layoutObjectCounter, ("Layo utObject"));
220 unsigned LayoutObject::s_instanceCount = 0; 220 unsigned LayoutObject::s_instanceCount = 0;
221 221
222 LayoutObject::LayoutObject(Node* node) 222 LayoutObject::LayoutObject(Node* node)
223 : ImageResourceClient() 223 : ImageResourceClient()
(...skipping 2965 matching lines...) Expand 10 before | Expand all | Expand 10 after
3189 { 3189 {
3190 if (object1) { 3190 if (object1) {
3191 const blink::LayoutObject* root = object1; 3191 const blink::LayoutObject* root = object1;
3192 while (root->parent()) 3192 while (root->parent())
3193 root = root->parent(); 3193 root = root->parent();
3194 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3194 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3195 } 3195 }
3196 } 3196 }
3197 3197
3198 #endif 3198 #endif
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutObject.h ('k') | Source/core/paint/GridPainter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698