summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authordtrainor <dtrainor@chromium.org>2014-10-08 11:05:24 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-08 18:05:49 +0000
commit037df0df0d5abcfee54e519eaffc90fe41e35efb (patch)
tree6abc82e6331d23b2808303686ce1ac2bab461e74 /android_webview
parent40720d61ebdccd5b62c16d6a26258792c55bc2a1 (diff)
downloadchromium_src-037df0df0d5abcfee54e519eaffc90fe41e35efb.zip
chromium_src-037df0df0d5abcfee54e519eaffc90fe41e35efb.tar.gz
chromium_src-037df0df0d5abcfee54e519eaffc90fe41e35efb.tar.bz2
Fix reinterpret_cast issues
It looks like these places are using incorrect casting (reinterpret_cast instead of static_cast) for GetUserData. BUG= Review URL: https://codereview.chromium.org/629503004 Cr-Commit-Position: refs/heads/master@{#298743}
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/browser/aw_contents_client_bridge_base.cc2
-rw-r--r--android_webview/native/aw_contents.cc2
-rw-r--r--android_webview/native/aw_settings.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/android_webview/browser/aw_contents_client_bridge_base.cc b/android_webview/browser/aw_contents_client_bridge_base.cc
index ffd7160..13f9e5f 100644
--- a/android_webview/browser/aw_contents_client_bridge_base.cc
+++ b/android_webview/browser/aw_contents_client_bridge_base.cc
@@ -25,7 +25,7 @@ class UserData : public base::SupportsUserData::Data {
content::WebContents* web_contents) {
if (!web_contents)
return NULL;
- UserData* data = reinterpret_cast<UserData*>(
+ UserData* data = static_cast<UserData*>(
web_contents->GetUserData(kAwContentsClientBridgeBase));
return data ? data->contents_ : NULL;
}
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 71da30b..29ed365 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -113,7 +113,7 @@ class AwContentsUserData : public base::SupportsUserData::Data {
static AwContents* GetContents(WebContents* web_contents) {
if (!web_contents)
return NULL;
- AwContentsUserData* data = reinterpret_cast<AwContentsUserData*>(
+ AwContentsUserData* data = static_cast<AwContentsUserData*>(
web_contents->GetUserData(kAwContentsUserDataKey));
return data ? data->contents_ : NULL;
}
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc
index d82c617..012299c 100644
--- a/android_webview/native/aw_settings.cc
+++ b/android_webview/native/aw_settings.cc
@@ -61,7 +61,7 @@ class AwSettingsUserData : public base::SupportsUserData::Data {
static AwSettings* GetSettings(content::WebContents* web_contents) {
if (!web_contents)
return NULL;
- AwSettingsUserData* data = reinterpret_cast<AwSettingsUserData*>(
+ AwSettingsUserData* data = static_cast<AwSettingsUserData*>(
web_contents->GetUserData(kAwSettingsUserDataKey));
return data ? data->settings_ : NULL;
}