[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:12:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7355c8773582b917fa852000945acda1f32d8da5
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 28 23:41:03 2010 +0000
2010-10-28 Lucas Forschler <lforschler at apple.com>
Reviewed by Geoffrey Garen.
Bug 46927 - Sunspider 0.9 web site should prominently link to Sunspider 0.9.1
Notes:
-Created a new sunspider "landing" page which lists current and previous versions of SunSpider.
-Edited the .htaccess file to redirect the old pages to the new landing page.
-This should keep our search engine page rankings effective.
Potentially breaking:
-This COULD potentially break the SunSpider benchmark.
-Local testing with relative links seems to function as expected.
-The .htaccess 301 redirects are UNTESTED.
* .htaccess:
* perf/sunspider: Added.
* perf/sunspider-0.9.1/sunspider.html: Removed.
* perf/sunspider-0.9.1/versions.html: Removed.
* perf/sunspider-0.9/sunspider.html: Removed.
* perf/sunspider/sunspider.css: Added.
* perf/sunspider/sunspider.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70824 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitSite/.htaccess b/WebKitSite/.htaccess
index 2a59561..d9d8b00 100644
--- a/WebKitSite/.htaccess
+++ b/WebKitSite/.htaccess
@@ -1,4 +1,7 @@
AddType application/x-httpd-php html
AddType text/cache-manifest manifest
-RewriteRule .*webdevelopers.* http://trac.webkit.org/projects/webkit/wiki/WebDevelopers [R=301]
\ No newline at end of file
+RewriteRule .*webdevelopers.* http://trac.webkit.org/projects/webkit/wiki/WebDevelopers [R=301]
+Redirect 301 /perf/sunspider-0.9/sunspider.html /perf/sunspider/sunspider.html
+Redirect 301 /perf/sunspider-0.9.1/sunspider.html /perf/sunspider/sunspider.html
+Redirect 301 /perf/sunspider-0.9.1/versions.html /perf/sunspider/sunspider.html
\ No newline at end of file
diff --git a/WebKitSite/ChangeLog b/WebKitSite/ChangeLog
index e825755..84adc86 100644
--- a/WebKitSite/ChangeLog
+++ b/WebKitSite/ChangeLog
@@ -1,3 +1,26 @@
+2010-10-28 Lucas Forschler <lforschler at apple.com>
+
+ Reviewed by Geoffrey Garen.
+
+ Bug 46927 - Sunspider 0.9 web site should prominently link to Sunspider 0.9.1
+ Notes:
+ -Created a new sunspider "landing" page which lists current and previous versions of SunSpider.
+ -Edited the .htaccess file to redirect the old pages to the new landing page.
+ -This should keep our search engine page rankings effective.
+ Potentially breaking:
+ -This COULD potentially break the SunSpider benchmark.
+ -Local testing with relative links seems to function as expected.
+ -The .htaccess 301 redirects are UNTESTED.
+
+
+ * .htaccess:
+ * perf/sunspider: Added.
+ * perf/sunspider-0.9.1/sunspider.html: Removed.
+ * perf/sunspider-0.9.1/versions.html: Removed.
+ * perf/sunspider-0.9/sunspider.html: Removed.
+ * perf/sunspider/sunspider.css: Added.
+ * perf/sunspider/sunspider.html: Added.
+
2010-10-19 Jenn Braithwaite <jennb at chromium.org>
Reviewed by David Levin.
diff --git a/WebKitSite/perf/sunspider-0.9.1/sunspider.html b/WebKitSite/perf/sunspider-0.9.1/sunspider.html
deleted file mode 100644
index ac65970..0000000
--- a/WebKitSite/perf/sunspider-0.9.1/sunspider.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-
-<meta charset=utf8>
-
-<!--
- Copyright (C) 2007 Apple Inc. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<title>SunSpider 0.9.1 JavaScript Benchmark</title>
-<link rel="stylesheet" href="sunspider.css">
-</head>
-
-<body>
-
-<h2><span id="logo">☀</span>SunSpider 0.9.1 JavaScript Benchmark</h2>
-
-<p>This is SunSpider, a JavaScript benchmark. This benchmark tests the
-core JavaScript language only, not the DOM or other browser APIs. It
-is designed to compare different versions of the same browser, and
-different browsers to each other. Unlike many widely available
-JavaScript benchmarks, this test is:</p>
-
-<dl>
-<dt>Real World<dt>
-<dd>This test mostly avoids microbenchmarks, and tries to focus on
-the kinds of actual problems developers solve with JavaScript today,
-and the problems they may want to tackle in the future as the language
-gets faster. This includes tests to generate a tagcloud from JSON
-input, a 3D raytracer, cryptography tests, code decompression, and
-many more examples. There are a few microbenchmarkish things, but they
-mostly represent real performance problems that developers have
-encountered.</dd>
-
-<dt>Balanced<dt>
-<dd>This test is balanced between different areas of the language and
-different types of code. It's not all math, all string processing, or
-all timing simple loops. In addition to having tests in many
-categories, the individual tests were balanced to take similar amounts
-of time on currently shipping versions of popular browsers.</dd>
-
-<dt>Statistically Sound<dt>
-<dd>One of the challenges of benchmarking is knowing how much noise
-you have in your measurements. This benchmark runs each test multiple
-times and determines an error range (technically, a 95% confidence
-interval). In addition, in comparison mode it tells you if you have
-enough data to determine if the difference is statistically
-significant.</dd>
-
-</dl>
-
-<p><b>Current version - sunspider-0.9.1:</b> <a href="sunspider-0.9.1/driver.html">Start Now!</a><br>
-<small>(When you run the benchmark, be patient - it loops through all of the
-test cases five times and can take a minute or longer to complete.)</small></p>
-
-<a href="versions.html">All versions.</a>
-
-</body>
-
-</html>
diff --git a/WebKitSite/perf/sunspider-0.9.1/versions.html b/WebKitSite/perf/sunspider-0.9.1/versions.html
deleted file mode 100644
index 47741ce..0000000
--- a/WebKitSite/perf/sunspider-0.9.1/versions.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-
-<meta charset=utf8>
-
-<!--
- Copyright (C) 2007 Apple Inc. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<title>SunSpider 0.9.1 JavaScript Benchmark</title>
-<link rel="stylesheet" href="sunspider.css">
-</head>
-
-<body>
-
-<h2><span id="logo">☀</span>SunSpider 0.9.1 JavaScript Benchmark</h2>
-
-<p>This is SunSpider, a JavaScript benchmark. This benchmark tests the
-core JavaScript language only, not the DOM or other browser APIs. It
-is designed to compare different versions of the same browser, and
-different browsers to each other.</p>
-
-<p>This version of the harness is 0.9.1. This page lists all versions
-of the test content:</p>
-
-<ul>
-<li><a href="sunspider-0.9/driver.html">Version 0.9</a></li>
-<li><a href="sunspider-0.9.1/driver.html">Version 0.9.1</a></li>
-</ul>
-
-</body>
-<html>
diff --git a/WebKitSite/perf/sunspider-0.9/sunspider.html b/WebKitSite/perf/sunspider-0.9/sunspider.html
deleted file mode 100644
index 7f3cc04..0000000
--- a/WebKitSite/perf/sunspider-0.9/sunspider.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-
-<!--
- Copyright (C) 2007 Apple Inc. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<title>SunSpider JavaScript Benchmark</title>
-<link rel="stylesheet" href="sunspider.css">
-</head>
-
-<body>
-
-<h2><span id="logo">☀</span>SunSpider JavaScript Benchmark</h2>
-
-<p>This is SunSpider, a JavaScript benchmark. This benchmark tests the
-core JavaScript language only, not the DOM or other browser APIs. It
-is designed to compare different versions of the same browser, and
-different browsers to each other. Unlike many widely available
-JavaScript benchmarks, this test is:</p>
-
-<dl>
-<dt>Real World<dt>
-<dd>This test mostly avoids microbenchmarks, and tries to focus on
-the kinds of actual problems developers solve with JavaScript today,
-and the problems they may want to tackle in the future as the language
-gets faster. This includes tests to generate a tagcloud from JSON
-input, a 3D raytracer, cryptography tests, code decompression, and
-many more examples. There are a few microbenchmarkish things, but they
-mostly represent real performance problems that developers have
-encountered.</dd>
-
-<dt>Balanced<dt>
-<dd>This test is balanced between different areas of the language and
-different types of code. It's not all math, all string processing, or
-all timing simple loops. In addition to having tests in many
-categories, the individual tests were balanced to take similar amounts
-of time on currently shipping versions of popular browsers.</dd>
-
-<dt>Statistically Sound<dt>
-<dd>One of the challenges of benchmarking is knowing how much noise
-you have in your measurements. This benchmark runs each test multiple
-times and determines an error range (technically, a 95% confidence
-interval). In addition, in comparison mode it tells you if you have
-enough data to determine if the difference is statistically
-significant.</dd>
-
-</dl>
-
-<p><a href="sunspider-driver.html">Start Now!</a><br>
-<small>(When you run the benchmark, be patient - it loops through all of the
-test cases five times and can take a minute or longer to complete.)</small></p>
-
-</body>
-
-</html>
diff --git a/WebKitSite/perf/sunspider-0.9/sunspider.css b/WebKitSite/perf/sunspider/sunspider.css
similarity index 100%
copy from WebKitSite/perf/sunspider-0.9/sunspider.css
copy to WebKitSite/perf/sunspider/sunspider.css
diff --git a/WebKitSite/perf/sunspider/sunspider.html b/WebKitSite/perf/sunspider/sunspider.html
new file mode 100644
index 0000000..dd340b4
--- /dev/null
+++ b/WebKitSite/perf/sunspider/sunspider.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+<!--
+ Copyright (C) 2007 Apple Inc. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<title>SunSpider JavaScript Benchmark</title>
+<link rel="stylesheet" href="sunspider.css">
+</head>
+
+<body>
+
+<h2><span id="logo">☀</span>SunSpider JavaScript Benchmark</h2>
+
+<p>This is SunSpider, a JavaScript benchmark. This benchmark tests the
+core JavaScript language only, not the DOM or other browser APIs. It
+is designed to compare different versions of the same browser, and
+different browsers to each other. Unlike many widely available
+JavaScript benchmarks, this test is:</p>
+
+<dl>
+<dt>Real World<dt>
+<dd>This test mostly avoids microbenchmarks, and tries to focus on
+the kinds of actual problems developers solve with JavaScript today,
+and the problems they may want to tackle in the future as the language
+gets faster. This includes tests to generate a tagcloud from JSON
+input, a 3D raytracer, cryptography tests, code decompression, and
+many more examples. There are a few microbenchmarkish things, but they
+mostly represent real performance problems that developers have
+encountered.</dd>
+
+<dt>Balanced<dt>
+<dd>This test is balanced between different areas of the language and
+different types of code. It's not all math, all string processing, or
+all timing simple loops. In addition to having tests in many
+categories, the individual tests were balanced to take similar amounts
+of time on currently shipping versions of popular browsers.</dd>
+
+<dt>Statistically Sound<dt>
+<dd>One of the challenges of benchmarking is knowing how much noise
+you have in your measurements. This benchmark runs each test multiple
+times and determines an error range (technically, a 95% confidence
+interval). In addition, in comparison mode it tells you if you have
+enough data to determine if the difference is statistically
+significant.</dd>
+
+</dl>
+
+<p><b>Current Version</b><br>
+<a href="../sunspider-0.9.1/sunspider-0.9.1/driver.html">Start SunSpider 0.9.1 now!</a><br>
+<small>(When you run the benchmark, be patient - it loops through all of the
+test cases five times and can take a minute or longer to complete.)</small></p>
+
+<p>
+Previous Versions<br>
+<li>
+<a href="../sunspider-0.9/sunspider-driver.html">SunSpider 0.9</a><br>
+</li>
+</p>
+</body>
+
+</html>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list