commit d0c887c5d9f5595e0c2075f65976def2282f9b42
author Mike Reed <reed@google.com> Thu May 28 16:17:52 2009 -0400
committer Mike Reed <reed@google.com> Thu May 28 16:58:12 2009 -0400
tree 6091ac27861524ca0ad15293873f09e4fb1c1040
parent 2af78f0088820a0b10e92b3d4e07e2688e8555f1

add null check for renderer, and fix webkit coding style

WebKit/android/jni/WebViewCore.cpp

diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index c1df546..e40fd1d 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -1275,11 +1275,11 @@
 
 static bool nodeIsPlugin(Node* node) {
     RenderObject* renderer = node->renderer();
-    if (renderer->isWidget()) {
+    if (renderer && renderer->isWidget()) {
         Widget* widget = static_cast<RenderWidget*>(renderer)->widget();
         return widget && widget->isPluginView();
     }
-    return NULL;
+    return 0;
 }
 
 // Update mouse position and may change focused node.
@@ -1311,9 +1311,8 @@
     m_lastFocusedBounds = node->getRect();
 
     // hack to give the plugin focus (for keys). better fix on the way
-    if (nodeIsPlugin(node)) {
+    if (nodeIsPlugin(node))
         node->document()->setFocusedNode(node);
-    }
     return true;
 }