Fix fast/frames/crash-frameset-CSS-content-property.html

This test switches a <frameset> to a <body>. For framesets, LayoutView::CalculateScrollbarModes forces the user scrollable bit to be false. It excluded layout object is not LayoutFrameset but it is of type of Frameset. In this patch, we changed the Frameset check to body->GetLayoutObject()->IsFrameSet(). Bug: 875287 Cq-Include-Trybots: luci.chromium.try:linux-blink-gen-property-trees;luci.chromium.try:linux_layout_tests_layout_ng;luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel Change-Id: Icefcc3801dc79b39576f1248a07e43f905279e13 Reviewed-on: https://chromium-review.googlesource.com/1254470Reviewed-by: Philip Rogers <pdr@chromium.org> Commit-Queue: Jianpeng Chao <chaopeng@chromium.org> Cr-Commit-Position: refs/heads/master@{#595505}

Fix fast/frames/crash-frameset-CSS-content-property.html
This test switches a <frameset> to a <body>. For framesets, LayoutView::CalculateScrollbarModes forces the user scrollable bit to be false. It excluded layout object is not LayoutFrameset but it is of type of Frameset. In this patch, we changed the Frameset check to body->GetLayoutObject()->IsFrameSet(). Bug: 875287 Cq-Include-Trybots: luci.chromium.try:linux-blink-gen-property-trees;luci.chromium.try:linux_layout_tests_layout_ng;luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel Change-Id: Icefcc3801dc79b39576f1248a07e43f905279e13 Reviewed-on: https://chromium-review.googlesource.com/1254470Reviewed-by: Philip Rogers <pdr@chromium.org> Commit-Queue: Jianpeng Chao <chaopeng@chromium.org> Cr-Commit-Position: refs/heads/master@{#595505}
2892d91b · chaopeng · Commit Bot · 4fff43ef · 2892d91b · 2892d91b
Commit 2892d91b authored Oct 01, 2018 by chaopeng Committed by Commit Bot Oct 01, 2018
Showing with 1 addition and 4 deletions

third_party/WebKit/LayoutTests/TestExpectations third_party/WebKit/LayoutTests/TestExpectations +0 -3

third_party/blink/renderer/core/layout/layout_view.cc third_party/blink/renderer/core/layout/layout_view.cc +1 -1

No files found.
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -5126,9 +5126,6 @@ crbug.com/875170 animations/interpolation/svg-stroke-dasharray-interpolation.htm
 # Test frequently times out on Mac CQ bots.
 crbug.com/874703 [ Mac ] http/tests/devtools/extensions/extensions-panel.js [ Timeout Pass ]

-# This won't pass until the bug fixed.
-crbug.com/875287 fast/frames/crash-frameset-CSS-content-property.html [ Crash ]
-
 # Wake Lock api test timeouts
 crbug.com/872530 external/wpt/wake-lock/wakelock-applicability-manual.https.html [ Pass Timeout ]
 crbug.com/872530 external/wpt/wake-lock/wakelock-document-hidden.https.html [ Pass Timeout ]

--- a/third_party/blink/renderer/core/layout/layout_view.cc
+++ b/third_party/blink/renderer/core/layout/layout_view.cc
@@ -668,7 +668,7 @@ void LayoutView::CalculateScrollbarModes(ScrollbarMode& h_mode,
  Document& document = GetDocument();
  if (Node* body = document.body()) {
    // Framesets can't scroll.
-    if (IsHTMLFrameSetElement(body) && body->GetLayoutObject())
+    if (body->GetLayoutObject() && body->GetLayoutObject()->IsFrameSet())
      RETURN_SCROLLBAR_MODE(kScrollbarAlwaysOff);
  }