summaryrefslogtreecommitdiffstats
path: root/ppapi/native_client/tests
diff options
context:
space:
mode:
authorpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 02:56:28 +0000
committerpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 02:56:28 +0000
commit53f1a000c4cd5fcb2a74609a518ec074dcc46e3b (patch)
tree62c69105cd30fb6e0412ee6635739dad05c34890 /ppapi/native_client/tests
parentcd681c453a82ab32086917f92884a5072cda46ae (diff)
downloadchromium_src-53f1a000c4cd5fcb2a74609a518ec074dcc46e3b.zip
chromium_src-53f1a000c4cd5fcb2a74609a518ec074dcc46e3b.tar.gz
chromium_src-53f1a000c4cd5fcb2a74609a518ec074dcc46e3b.tar.bz2
PPAPI SetFullscreen: Do return PP_FALSE when transition cannot be process. The cases include:
- going into fullscreen when not processing a user gesture - requesting a duplicate transition Update tests. BUG=41780 TEST=Pepper and NaCl tests, manually Review URL: http://codereview.chromium.org/8070018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client/tests')
-rw-r--r--ppapi/native_client/tests/ppapi_browser/ppb_fullscreen/ppapi_ppb_fullscreen.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_fullscreen/ppapi_ppb_fullscreen.cc b/ppapi/native_client/tests/ppapi_browser/ppb_fullscreen/ppapi_ppb_fullscreen.cc
index 90eb935..959b7bb 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_fullscreen/ppapi_ppb_fullscreen.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_fullscreen/ppapi_ppb_fullscreen.cc
@@ -99,12 +99,13 @@ void TestSetFullscreenTrue() {
// Transition to fullscreen.
// This can only be done when processing a user gesture -
// see HandleInputEvent().
+ EXPECT(ppb->SetFullscreen(pp_instance(), PP_TRUE) == PP_FALSE);
EXPECT(PPBInputEvent()->
RequestInputEvents(pp_instance(),
PP_INPUTEVENT_CLASS_MOUSE) == PP_OK);
} else {
// No change.
- EXPECT(ppb->SetFullscreen(pp_instance(), PP_TRUE) == PP_TRUE);
+ EXPECT(ppb->SetFullscreen(pp_instance(), PP_TRUE) == PP_FALSE);
EXPECT(ppb->IsFullscreen(pp_instance()) == PP_TRUE);
TEST_PASSED;
}
@@ -117,8 +118,10 @@ void TestSetFullscreenFalse() {
// Transition out of fullscreen.
EXPECT(CreateGraphics2D(&g_graphics2d));
// The transition is asynchronous and ends at the next DidChangeView().
- g_normal_pending = true;
EXPECT(ppb->SetFullscreen(pp_instance(), PP_FALSE) == PP_TRUE);
+ g_normal_pending = true;
+ // Transition is pending, so repeated requests fail.
+ EXPECT(ppb->SetFullscreen(pp_instance(), PP_FALSE) == PP_FALSE);
EXPECT(ppb->IsFullscreen(pp_instance()) == PP_TRUE);
// No 2D or 3D device can be bound during transition.
EXPECT(PPBGraphics2D()->IsGraphics2D(g_graphics2d) == PP_TRUE);
@@ -127,7 +130,7 @@ void TestSetFullscreenFalse() {
// The transition ends at the next DidChangeView().
} else {
// No change.
- EXPECT(ppb->SetFullscreen(pp_instance(), PP_FALSE) == PP_TRUE);
+ EXPECT(ppb->SetFullscreen(pp_instance(), PP_FALSE) == PP_FALSE);
EXPECT(ppb->IsFullscreen(pp_instance()) == PP_FALSE);
TEST_PASSED;
}
@@ -177,8 +180,10 @@ PP_Bool HandleInputEvent(PP_Instance instance, PP_Resource event) {
PP_INPUTEVENT_CLASS_MOUSE);
EXPECT(PPBFullscreenDev()->IsFullscreen(pp_instance()) == PP_FALSE);
EXPECT(CreateGraphics2D(&g_graphics2d));
- g_fullscreen_pending = true;
EXPECT(PPBFullscreenDev()->SetFullscreen(pp_instance(), PP_TRUE) == PP_TRUE);
+ g_fullscreen_pending = true;
+ // Transition is pending, so repeated requests fail.
+ EXPECT(PPBFullscreenDev()->SetFullscreen(pp_instance(), PP_TRUE) == PP_FALSE);
EXPECT(PPBFullscreenDev()->IsFullscreen(pp_instance()) == PP_FALSE);
// No 2D or 3D device can be bound during transition.
EXPECT(PPBGraphics2D()->IsGraphics2D(g_graphics2d) == PP_TRUE);