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

Side by Side Diff: Source/modules/push_messaging/PushManager.cpp

Issue 808233004: Oilpan: fix build after r187472. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/push_messaging/PushManager.h" 6 #include "modules/push_messaging/PushManager.h"
7 7
8 #include "bindings/core/v8/CallbackPromiseAdapter.h" 8 #include "bindings/core/v8/CallbackPromiseAdapter.h"
9 #include "bindings/core/v8/ScriptPromise.h" 9 #include "bindings/core/v8/ScriptPromise.h"
10 #include "bindings/core/v8/ScriptPromiseResolver.h" 10 #include "bindings/core/v8/ScriptPromiseResolver.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 } 64 }
65 65
66 return promise; 66 return promise;
67 } 67 }
68 68
69 ScriptPromise PushManager::getRegistration(ScriptState* scriptState) 69 ScriptPromise PushManager::getRegistration(ScriptState* scriptState)
70 { 70 {
71 if (!m_registration->active()) 71 if (!m_registration->active())
72 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(AbortError, "Registration failed - no active Service Worker")); 72 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(AbortError, "Registration failed - no active Service Worker"));
73 73
74 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip tState); 74 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState);
75 ScriptPromise promise = resolver->promise(); 75 ScriptPromise promise = resolver->promise();
76 76
77 pushProvider()->getRegistration(m_registration->webRegistration(), new PushR egistrationCallbacks(resolver, m_registration)); 77 pushProvider()->getRegistration(m_registration->webRegistration(), new PushR egistrationCallbacks(resolver, m_registration));
78 return promise; 78 return promise;
79 } 79 }
80 80
81 ScriptPromise PushManager::hasPermission(ScriptState* scriptState) 81 ScriptPromise PushManager::hasPermission(ScriptState* scriptState)
82 { 82 {
83 if (scriptState->executionContext()->isDocument()) { 83 if (scriptState->executionContext()->isDocument()) {
84 Document* document = toDocument(scriptState->executionContext()); 84 Document* document = toDocument(scriptState->executionContext());
85 // FIXME: add test coverage for this condition - https://crbug.com/44043 1 85 // FIXME: add test coverage for this condition - https://crbug.com/44043 1
86 if (!document->domWindow() || !document->frame()) 86 if (!document->domWindow() || !document->frame())
87 return ScriptPromise::rejectWithDOMException(scriptState, DOMExcepti on::create(InvalidStateError, "Document is detached from window.")); 87 return ScriptPromise::rejectWithDOMException(scriptState, DOMExcepti on::create(InvalidStateError, "Document is detached from window."));
88 } 88 }
89 89
90 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState); 90 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState);
91 ScriptPromise promise = resolver->promise(); 91 ScriptPromise promise = resolver->promise();
92 pushProvider()->getPermissionStatus(m_registration->webRegistration(), new P ushPermissionStatusCallbacks(resolver)); 92 pushProvider()->getPermissionStatus(m_registration->webRegistration(), new P ushPermissionStatusCallbacks(resolver));
93 return promise; 93 return promise;
94 } 94 }
95 95
96 void PushManager::trace(Visitor* visitor) 96 void PushManager::trace(Visitor* visitor)
97 { 97 {
98 visitor->trace(m_registration); 98 visitor->trace(m_registration);
99 } 99 }
100 100
101 } // namespace blink 101 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698