|
|
Chromium Code Reviews|
Created:
7 years, 4 months ago by ojan Modified:
7 years, 4 months ago CC:
blink-reviews, dglazkov+blink, eae+blinkwatch, leviw+renderwatch, jchaffraix+rendering Base URL:
svn://svn.chromium.org/blink/trunk Visibility:
Public. |
DescriptionAdd UseCounters for display:run-in and display:compact.
This is to see if we can remove these features and simplify the code.
Our run-in implementation is buggy-tastic and, as best I can tell,
compact does nothing different than display:block.
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=155266
Patch Set 1 #Patch Set 2 : merge to ToT #Patch Set 3 : include header #
Total comments: 2
Patch Set 4 : fix double counting #Patch Set 5 : fix double counting #Patch Set 6 : merge to ToT #Patch Set 7 : fix enum #Messages
Total messages: 19 (0 generated)
lgtm
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ojan@chromium.org/21081004/1
Failed to apply patch for Source/core/page/UseCounter.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file Source/core/page/UseCounter.h
Hunk #1 FAILED at 150.
1 out of 1 hunk FAILED -- saving rejects to file
Source/core/page/UseCounter.h.rej
Patch: Source/core/page/UseCounter.h
Index: Source/core/page/UseCounter.h
diff --git a/Source/core/page/UseCounter.h b/Source/core/page/UseCounter.h
index
5b170244d44aaead473fe0388c625254a6271920..d85da7a4e68d3b50363ddf1c65f595128546e45f
100644
--- a/Source/core/page/UseCounter.h
+++ b/Source/core/page/UseCounter.h
@@ -150,6 +150,8 @@ public:
ShadowDOMPrefixedCreateShadowRoot,
ShadowDOMPrefixedShadowRoot,
SVGAnimationElement,
+ CSSDisplayRunIn,
+ CSSDisplayCompact,
// Add new features immediately above this line. Don't change assigned
// numbers of each items, and don't reuse unused slots.
NumberOfFeatures, // This enum value must be last.
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ojan@chromium.org/21081004/7001
Sorry for I got bad news for ya. Compile failed with a clobber build on linux_layout. http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_layo... Your code is likely broken or HEAD is junk. Please ensure your code is not broken then alert the build sheriffs. Look at the try server FAQ for more details.
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ojan@chromium.org/21081004/19001
Retried try job too often on linux_blink_rel for step(s) webkit_lint, webkit_python_tests, webkit_tests, webkit_unit_tests, weborigin_unittests, wtf_unittests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_blin...
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ojan@chromium.org/21081004/19001
Failed to apply patch for Source/core/rendering/RenderObject.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file Source/core/rendering/RenderObject.cpp
Hunk #1 succeeded at 43 with fuzz 2.
Hunk #2 FAILED at 175.
1 out of 2 hunks FAILED -- saving rejects to file
Source/core/rendering/RenderObject.cpp.rej
Patch: Source/core/rendering/RenderObject.cpp
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp
b/Source/core/rendering/RenderObject.cpp
index
376a739140520cab245ee520d644e3c46b0efdc8..0f8862f476291f85fbd8e0d09d616a90905591bd
100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -43,6 +43,7 @@
#include "core/page/FrameView.h"
#include "core/page/Page.h"
#include "core/page/Settings.h"
+#include "core/page/UseCounter.h"
#include "core/page/animation/AnimationController.h"
#include "core/platform/graphics/FloatQuad.h"
#include "core/platform/graphics/GraphicsContext.h"
@@ -174,10 +175,14 @@ RenderObject* RenderObject::createObject(Element* element,
RenderStyle* style)
return 0;
case INLINE:
return new (arena) RenderInline(element);
- case BLOCK:
- case INLINE_BLOCK:
case RUN_IN:
+ UseCounter::count(doc, UseCounter::Feature::CSSDisplayRunIn);
+ // Intentionally fall through.
case COMPACT:
+ UseCounter::count(doc, UseCounter::Feature::CSSDisplayCompact);
+ // Intentionally fall through.
+ case BLOCK:
+ case INLINE_BLOCK:
if ((!style->hasAutoColumnCount() || !style->hasAutoColumnWidth()) &&
doc->regionBasedColumnsEnabled())
return new (arena) RenderMultiColumnBlock(element);
return new (arena) RenderBlock(element);
https://chromiumcodereview.appspot.com/21081004/diff/19001/Source/core/render... File Source/core/rendering/RenderObject.cpp (right): https://chromiumcodereview.appspot.com/21081004/diff/19001/Source/core/render... Source/core/rendering/RenderObject.cpp:182: UseCounter::count(doc, UseCounter::Feature::CSSDisplayCompact); Do you really want to count run-in as compact?
https://chromiumcodereview.appspot.com/21081004/diff/19001/Source/core/render... File Source/core/rendering/RenderObject.cpp (right): https://chromiumcodereview.appspot.com/21081004/diff/19001/Source/core/render... Source/core/rendering/RenderObject.cpp:182: UseCounter::count(doc, UseCounter::Feature::CSSDisplayCompact); On 2013/07/31 16:47:02, eseidel wrote: > Do you really want to count run-in as compact? lol. whoops.
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ojan@chromium.org/21081004/39001
Failed to apply patch for Source/core/rendering/RenderObject.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file Source/core/rendering/RenderObject.cpp
Hunk #1 succeeded at 43 with fuzz 2.
Hunk #2 FAILED at 170.
1 out of 2 hunks FAILED -- saving rejects to file
Source/core/rendering/RenderObject.cpp.rej
Patch: Source/core/rendering/RenderObject.cpp
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp
b/Source/core/rendering/RenderObject.cpp
index
376a739140520cab245ee520d644e3c46b0efdc8..80fb7999b4d539999152b6f6bd8e560bcbb9cf48
100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -43,6 +43,7 @@
#include "core/page/FrameView.h"
#include "core/page/Page.h"
#include "core/page/Settings.h"
+#include "core/page/UseCounter.h"
#include "core/page/animation/AnimationController.h"
#include "core/platform/graphics/FloatQuad.h"
#include "core/platform/graphics/GraphicsContext.h"
@@ -169,6 +170,12 @@ RenderObject* RenderObject::createObject(Element* element,
RenderStyle* style)
return new (arena) RenderRubyText(element);
if (RuntimeEnabledFeatures::cssRegionsEnabled() &&
style->isDisplayRegionType() && !style->regionThread().isEmpty() &&
doc->renderView())
return new (arena) RenderRegion(element, 0);
+
+ if (style->display() == RUN_IN)
+ UseCounter::count(doc, UseCounter::Feature::CSSDisplayRunIn);
+ else if (style->display() == COMPACT)
+ UseCounter::count(doc, UseCounter::Feature::CSSDisplayCompact);
+
switch (style->display()) {
case NONE:
return 0;
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ojan@chromium.org/21081004/43001
Sorry for I got bad news for ya. Compile failed with a clobber build on linux_blink_rel. http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_blin... Your code is likely broken or HEAD is junk. Please ensure your code is not broken then alert the build sheriffs. Look at the try server FAQ for more details.
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ojan@chromium.org/21081004/47002
Message was sent while issue was closed.
Change committed as 155266 |
