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

Side by Side Diff: sky/engine/core/rendering/RenderObject.cpp

Issue 689853003: Remove CSS Grid Layout and grid media queries. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "core/html/HTMLAnchorElement.h" 42 #include "core/html/HTMLAnchorElement.h"
43 #include "core/html/HTMLElement.h" 43 #include "core/html/HTMLElement.h"
44 #include "core/page/AutoscrollController.h" 44 #include "core/page/AutoscrollController.h"
45 #include "core/page/EventHandler.h" 45 #include "core/page/EventHandler.h"
46 #include "core/page/Page.h" 46 #include "core/page/Page.h"
47 #include "core/frame/Settings.h" 47 #include "core/frame/Settings.h"
48 #include "core/frame/UseCounter.h" 48 #include "core/frame/UseCounter.h"
49 #include "core/rendering/HitTestResult.h" 49 #include "core/rendering/HitTestResult.h"
50 #include "core/rendering/RenderFlexibleBox.h" 50 #include "core/rendering/RenderFlexibleBox.h"
51 #include "core/rendering/RenderGeometryMap.h" 51 #include "core/rendering/RenderGeometryMap.h"
52 #include "core/rendering/RenderGrid.h"
53 #include "core/rendering/RenderImage.h" 52 #include "core/rendering/RenderImage.h"
54 #include "core/rendering/RenderImageResourceStyleImage.h" 53 #include "core/rendering/RenderImageResourceStyleImage.h"
55 #include "core/rendering/RenderInline.h" 54 #include "core/rendering/RenderInline.h"
56 #include "core/rendering/RenderLayer.h" 55 #include "core/rendering/RenderLayer.h"
57 #include "core/rendering/RenderObjectInlines.h" 56 #include "core/rendering/RenderObjectInlines.h"
58 #include "core/rendering/RenderText.h" 57 #include "core/rendering/RenderText.h"
59 #include "core/rendering/RenderTheme.h" 58 #include "core/rendering/RenderTheme.h"
60 #include "core/rendering/RenderView.h" 59 #include "core/rendering/RenderView.h"
61 #include "core/rendering/compositing/CompositedLayerMapping.h" 60 #include "core/rendering/compositing/CompositedLayerMapping.h"
62 #include "core/rendering/compositing/RenderLayerCompositor.h" 61 #include "core/rendering/compositing/RenderLayerCompositor.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 case NONE: 140 case NONE:
142 return 0; 141 return 0;
143 case INLINE: 142 case INLINE:
144 return new RenderInline(element); 143 return new RenderInline(element);
145 case BLOCK: 144 case BLOCK:
146 case INLINE_BLOCK: 145 case INLINE_BLOCK:
147 return new RenderBlockFlow(element); 146 return new RenderBlockFlow(element);
148 case FLEX: 147 case FLEX:
149 case INLINE_FLEX: 148 case INLINE_FLEX:
150 return new RenderFlexibleBox(element); 149 return new RenderFlexibleBox(element);
151 case GRID:
152 case INLINE_GRID:
153 return new RenderGrid(element);
154 } 150 }
155 151
156 return 0; 152 return 0;
157 } 153 }
158 154
159 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, renderObjectCounter, ("Rend erObject")); 155 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, renderObjectCounter, ("Rend erObject"));
160 unsigned RenderObject::s_instanceCount = 0; 156 unsigned RenderObject::s_instanceCount = 0;
161 157
162 RenderObject::RenderObject(Node* node) 158 RenderObject::RenderObject(Node* node)
163 : ImageResourceClient() 159 : ImageResourceClient()
(...skipping 2680 matching lines...) Expand 10 before | Expand all | Expand 10 after
2844 { 2840 {
2845 if (object1) { 2841 if (object1) {
2846 const blink::RenderObject* root = object1; 2842 const blink::RenderObject* root = object1;
2847 while (root->parent()) 2843 while (root->parent())
2848 root = root->parent(); 2844 root = root->parent();
2849 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 2845 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
2850 } 2846 }
2851 } 2847 }
2852 2848
2853 #endif 2849 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderObject.h ('k') | sky/engine/core/rendering/style/GridCoordinate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698