diff options
7 files changed, 2 insertions, 39 deletions
diff --git a/Source/WebCore/platform/graphics/android/GradientAndroid.cpp b/Source/WebCore/platform/graphics/android/GradientAndroid.cpp index b8dc9dd..6007a0a 100644 --- a/Source/WebCore/platform/graphics/android/GradientAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/GradientAndroid.cpp @@ -113,7 +113,6 @@ SkShader* Gradient::getShader(SkShader::TileMode mode) void Gradient::fill(GraphicsContext* context, const FloatRect& rect) { - SkRect r; SkPaint paint; // we don't care about the mode, so try to use the existing one SkShader::TileMode mode = m_gradient ? m_gradient->m_tileMode : diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/LayerAndroid.cpp index 83fb414..b4e20e8 100644 --- a/Source/WebCore/platform/graphics/android/LayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/LayerAndroid.cpp @@ -321,8 +321,6 @@ void LayerAndroid::setBackgroundColor(SkColor color) m_backgroundColor = color; } -static int gDebugChildLevel; - FloatPoint LayerAndroid::translation() const { TransformationMatrix::DecomposedType tDecomp; @@ -612,8 +610,6 @@ void LayerAndroid::updateGLPositionsAndScale(const TransformationMatrix& parentM IntSize layerSize(getSize().width(), getSize().height()); FloatPoint anchorPoint(getAnchorPoint().fX, getAnchorPoint().fY); FloatPoint position(getPosition().fX - m_offset.x(), getPosition().fY - m_offset.y()); - float centerOffsetX = (0.5f - anchorPoint.x()) * layerSize.width(); - float centerOffsetY = (0.5f - anchorPoint.y()) * layerSize.height(); float originX = anchorPoint.x() * layerSize.width(); float originY = anchorPoint.y() * layerSize.height(); TransformationMatrix localMatrix; diff --git a/Source/WebCore/platform/graphics/android/PerformanceMonitor.cpp b/Source/WebCore/platform/graphics/android/PerformanceMonitor.cpp index 241cbef..902fa1e 100644 --- a/Source/WebCore/platform/graphics/android/PerformanceMonitor.cpp +++ b/Source/WebCore/platform/graphics/android/PerformanceMonitor.cpp @@ -69,7 +69,6 @@ void PerformanceMonitor::stop(const String &tag) float mtime = (seconds * 1000.0) + (useconds/1000.0); - float avg = 0; if (item->average_ms) { item->average_ms = (item->average_ms + mtime) / 2; } else diff --git a/Source/WebCore/platform/graphics/android/TiledPage.cpp b/Source/WebCore/platform/graphics/android/TiledPage.cpp index 7aac242..cd23a7f 100644 --- a/Source/WebCore/platform/graphics/android/TiledPage.cpp +++ b/Source/WebCore/platform/graphics/android/TiledPage.cpp @@ -246,11 +246,6 @@ void TiledPage::prepare(bool goingDown, bool goingLeft, const SkIRect& tileBound int nbTilesWidth = tileBounds.width(); int nbTilesHeight = tileBounds.height(); - // Expand number of tiles to allow tiles outside of viewport to be prepared for - // smoother scrolling. - int nTilesToPrepare = nbTilesWidth * nbTilesHeight; - int nMaxTilesPerPage = m_baseTileSize / 2; - if (bounds == ExpandedBounds) { // prepare tiles outside of the visible bounds int expandX = m_glWebViewState->expandedTileBoundsX(); diff --git a/Source/WebCore/platform/graphics/android/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/TransferQueue.cpp index 2d5be64..35a36dd 100644 --- a/Source/WebCore/platform/graphics/android/TransferQueue.cpp +++ b/Source/WebCore/platform/graphics/android/TransferQueue.cpp @@ -494,7 +494,7 @@ bool TransferQueue::tryUpdateQueueWithBitmap(const TileRenderInfo* renderInfo, return false; uint8_t* img = (uint8_t*)buffer.bits; - int row, col; + int row; int bpp = 4; // Now we only deal with RGBA8888 format. int width = TilesManager::instance()->tileWidth(); int height = TilesManager::instance()->tileHeight(); 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); } |