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

Side by Side Diff: Source/bindings/core/dart/DartCallback.cpp

Issue 1532413002: Added Dartium changes onto 45.0.2454.104 (Closed) Base URL: http://src.chromium.org/blink/branches/chromium/2454
Patch Set: Created 5 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
« no previous file with comments | « Source/bindings/core/dart/DartCallback.h ('k') | Source/bindings/core/dart/DartController.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2006-2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
11 * copyright notice, this list of conditions and the following disclaimer 11 * copyright notice, this list of conditions and the following disclaimer
12 * in the documentation and/or other materials provided with the 12 * in the documentation and/or other materials provided with the
13 * distribution. 13 * distribution.
14 * * Neither the name of Google Inc. nor the names of its 14 * * Neither the name of Google Inc. nor the names of its
15 * contributors may be used to endorse or promote products derived from 15 * contributors may be used to endorse or promote products derived from
16 * this software without specific prior written permission. 16 * this software without specific prior written permission.
17 * 17 *
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "web/DatabaseClientImpl.h" 32 #include "bindings/core/dart/DartCallback.h"
33 33
34 #include "core/dom/Document.h" 34 #include "bindings/core/dart/DartController.h"
35 #include "core/dom/ExecutionContext.h" 35 #include "bindings/core/dart/DartDOMData.h"
36 #include "public/web/WebContentSettingsClient.h" 36 #include "bindings/core/dart/DartUtilities.h"
37 #include "web/WebLocalFrameImpl.h"
38 37
39 namespace blink { 38 namespace blink {
40 39
41 PassOwnPtrWillBeRawPtr<DatabaseClientImpl> DatabaseClientImpl::create() 40 DartCallback::DartCallback(Dart_Handle object, Dart_Handle& exception)
42 { 41 {
43 return adoptPtrWillBeNoop(new DatabaseClientImpl()); 42 if (!Dart_IsClosure(object)) {
43 exception = Dart_NewStringFromCString("Callback must be a function");
44 m_callback = 0;
45 return;
46 }
47 m_callback = Dart_NewPersistentHandle(object);
44 } 48 }
45 49
46 DatabaseClientImpl::~DatabaseClientImpl() 50 DartCallback::~DartCallback()
47 { 51 {
52 if (!m_callback || !isIsolateAlive())
53 return;
54
55 DartIsolateScope scope(isolate());
56 Dart_DeletePersistentHandle(m_callback);
48 } 57 }
49 58
50 DEFINE_TRACE(DatabaseClientImpl) 59 bool DartCallback::handleEvent(int argc, Dart_Handle* argv)
51 { 60 {
52 DatabaseClient::trace(visitor); 61 ASSERT(isolate() == Dart_CurrentIsolate());
53 } 62 ASSERT(m_callback);
54 63
55 bool DatabaseClientImpl::allowDatabase(ExecutionContext* executionContext, const String& name, const String& displayName, unsigned long estimatedSize) 64 ExecutionContext* context = DartDOMData::current()->scriptExecutionContext() ;
56 { 65 DartController* dartController = DartController::retrieve(context);
57 ASSERT(executionContext->isContextThread()); 66
58 Document* document = toDocument(executionContext); 67 Dart_Handle result = dartController->callFunction(Dart_HandleFromPersistent( m_callback), argc, argv);
59 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame() ); 68 if (Dart_IsError(result)) {
60 if (!webFrame) 69 DartUtilities::reportProblem(context, result);
61 return false; 70 return false;
62 if (webFrame->contentSettingsClient()) 71 }
63 return webFrame->contentSettingsClient()->allowDatabase(name, displayNam e, estimatedSize); 72
64 return true; 73 return true;
65 } 74 }
66 75
67 DatabaseClientImpl::DatabaseClientImpl()
68 {
69 } 76 }
70
71 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/dart/DartCallback.h ('k') | Source/bindings/core/dart/DartController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698