Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Side by Side Diff: Source/modules/screen_orientation/LockOrientationCallback.cpp

Issue 400623004: Revert of Resolve screen.orientation.lock() promise with undefined. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/screen_orientation/LockOrientationCallback.h" 6 #include "modules/screen_orientation/LockOrientationCallback.h"
7 7
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "core/dom/DOMException.h" 9 #include "core/dom/DOMException.h"
10 #include "core/dom/ExceptionCode.h" 10 #include "core/dom/ExceptionCode.h"
11 #include "modules/screen_orientation/ScreenOrientation.h" 11 #include "modules/screen_orientation/ScreenOrientation.h"
12 12
13 namespace WebCore { 13 namespace WebCore {
14 14
15 LockOrientationCallback::LockOrientationCallback(PassRefPtr<ScriptPromiseResolve r> resolver) 15 LockOrientationCallback::LockOrientationCallback(PassRefPtr<ScriptPromiseResolve r> resolver)
16 : m_resolver(resolver) 16 : m_resolver(resolver)
17 { 17 {
18 } 18 }
19 19
20 LockOrientationCallback::~LockOrientationCallback() 20 LockOrientationCallback::~LockOrientationCallback()
21 { 21 {
22 } 22 }
23 23
24 void LockOrientationCallback::onSuccess() 24 void LockOrientationCallback::onSuccess(unsigned angle, blink::WebScreenOrientat ionType type)
25 { 25 {
26 m_resolver->resolve(); 26 // FIXME: for the moment, we do nothing with the angle, we should use it and
27 // convert it to the appropriate type if the type == 'undefined' when the
28 // method will be implemented in ScreenOrientationController.
29 m_resolver->resolve(ScreenOrientation::orientationTypeToString(type));
27 } 30 }
28 31
29 void LockOrientationCallback::onError(blink::WebLockOrientationError error) 32 void LockOrientationCallback::onError(blink::WebLockOrientationError error)
30 { 33 {
31 ExceptionCode code = 0; 34 ExceptionCode code = 0;
32 String msg = ""; 35 String msg = "";
33 36
34 switch (error) { 37 switch (error) {
35 case blink::WebLockOrientationErrorNotAvailable: 38 case blink::WebLockOrientationErrorNotAvailable:
36 code = NotSupportedError; 39 code = NotSupportedError;
37 msg = "lockOrientation() is not available on this device."; 40 msg = "lockOrientation() is not available on this device.";
38 break; 41 break;
39 case blink::WebLockOrientationErrorFullScreenRequired: 42 case blink::WebLockOrientationErrorFullScreenRequired:
40 code = SecurityError; 43 code = SecurityError;
41 msg = "The page needs to be fullscreen in order to call lockOrientation( )."; 44 msg = "The page needs to be fullscreen in order to call lockOrientation( ).";
42 break; 45 break;
43 case blink::WebLockOrientationErrorCanceled: 46 case blink::WebLockOrientationErrorCanceled:
44 code = AbortError; 47 code = AbortError;
45 msg = "A call to lockOrientation() or unlockOrientation() canceled this call."; 48 msg = "A call to lockOrientation() or unlockOrientation() canceled this call.";
46 break; 49 break;
47 } 50 }
48 51
49 m_resolver->reject(DOMException::create(code, msg)); 52 m_resolver->reject(DOMException::create(code, msg));
50 } 53 }
51 54
52 } // namespace WebCore 55 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/screen_orientation/LockOrientationCallback.h ('k') | public/platform/WebLockOrientationCallback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698