From 33194f6ef8dc786de45c3995361c3036be540451 Mon Sep 17 00:00:00 2001 From: Christian Biesinger Date: Mon, 21 Mar 2016 16:10:12 -0400 Subject: [PATCH] Mixed up vertical and horizontal :( Small typo in the original change, https://codereview.chromium.org/1811753003/ BUG=594465, 593593, 590683, 593624, 593593 R=leviw@chromium.org,mstensho@opera.com Review URL: https://codereview.chromium.org/1814323002 Cr-Commit-Position: refs/heads/master@{#382309} (cherry picked from commit d0298a936fceca5e36521aa892edf932b0728bff) Review URL: https://codereview.chromium.org/1818123003 . Cr-Commit-Position: refs/branch-heads/2661@{#326} Cr-Branched-From: ef6f6ae5e4c96622286b563658d5cd62a6cf1197-refs/heads/master@{#378081} --- third_party/WebKit/LayoutTests/SlowTests | 1 + third_party/WebKit/LayoutTests/TestExpectations | 2 ++ third_party/WebKit/Source/core/layout/LayoutBlock.cpp | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/third_party/WebKit/LayoutTests/SlowTests b/third_party/WebKit/LayoutTests/SlowTests index 1f85299a29032..2ce52a1d46312 100644 --- a/third_party/WebKit/LayoutTests/SlowTests +++ b/third_party/WebKit/LayoutTests/SlowTests @@ -115,6 +115,7 @@ crbug.com/327078 http/tests/inspector/network/long-script-content.html [ Slow ] crbug.com/420008 [ Release ] inspector/editor/text-editor-word-jumps.html [ Slow ] crbug.com/420008 [ Release ] http/tests/inspector/console-xhr-logging.html [ Slow ] webkit.org/b/60109 inspector/elements/edit/edit-dom-actions.html [ Slow ] +crbug.com/596486 [ Linux ] inspector/elements/insert-node.html [ Slow ] webkit.org/b/84735 [ Win ] http/tests/inspector/change-iframe-src.html [ Slow ] crbug.com/504565 [ Mac ] http/tests/inspector/search/sources-search-scope.html [ Slow ] crbug.com/451577 http/tests/inspector/resource-tree/resource-tree-crafted-frame-add.html [ Slow ] diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index 10551b300efdb..17fc3ab693497 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations @@ -1346,6 +1346,8 @@ crbug.com/571376 http/tests/webfont/font-display-intervention.html [ Pass Failur crbug.com/320139 fast/repaint/block-layout-inline-children-replaced.html [ Pass Failure ] +crbug.com/596486 [ Linux ] inspector/elements/edit/edit-dom-actions.html [ Timeout Pass ] + crbug.com/575766 http/tests/inspector/resource-tree/resource-tree-frame-add.html [ Timeout Pass ] crbug.com/581468 http/tests/inspector/resource-tree/resource-tree-non-unique-url.html [ Pass Failure ] diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp index 53ec7ec493a25..1f12215b6c69d 100644 --- a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp @@ -1923,8 +1923,8 @@ int LayoutBlock::columnGap() const void LayoutBlock::scrollbarsChanged(bool horizontalScrollbarChanged, bool verticalScrollbarChanged) { - m_widthAvailableToChildrenChanged |= horizontalScrollbarChanged; - m_heightAvailableToChildrenChanged |= verticalScrollbarChanged; + m_widthAvailableToChildrenChanged |= verticalScrollbarChanged; + m_heightAvailableToChildrenChanged |= horizontalScrollbarChanged; } void LayoutBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const