[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
robert at webkit.org
robert at webkit.org
Wed Dec 22 13:14:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d640b728af6abf4e7dc612db65ec08c23d0d2aed
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 9 18:46:14 2010 +0000
2010-09-09 Robert Hogan <robert at webkit.org>
Reviewed by Adam Barth.
Give WebKit clients a way to replace window.screen to
foil attempts to track users with it
This allows clients to overload the values returned by the
Screen object through the JSC manipulation API (such as
QWebFrame::addToJavaScriptWindowObject() in Qt). Clients will
want to do this when they do not want to reveal too much
explicit information about the user's desktop configuration.
https://bugs.webkit.org/show_bug.cgi?id=41802
* fast/dom/Window/window-property-shadowing-expected.txt:
* fast/dom/Window/window-property-shadowing.html:
* fast/js/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1-expected.txt:
* fast/js/var-declarations-shadowing-expected.txt:
* fast/js/var-declarations-shadowing.html:
* http/tests/security/cross-frame-access-put-expected.txt:
2010-09-09 Robert Hogan <robert at webkit.org>
Reviewed by Adam Barth.
Give WebKit clients a way to replace window.screen
to foil attempts to track users with it.
This allows clients to overload the values returned by the
Screen object through the JSC manipulation API (such as
QWebFrame::addToJavaScriptWindowObject() in Qt). Clients will
want to do this when they do not want to reveal too much
explicit information about the user's desktop configuration.
https://bugs.webkit.org/show_bug.cgi?id=41802
* page/DOMWindow.idl:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67100 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f58c4b8..2ddcb2b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,25 @@
+2010-09-09 Robert Hogan <robert at webkit.org>
+
+ Reviewed by Adam Barth.
+
+ Give WebKit clients a way to replace window.screen to
+ foil attempts to track users with it
+
+ This allows clients to overload the values returned by the
+ Screen object through the JSC manipulation API (such as
+ QWebFrame::addToJavaScriptWindowObject() in Qt). Clients will
+ want to do this when they do not want to reveal too much
+ explicit information about the user's desktop configuration.
+
+ https://bugs.webkit.org/show_bug.cgi?id=41802
+
+ * fast/dom/Window/window-property-shadowing-expected.txt:
+ * fast/dom/Window/window-property-shadowing.html:
+ * fast/js/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1-expected.txt:
+ * fast/js/var-declarations-shadowing-expected.txt:
+ * fast/js/var-declarations-shadowing.html:
+ * http/tests/security/cross-frame-access-put-expected.txt:
+
2010-09-09 Dean Jackson <dino at apple.com>
Reviewed by Simon Fraser.
diff --git a/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt b/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt
index 9c7abec..db96d86 100644
--- a/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt
@@ -15,6 +15,7 @@ PASS: length successfully shadowed
PASS: name successfully shadowed
PASS: navigator successfully shadowed
PASS: clientInformation successfully shadowed
+PASS: screen successfully shadowed
PASS: offscreenBuffering successfully shadowed
PASS: opener successfully shadowed
PASS: outerHeight successfully shadowed
diff --git a/LayoutTests/fast/dom/Window/window-property-shadowing.html b/LayoutTests/fast/dom/Window/window-property-shadowing.html
index aa3c385..f034d29 100644
--- a/LayoutTests/fast/dom/Window/window-property-shadowing.html
+++ b/LayoutTests/fast/dom/Window/window-property-shadowing.html
@@ -49,6 +49,8 @@
log(navigator == 1 ? "PASS: navigator successfully shadowed" : "FAIL: navigator was not shadowed");
var clientInformation = 1;
log(clientInformation == 1 ? "PASS: clientInformation successfully shadowed" : "FAIL: clientInformation was not shadowed");
+ var screen = 1;
+ log(screen == 1 ? "PASS: screen successfully shadowed" : "FAIL: screen was not shadowed");
var offscreenBuffering = 2;
log(offscreenBuffering == 2 ? "PASS: offscreenBuffering successfully shadowed" : "FAIL: offscreenBuffering was not shadowed");
var opener = 1;
diff --git a/LayoutTests/fast/js/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1-expected.txt b/LayoutTests/fast/js/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1-expected.txt
index e079a62..bd6dd8d 100644
--- a/LayoutTests/fast/js/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1-expected.txt
+++ b/LayoutTests/fast/js/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1-expected.txt
@@ -1,6 +1,6 @@
S8.6.2_A5_T1
-FAIL TypeError: Result of expression 'screen.touch' [undefined] is not a function.
+PASS
TEST COMPLETE
diff --git a/LayoutTests/fast/js/var-declarations-shadowing-expected.txt b/LayoutTests/fast/js/var-declarations-shadowing-expected.txt
index 19527f9..999fd23 100644
--- a/LayoutTests/fast/js/var-declarations-shadowing-expected.txt
+++ b/LayoutTests/fast/js/var-declarations-shadowing-expected.txt
@@ -80,9 +80,9 @@ PASS: defaultStatus == marker should be true and is.
PASS: eval('defaultStatus == marker') should be true and is.
PASS: defaultstatus == marker should be true and is.
PASS: eval('defaultstatus == marker') should be true and is.
+PASS: screen == marker should be true and is.
+PASS: eval('screen == marker') should be true and is.
-----
-PASS: screen == marker should be false and is.
-PASS: eval('screen == marker') should be false and is.
PASS: history == marker should be false and is.
PASS: eval('history == marker') should be false and is.
PASS: frameElement == marker should be false and is.
diff --git a/LayoutTests/fast/js/var-declarations-shadowing.html b/LayoutTests/fast/js/var-declarations-shadowing.html
index 21bbc34..6282bec 100644
--- a/LayoutTests/fast/js/var-declarations-shadowing.html
+++ b/LayoutTests/fast/js/var-declarations-shadowing.html
@@ -253,13 +253,13 @@ try {
shouldBe(defaultstatus == marker, "defaultstatus == marker", true);
shouldBe(eval('defaultstatus == marker'), "eval('defaultstatus == marker')", true);
-log("-----");
-
try {
eval("var screen = marker");
} catch(e) { }
-shouldBe(screen == marker, "screen == marker", false);
-shouldBe(eval('screen == marker'), "eval('screen == marker')", false);
+shouldBe(screen == marker, "screen == marker", true);
+shouldBe(eval('screen == marker'), "eval('screen == marker')", true);
+
+log("-----");
try {
eval("var history = marker");
diff --git a/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt b/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt
index 50e9070..be9d15b 100644
--- a/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt
+++ b/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt
@@ -370,6 +370,8 @@ CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http
CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-put.html. Domains, protocols and ports must match.
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-put.html. Domains, protocols and ports must match.
+
ALERT: PASS: window.Attr should be '[object AttrConstructor]' and is.
ALERT: PASS: window.CDATASection should be '[object CDATASectionConstructor]' and is.
ALERT: PASS: window.CharacterData should be '[object CharacterDataConstructor]' and is.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 46f133d..62c1b68 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-09 Robert Hogan <robert at webkit.org>
+
+ Reviewed by Adam Barth.
+
+ Give WebKit clients a way to replace window.screen
+ to foil attempts to track users with it.
+
+ This allows clients to overload the values returned by the
+ Screen object through the JSC manipulation API (such as
+ QWebFrame::addToJavaScriptWindowObject() in Qt). Clients will
+ want to do this when they do not want to reveal too much
+ explicit information about the user's desktop configuration.
+
+ https://bugs.webkit.org/show_bug.cgi?id=41802
+
+ * page/DOMWindow.idl:
+
2010-09-09 Kenneth Russell <kbr at google.com>
Reviewed by James Robinson.
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index 702edcd..b1c292a 100644
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -44,7 +44,7 @@ module window {
LegacyParent=JSDOMWindowBase
] DOMWindow {
// DOM Level 0
- readonly attribute Screen screen;
+ attribute [Replaceable] Screen screen;
readonly attribute [DoNotCheckDomainSecurity, JSCCustomGetter] History history;
attribute [Replaceable] BarInfo locationbar;
attribute [Replaceable] BarInfo menubar;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list