--- a/test/langtools/jdk/javadoc/doclet/testJavascript/TestJavascript.java	Fri Mar 29 09:31:44 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testJavascript/TestJavascript.java	Mon Apr 01 12:44:23 2019 +0530
@@ -44,88 +44,20 @@
     @Test
     public void test() {
         javadoc("-d", "out",
-                "--frames",
                 "-sourcepath", testSrc,
                 "pkg", testSrc("TestJavascript.java"));
         checkExit(Exit.OK);
 
         checkOutput("pkg/C.html", true,
-                "<a href=\"../index.html?pkg/C.html\" target=\"_top\">Frames</a>",
                 "<script type=\"text/javascript\"><!--\n"
                 + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
                 + "//-->\n"
                 + "</script>");
 
-        checkOutput("TestJavascript.html", true,
-                "<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>");
-
         checkOutput("index.html", true,
-                "<script type=\"text/javascript\">\n"
-                + "    tmpTargetPage = \"\" + window.location.search;\n"
-                + "    if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")\n"
-                + "        tmpTargetPage = tmpTargetPage.substring(1);\n"
-                + "    if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))\n"
-                + "        tmpTargetPage = \"undefined\";\n"
-                + "    targetPage = tmpTargetPage;\n"
-                + "    function validURL(url) {\n"
-                + "        try {\n"
-                + "            url = decodeURIComponent(url);\n"
-                + "        }\n"
-                + "        catch (error) {\n"
-                + "            return false;\n"
-                + "        }\n"
-                + "        var pos = url.indexOf(\".html\");\n"
-                + "        if (pos == -1 || pos != url.length - 5)\n"
-                + "            return false;\n"
-                + "        var allowNumber = false;\n"
-                + "        var allowSep = false;\n"
-                + "        var seenDot = false;\n"
-                + "        for (var i = 0; i < url.length - 5; i++) {\n"
-                + "            var ch = url.charAt(i);\n"
-                + "            if ('a' <= ch && ch <= 'z' ||\n"
-                + "                    'A' <= ch && ch <= 'Z' ||\n"
-                + "                    ch == '$' ||\n"
-                + "                    ch == '_' ||\n"
-                + "                    ch.charCodeAt(0) > 127) {\n"
-                + "                allowNumber = true;\n"
-                + "                allowSep = true;\n"
-                + "            } else if ('0' <= ch && ch <= '9'\n"
-                + "                    || ch == '-') {\n"
-                + "                if (!allowNumber)\n"
-                + "                     return false;\n"
-                + "            } else if (ch == '/' || ch == '.') {\n"
-                + "                if (!allowSep)\n"
-                + "                    return false;\n"
-                + "                allowNumber = false;\n"
-                + "                allowSep = false;\n"
-                + "                if (ch == '.')\n"
-                + "                     seenDot = true;\n"
-                + "                if (ch == '/' && seenDot)\n"
-                + "                     return false;\n"
-                + "            } else {\n"
-                + "                return false;\n"
-                + "            }\n"
-                + "        }\n"
-                + "        return true;\n"
-                + "    }\n"
-                + "    function loadFrames() {\n"
-                + "        if (targetPage != \"\" && targetPage != \"undefined\")\n"
-                + "             top.classFrame.location = top.targetPage;\n"
-                + "    }\n"
-                + "</script>");
-
-        checkOutput("index.html", true,
-                "<body class=\"frames\" onload=\"loadFrames()\"");
-
-        //Make sure title javascript only runs if is-external is not true
-        checkOutput("pkg/C.html", true,
-                "    try {\n"
-                + "        if (location.href.indexOf('is-external=true') == -1) {\n"
-                + "            parent.document.title=\"C\";\n"
-                + "        }\n"
-                + "    }\n"
-                + "    catch(err) {\n"
-                + "    }");
+                "<script type=\"text/javascript\"><!--\n"
+                + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
+                + "//-->\n");
 
         checkOutput("script.js", true,
                 "$(window).resize(function() {\n"