summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-08-13 17:01:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-13 17:01:53 -0700
commita78a0374994f64bada8d195b649acaded3fce271 (patch)
tree21d6ff08cfa195dd1d8af6cb7393dc0ec05f2c2d
parentf5bd51141520dae306b911bb58fc230cf5c5a5a4 (diff)
parent465864a6d72a2505b7a725ddaadfff05cdece8fc (diff)
downloadexternal_webkit-a78a0374994f64bada8d195b649acaded3fce271.zip
external_webkit-a78a0374994f64bada8d195b649acaded3fce271.tar.gz
external_webkit-a78a0374994f64bada8d195b649acaded3fce271.tar.bz2
am 465864a6: DO NOT MERGE Null check
* commit '465864a6d72a2505b7a725ddaadfff05cdece8fc': DO NOT MERGE Null check
-rw-r--r--Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp b/Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp
index 3b93d51..d6fa5ce 100644
--- a/Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp
@@ -60,7 +60,7 @@ public:
: m_context(platformContext) { }
~GraphicsContextPlatformPrivate()
{
- if (m_context->deleteUs())
+ if (m_context && m_context->deleteUs())
delete m_context;
}