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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 21081004: Add UseCounters for display:run-in and display:compact. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix enum Created 7 years, 4 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/page/UseCounter.h ('k') | no next file » | 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 25 matching lines...) Expand all
36 #include "core/editing/htmlediting.h" 36 #include "core/editing/htmlediting.h"
37 #include "core/html/HTMLAnchorElement.h" 37 #include "core/html/HTMLAnchorElement.h"
38 #include "core/html/HTMLElement.h" 38 #include "core/html/HTMLElement.h"
39 #include "core/html/HTMLHtmlElement.h" 39 #include "core/html/HTMLHtmlElement.h"
40 #include "core/html/HTMLTableElement.h" 40 #include "core/html/HTMLTableElement.h"
41 #include "core/page/EventHandler.h" 41 #include "core/page/EventHandler.h"
42 #include "core/page/Frame.h" 42 #include "core/page/Frame.h"
43 #include "core/page/FrameView.h" 43 #include "core/page/FrameView.h"
44 #include "core/page/Page.h" 44 #include "core/page/Page.h"
45 #include "core/page/Settings.h" 45 #include "core/page/Settings.h"
46 #include "core/page/UseCounter.h"
46 #include "core/page/animation/AnimationController.h" 47 #include "core/page/animation/AnimationController.h"
47 #include "core/platform/Partitions.h" 48 #include "core/platform/Partitions.h"
48 #include "core/platform/graphics/FloatQuad.h" 49 #include "core/platform/graphics/FloatQuad.h"
49 #include "core/platform/graphics/GraphicsContext.h" 50 #include "core/platform/graphics/GraphicsContext.h"
50 #include "core/platform/graphics/transforms/TransformState.h" 51 #include "core/platform/graphics/transforms/TransformState.h"
51 #include "core/rendering/FlowThreadController.h" 52 #include "core/rendering/FlowThreadController.h"
52 #include "core/rendering/HitTestResult.h" 53 #include "core/rendering/HitTestResult.h"
53 #include "core/rendering/RenderCounter.h" 54 #include "core/rendering/RenderCounter.h"
54 #include "core/rendering/RenderDeprecatedFlexibleBox.h" 55 #include "core/rendering/RenderDeprecatedFlexibleBox.h"
55 #include "core/rendering/RenderFlexibleBox.h" 56 #include "core/rendering/RenderFlexibleBox.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 if (style->display() == INLINE) 158 if (style->display() == INLINE)
158 return new RenderRubyAsInline(element); 159 return new RenderRubyAsInline(element);
159 else if (style->display() == BLOCK) 160 else if (style->display() == BLOCK)
160 return new RenderRubyAsBlock(element); 161 return new RenderRubyAsBlock(element);
161 } 162 }
162 // treat <rt> as ruby text ONLY if it still has its default treatment of blo ck 163 // treat <rt> as ruby text ONLY if it still has its default treatment of blo ck
163 if (element->hasTagName(rtTag) && style->display() == BLOCK) 164 if (element->hasTagName(rtTag) && style->display() == BLOCK)
164 return new RenderRubyText(element); 165 return new RenderRubyText(element);
165 if (RuntimeEnabledFeatures::cssRegionsEnabled() && style->isDisplayRegionTyp e() && !style->regionThread().isEmpty() && doc->renderView()) 166 if (RuntimeEnabledFeatures::cssRegionsEnabled() && style->isDisplayRegionTyp e() && !style->regionThread().isEmpty() && doc->renderView())
166 return new RenderRegion(element, 0); 167 return new RenderRegion(element, 0);
168
169 if (style->display() == RUN_IN)
170 UseCounter::count(doc, UseCounter::CSSDisplayRunIn);
171 else if (style->display() == COMPACT)
172 UseCounter::count(doc, UseCounter::CSSDisplayCompact);
173
167 switch (style->display()) { 174 switch (style->display()) {
168 case NONE: 175 case NONE:
169 return 0; 176 return 0;
170 case INLINE: 177 case INLINE:
171 return new RenderInline(element); 178 return new RenderInline(element);
172 case BLOCK: 179 case BLOCK:
173 case INLINE_BLOCK: 180 case INLINE_BLOCK:
174 case RUN_IN: 181 case RUN_IN:
175 case COMPACT: 182 case COMPACT:
176 if ((!style->hasAutoColumnCount() || !style->hasAutoColumnWidth()) && do c->regionBasedColumnsEnabled()) 183 if ((!style->hasAutoColumnCount() || !style->hasAutoColumnWidth()) && do c->regionBasedColumnsEnabled())
(...skipping 3092 matching lines...) Expand 10 before | Expand all | Expand 10 after
3269 { 3276 {
3270 if (object1) { 3277 if (object1) {
3271 const WebCore::RenderObject* root = object1; 3278 const WebCore::RenderObject* root = object1;
3272 while (root->parent()) 3279 while (root->parent())
3273 root = root->parent(); 3280 root = root->parent();
3274 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3281 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3275 } 3282 }
3276 } 3283 }
3277 3284
3278 #endif 3285 #endif
OLDNEW
« no previous file with comments | « Source/core/page/UseCounter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698