diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 16:59:56 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 16:59:56 +0000 |
| commit | 1efa8696f8388ca66491c68508f0c75d69d6f1d0 (patch) | |
| tree | 10f6f51921b06617a82c6283998ac045e4a2d818 /chrome_frame | |
| parent | 0c2b4937291d4243f750afbee2c9855e72a451c7 (diff) | |
| download | chromium_src-1efa8696f8388ca66491c68508f0c75d69d6f1d0.zip chromium_src-1efa8696f8388ca66491c68508f0c75d69d6f1d0.tar.gz chromium_src-1efa8696f8388ca66491c68508f0c75d69d6f1d0.tar.bz2 | |
Fix JS error in ChromeFrameTestWithWebServer.FLAKY_WidgetModeIE_SrcProperty that could result in an IE browser hang on a JS error dialog.
BUG=111384
TEST=chrome_frame_tests.exe
Review URL: https://chromiumcodereview.appspot.com/9290026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/data/src_property_host.html | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/chrome_frame/test/data/src_property_host.html b/chrome_frame/test/data/src_property_host.html index 9d025e2..85fbfcd 100644 --- a/chrome_frame/test/data/src_property_host.html +++ b/chrome_frame/test/data/src_property_host.html @@ -1,4 +1,4 @@ -<html>
+<html> <head><title>src property test</title> <script type="text/javascript" src="chrome_frame_tester_helpers.js"> </script> @@ -8,18 +8,21 @@ } function OnChromeFrameLoaded(url) { - url = url.data; - - var chromeFrame = GetChromeFrame(); - var frame_url = chromeFrame.src; - - appendStatus("Loaded URL: " + url + " Frame url: " + frame_url); + try { + url = url.data; + var chromeFrame = GetChromeFrame(); + var frame_url = chromeFrame.src; + appendStatus("Loaded URL: " + url + " Frame url: " + frame_url); + } + catch (err) { + onFailure("ChromeFrame_SrcTest", 2, "OnChromeFrameLoaded failed."); + } } function GetChromeFrame() { - return window.document.ChromeFrame;
- }
-
+ return window.document.ChromeFrame; + } + </script> </head> <body> @@ -32,7 +35,7 @@ insertControl( "ChromeFrameSpan", { "src": "src_property_frame1.html", "eventHandlers": { - "onload": "return OnChromeFrameLoaded();", + "onload": "return OnChromeFrameLoaded(arguments[0]);", "onloaderror": "return OnNavigationFailed(arguments[0]);" } }); |