source: webkit/trunk/Source/WebCore/css/CSSGridAutoRepeatValue.cpp

Last change on this file was 245295, checked in by Oriol Brufau, 6 years ago

[css-grid] Update grid when changing auto repeat type
https://bugs.webkit.org/show_bug.cgi?id=197849

Reviewed by Javier Fernandez.

LayoutTests/imported/w3c:

Import WPT test.

  • web-platform-tests/css/css-grid/grid-definition/grid-change-auto-repeat-tracks-expected.txt: Added.
  • web-platform-tests/css/css-grid/grid-definition/grid-change-auto-repeat-tracks.html: Added.
  • web-platform-tests/css/css-grid/grid-definition/w3c-import.log:

Source/WebCore:

Test: imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-change-auto-repeat-tracks.html

This patch makes two 'repeat()' values for 'grid-template' be considered
to be different if one uses 'auto-fill' and the other 'auto-fit'.

Previously, they were considered to be equal if the repeated values
were the same, without comparing the repeat type. Therefore, the grid
was not updated when setting both values one after the other.

  • css/CSSGridAutoRepeatValue.cpp:

(WebCore::CSSGridAutoRepeatValue::equals const):

  • css/CSSGridAutoRepeatValue.h:

LayoutTests:

Remove the test which has been upstreamed to WPT.

  • fast/css-grid-layout/grid-change-auto-repeat-tracks-expected.txt: Removed.
  • fast/css-grid-layout/grid-change-auto-repeat-tracks.html: Removed.
  • Property svn:eol-style set to LF
File size: 2.1 KB
Line 
1/*
2 * Copyright (C) 2016 Igalia S.L.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are
6 * met:
7 *
8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above
11 * copyright notice, this list of conditions and the following disclaimer
12 * in the documentation and/or other materials provided with the
13 * distribution.
14 * * Neither the name of Google Inc. nor the names of its
15 * contributors may be used to endorse or promote products derived from
16 * this software without specific prior written permission.
17 *
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */
30
31#include "config.h"
32#include "CSSGridAutoRepeatValue.h"
33
34#include <wtf/text/StringBuilder.h>
35
36namespace WebCore {
37
38String CSSGridAutoRepeatValue::customCSSText() const
39{
40 StringBuilder result;
41 result.append("repeat(");
42 result.append(getValueName(autoRepeatID()));
43 result.append(", ");
44 result.append(CSSValueList::customCSSText());
45 result.append(')');
46 return result.toString();
47}
48
49bool CSSGridAutoRepeatValue::equals(const CSSGridAutoRepeatValue& other) const
50{
51 return m_autoRepeatID == other.m_autoRepeatID && CSSValueList::equals(other);
52}
53
54} // namespace WebCore
Note: See TracBrowser for help on using the repository browser.