diff options
| author | Cary Clark <cary@android.com> | 2010-04-06 14:38:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-06 14:38:28 -0700 |
| commit | d9f0b38514b40a8b41b90e7febe94e9afbec3711 (patch) | |
| tree | 3f835054c089a93a0433703f9e0ed62dd0ad8c37 | |
| parent | 8d755f42148b344be88635990cd0037532837af3 (diff) | |
| parent | 4c249c549069fc103bc6103c012f056a9e0f8117 (diff) | |
| download | external_webkit-d9f0b38514b40a8b41b90e7febe94e9afbec3711.zip external_webkit-d9f0b38514b40a8b41b90e7febe94e9afbec3711.tar.gz external_webkit-d9f0b38514b40a8b41b90e7febe94e9afbec3711.tar.bz2 | |
am 4c249c54: am 213f1345: Merge "suppress compiler warnings in plugin code" into froyo
| -rw-r--r-- | WebCore/plugins/android/PluginViewAndroid.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp index 682268a..8b606e8 100644 --- a/WebCore/plugins/android/PluginViewAndroid.cpp +++ b/WebCore/plugins/android/PluginViewAndroid.cpp @@ -375,12 +375,15 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value) *retValue = !networkStateNotifier().onLine(); return NPERR_NO_ERROR; } + break; } case kJavaContext_ANPGetValue: { jobject* retObject = static_cast<jobject*>(value); *retObject = android::WebViewCore::getApplicationContext(); return NPERR_NO_ERROR; } + default: + ; // do nothing } (void)anp_getInterface(variable, value, &error); |