summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome_frame/test/data/src_property_host.html50
1 files changed, 27 insertions, 23 deletions
diff --git a/chrome_frame/test/data/src_property_host.html b/chrome_frame/test/data/src_property_host.html
index 7b7b358..b17dd1b 100644
--- a/chrome_frame/test/data/src_property_host.html
+++ b/chrome_frame/test/data/src_property_host.html
@@ -7,33 +7,37 @@
onFailure("ChromeFrame_SrcTest", 1, "ChromeFrame Navigation failed");
}
- var load_count = 2;
-
+ var load_count = 2;
+
function OnChromeFrameLoaded(url) {
- url = url.data;
+ try {
+ url = url.data;
- var chromeFrame = GetChromeFrame();
- var frame_url = chromeFrame.src;
-
- appendStatus("Loaded URL: " + url + " Frame url: " + frame_url);
- load_count--;
+ var chromeFrame = GetChromeFrame();
+ var frame_url = chromeFrame.src;
+
+ appendStatus("Loaded URL: " + url + " Frame url: " + frame_url);
+ load_count--;
- if (load_count) {
- // For the first load, the URLs should match.
- if (frame_url != url) {
- onFailure("SrcProperty", 1, "Url: " + url);
- }
- } else {
- // Previous versions changed the frame URL when internal navigation
- // was performed. This does not match how iframes behave, and so we
- // report success only in the case that they continue to match, even
- // though the "internal" URL is different (and not visible) to the
- // external host.
- if (frame_url == url) {
- onFailure("SrcProperty", 1, "Url: " + url);
+ if (load_count) {
+ // For the first load, the URLs should match.
+ if (frame_url != url) {
+ onFailure("SrcProperty", 1, "Url: " + url);
+ }
} else {
- onSuccess("SrcProperty", 1);
- }
+ // Previous versions changed the frame URL when internal navigation
+ // was performed. This does not match how iframes behave, and so we
+ // report success only in the case that they continue to match, even
+ // though the "internal" URL is different (and not visible) to the
+ // external host.
+ if (frame_url == url) {
+ onFailure("SrcProperty", 1, "Url: " + url);
+ } else {
+ onSuccess("SrcProperty", 1);
+ }
+ }
+ } catch (e) {
+ onFailure("SrcProperty", 1, "OnChromeFrameLoaded: " + e.description);
}
}