diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 21:35:00 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 21:35:00 +0000 |
| commit | 1deaec00b8a5ee9e401103a0fac4f1f7cdbf27d3 (patch) | |
| tree | 31de43c972b8fba7664b7ec9811652ae7b0fc43d /ppapi/native_client | |
| parent | 5cbb73b85e5df358babed19fbd0b264e63a86f68 (diff) | |
| download | chromium_src-1deaec00b8a5ee9e401103a0fac4f1f7cdbf27d3.zip chromium_src-1deaec00b8a5ee9e401103a0fac4f1f7cdbf27d3.tar.gz chromium_src-1deaec00b8a5ee9e401103a0fac4f1f7cdbf27d3.tar.bz2 | |
Re-land r98511 which was reverted in r98531.
Don't send DidChangeView to the plugin unless the parameters have actually changed.
Apparently WebKit sends the update for every layout, even if nothing has changed.
Review URL: http://codereview.chromium.org/7761005
Review URL: http://codereview.chromium.org/7828026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
| -rw-r--r-- | ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.html | 5 | ||||
| -rw-r--r-- | ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.js | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.html b/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.html index e9e4edd..ab86fd0 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.html +++ b/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.html @@ -17,8 +17,9 @@ name="nacl_module" src="ppapi_ppp_instance.nmf" style="background-color:#AAAAAA" - width="15" height="20" /> - <!-- NOTE: PPP_Instance::DidChangeView verifies these exact dimenstions --> + width="20" height="20" /> + <!-- NOTE: The width and height must be different from the values checked + in PPP_Instance::DidChangeView so when we set them, they change --> </div> <br> <script type="text/javascript"> diff --git a/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.js b/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.js index e707887..bc4b620 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.js +++ b/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.js @@ -42,7 +42,10 @@ function setupTests(tester, plugin) { }); tester.addAsyncTest('PPP_Instance::DidChangeView', function(test) { - addTestListeners(3, test, 'DidChangeView'); + // The .cc file hardcodes an expected 15x20 size. + plugin.width = 15; + plugin.height = 20; + addTestListener(test, 'DidChangeView'); }); tester.addAsyncTest('PPP_Instance::DidChangeFocus', function(test) { |