diff options
author | Chris Craik <ccraik@google.com> | 2012-02-28 13:59:01 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-28 13:59:01 -0800 |
commit | 7a5ba79e8c522b61d1dba7cb6766ee6bc756386f (patch) | |
tree | 63997092d7db9ac4b0725cfd5f526c87a8f6310f /Source/WebKit | |
parent | 3308b481689e8e34c7a62c580685c4ab1cfb2f48 (diff) | |
parent | 894aaa1bd5446eebf8169efa1998fbe6964c18d0 (diff) | |
download | external_webkit-7a5ba79e8c522b61d1dba7cb6766ee6bc756386f.zip external_webkit-7a5ba79e8c522b61d1dba7cb6766ee6bc756386f.tar.gz external_webkit-7a5ba79e8c522b61d1dba7cb6766ee6bc756386f.tar.bz2 |
Merge "removed unused vars/functions"
Diffstat (limited to 'Source/WebKit')
-rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 17 | ||||
-rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 11 |
2 files changed, 1 insertions, 27 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index e300976..32befc7 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -772,8 +772,6 @@ SkPicture* WebViewCore::rebuildPicture(const SkIRect& inval) void WebViewCore::rebuildPictureSet(PictureSet* pictureSet) { - WebCore::FrameView* view = m_mainFrame->view(); - #ifdef FAST_PICTURESET WTF::Vector<Bucket*>* buckets = pictureSet->bucketsToUpdate(); @@ -996,15 +994,6 @@ void WebViewCore::offInvalidate(const WebCore::IntRect &r) contentInvalidate(r); } -static int pin_pos(int x, int width, int targetWidth) -{ - if (x + width > targetWidth) - x = targetWidth - width; - if (x < 0) - x = 0; - return x; -} - void WebViewCore::didFirstLayout() { ALOG_ASSERT(m_javaGlue->m_obj, "A Java widget was not associated with this view bridge!"); @@ -1152,7 +1141,6 @@ void WebViewCore::setSizeScreenWidthAndScale(int width, int height, int osw = m_screenWidth; int osh = m_screenHeight; int otw = m_textWrapWidth; - float oldScale = m_scale; m_screenWidth = screenWidth; m_screenHeight = screenHeight; m_textWrapWidth = textWrapWidth; @@ -2128,7 +2116,6 @@ void WebViewCore::setSelection(int start, int end) control->selectionChanged(true); } client->setUiGeneratedSelectionChange(false); - WebCore::Frame* focusedFrame = focus->document()->frame(); bool isPasswordField = false; if (focus->isElementNode()) { WebCore::Element* element = static_cast<WebCore::Element*>(focus); @@ -3024,7 +3011,6 @@ bool WebViewCore::key(const PlatformKeyboardEvent& event) WebCore::Node* focusNode = currentFocus(); if (focusNode) { WebCore::Frame* frame = focusNode->document()->frame(); - WebFrame* webFrame = WebFrame::getWebFrame(frame); eventHandler = frame->eventHandler(); VisibleSelection old = frame->selection()->selection(); EditorClientAndroid* client = static_cast<EditorClientAndroid*>( @@ -4045,7 +4031,6 @@ Vector<VisibleSelection> WebViewCore::getTextRanges( } Position nextRangeStart = start; Position previousRangeEnd; - int i = 0; do { VisibleSelection selection(nextRangeStart, end); ranges.append(selection); @@ -4084,7 +4069,6 @@ void WebViewCore::insertText(const WTF::String &text) return; Document* document = focus->document(); - Frame* frame = document->frame(); EditorClientAndroid* client = static_cast<EditorClientAndroid*>( m_mainFrame->editor()->client()); @@ -4795,7 +4779,6 @@ static jobject HitTest(JNIEnv* env, jobject obj, jint nativeClass, jint x, WebViewCore* viewImpl = reinterpret_cast<WebViewCore*>(nativeClass); if (!viewImpl) return 0; - Node* node = 0; AndroidHitTestResult result = viewImpl->hitTestAtPoint(x, y, slop, doMoveMouse); return result.createJavaObject(env); } diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 624a696..6aed700 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -834,15 +834,6 @@ class GLDrawFunctor : Functor { jint extras; }; -static jobject createJavaRect(JNIEnv* env, int x, int y, int right, int bottom) -{ - jclass rectClass = env->FindClass("android/graphics/Rect"); - jmethodID init = env->GetMethodID(rectClass, "<init>", "(IIII)V"); - jobject rect = env->NewObject(rectClass, init, x, y, right, bottom); - env->DeleteLocalRef(rectClass); - return rect; -} - /* * Native JNI methods */ @@ -874,7 +865,7 @@ static void nativeCreate(JNIEnv *env, jobject obj, int viewImpl, jstring drawableDir, jboolean isHighEndGfx) { WTF::String dir = jstringToWtfString(env, drawableDir); - WebView* webview = new WebView(env, obj, viewImpl, dir, isHighEndGfx); + new WebView(env, obj, viewImpl, dir, isHighEndGfx); // NEED THIS OR SOMETHING LIKE IT! //Release(obj); } |