summaryrefslogtreecommitdiffstats
path: root/android_webview/lib
diff options
context:
space:
mode:
authorboliu <boliu@chromium.org>2015-04-08 10:07:05 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-08 17:08:36 +0000
commit684ba03ae718cb7ffa9dc0720d011f941c084da3 (patch)
tree3a16c9ddd227675c713c2c1c5eb753fadc2217aa /android_webview/lib
parent54dea7dc6a96261555f9be42d648f46e6d709e47 (diff)
downloadchromium_src-684ba03ae718cb7ffa9dc0720d011f941c084da3.zip
chromium_src-684ba03ae718cb7ffa9dc0720d011f941c084da3.tar.gz
chromium_src-684ba03ae718cb7ffa9dc0720d011f941c084da3.tar.bz2
Null check ContentViewCore::GetJavaObject
ContentViewCoreImpl holds a weak reference to the java peer. This means reference returned by GetJavaObject may be null. Go through all callers of this API and make sure they correctly handle null reference. BUG=469803 Review URL: https://codereview.chromium.org/1067023005 Cr-Commit-Position: refs/heads/master@{#324243}
Diffstat (limited to 'android_webview/lib')
-rw-r--r--android_webview/lib/main/aw_main_delegate.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 27e5da9..8520816 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -195,7 +195,7 @@ AwMessagePortService* AwMainDelegate::CreateAwMessagePortService() {
content::ExternalVideoSurfaceContainer*
AwMainDelegate::CreateExternalVideoSurfaceContainer(
content::WebContents* web_contents) {
- return new ExternalVideoSurfaceContainerImpl(web_contents);
+ return ExternalVideoSurfaceContainerImpl::Create(web_contents);
}
#endif