summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-04-19 13:45:58 -0700
committerChris Craik <ccraik@google.com>2012-04-19 13:45:58 -0700
commit926718415b221828e223fe24aaf39ae41c6ecd30 (patch)
tree51ed70eefc05e52ebfa0752e753bd934aaf26aaa /Source/WebCore
parent6230a7a2415e8b40c6d19847bc94a0919f06127b (diff)
downloadexternal_webkit-926718415b221828e223fe24aaf39ae41c6ecd30.zip
external_webkit-926718415b221828e223fe24aaf39ae41c6ecd30.tar.gz
external_webkit-926718415b221828e223fe24aaf39ae41c6ecd30.tar.bz2
fix minor warnings and style issues
Change-Id: Iaa4b1abeca17df54a4ddd169a3828695b8dcc776
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/GaneshContext.cpp8
1 files changed, 3 insertions, 5 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");