[Typed-OM] Add CSSURLImageValue

Spec: https://drafts.css-houdini.org/css-typed-om/#cssurlimagevalue BUG=545318 Review-Url: https://codereview.chromium.org/2208283002 Cr-Commit-Position: refs/heads/master@{#413386}

[Typed-OM] Add CSSURLImageValue
Spec: https://drafts.css-houdini.org/css-typed-om/#cssurlimagevalue BUG=545318 Review-Url: https://codereview.chromium.org/2208283002 Cr-Commit-Position: refs/heads/master@{#413386}
15c53e90 · anthonyhkf · Commit bot · 565bd2b7 · 15c53e90 · 15c53e90
Commit 15c53e90 authored Aug 21, 2016 by anthonyhkf Committed by Commit bot Aug 22, 2016
8 changed files
--- a/third_party/WebKit/LayoutTests/http/tests/worklet/webexposed/global-interface-listing-paint-worklet-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/worklet/webexposed/global-interface-listing-paint-worklet-expected.txt
@@ -123,6 +123,9 @@ CONSOLE MESSAGE: line 137:     getter x
 CONSOLE MESSAGE: line 137:     getter y
 CONSOLE MESSAGE: line 137:     getter z
 CONSOLE MESSAGE: line 137:     method constructor
+CONSOLE MESSAGE: line 137: interface CSSURLImageValue : CSSImageValue
+CONSOLE MESSAGE: line 137:     getter url
+CONSOLE MESSAGE: line 137:     method constructor
 CONSOLE MESSAGE: line 137: interface CSSVariableReferenceValue
 CONSOLE MESSAGE: line 137:     getter fallback
 CONSOLE MESSAGE: line 137:     getter variable

--- a/third_party/WebKit/LayoutTests/typedcssom/cssURLImageValue.html
+++ b/third_party/WebKit/LayoutTests/typedcssom/cssURLImageValue.html
+<!DOCTYPE html>
+<script src="../resources/testharness.js"></script>
+<script src="../resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  var bg = new CSSURLImageValue("http://localhost");
+  assert_equals(bg.state, "unloaded");
+}, "Can construct a new CSSURLImageValue object with url");
+</script>
--- a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt
+++ b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt
@@ -660,6 +660,10 @@ interface CSSTranslation : CSSTransformComponent
    getter y
    getter z
    method constructor
+interface CSSURLImageValue : CSSImageValue
+    attribute @@toStringTag
+    getter url
+    method constructor
 interface CSSVariableReferenceValue
    attribute @@toStringTag
    getter fallback

--- a/third_party/WebKit/Source/core/core.gypi
+++ b/third_party/WebKit/Source/core/core.gypi
@@ -58,6 +58,7 @@
            'css/cssom/CSSTransformComponent.idl',
            'css/cssom/CSSTransformValue.idl',
            'css/cssom/CSSTranslation.idl',
+            'css/cssom/CSSURLImageValue.idl',
            'css/cssom/CSSVariableReferenceValue.idl',
            'css/cssom/StylePropertyMap.idl',
            'dom/ArrayBuffer.idl',
@@ -1397,6 +1398,7 @@
            'css/cssom/CSSTransformValue.h',
            'css/cssom/CSSTranslation.cpp',
            'css/cssom/CSSTranslation.h',
+            'css/cssom/CSSURLImageValue.h',
            'css/cssom/CSSUnsupportedStyleValue.cpp',
            'css/cssom/CSSUnsupportedStyleValue.h',
            'css/cssom/ComputedStylePropertyMap.cpp',
@@ -4065,6 +4067,7 @@
            'css/cssom/CSSResourceValueTest.cpp',
            'css/cssom/CSSStyleImageValueTest.cpp',
            'css/cssom/CSSTokenStreamValueTest.cpp',
+            'css/cssom/CSSURLImageValueTest.cpp',
            'css/cssom/CSSVariableReferenceValueTest.cpp',
            'css/cssom/FilteredComputedStylePropertyMapTest.cpp',
            'css/invalidation/InvalidationSetTest.cpp',

--- a/third_party/WebKit/Source/core/css/cssom/CSSStyleValue.h
+++ b/third_party/WebKit/Source/core/css/cssom/CSSStyleValue.h
@@ -32,6 +32,7 @@ public:
        SimpleLengthType,
        TokenStreamType,
        TransformType,
+        URLImageType,
    };
    virtual ~CSSStyleValue() { }

--- a/third_party/WebKit/Source/core/css/cssom/CSSURLImageValue.h
+++ b/third_party/WebKit/Source/core/css/cssom/CSSURLImageValue.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 CSSURLImageValue_h
+#define CSSURLImageValue_h
+#include "core/css/cssom/CSSStyleImageValue.h"
+namespace blink {
+class CORE_EXPORT CSSURLImageValue final : public CSSStyleImageValue {
+    WTF_MAKE_NONCOPYABLE(CSSURLImageValue);
+    DEFINE_WRAPPERTYPEINFO();
+public:
+    static CSSURLImageValue* create(const AtomicString& url)
+    {
+        return new CSSURLImageValue(CSSImageValue::create(url));
+    }
+    static CSSURLImageValue* create(const CSSImageValue* imageValue)
+    {
+        return new CSSURLImageValue(imageValue);
+    }
+    StyleValueType type() const override { return URLImageType; }
+    const CSSValue* toCSSValue() const { return m_imageValue.get(); }
+    const String& url() const { return m_imageValue->url(); }
+private:
+    explicit CSSURLImageValue(const CSSImageValue* imageValue)
+        : CSSStyleImageValue(imageValue)
+    {
+    }
+};
+} // namespace blink
+#endif // CSSResourceValue_h
--- a/third_party/WebKit/Source/core/css/cssom/CSSURLImageValue.idl
+++ b/third_party/WebKit/Source/core/css/cssom/CSSURLImageValue.idl
+// 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.
+[
+    Constructor(DOMString url),
+    Exposed=(Window,PaintWorklet),
+    RuntimeEnabled=CSSTypedOM
+] interface CSSURLImageValue : CSSImageValue {
+    readonly attribute DOMString url;
+};
--- a/third_party/WebKit/Source/core/css/cssom/CSSURLImageValueTest.cpp
+++ b/third_party/WebKit/Source/core/css/cssom/CSSURLImageValueTest.cpp
+// 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 "core/css/cssom/CSSURLImageValue.h"
+#include "testing/gtest/include/gtest/gtest.h"
+namespace blink {
+namespace {
+void checkNullURLImageValue(CSSURLImageValue* urlImageValue)
+{
+    EXPECT_EQ(urlImageValue->state(), "unloaded");
+    bool isNull;
+    EXPECT_EQ(urlImageValue->intrinsicWidth(isNull), 0);
+    EXPECT_EQ(urlImageValue->intrinsicHeight(isNull), 0);
+    EXPECT_EQ(urlImageValue->intrinsicRatio(isNull), 0);
+    EXPECT_TRUE(isNull);
+}
+TEST(CSSURLImageValueTest, CreateURLImageValueFromURL)
+{
+    checkNullURLImageValue(CSSURLImageValue::create("http://localhost"));
+}
+TEST(CSSURLImageValueTest, CreateURLImageValueFromImageValue)
+{
+    checkNullURLImageValue(CSSURLImageValue::create(CSSImageValue::create("http://localhost")));
+}
+} // namespace
+} // namespace blink