Skip lots of display checks in adjustRenderStyle when possible

Skip lots of display checks in adjustRenderStyle when possible

1.5% of the time in the peacekeeper benchmark (and 2% of the recalcStyle
time) is spent inside adjustRenderStyle. This patch is the start of
trying to make adjustRenderStyle do less work in the common cases.

This patch moves the logic for adjusting the style based on the display
property out into a function and adds an early return for when the
element is display: block and is not floating since none of the other
sections of the function are needed then.

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=169425

[abarth-chromium, 2014-03-17 20:19:38]

lgtm

[esprehn, 2014-03-17 23:34:02]

The CQ bit was checked by esprehn@chromium.org

[commit-bot: I haz the power, 2014-03-17 23:34:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/esprehn@chromium.org/202283003/1

[commit-bot: I haz the power, 2014-03-17 23:36:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-17 23:36:50]

Try jobs failed on following builders:
  tryserver.blink on win_blink_compile_dbg

[esprehn, 2014-03-17 23:38:14]

The CQ bit was checked by esprehn@chromium.org

[commit-bot: I haz the power, 2014-03-17 23:38:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/esprehn@chromium.org/202283003/1

[commit-bot: I haz the power, 2014-03-17 23:43:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-17 23:43:57]

Try jobs failed on following builders:
  tryserver.blink on mac_blink_compile_dbg

[esprehn, 2014-03-17 23:49:59]

The CQ bit was checked by esprehn@chromium.org

[commit-bot: I haz the power, 2014-03-17 23:50:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/esprehn@chromium.org/202283003/20001

[ojan, 2014-03-18 01:41:07]

https://codereview.chromium.org/202283003/diff/20001/Source/core/css/resolver...
File Source/core/css/resolver/StyleAdjuster.cpp (right):

https://codereview.chromium.org/202283003/diff/20001/Source/core/css/resolver...
Source/core/css/resolver/StyleAdjuster.cpp:390: 
Don't you also need to check !hasOutOfFlowPosition? I'm just looking at the line
above that sets equivalentBlockDisplay.

[esprehn, 2014-03-18 01:45:55]

https://codereview.chromium.org/202283003/diff/20001/Source/core/css/resolver...
File Source/core/css/resolver/StyleAdjuster.cpp (right):

https://codereview.chromium.org/202283003/diff/20001/Source/core/css/resolver...
Source/core/css/resolver/StyleAdjuster.cpp:390: 
On 2014/03/18 01:41:08, ojan wrote:
> Don't you also need to check !hasOutOfFlowPosition? I'm just looking at the
line
> above that sets equivalentBlockDisplay.

Not here, equivalentBlockDisplay only takes the display and the floating status
into account so it doesn't matter if you're positioned or not. The above code is
also a noop if you're BLOCK and not floating. The code is accounting for if
you're _not_ BLOCK and you're out of flow positioned we might need to massage
your value into a BLOCK value (ex. display: inline becomes block).

[commit-bot: I haz the power, 2014-03-18 03:23:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-18 03:23:35]

Commit queue rejected this change because the description was changed
between the time the change entered the commit queue and the time it
was ready to commit. You can safely check the commit box again.

[esprehn, 2014-03-18 03:32:15]

The CQ bit was checked by esprehn@chromium.org

[commit-bot: I haz the power, 2014-03-18 03:32:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/esprehn@chromium.org/202283003/20001

[commit-bot: I haz the power, 2014-03-18 03:32:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-18 03:32:45]

Failed to apply patch for Source/core/css/resolver/StyleAdjuster.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/css/resolver/StyleAdjuster.h
  Hunk #1 FAILED at 41.
  1 out of 1 hunk FAILED -- saving rejects to file
Source/core/css/resolver/StyleAdjuster.h.rej

Patch:       Source/core/css/resolver/StyleAdjuster.h
Index: Source/core/css/resolver/StyleAdjuster.h
diff --git a/Source/core/css/resolver/StyleAdjuster.h
b/Source/core/css/resolver/StyleAdjuster.h
index
787beafe5a236e923f5bf888cd0d677eccb6cc38..6122ae7431c52dbadbebc08a570cf5bf342bd1c1
100644
--- a/Source/core/css/resolver/StyleAdjuster.h
+++ b/Source/core/css/resolver/StyleAdjuster.h
@@ -41,6 +41,8 @@ public:
     void adjustRenderStyle(RenderStyle* styleToAdjust, RenderStyle*
parentStyle, Element*);
 
 private:
+    void adjustStyleForDisplay(RenderStyle* styleToAdjust, RenderStyle*
parentStyle);
+
     const CachedUAStyle& m_cachedUAStyle;
     bool m_useQuirksModeStyles;
 };

[esprehn, 2014-03-18 06:44:00]

The CQ bit was checked by esprehn@chromium.org

[commit-bot: I haz the power, 2014-03-18 06:44:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/esprehn@chromium.org/202283003/40001

[commit-bot: I haz the power, 2014-03-18 07:44:00]

Change committed as 169425