Update tests whose result depends on __defineGetter__ throwing behavior

V8's current behavior is to not throw when __defineGetter__ fails, but it is being changed to throw. The tests now pass whether or not __defineGetter__ throws. Bug: v8:5070 Change-Id: I219a4d2665edc886c040578ba1108c36cafa3bc6 Reviewed-on: https://chromium-review.googlesource.com/595240 Commit-Queue: Yuki Shiino <yukishiino@chromium.org> Reviewed-by: Yuki Shiino <yukishiino@chromium.org> Cr-Commit-Position: refs/heads/master@{#491310}

Update tests whose result depends on defineGetter throwing behavior
V8's current behavior is to not throw when __defineGetter__ fails, but it is being changed to throw. The tests now pass whether or not __defineGetter__ throws. Bug: v8:5070 Change-Id: I219a4d2665edc886c040578ba1108c36cafa3bc6 Reviewed-on: https://chromium-review.googlesource.com/595240 Commit-Queue: Yuki Shiino <yukishiino@chromium.org> Reviewed-by: Yuki Shiino <yukishiino@chromium.org> Cr-Commit-Position: refs/heads/master@{#491310}
534bb7ba · Adam Klein · Commit Bot · 3666256d · 534bb7ba · 534bb7ba
Commit 534bb7ba authored Aug 02, 2017 by Adam Klein Committed by Commit Bot Aug 02, 2017
5 changed files
--- a/third_party/WebKit/LayoutTests/fast/dom/Window/Location/location-override-toString-using-defineGetter.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/Window/Location/location-override-toString-using-defineGetter.html
@@ -5,9 +5,11 @@
 </head>
 <body>
 <script>
-    window.location.__defineGetter__("toString", function () {
+    try {
-        return function() { return "haxored"; }
+        window.location.__defineGetter__("toString", function () {
-    });
+            return function() { return "haxored"; }
+        });
+    } catch (e) { }
    var result = normalizeURL(String(window.location));
    var correctValue = normalizeURL(document.URL);

--- a/third_party/WebKit/LayoutTests/fast/dom/Window/Location/location-override-valueOf-using-defineGetter.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/Window/Location/location-override-valueOf-using-defineGetter.html
@@ -5,13 +5,15 @@
 </head>
 <body>
 <script>
-    window.location.__defineGetter__("valueOf", function () {
+    try {
-        return function() { return "haxored"; }
+        window.location.__defineGetter__("valueOf", function () {
-    });
+            return function() { return "haxored"; }
+        });
+    } catch (e) { }
    var result = normalizeURL(String(window.location));
    var correctValue = normalizeURL(document.URL);
    shouldBe("result", "correctValue");
 </script>
 </body>
 </html>
\ No newline at end of file
--- a/third_party/WebKit/LayoutTests/fast/dom/Window/Location/window-override-location-using-defineGetter.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/Window/Location/window-override-location-using-defineGetter.html
@@ -5,11 +5,13 @@
 </head>
 <body>
 <script>
-    window.__defineGetter__("location", function() { return "haxored"; });
+    try {
+        window.__defineGetter__("location", function() { return "haxored"; });
+    } catch (e) { }
    var result = normalizeURL(String(window.location));
    var correctValue = normalizeURL(document.URL);
    shouldBe("result", "correctValue");
 </script>
 </body>
 </html>
\ No newline at end of file
--- a/third_party/WebKit/LayoutTests/fast/dom/Window/Location/window-override-window-using-defineGetter.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/Window/Location/window-override-window-using-defineGetter.html
@@ -5,9 +5,11 @@
 </head>
 <body>
 <script>
-    window.__defineGetter__("window", function() {
+    try {
-        return { location: "haxored" };
+        window.__defineGetter__("window", function() {
-    });
+            return { location: "haxored" };
+        });
+    } catch (e) { }
    var result = normalizeURL(String(window.location));
    var correctValue = normalizeURL(document.URL);

--- a/third_party/WebKit/LayoutTests/fast/dom/getter-on-window-object2.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/getter-on-window-object2.html
@@ -6,7 +6,7 @@ description("This page tests what happens when a getter / setter on the window o
 var x = 1;
 try {
    window.__defineGetter__("x", function() { return "window.x __getter__"; });
-} catch(e) { debug(e); }
+} catch(e) { }
 shouldBe("window.x", "1");
 shouldBe("typeof window.__lookupGetter__('x')", "'undefined'");
@@ -16,7 +16,7 @@ debug("");
 try {
 window.__defineSetter__("x", function() { debug("window.x __setter__ called"); });
-} catch(e) { debug(e); }
+} catch(e) { }
 x = 2;
 shouldBe("window.x", "2");