From 4c5a4dcf70c125b8a568b050ed1c2491f25e4593 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 14 Jun 2012 17:18:29 -0700
Subject: Remove unused and fix build warning

Change-Id: I68292b54638502d0769e6e8dbeea5d77eef901d0
---
 Source/WebCore/plugins/android/PluginViewAndroid.cpp |  8 ++++----
 Source/WebKit/android/jni/WebViewCore.cpp            | 15 ---------------
 Source/WebKit/android/jni/WebViewCore.h              |  3 ---
 3 files changed, 4 insertions(+), 22 deletions(-)

(limited to 'Source')

diff --git a/Source/WebCore/plugins/android/PluginViewAndroid.cpp b/Source/WebCore/plugins/android/PluginViewAndroid.cpp
index fdf6e03..2cc95b1 100644
--- a/Source/WebCore/plugins/android/PluginViewAndroid.cpp
+++ b/Source/WebCore/plugins/android/PluginViewAndroid.cpp
@@ -405,7 +405,7 @@ bool PluginView::platformGetValueStatic(NPNVariable variable, void* value, NPErr
     // our interface query is valid with no NPP instance
     *result = NPERR_GENERIC_ERROR;
 
-    switch (variable) {
+    switch ((int)variable) {
         case NPNVisOfflineBool: {
             if (value != NULL) {
                 bool* retValue = static_cast<bool*>(value);
@@ -422,7 +422,7 @@ bool PluginView::platformGetValueStatic(NPNVariable variable, void* value, NPErr
             return true;
         }
         default:
-            ; // do nothing
+            break; // do nothing
     }
 
     (void)anp_getInterface(variable, value, result);
@@ -490,7 +490,7 @@ void PluginView::setNPWindowIfNeeded()
 
 bool PluginView::platformGetValue(NPNVariable variable, void* value, NPError* result)
 {
-    switch (variable) {
+    switch ((int)variable) {
         case NPNVWindowNPObject: {
             NPObject* windowScriptObject =
                     m_parentFrame->script()->windowScriptNPObject();
@@ -581,7 +581,7 @@ NPError PluginView::platformSetValue(NPPVariable variable, void* value)
 {
     NPError error = NPERR_GENERIC_ERROR;
 
-    switch (variable) {
+    switch ((int)variable) {
         case kRequestDrawingModel_ANPSetValue: {
             ANPDrawingModel model = reinterpret_cast<ANPDrawingModel>(value);
             if (m_window->setDrawingModel(model))
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 31d5535..885e730 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -423,7 +423,6 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
     , m_mainFrame(mainframe)
     , m_popupReply(0)
     , m_blockTextfieldUpdates(false)
-    , m_focusBoundsChanged(false)
     , m_skipContentDraw(false)
     , m_textGeneration(0)
     , m_maxXScroll(320/4)
@@ -728,13 +727,6 @@ void WebViewCore::clearContent()
     updateLocale();
 }
 
-bool WebViewCore::focusBoundsChanged()
-{
-    bool result = m_focusBoundsChanged;
-    m_focusBoundsChanged = false;
-    return result;
-}
-
 void WebViewCore::paintContents(WebCore::GraphicsContext* gc, WebCore::IntRect& dirty)
 {
     WebCore::FrameView* view = m_mainFrame->view();
@@ -4799,11 +4791,6 @@ static void RegisterURLSchemeAsLocal(JNIEnv* env, jobject obj, jint nativeClass,
     WebCore::SchemeRegistry::registerURLSchemeAsLocal(jstringToWtfString(env, scheme));
 }
 
-static bool FocusBoundsChanged(JNIEnv* env, jobject obj, jint nativeClass)
-{
-    return reinterpret_cast<WebViewCore*>(nativeClass)->focusBoundsChanged();
-}
-
 static void Pause(JNIEnv* env, jobject obj, jint nativeClass)
 {
     // This is called for the foreground tab when the browser is put to the
@@ -5005,8 +4992,6 @@ static int FindNext(JNIEnv* env, jobject obj, jint nativeClass,
 static JNINativeMethod gJavaWebViewCoreMethods[] = {
     { "nativeClearContent", "(I)V",
             (void*) ClearContent },
-    { "nativeFocusBoundsChanged", "(I)Z",
-        (void*) FocusBoundsChanged } ,
     { "nativeKey", "(IIIIZZZZ)Z",
         (void*) Key },
     { "nativeContentInvalidateAll", "(I)V",
diff --git a/Source/WebKit/android/jni/WebViewCore.h b/Source/WebKit/android/jni/WebViewCore.h
index ba35005..def09d7 100644
--- a/Source/WebKit/android/jni/WebViewCore.h
+++ b/Source/WebKit/android/jni/WebViewCore.h
@@ -509,8 +509,6 @@ namespace android {
         // reset the picture set to empty
         void clearContent();
 
-        bool focusBoundsChanged();
-
         // record content in a new BaseLayerAndroid, copying the layer tree as well
         WebCore::BaseLayerAndroid* recordContent(SkIPoint* );
 
@@ -760,7 +758,6 @@ namespace android {
         // Used in passToJS to avoid updating the UI text field until after the
         // key event has been processed.
         bool m_blockTextfieldUpdates;
-        bool m_focusBoundsChanged;
         bool m_skipContentDraw;
         // Passed in with key events to know when they were generated.  Store it
         // with the cache so that we can ignore stale text changes.
-- 
cgit v1.1