summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 00:32:43 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 00:32:43 +0000
commit06e7d7fd35cbd00b8c0bc771a654d0d56d859ac4 (patch)
tree083138dd9ef4b706d4087db197fc97b3e44a95a6 /chrome
parentf0e11278e195088d92ae5acfdbc975ba73868dbe (diff)
downloadchromium_src-06e7d7fd35cbd00b8c0bc771a654d0d56d859ac4.zip
chromium_src-06e7d7fd35cbd00b8c0bc771a654d0d56d859ac4.tar.gz
chromium_src-06e7d7fd35cbd00b8c0bc771a654d0d56d859ac4.tar.bz2
Finish implementing NPN_ConvertPoint, and add a unit test for it
BUG=29457,31767 TEST=self-testing Review URL: http://codereview.chromium.org/580019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/data/npapi/convert_point.html27
-rw-r--r--chrome/test/ui/npapi_uitest.cc21
2 files changed, 48 insertions, 0 deletions
diff --git a/chrome/test/data/npapi/convert_point.html b/chrome/test/data/npapi/convert_point.html
new file mode 100644
index 0000000..4c02529
--- /dev/null
+++ b/chrome/test/data/npapi/convert_point.html
@@ -0,0 +1,27 @@
+<html>
+
+<head>
+<script src="npapi.js"></script>
+</head>
+
+
+<body>
+<div id="statusPanel" style="border: 1px solid red; width: 100%">
+Test running....
+</div>
+
+
+NPAPI ConvertPoint test<p>
+Tests that NPN_ConvertPoint works.<P>
+
+<div style="position:absolute; left: 100px; top: 100px">
+<embed type="application/vnd.npapi-test"
+ src="foo"
+ name="convert_point"
+ id="1"
+ mode="np_embed"
+>
+</div>
+
+</body>
+</html>
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index e2d0336..f7df01f 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -428,3 +428,24 @@ TEST_F(NPAPIVisiblePluginTester, PluginReferrerTest) {
kTestCompleteSuccess, kShortWaitTimeout);
}
+#if defined(OS_MACOSX)
+TEST_F(NPAPIVisiblePluginTester, PluginConvertPointTest) {
+ if (UITest::in_process_renderer())
+ return;
+
+ scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+ scoped_refptr<WindowProxy> window(browser->GetWindow());
+ window->SetBounds(gfx::Rect(100, 100, 600, 600));
+
+ GURL url(URLRequestMockHTTPJob::GetMockUrl(
+ FilePath(FILE_PATH_LITERAL("npapi/convert_point.html"))));
+ NavigateToURL(url);
+
+ // TODO(stuartmorgan): When the automation system supports sending clicks,
+ // change the test to trigger on mouse-down rather than window focus.
+ browser->BringToFront();
+ WaitForFinish("convert_point", "1", url, kTestCompleteCookie,
+ kTestCompleteSuccess, kShortWaitTimeout);
+}
+#endif
+