Changeset 167022 in webkit


Ignore:
Timestamp:
Apr 9, 2014 11:19:52 AM (10 years ago)
Author:
zoltan@webkit.org
Message:

[CSS Shapes] Add no regions version of RegionsShapes performance test
​https://bugs.webkit.org/show_bug.cgi?id=131442

Reviewed by Ryosuke Niwa.

We would like have a no regions version for RegionsShapes performance test. The new
test produces similar layout to RegionsShapes.html without using regions. It is helpful
for us to do further comparisons when necessary. This test is skipped by default.

  • Layout/Shapes/RegionsShapesNoRegions.html: Added.
  • Layout/Shapes/resources/RegionsShapes.css: Added.

(html, body):
(.shape):
(#circleShape):
(#imageShape):
(#insetShape):
(#roundedInsetShape):
(#triangleLeft):
(#triangleRight):
(#selfIntersectingStar):
(#region1):
(#region2):
(#region3):

  • Layout/Shapes/resources/RegionsShapesContent.html:
  • Layout/Shapes/resources/RegionsShapesContentNoRegionsWidth400.html: Added.
  • Layout/Shapes/resources/RegionsShapesContentNoRegionsWidth600.html: Added.
  • Layout/Shapes/resources/RegionsShapesContentNoRegionsWidth800.html: Added.
Location:
trunk/PerformanceTests
Files:
5 added
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/PerformanceTests/ChangeLog

    r166670 r167022  
     12014-04-09  Zoltan Horvath  <zoltan@webkit.org>
     2
     3        [CSS Shapes] Add no regions version of RegionsShapes performance test
     4        https://bugs.webkit.org/show_bug.cgi?id=131442
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        We would like have a no regions version for RegionsShapes performance test. The new
     9        test produces similar layout to RegionsShapes.html without using regions. It is helpful
     10        for us to do further comparisons when necessary. This test is skipped by default.
     11
     12        * Layout/Shapes/RegionsShapesNoRegions.html: Added.
     13        * Layout/Shapes/resources/RegionsShapes.css: Added.
     14        (html, body):
     15        (.shape):
     16        (#circleShape):
     17        (#imageShape):
     18        (#insetShape):
     19        (#roundedInsetShape):
     20        (#triangleLeft):
     21        (#triangleRight):
     22        (#selfIntersectingStar):
     23        (#region1):
     24        (#region2):
     25        (#region3):
     26        * Layout/Shapes/resources/RegionsShapesContent.html:
     27        * Layout/Shapes/resources/RegionsShapesContentNoRegionsWidth400.html: Added.
     28        * Layout/Shapes/resources/RegionsShapesContentNoRegionsWidth600.html: Added.
     29        * Layout/Shapes/resources/RegionsShapesContentNoRegionsWidth800.html: Added.
     30
    1312014-04-02  Geoffrey Garen  <ggaren@apple.com>
    232

  • trunk/PerformanceTests/Layout/Shapes/resources/RegionsShapesContent.html

    r166416 r167022  
    22<html>
    33<head>
     4<link rel="stylesheet" type="text/css" href="./Shapes/resources/RegionsShapes.css">
    45<style>
    5 html, body {
    6     padding: 0;
    7     margin: 0;
    8 }
    9 
    10 article {
    11     -webkit-flow-into: article;
    12     text-align: justify;
    13     font-family: Palatino, Georgia, serif;
    14     font-size: 10px;
    15     -webkit-hyphens: auto;
    16     text-align: justify;
    17     line-height: 1.2em;
    18 }
     6article { -webkit-flow-into: article; }
    197
    208.regionColumns {
    … …  
    3725}
    3826
    39 .page { width: 100%; }
    40 #region1 { width: 40%; }
    41 #region2 { width: 22%; }
    42 #region3 { width: 22%; }
    4327#region4 { height: 200px; }
    4428#region5 { height: 300px; }
    45 
    46 .shape {
    47     width: 100px;
    48     height: 100px;
    49 }
    50 
    51 #circleShape {
    52     float: left;
    53     -webkit-shape-outside: circle(closest-side at center);
    54     -webkit-shape-margin: 2px;
    55     -webkit-clip-path: circle(closest-side at center);
    56     background-color: green;
    57 }
    58 
    59 #imageShape {
    60     float: left;
    61     background: url("./Shapes/resources/shape.gif") no-repeat;
    62     -webkit-shape-outside: url("./Shapes/resources/shape.gif");
    63     -webkit-shape-margin: 2px;
    64     width: 200px;
    65     height: 200px;
    66 }
    67 
    68 #insetShape {
    69     float: right;
    70     -webkit-shape-outside: inset(5px);
    71     -webkit-clip-path: inset(5px);
    72     -webkit-shape-margin: 4px;
    73     background-color: red;
    74     border: 1px solid black;
    75 }
    76 
    77 #roundedInsetShape {
    78     float: right;
    79     -webkit-shape-outside: inset(5px round 64px 32px 16px 36px);
    80     -webkit-clip-path: inset(5px round 64px 32px 16px 36px);
    81     -webkit-shape-margin: 4px;
    82     background-color: lightblue;
    83     opacity: 0.4;
    84     border: 1px solid black;
    85 }
    86 
    87 #triangleLeft {
    88     float: left;
    89     -webkit-shape-outside: polygon(0 0, 100% 50%, 0 100%);
    90     -webkit-clip-path: polygon(0 0, 100% 50%, 0 100%);
    91     -webkit-shape-margin: 4px;
    92     background-color: yellow;
    93     opacity: 0.4;
    94 }
    95 
    96 #triangleRight {
    97     float: right;
    98     -webkit-shape-outside: polygon(100% 0, 0 50%, 100% 100%);
    99     -webkit-clip-path: polygon(100% 0, 0 50%, 100% 100%);
    100     -webkit-shape-margin: 4px;
    101     background-color: orange;
    102 }
    103 
    104 #selfIntersectingStar {
    105     float: left;
    106     -webkit-shape-outside: polygon(50% 0, 100% 100%, 0 34%, 100% 34%, 0 100%);
    107     -webkit-clip-path: polygon(50% 0, 100% 100%, 0 34%, 100% 34%, 0 100%);
    108     -webkit-shape-margin: 4px;
    109     background-color: blue;
    110     width: 100px;
    111     height: 200px;
    112 }
    11329
    11430@media screen and (max-width: 650px) {
    … …  
    12844
    12945<body>
    130 <div class="page">
     46<div>
    13147  <div id="region1" class="regionColumns"></div>
    13248  <div id="region2" class="regionColumns"></div>
Note: See TracChangeset for help on using the changeset viewer.