Changeset 175930 in webkit


Ignore:
Timestamp:
Nov 11, 2014 8:26:06 AM (9 years ago)
Author:
svillar@igalia.com
Message:

[CSS Grid Layout] Limit the size of explicit/implicit grid
https://bugs.webkit.org/show_bug.cgi?id=136217

Reviewed by Andreas Kling.

Source/WebCore:

A recent change in the specs allow us to set a limit (maximum
size) for both the explicit and implicit grids so we can protect
ourselves from absurdly huge grid specifications. It was decided
to use the recommended limit which is 1 million.

This means that we can remove the old limitation for the number of
repetitions in repeat(). Instead we now clamp the number of
repetitions to the maximum value that allow us to have the maximum
number of whole repetitions without exceeding the track number
limit.

  • WebCore.xcodeproj/project.pbxproj:
  • css/CSSParser.cpp:

(WebCore::CSSParser::parseGridTrackRepeatFunction): Replaced the
old limit by the new one.

  • rendering/RenderGrid.cpp:

(WebCore::RenderGrid::placeItemsOnGrid): Use the amount of tracks
provided by GridResolvedPosition.
(WebCore::RenderGrid::populateExplicitGridAndOrderIterator): Ditto.

  • rendering/style/GridCoordinate.h:

(WebCore::GridSpan::GridSpan):

  • rendering/style/GridResolvedPosition.cpp:

(WebCore::GridResolvedPosition::explicitGridColumnCount): Bring
the static function back to life.
(WebCore::GridResolvedPosition::explicitGridRowCount): Ditto.
(WebCore::explicitGridSizeForSide):

  • rendering/style/GridResolvedPosition.h:

Tools:

Added a new unit test for the CSS parser. Right now it only checks
that we properly clamp the maximum number of tracks on a grid to a
maximum of 1 million.

  • TestWebKitAPI/CMakeLists.txt:
  • TestWebKitAPI/PlatformEfl.cmake:
  • TestWebKitAPI/PlatformGTK.cmake:
  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
  • TestWebKitAPI/Tests/WebCore/CSSParser.cpp: Added.

(TestWebKitAPI::computeNumberOfTracks): Helper function.
(TestWebKitAPI::TEST): Added a
CSSPropertyParserTest.GridTrackLimits test case.

LayoutTests:

Removed as they are now part of the WebCore's CSSParser.cpp unit
test. The reason why it was moved there is because the test would
require huge (~1000000 tracks) grid allocations, making the test
quite slow specially on Debug builds.

  • fast/css-grid-layout/grid-element-repeat-max-repetitions-expected.txt: Removed.
  • fast/css-grid-layout/grid-element-repeat-max-repetitions.html: Removed.
Location:
trunk
Files:
1 added
2 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r175909 r175930  
     12014-10-07  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        [CSS Grid Layout] Limit the size of explicit/implicit grid
     4        https://bugs.webkit.org/show_bug.cgi?id=136217
     5
     6        Reviewed by Andreas Kling.
     7
     8        Removed as they are now part of the WebCore's CSSParser.cpp unit
     9        test. The reason why it was moved there is because the test would
     10        require huge (~1000000 tracks) grid allocations, making the test
     11        quite slow specially on Debug builds.
     12
     13        * fast/css-grid-layout/grid-element-repeat-max-repetitions-expected.txt: Removed.
     14        * fast/css-grid-layout/grid-element-repeat-max-repetitions.html: Removed.
     15
    1162014-11-11  Jinwoo Song  <jinwoo7.song@samsung.com>
    217
  • trunk/Source/WebCore/ChangeLog

    r175889 r175930  
     12014-10-07  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        [CSS Grid Layout] Limit the size of explicit/implicit grid
     4        https://bugs.webkit.org/show_bug.cgi?id=136217
     5
     6        Reviewed by Andreas Kling.
     7
     8        A recent change in the specs allow us to set a limit (maximum
     9        size) for both the explicit and implicit grids so we can protect
     10        ourselves from absurdly huge grid specifications. It was decided
     11        to use the recommended limit which is 1 million.
     12
     13        This means that we can remove the old limitation for the number of
     14        repetitions in repeat(). Instead we now clamp the number of
     15        repetitions to the maximum value that allow us to have the maximum
     16        number of whole repetitions without exceeding the track number
     17        limit.
     18
     19        * WebCore.xcodeproj/project.pbxproj:
     20        * css/CSSParser.cpp:
     21        (WebCore::CSSParser::parseGridTrackRepeatFunction): Replaced the
     22        old limit by the new one.
     23        * rendering/RenderGrid.cpp:
     24        (WebCore::RenderGrid::placeItemsOnGrid): Use the amount of tracks
     25        provided by GridResolvedPosition.
     26        (WebCore::RenderGrid::populateExplicitGridAndOrderIterator): Ditto.
     27        * rendering/style/GridCoordinate.h:
     28        (WebCore::GridSpan::GridSpan):
     29        * rendering/style/GridResolvedPosition.cpp:
     30        (WebCore::GridResolvedPosition::explicitGridColumnCount): Bring
     31        the static function back to life.
     32        (WebCore::GridResolvedPosition::explicitGridRowCount): Ditto.
     33        (WebCore::explicitGridSizeForSide):
     34        * rendering/style/GridResolvedPosition.h:
     35
    1362014-11-11  Yusuke Suzuki  <utatane.tea@gmail.com>
    237
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r175814 r175930  
    16581658                499B3EDD128DB50200E726C2 /* PlatformCAAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 499B3EDC128DB50100E726C2 /* PlatformCAAnimation.h */; settings = {ATTRIBUTES = (Private, ); }; };
    16591659                49AE2D8E134EE50C0072920A /* CSSCalculationValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49AE2D8C134EE50C0072920A /* CSSCalculationValue.cpp */; };
    1660                 49AE2D8F134EE50C0072920A /* CSSCalculationValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 49AE2D8D134EE50C0072920A /* CSSCalculationValue.h */; };
     1660                49AE2D8F134EE50C0072920A /* CSSCalculationValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 49AE2D8D134EE50C0072920A /* CSSCalculationValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
    16611661                49AE2D96134EE5F90072920A /* CalculationValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49AE2D94134EE5F90072920A /* CalculationValue.cpp */; };
    16621662                49AE2D97134EE5F90072920A /* CalculationValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 49AE2D95134EE5F90072920A /* CalculationValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    17801780                4BAE95B10B2FA9CE00AED8A0 /* EditorDeleteAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAE95B00B2FA9CE00AED8A0 /* EditorDeleteAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17811781                4E1959210A39DABA00220FE5 /* MediaFeatureNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E19591F0A39DABA00220FE5 /* MediaFeatureNames.cpp */; };
    1782                 4E1959220A39DABA00220FE5 /* MediaFeatureNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959200A39DABA00220FE5 /* MediaFeatureNames.h */; };
     1782                4E1959220A39DABA00220FE5 /* MediaFeatureNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959200A39DABA00220FE5 /* MediaFeatureNames.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17831783                4E1959290A39DACC00220FE5 /* MediaQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E1959230A39DACC00220FE5 /* MediaQuery.cpp */; };
    1784                 4E19592A0A39DACC00220FE5 /* MediaQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959240A39DACC00220FE5 /* MediaQuery.h */; };
     1784                4E19592A0A39DACC00220FE5 /* MediaQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959240A39DACC00220FE5 /* MediaQuery.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17851785                4E19592B0A39DACC00220FE5 /* MediaQueryEvaluator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E1959250A39DACC00220FE5 /* MediaQueryEvaluator.cpp */; };
    17861786                4E19592C0A39DACC00220FE5 /* MediaQueryEvaluator.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959260A39DACC00220FE5 /* MediaQueryEvaluator.h */; };
    17871787                4E19592D0A39DACC00220FE5 /* MediaQueryExp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E1959270A39DACC00220FE5 /* MediaQueryExp.cpp */; };
    1788                 4E19592E0A39DACC00220FE5 /* MediaQueryExp.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959280A39DACC00220FE5 /* MediaQueryExp.h */; };
     1788                4E19592E0A39DACC00220FE5 /* MediaQueryExp.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959280A39DACC00220FE5 /* MediaQueryExp.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17891789                4F1534DE11B532EC0021FD86 /* EditingBehavior.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1534DD11B532EC0021FD86 /* EditingBehavior.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17901790                4F1534E011B533020021FD86 /* EditingBehaviorTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    20502050                536D5A23193E8E0C00CE4CAB /* ParsingUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 536D5A22193E8E0C00CE4CAB /* ParsingUtilities.h */; };
    20512051                536D5A25193F40FC00CE4CAB /* SourceSizeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 536D5A24193F40FC00CE4CAB /* SourceSizeList.cpp */; };
    2052                 536D5A27193F410B00CE4CAB /* SourceSizeList.h in Headers */ = {isa = PBXBuildFile; fileRef = 536D5A26193F410B00CE4CAB /* SourceSizeList.h */; };
     2052                536D5A27193F410B00CE4CAB /* SourceSizeList.h in Headers */ = {isa = PBXBuildFile; fileRef = 536D5A26193F410B00CE4CAB /* SourceSizeList.h */; settings = {ATTRIBUTES = (Private, ); }; };
    20532053                53C8298D13D8D92700DE2DEB /* RenderFlexibleBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53C8298B13D8D92700DE2DEB /* RenderFlexibleBox.cpp */; };
    20542054                53C8298E13D8D92700DE2DEB /* RenderFlexibleBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 53C8298C13D8D92700DE2DEB /* RenderFlexibleBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    20672067                589556ED18D4A44000764B03 /* BorderEdge.h in Headers */ = {isa = PBXBuildFile; fileRef = 589556EC18D4A44000764B03 /* BorderEdge.h */; };
    20682068                58AEE2F418D4BCCF0022E7FE /* BorderEdge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58AEE2F318D4BCCF0022E7FE /* BorderEdge.cpp */; };
    2069                 58CD35CB18EB4C3900B9F3AC /* FloatSizeHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 58CD35CA18EB4C3900B9F3AC /* FloatSizeHash.h */; };
     2069                58CD35CB18EB4C3900B9F3AC /* FloatSizeHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 58CD35CA18EB4C3900B9F3AC /* FloatSizeHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
    20702070                58DEED8619873FF000888FF3 /* RenderSelectionInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58DEED8519873FF000888FF3 /* RenderSelectionInfo.cpp */; };
    20712071                5905ADBF1302F3CE00F116DF /* XMLTreeViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */; };
     
    51345134                BC53C6080DA56C570021EB5D /* Gradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC53C6070DA56C570021EB5D /* Gradient.cpp */; };
    51355135                BC53C60B0DA56CF10021EB5D /* GradientCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC53C60A0DA56CF10021EB5D /* GradientCG.cpp */; };
    5136                 BC53C6920DA591140021EB5D /* CSSGradientValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC53C6910DA591140021EB5D /* CSSGradientValue.h */; };
     5136                BC53C6920DA591140021EB5D /* CSSGradientValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC53C6910DA591140021EB5D /* CSSGradientValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
    51375137                BC53D911114310CC000D817E /* WebCoreJSClientData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC53D910114310CC000D817E /* WebCoreJSClientData.h */; };
    51385138                BC53DA2E1143121E000D817E /* DOMWrapperWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = BC53DA2D1143121E000D817E /* DOMWrapperWorld.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    52305230                BC772B3C0C4EA91E0083285F /* CSSHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = BC772B360C4EA91E0083285F /* CSSHelper.h */; settings = {ATTRIBUTES = (Private, ); }; };
    52315231                BC772B3D0C4EA91E0083285F /* CSSParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC772B370C4EA91E0083285F /* CSSParser.cpp */; };
    5232                 BC772B3E0C4EA91E0083285F /* CSSParser.h in Headers */ = {isa = PBXBuildFile; fileRef = BC772B380C4EA91E0083285F /* CSSParser.h */; };
     5232                BC772B3E0C4EA91E0083285F /* CSSParser.h in Headers */ = {isa = PBXBuildFile; fileRef = BC772B380C4EA91E0083285F /* CSSParser.h */; settings = {ATTRIBUTES = (Private, ); }; };
    52335233                BC772C460C4EB2C60083285F /* XMLHttpRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC772C440C4EB2C60083285F /* XMLHttpRequest.cpp */; };
    52345234                BC772C470C4EB2C60083285F /* XMLHttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BC772C450C4EB2C60083285F /* XMLHttpRequest.h */; };
  • trunk/Source/WebCore/css/CSSParser.cpp

    r175848 r175930  
    6161#include "Document.h"
    6262#include "FloatConversion.h"
     63#include "GridCoordinate.h"
    6364#include "HTMLParserIdioms.h"
    6465#include "HashTools.h"
     
    151152static const unsigned INVALID_NUM_PARSED_PROPERTIES = UINT_MAX;
    152153static const double MAX_SCALE = 1000000;
    153 #if ENABLE(CSS_GRID_LAYOUT)
    154 static const unsigned MAX_GRID_TRACK_REPETITIONS = 10000;
    155 #endif
    156154
    157155template <unsigned N>
     
    52695267        return false;
    52705268
    5271     ASSERT_WITH_SECURITY_IMPLICATION(arguments->valueAt(0)->fValue > 0);
    5272     size_t repetitions = arguments->valueAt(0)->fValue;
    5273     // Clamp repetitions at MAX_GRID_TRACK_REPETITIONS.
    5274     // http://www.w3.org/TR/css-grid-1/#repeat-notation
    5275     if (repetitions > MAX_GRID_TRACK_REPETITIONS)
    5276         repetitions = MAX_GRID_TRACK_REPETITIONS;
     5269    ASSERT(arguments->valueAt(0)->fValue > 0);
     5270    // If arguments->valueAt(0)->fValue > SIZE_MAX then repetitions becomes 0 during the type casting, that's why we
     5271    // clamp it down to kGridMaxTracks before the type casting.
     5272    size_t repetitions = clampTo<size_t>(arguments->valueAt(0)->fValue, 0, kGridMaxTracks);
     5273
    52775274    RefPtr<CSSValueList> repeatedValues = CSSValueList::createSpaceSeparated();
    52785275    arguments->next(); // Skip the repetition count.
     
    52845281        parseGridLineNames(*arguments, *repeatedValues);
    52855282
    5286     bool sawTrackSize = false;
     5283    unsigned numberOfTracks = 0;
    52875284    while (arguments->current()) {
    52885285        RefPtr<CSSValue> trackSize = parseGridTrackSize(*arguments);
     
    52915288
    52925289        repeatedValues->append(trackSize.releaseNonNull());
    5293         sawTrackSize = true;
     5290        ++numberOfTracks;
    52945291
    52955292        // This takes care of any trailing <custom-ident>* in the grammar.
     
    53005297
    53015298    // We should have found at least one <track-size>, otherwise the declaration is invalid.
    5302     if (!sawTrackSize)
    5303         return false;
     5299    if (!numberOfTracks)
     5300        return false;
     5301
     5302    // We clamp the number of repetitions to a multiple of the repeat() track list's size, while staying below the max
     5303    // grid size.
     5304    repetitions = std::min(repetitions, kGridMaxTracks / numberOfTracks);
    53045305
    53055306    for (size_t i = 0; i < repetitions; ++i) {
  • trunk/Source/WebCore/rendering/RenderGrid.cpp

    r175314 r175930  
    741741    }
    742742
    743     ASSERT(gridRowCount() >= style().gridRows().size());
    744     ASSERT(gridColumnCount() >= style().gridColumns().size());
     743    ASSERT(gridRowCount() >= GridResolvedPosition::explicitGridRowCount(style()));
     744    ASSERT(gridColumnCount() >= GridResolvedPosition::explicitGridColumnCount(style()));
    745745
    746746    // FIXME: Implement properly "stack" value in auto-placement algorithm.
     
    759759{
    760760    OrderIteratorPopulator populator(m_orderIterator);
    761     size_t maximumRowIndex = std::max<size_t>(1, style().gridRows().size());
    762     size_t maximumColumnIndex = std::max<size_t>(1, style().gridColumns().size());
     761    size_t maximumRowIndex = std::max<size_t>(1, GridResolvedPosition::explicitGridRowCount(style()));
     762    size_t maximumColumnIndex = std::max<size_t>(1, GridResolvedPosition::explicitGridColumnCount(style()));
    763763
    764764    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
  • trunk/Source/WebCore/rendering/style/GridCoordinate.h

    r170531 r175930  
    4141namespace WebCore {
    4242
     43// Recommended maximum size for both explicit and implicit grids.
     44const size_t kGridMaxTracks = 1000000;
     45
    4346// A span in a single direction (either rows or columns). Note that |resolvedInitialPosition|
    4447// and |resolvedFinalPosition| are grid areas' indexes, NOT grid lines'. Iterating over the
     
    4750public:
    4851    GridSpan(const GridResolvedPosition& resolvedInitialPosition, const GridResolvedPosition& resolvedFinalPosition)
    49         : resolvedInitialPosition(resolvedInitialPosition)
    50         , resolvedFinalPosition(resolvedFinalPosition)
     52        : resolvedInitialPosition(std::min(resolvedInitialPosition.toInt(), kGridMaxTracks - 1))
     53        , resolvedFinalPosition(std::min(resolvedFinalPosition.toInt(), kGridMaxTracks))
    5154    {
    5255        ASSERT(resolvedInitialPosition <= resolvedFinalPosition);
  • trunk/Source/WebCore/rendering/style/GridResolvedPosition.cpp

    r170996 r175930  
    4949}
    5050
     51size_t GridResolvedPosition::explicitGridColumnCount(const RenderStyle& gridContainerStyle)
     52{
     53    return std::min(gridContainerStyle.gridColumns().size(), kGridMaxTracks);
     54}
     55
     56size_t GridResolvedPosition::explicitGridRowCount(const RenderStyle& gridContainerStyle)
     57{
     58    return std::min(gridContainerStyle.gridRows().size(), kGridMaxTracks);
     59}
     60
    5161static size_t explicitGridSizeForSide(const RenderStyle& gridContainerStyle, GridPositionSide side)
    5262{
    53     return isColumnSide(side) ? gridContainerStyle.gridColumns().size() : gridContainerStyle.gridRows().size();
     63    return isColumnSide(side) ? GridResolvedPosition::explicitGridColumnCount(gridContainerStyle) : GridResolvedPosition::explicitGridRowCount(gridContainerStyle);
    5464}
    5565
  • trunk/Source/WebCore/rendering/style/GridResolvedPosition.h

    r170531 r175930  
    147147    }
    148148
     149    static size_t explicitGridColumnCount(const RenderStyle&);
     150    static size_t explicitGridRowCount(const RenderStyle&);
     151
    149152private:
    150153
  • trunk/Tools/ChangeLog

    r175887 r175930  
     12014-10-07  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        [CSS Grid Layout] Limit the size of explicit/implicit grid
     4        https://bugs.webkit.org/show_bug.cgi?id=136217
     5
     6        Reviewed by Andreas Kling.
     7
     8        Added a new unit test for the CSS parser. Right now it only checks
     9        that we properly clamp the maximum number of tracks on a grid to a
     10        maximum of 1 million.
     11
     12        * TestWebKitAPI/CMakeLists.txt:
     13        * TestWebKitAPI/PlatformEfl.cmake:
     14        * TestWebKitAPI/PlatformGTK.cmake:
     15        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
     16        * TestWebKitAPI/Tests/WebCore/CSSParser.cpp: Added.
     17        (TestWebKitAPI::computeNumberOfTracks): Helper function.
     18        (TestWebKitAPI::TEST): Added a
     19        CSSPropertyParserTest.GridTrackLimits test case.
     20
    1212014-11-11  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
    222
  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r174422 r175930  
    2020    ${JAVASCRIPTCORE_DIR}/runtime
    2121    ${THIRDPARTY_DIR}/gtest/include
     22    ${WEBCORE_DIR}/css
     23    ${WEBCORE_DIR}/dom
    2224    ${WEBCORE_DIR}/editing
    2325    ${WEBCORE_DIR}/platform
     26    ${WEBCORE_DIR}/platform/animation
    2427    ${WEBCORE_DIR}/platform/graphics
    2528    ${WEBCORE_DIR}/platform/text
    2629    ${WEBCORE_DIR}/platform/network
    2730    ${WEBCORE_DIR}/platform/network/soup
     31    ${WEBCORE_DIR}/rendering
     32    ${WEBCORE_DIR}/rendering/style
    2833    ${WEBKIT2_DIR}/Platform/IPC
    2934    ${WEBKIT2_DIR}/Shared
  • trunk/Tools/TestWebKitAPI/PlatformEfl.cmake

    r173785 r175930  
    5858
    5959set(test_webcore_BINARIES
     60    CSSParser
    6061    LayoutUnit
    6162    URL
  • trunk/Tools/TestWebKitAPI/PlatformGTK.cmake

    r175046 r175930  
    109109set(TestWebCoreGtk_SOURCES
    110110    ${TESTWEBKITAPI_DIR}/Tests/WebCore/gtk/UserAgentQuirks.cpp
     111    ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScriptsData.cpp
    111112)
    112113
     
    115116    ${TestWebCoreGtk_SOURCES}
    116117    ${TESTWEBKITAPI_DIR}/TestsController.cpp
     118    ${TESTWEBKITAPI_DIR}/Tests/WebCore/CSSParser.cpp
    117119    ${TESTWEBKITAPI_DIR}/Tests/WebCore/LayoutUnit.cpp
    118120    ${TESTWEBKITAPI_DIR}/Tests/WebCore/URL.cpp
  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r174652 r175930  
    245245                CD5393C81757BA9700C07123 /* MD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5393C71757BA9700C07123 /* MD5.cpp */; };
    246246                CD5393CA1757BAC400C07123 /* SHA1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5393C91757BAC400C07123 /* SHA1.cpp */; };
     247                CD5451EA19E41F9D0016936F /* CSSParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5451E919E41F9D0016936F /* CSSParser.cpp */; };
    247248                CD5497B415857F0C00B5BC30 /* MediaTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5497B315857F0C00B5BC30 /* MediaTime.cpp */; };
    248249                CD59F53419E9110D00CF1835 /* file-with-mse.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD59F53219E910AA00CF1835 /* file-with-mse.html */; };
     
    623624                CD5393C71757BA9700C07123 /* MD5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MD5.cpp; sourceTree = "<group>"; };
    624625                CD5393C91757BAC400C07123 /* SHA1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SHA1.cpp; sourceTree = "<group>"; };
     626                CD5451E919E41F9D0016936F /* CSSParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSParser.cpp; sourceTree = "<group>"; };
    625627                CD5497B315857F0C00B5BC30 /* MediaTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaTime.cpp; sourceTree = "<group>"; };
    626628                CD59F53219E910AA00CF1835 /* file-with-mse.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "file-with-mse.html"; sourceTree = "<group>"; };
     
    754756                        isa = PBXGroup;
    755757                        children = (
     758                                CD5451E919E41F9D0016936F /* CSSParser.cpp */,
    756759                                93A720E518F1A0E800A848E1 /* CalculationValue.cpp */,
    757760                                CDC2C7141797089D00E627FB /* TimeRanges.cpp */,
     
    13971400                                BC22D31514DC689800FFB1DD /* UserMessage.cpp in Sources */,
    13981401                                BC55F5F914AD78EE00484BE1 /* Vector.cpp in Sources */,
     1402                                CD5451EA19E41F9D0016936F /* CSSParser.cpp in Sources */,
    13991403                                290A9BB71735DE8A00D71BBC /* CloseNewWindowInNavigationPolicyDelegate.mm in Sources */,
    14001404                                FE217ECD1640A54A0052988B /* VMInspector.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.