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

Side by Side Diff: content/browser/android/app_web_message_port_service_impl.h

Issue 2538463002: android: Don't pass ScopedJavaGlobalRef pointers. (Closed)
Patch Set: timeouts are very annoying Created 4 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef CONTENT_BROWSER_ANDROID_APP_WEB_MESSAGE_PORT_SERVICE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_APP_WEB_MESSAGE_PORT_SERVICE_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_APP_WEB_MESSAGE_PORT_SERVICE_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_APP_WEB_MESSAGE_PORT_SERVICE_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/android/jni_weak_ref.h" 10 #include "base/android/jni_weak_ref.h"
(...skipping 16 matching lines...) Expand all
27 // Returns the AppWebMessagePortServiceImpl singleton. 27 // Returns the AppWebMessagePortServiceImpl singleton.
28 static AppWebMessagePortServiceImpl* GetInstance(); 28 static AppWebMessagePortServiceImpl* GetInstance();
29 29
30 AppWebMessagePortServiceImpl(); 30 AppWebMessagePortServiceImpl();
31 ~AppWebMessagePortServiceImpl() override; 31 ~AppWebMessagePortServiceImpl() override;
32 void Init(JNIEnv* env, jobject object); 32 void Init(JNIEnv* env, jobject object);
33 33
34 // AppWebMessagePortService implementation 34 // AppWebMessagePortService implementation
35 35
36 void CreateMessageChannel(JNIEnv* env, 36 void CreateMessageChannel(JNIEnv* env,
37 jobjectArray ports, 37 const base::android::JavaRef<jobjectArray>& ports,
38 WebContents* web_contents) override; 38 WebContents* web_contents) override;
39 void CleanupPort(int message_port_id) override; 39 void CleanupPort(int message_port_id) override;
40 40
41 // Methods called from Java. 41 // Methods called from Java.
42 void PostAppToWebMessage( 42 void PostAppToWebMessage(
43 JNIEnv* env, 43 JNIEnv* env,
44 const base::android::JavaParamRef<jobject>& object, 44 const base::android::JavaParamRef<jobject>& object,
45 int sender_id, 45 int sender_id,
46 const base::android::JavaParamRef<jstring>& message, 46 const base::android::JavaParamRef<jstring>& message,
47 const base::android::JavaParamRef<jintArray>& sent_ports); 47 const base::android::JavaParamRef<jintArray>& sent_ports);
(...skipping 18 matching lines...) Expand all
66 friend struct base::DefaultSingletonTraits<AppWebMessagePortServiceImpl>; 66 friend struct base::DefaultSingletonTraits<AppWebMessagePortServiceImpl>;
67 67
68 void PostAppToWebMessageOnIOThread(int sender_id, 68 void PostAppToWebMessageOnIOThread(int sender_id,
69 base::string16* message, 69 base::string16* message,
70 std::vector<int>* sent_ports); 70 std::vector<int>* sent_ports);
71 void CreateMessageChannelOnIOThread( 71 void CreateMessageChannelOnIOThread(
72 scoped_refptr<AppWebMessagePortMessageFilter> filter, 72 scoped_refptr<AppWebMessagePortMessageFilter> filter,
73 int* port1, 73 int* port1,
74 int* port2); 74 int* port2);
75 void OnMessageChannelCreated( 75 void OnMessageChannelCreated(
76 base::android::ScopedJavaGlobalRef<jobjectArray>* ports, 76 const base::android::JavaRef<jobjectArray>& ports,
77 int* port1, 77 int* port1,
78 int* port2); 78 int* port2);
79 void AddPort(int message_port_id, AppWebMessagePortMessageFilter* filter); 79 void AddPort(int message_port_id, AppWebMessagePortMessageFilter* filter);
80 void PostClosePortMessage(int message_port_id); 80 void PostClosePortMessage(int message_port_id);
81 81
82 JavaObjectWeakGlobalRef java_ref_; 82 JavaObjectWeakGlobalRef java_ref_;
83 typedef std::map<int, AppWebMessagePortMessageFilter*> MessagePorts; 83 typedef std::map<int, AppWebMessagePortMessageFilter*> MessagePorts;
84 MessagePorts ports_; // Access on IO thread 84 MessagePorts ports_; // Access on IO thread
85 85
86 DISALLOW_COPY_AND_ASSIGN(AppWebMessagePortServiceImpl); 86 DISALLOW_COPY_AND_ASSIGN(AppWebMessagePortServiceImpl);
87 }; 87 };
88 88
89 bool RegisterAppWebMessagePortService(JNIEnv* env); 89 bool RegisterAppWebMessagePortService(JNIEnv* env);
90 90
91 } // namespace content 91 } // namespace content
92 92
93 #endif // CONTENT_BROWSER_ANDROID_APP_WEB_MESSAGE_PORT_SERVICE_IMPL_H_ 93 #endif // CONTENT_BROWSER_ANDROID_APP_WEB_MESSAGE_PORT_SERVICE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698