[Layout API] Use Document::layoutViewItem in WebFrameTest

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 863 matching lines @@
     settings->setViewportMetaEnabled(true);
     settings->setViewportEnabled(true);
     settings->setMainFrameResizesAreOrientationChanges(true);
     settings->setShrinksViewportContentToFit(true);
 }
 
 // Helper function to set autosizing multipliers on a document.
 bool setTextAutosizingMultiplier(Document* document, float multiplier)
 {
     bool multiplierSet = false;
-    for (LayoutObject* layoutObject = document->layoutView(); layoutObject; layoutObject = layoutObject->nextInPreOrder()) {
-        if (layoutObject->style()) {
-            layoutObject->mutableStyleRef().setTextAutosizingMultiplier(multiplier);
+    for (LayoutItem layoutItem = document->layoutViewItem(); !layoutItem.isNull(); layoutItem = layoutItem.nextInPreOrder()) {
+        if (layoutItem.style()) {
+            layoutItem.mutableStyleRef().setTextAutosizingMultiplier(multiplier);
 
-            EXPECT_EQ(multiplier, layoutObject->style()->textAutosizingMultiplier());
+            EXPECT_EQ(multiplier, layoutItem.style()->textAutosizingMultiplier());
             multiplierSet = true;
         }
     }
     return multiplierSet;
 }
 
 // Helper function to check autosizing multipliers on a document.
 bool checkTextAutosizingMultiplier(Document* document, float multiplier)
 {
     bool multiplierChecked = false;
-    for (LayoutObject* layoutObject = document->layoutView(); layoutObject; layoutObject = layoutObject->nextInPreOrder()) {
-        if (layoutObject->style() && layoutObject->isText()) {
-            EXPECT_EQ(multiplier, layoutObject->style()->textAutosizingMultiplier());
+    for (LayoutItem layoutItem = document->layoutViewItem(); !layoutItem.isNull(); layoutItem = layoutItem.nextInPreOrder()) {
+        if (layoutItem.style() && layoutItem.isText()) {
+            EXPECT_EQ(multiplier, layoutItem.style()->textAutosizingMultiplier());
             multiplierChecked = true;
         }
     }
     return multiplierChecked;
 }
 
 } // anonymous namespace
 
 TEST_P(ParameterizedWebFrameTest, ChangeInFixedLayoutResetsTextAutosizingMultipliers)
 {
@@ skipping 58 matching lines @@
     Document* document = mainFrame->document();
     FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
     document->settings()->setTextAutosizingEnabled(true);
     EXPECT_TRUE(document->settings()->textAutosizingEnabled());
     webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
 
     for (Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {
         if (!frame->isLocalFrame())
             continue;
         EXPECT_TRUE(setTextAutosizingMultiplier(toLocalFrame(frame)->document(), 2));
-        for (LayoutObject* layoutObject = toLocalFrame(frame)->document()->layoutView(); layoutObject; layoutObject = layoutObject->nextInPreOrder()) {
-            if (layoutObject->isText())
-                EXPECT_FALSE(layoutObject->needsLayout());
+        for (LayoutItem layoutItem = toLocalFrame(frame)->document()->layoutViewItem(); !layoutItem.isNull(); layoutItem = layoutItem.nextInPreOrder()) {
+            if (layoutItem.isText())
+                EXPECT_FALSE(layoutItem.needsLayout());
         }
     }
 
     frameView->page()->frameHost().visualViewport().setSize(IntSize(200, 200));
 
     for (Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {
         if (!frame->isLocalFrame())
             continue;
-        for (LayoutObject* layoutObject = toLocalFrame(frame)->document()->layoutView(); layoutObject; layoutObject = layoutObject->nextInPreOrder()) {
-            if (layoutObject->isText())
-                EXPECT_TRUE(layoutObject->needsLayout());
+        for (LayoutItem layoutItem = toLocalFrame(frame)->document()->layoutViewItem(); !layoutItem.isNull(); layoutItem = layoutItem.nextInPreOrder()) {
+            if (layoutItem.isText())
+                EXPECT_TRUE(layoutItem.needsLayout());
         }
     }
 }
 
 TEST_P(ParameterizedWebFrameTest, ZeroHeightPositiveWidthNotIgnored)
 {
     FixedLayoutTestWebViewClient client;
     client.m_screenInfo.deviceScaleFactor = 1;
     int viewportWidth = 1280;
     int viewportHeight = 0;
@@ skipping 7808 matching lines @@
     request.setURL(toKURL("javascript:location='" + redirectURL + "'"));
     helper.webViewImpl()->mainFrame()->toWebLocalFrame()->loadRequest(request);
 
     // Normally, the result of the JS url replaces the existing contents on the
     // Document. However, if the JS triggers a navigation, the contents should
     // not be replaced.
     EXPECT_EQ("", toLocalFrame(helper.webViewImpl()->page()->mainFrame())->document()->documentElement()->innerText());
 }
 
 } // namespace blink