Clean out some more dead @viewport code

MediaValuesInitialViewport was only used by
|ViewportStyleResolver::initial_viewport_medium_|, but that in turn is
never used. Remove the class and drop the unused ViewportStyleResolver
field.

Bug: 991610
Change-Id: I51bb5a8f5e967b16d6c1e0f473b76d4bbc76ff28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2616562Reviewed-by: Rune Lillesveen <futhark@chromium.org>
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Cr-Commit-Position: refs/heads/master@{#841564}

third_party/blink/renderer/core/css/build.gni

@@ -393,8 +393,6 @@ blink_core_sources_css = [
   "media_values_cached.h",
   "media_values_dynamic.cc",
   "media_values_dynamic.h",
-  "media_values_initial_viewport.cc",
-  "media_values_initial_viewport.h",
   "native_paint_image_generator.h",
   "offscreen_font_selector.cc",
   "offscreen_font_selector.h",
@@ -663,7 +661,6 @@ blink_core_tests_css = [
   "media_query_list_test.cc",
   "media_query_matcher_test.cc",
   "media_query_set_test.cc",
-  "media_values_initial_viewport_test.cc",
   "media_values_test.cc",
   "parser/css_lazy_parsing_test.cc",
   "parser/css_parser_fast_paths_test.cc",

third_party/blink/renderer/core/css/media_query_evaluator.cc

@@ -47,7 +47,6 @@
 #include "third_party/blink/renderer/core/css/media_list.h"
 #include "third_party/blink/renderer/core/css/media_query.h"
 #include "third_party/blink/renderer/core/css/media_values_dynamic.h"
-#include "third_party/blink/renderer/core/css/media_values_initial_viewport.h"
 #include "third_party/blink/renderer/core/css/resolver/media_query_result.h"
 #include "third_party/blink/renderer/core/css_value_keywords.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
@@ -103,12 +102,6 @@ MediaQueryEvaluator::MediaQueryEvaluator(LocalFrame* frame)
 MediaQueryEvaluator::MediaQueryEvaluator(const MediaValues& media_values)
     : media_values_(media_values.Copy()) {}
 
-MediaQueryEvaluator::MediaQueryEvaluator(
-    MediaValuesInitialViewport* media_values)
-    : media_values_(media_values) {
-  DCHECK(media_values);
-}
-
 MediaQueryEvaluator::~MediaQueryEvaluator() = default;
 
 void MediaQueryEvaluator::Trace(Visitor* visitor) const {

third_party/blink/renderer/core/css/media_query_evaluator.h

@@ -33,6 +33,7 @@
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 
 namespace blink {
+
 class LocalFrame;
 class MediaQuery;
 class MediaQueryExp;
@@ -40,7 +41,6 @@ class MediaQueryResult;
 class MediaQuerySet;
 class MediaQuerySetResult;
 class MediaValues;
-class MediaValuesInitialViewport;
 
 using MediaQueryResultList = Vector<MediaQueryResult>;
 
@@ -74,7 +74,6 @@ class CORE_EXPORT MediaQueryEvaluator final
   // values.
   explicit MediaQueryEvaluator(const MediaValues&);
 
-  explicit MediaQueryEvaluator(MediaValuesInitialViewport*);
   MediaQueryEvaluator(const MediaQueryEvaluator&) = delete;
   MediaQueryEvaluator& operator=(const MediaQueryEvaluator&) = delete;
 

third_party/blink/renderer/core/css/media_query_evaluator_test.cc

@@ -10,7 +10,6 @@
 #include "third_party/blink/renderer/core/css/media_list.h"
 #include "third_party/blink/renderer/core/css/media_values.h"
 #include "third_party/blink/renderer/core/css/media_values_cached.h"
-#include "third_party/blink/renderer/core/css/media_values_initial_viewport.h"
 #include "third_party/blink/renderer/core/css/parser/css_tokenizer.h"
 #include "third_party/blink/renderer/core/css/parser/media_query_parser.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
@@ -474,20 +473,6 @@ TEST(MediaQueryEvaluatorTest, CachedFloatViewportNonFloatFriendly) {
                   media_query_evaluator);
 }
 
-TEST(MediaQueryEvaluatorTest, InitialViewport) {
-  auto page_holder = std::make_unique<DummyPageHolder>(IntSize(500, 500));
-  page_holder->GetFrameView().SetMediaType(media_type_names::kScreen);
-  page_holder->GetFrameView().SetLayoutSizeFixedToFrameSize(false);
-  page_holder->GetFrameView().SetInitialViewportSize(IntSize(500, 500));
-  page_holder->GetFrameView().SetLayoutSize(IntSize(800, 800));
-  page_holder->GetFrameView().SetFrameRect(IntRect(0, 0, 800, 800));
-
-  MediaQueryEvaluator media_query_evaluator(
-      MakeGarbageCollected<MediaValuesInitialViewport>(
-          page_holder->GetFrame()));
-  TestMQEvaluator(g_viewport_test_cases, media_query_evaluator);
-}
-
 TEST(MediaQueryEvaluatorTest, DynamicImmersive) {
   auto page_holder = std::make_unique<DummyPageHolder>(IntSize(500, 500));
   page_holder->GetFrameView().SetMediaType(media_type_names::kScreen);

third_party/blink/renderer/core/css/media_values_initial_viewport.cc

-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "third_party/blink/renderer/core/css/media_values_initial_viewport.h"
-
-#include "third_party/blink/renderer/core/dom/document.h"
-#include "third_party/blink/renderer/core/frame/local_frame.h"
-#include "third_party/blink/renderer/core/frame/local_frame_view.h"
-
-namespace blink {
-
-MediaValuesInitialViewport::MediaValuesInitialViewport(LocalFrame& frame)
-    : MediaValuesDynamic(&frame) {}
-
-double MediaValuesInitialViewport::ViewportWidth() const {
-  DCHECK(frame_->View());
-  return frame_->View()->InitialViewportWidth();
-}
-
-double MediaValuesInitialViewport::ViewportHeight() const {
-  DCHECK(frame_->View());
-  return frame_->View()->InitialViewportHeight();
-}
-
-}  // namespace blink

third_party/blink/renderer/core/css/media_values_initial_viewport.h

-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_MEDIA_VALUES_INITIAL_VIEWPORT_H_
-#define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_MEDIA_VALUES_INITIAL_VIEWPORT_H_
-
-#include "third_party/blink/renderer/core/css/media_values_dynamic.h"
-
-namespace blink {
-
-class CORE_EXPORT MediaValuesInitialViewport final : public MediaValuesDynamic {
- public:
-  explicit MediaValuesInitialViewport(LocalFrame&);
-
-  double ViewportWidth() const override;
-  double ViewportHeight() const override;
-};
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_RENDERER_CORE_CSS_MEDIA_VALUES_INITIAL_VIEWPORT_H_

third_party/blink/renderer/core/css/media_values_initial_viewport_test.cc

-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "third_party/blink/renderer/core/css/media_values_initial_viewport.h"
-
-#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/renderer/core/dom/document.h"
-#include "third_party/blink/renderer/core/frame/local_frame_view.h"
-#include "third_party/blink/renderer/core/testing/page_test_base.h"
-
-namespace blink {
-
-class MediaValuesInitialViewportTest : public PageTestBase {
- private:
-  void SetUp() override {
-    PageTestBase::SetUp(IntSize(320, 480));
-    GetDocument().View()->SetInitialViewportSize(IntSize(320, 480));
-  }
-};
-
-TEST_F(MediaValuesInitialViewportTest, InitialViewportSize) {
-  LocalFrameView* view = GetDocument().View();
-  ASSERT_TRUE(view);
-  EXPECT_TRUE(view->LayoutSizeFixedToFrameSize());
-
-  auto* media_values = MakeGarbageCollected<MediaValuesInitialViewport>(
-      *GetDocument().GetFrame());
-  EXPECT_EQ(320, media_values->ViewportWidth());
-  EXPECT_EQ(480, media_values->ViewportHeight());
-
-  view->SetLayoutSizeFixedToFrameSize(false);
-  view->SetLayoutSize(IntSize(800, 600));
-  EXPECT_EQ(320, media_values->ViewportWidth());
-  EXPECT_EQ(480, media_values->ViewportHeight());
-}
-
-}  // namespace blink

third_party/blink/renderer/core/css/resolver/viewport_style_resolver.cc

@@ -36,7 +36,6 @@
 #include "third_party/blink/renderer/core/css/css_style_sheet.h"
 #include "third_party/blink/renderer/core/css/css_to_length_conversion_data.h"
 #include "third_party/blink/renderer/core/css/document_style_sheet_collection.h"
-#include "third_party/blink/renderer/core/css/media_values_initial_viewport.h"
 #include "third_party/blink/renderer/core/css/resolver/style_resolver.h"
 #include "third_party/blink/renderer/core/css/style_rule.h"
 #include "third_party/blink/renderer/core/css/style_rule_import.h"
@@ -50,7 +49,6 @@
 #include "third_party/blink/renderer/core/frame/viewport_data.h"
 #include "third_party/blink/renderer/core/page/chrome_client.h"
 #include "third_party/blink/renderer/core/page/page.h"
-#include "third_party/blink/renderer/core/page/viewport_description.h"
 
 namespace blink {
 
@@ -67,8 +65,6 @@ bool HasViewportFitProperty(const CSSPropertyValueSet* property_set) {
 ViewportStyleResolver::ViewportStyleResolver(Document& document)
     : document_(document) {
   DCHECK(document.GetFrame());
-  initial_viewport_medium_ = MakeGarbageCollected<MediaQueryEvaluator>(
-      MakeGarbageCollected<MediaValuesInitialViewport>(*document.GetFrame()));
 }
 
 void ViewportStyleResolver::Reset() {
@@ -329,7 +325,6 @@ void ViewportStyleResolver::UpdateViewport(
 void ViewportStyleResolver::Trace(Visitor* visitor) const {
   visitor->Trace(document_);
   visitor->Trace(property_set_);
-  visitor->Trace(initial_viewport_medium_);
 }
 
 }  // namespace blink

third_party/blink/renderer/core/css/resolver/viewport_style_resolver.h

@@ -75,7 +75,6 @@ class CORE_EXPORT ViewportStyleResolver final
 
   Member<Document> document_;
   Member<MutableCSSPropertyValueSet> property_set_;
-  Member<MediaQueryEvaluator> initial_viewport_medium_;
   scoped_refptr<ComputedStyle> initial_style_;
   bool has_viewport_units_ = false;
   UpdateType needs_update_ = kCollectRules;