diff options
| author | Chris Craik <ccraik@google.com> | 2012-04-19 13:59:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-19 13:59:07 -0700 |
| commit | 7ad2efca85a989d9ab57e311af605a6fed9c9925 (patch) | |
| tree | e45320aa85871a116288b7c0c12232f3c357eb92 | |
| parent | 9add259c5c5b1c4c8b77157a9b59f771d58a0864 (diff) | |
| parent | 926718415b221828e223fe24aaf39ae41c6ecd30 (diff) | |
| download | external_webkit-7ad2efca85a989d9ab57e311af605a6fed9c9925.zip external_webkit-7ad2efca85a989d9ab57e311af605a6fed9c9925.tar.gz external_webkit-7ad2efca85a989d9ab57e311af605a6fed9c9925.tar.bz2 | |
Merge "fix minor warnings and style issues"
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/GaneshContext.cpp | 8 | ||||
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 7 |
2 files changed, 3 insertions, 12 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/GaneshContext.cpp b/Source/WebCore/platform/graphics/android/rendering/GaneshContext.cpp index bf43652..5c4b453 100644 --- a/Source/WebCore/platform/graphics/android/rendering/GaneshContext.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/GaneshContext.cpp @@ -60,9 +60,8 @@ GaneshContext* GaneshContext::instance() GrContext* GaneshContext::getGrContext() { - if (!m_grContext) { - m_grContext = GrContext::Create(kOpenGL_Shaders_GrEngine, NULL); - } + if (!m_grContext) + m_grContext = GrContext::Create(kOpenGL_Shaders_GrEngine, 0); return m_grContext; } @@ -88,9 +87,8 @@ SkDevice* GaneshContext::getDeviceForTile(const TileRenderInfo& renderInfo) if (!m_surfaceContext) { - if(eglGetCurrentContext() != EGL_NO_CONTEXT) { + if(eglGetCurrentContext() != EGL_NO_CONTEXT) ALOGV("ERROR: should not have a context yet"); - } display = eglGetDisplay(EGL_DEFAULT_DISPLAY); GLUtils::checkEglError("eglGetDisplay"); diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 497f5fd..7cc427f 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -4872,13 +4872,6 @@ static void FullScreenPluginHidden(JNIEnv* env, jobject obj, jint nativeClass, plugin->exitFullScreen(false); } -static WebCore::IntRect jrect_to_webrect(JNIEnv* env, jobject obj) -{ - int L, T, R, B; - GraphicsJNI::get_jrect(env, obj, &L, &T, &R, &B); - return WebCore::IntRect(L, T, R - L, B - T); -} - static jobject HitTest(JNIEnv* env, jobject obj, jint nativeClass, jint x, jint y, jint slop, jboolean doMoveMouse) { |