Changeset 200053 in webkit


Ignore:
Timestamp:
Apr 25, 2016 3:40:24 PM (8 years ago)
Author:
Simon Fraser
Message:

Fix issues with content-animation performance tests
​https://bugs.webkit.org/show_bug.cgi?id=157001

Reviewed by Sam Weinig.

Add patch content for svg-animation.html, and fix the paths in the patch so
it applies correctly.

Add the patch file to the .plan file.

  • Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch:
  • Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan:
Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r200045 r200053  
     12016-04-25  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Fix issues with content-animation performance tests
     4        https://bugs.webkit.org/show_bug.cgi?id=157001
     5
     6        Reviewed by Sam Weinig.
     7
     8        Add patch content for svg-animation.html, and fix the paths in the patch so
     9        it applies correctly.
     10
     11        Add the patch file to the .plan file.
     12
     13        * Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch:
     14        * Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan:
     15
    1162016-04-25  Brady Eidson  <beidson@apple.com>
    217

  • trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch

    r199805 r200053  
    1 diff --git a/PerformanceTests/Animation/css-animation.html b/PerformanceTests/Animation/css-animation.html
     1diff --git a/css-animation.html b/css-animation.html
    22index adae19cb018ed1ca93fd6b4cda80002348482fc3..8f1e29933faa13586dbf97b7874024854fbf2147 100644
    3 --- a/PerformanceTests/Animation/css-animation.html
    4 +++ b/PerformanceTests/Animation/css-animation.html
     3--- a/css-animation.html
     4+++ b/css-animation.html
    55@@ -167,9 +167,54 @@
    66         function setupAnimation()
    … …  
    5858 </head>
    5959 <body>
    60 diff --git a/PerformanceTests/Animation/raf-animation.html b/PerformanceTests/Animation/raf-animation.html
    61 index cb11bc1e7412050c132564e1f2dea9f8729871a6..dbf18e72de9880c28d9fbf9fa156b4949bb6a6cf 100644
    62 --- a/PerformanceTests/Animation/raf-animation.html
    63 +++ b/PerformanceTests/Animation/raf-animation.html
     60diff --git a/raf-animation.html b/raf-animation.html
     61index 09e72f222fcafdfa054a2d5a37b1dcc9eca096ca..dbf18e72de9880c28d9fbf9fa156b4949bb6a6cf 100644
     62--- a/raf-animation.html
     63+++ b/raf-animation.html
    6464@@ -195,9 +195,54 @@
    6565         {
    … …  
    7676+            if (location.hash === '#submit')
    7777+                submitResults();
    78          }
    79  
     78+        }
     79+
    8080+        function submitResults()
    8181+        {
    … …  
    110110+            }
    111111+            xhr.send(resultsString);
    112 +        }
    113 +       
     112         }
     113        
    114114         window.addEventListener('load', setupAnimation, false);
    115115+        window.addEventListener("hashchange", hashChanged, false);
    … …  
    117117 </head>
    118118 <body>
     119diff --git a/svg-animation.html b/svg-animation.html
     120index c286d50cc7e0e6d64e1b6fbd2beb3642fe90e958..fb21d522ca200021d452595cbfed3db252c80929 100644
     121--- a/svg-animation.html
     122+++ b/svg-animation.html
     123@@ -150,9 +150,54 @@
     124         function setupAnimation()
     125         {
     126             makeParticles();
     127+
     128+            window.setTimeout(function() {
     129+                location.hash = 'done';
     130+            }, 10000)
     131+        }
     132+
     133+        function hashChanged()
     134+        {
     135+            if (location.hash === '#submit')
     136+                submitResults();
     137+        }
     138+
     139+        function submitResults()
     140+        {
     141+            var results = {
     142+                'content-animation' : {
     143+                    'metrics' : {
     144+                        'FrameRate' : ['Arithmetic']
     145+                    },
     146+                    'tests' : {
     147+                        'svg-animation' : {
     148+                            'metrics' : {
     149+                                'FrameRate' : {
     150+                                    'current' : ['<native_framerate>'] // <native_framerate> is replaced by a framerate computed in native code
     151+                                }
     152+                            }
     153+                        }
     154+                    }
     155+                }
     156+            };
     157+            var resultsString = JSON.stringify(results);
     158+            var xhr = new XMLHttpRequest();
     159+            xhr.open("POST", "/report");
     160+            xhr.setRequestHeader("Content-type", "application/json");
     161+            xhr.setRequestHeader("Content-length", resultsString.length);
     162+            xhr.setRequestHeader("Connection", "close");
     163+            xhr.onreadystatechange = function() {
     164+                if (xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
     165+                    closeRequest = new XMLHttpRequest();
     166+                    closeRequest.open("GET", "/shutdown");
     167+                    closeRequest.send()
     168+                }
     169+            }
     170+            xhr.send(resultsString);
     171         }
     172         
     173         window.addEventListener('load', setupAnimation, false);
     174+        window.addEventListener("hashchange", hashChanged, false);
     175     </script>
     176 </head>
     177 <body>

  • trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan

    r199808 r200053  
    22    "timeout": 120,
    33    "count": 5,
    4     "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/Animation/@r199806",
     4    "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/Animation/@r200049",
     5    "benchmark_patch": "data/patches/ContentAnimation.patch",
    56    "test_files": [
    6         "css-animation.html",
    7         "raf-animation.html"
     7        "css-animation.html",
     8        "svg-animation.html",
     9        "raf-animation.html"
    810    ],
    911    "output_file": "css-animation.result",
Note: See TracChangeset for help on using the changeset viewer.