Merge 21296 - Fix a FORWARD_NULL defect reported by Coverity....

webkit/glue/chrome_client_impl.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "AccessibilityObject.h"
@@ skipping 134 matching lines @@
   // operations associated with scaling. However, this value is used ins some
   // cases by WebCore. For example, this is used as a scaling factor in canvas
   // so that things drawn in it are scaled just like the web page is.
   //
   // We don't currently implement scaling, so just return 1.0 (no scaling).
   return 1.0;
 }
 
 void ChromeClientImpl::focus() {
   WebViewDelegate* delegate = webview_->delegate();
-  if (delegate)
+  if (delegate) {
     delegate->didFocus();
 
-  // If accessibility is enabled, we should notify assistive technology that the
-  // active AccessibilityObject changed.
-  WebCore::Document* doc = webview_->GetFocusedWebCoreFrame()->document();
+    // If accessibility is enabled, we should notify assistive technology that
+    // the active AccessibilityObject changed.
+    WebCore::Document* doc = webview_->GetFocusedWebCoreFrame()->document();
 
-  if (doc && doc->axObjectCache()->accessibilityEnabled()) {
-    WebCore::Node* focused_node = webview_->GetFocusedNode();
+    if (doc && doc->axObjectCache()->accessibilityEnabled()) {
+      WebCore::Node* focused_node = webview_->GetFocusedNode();
 
-    if (!focused_node) {
-      // Could not retrieve focused Node.
-      return;
-    }
+      if (!focused_node) {
+        // Could not retrieve focused Node.
+        return;
+      }
 
-    // Retrieve the focused AccessibilityObject.
-    WebCore::AccessibilityObject* focused_acc_obj =
-        doc->axObjectCache()->getOrCreate(focused_node->renderer());
+      // Retrieve the focused AccessibilityObject.
+      WebCore::AccessibilityObject* focused_acc_obj =
+          doc->axObjectCache()->getOrCreate(focused_node->renderer());
 
-    // Alert assistive technology that focus changed.
-    if (focused_acc_obj) {
-      delegate->FocusAccessibilityObject(focused_acc_obj);
+      // Alert assistive technology that focus changed.
+      if (focused_acc_obj)
+        delegate->FocusAccessibilityObject(focused_acc_obj);
     }
   }
 }
 
 void ChromeClientImpl::unfocus() {
   WebViewDelegate* delegate = webview_->delegate();
   if (delegate)
     delegate->didBlur();
 }
 
@@ skipping 440 matching lines @@
         break;
       default:
         NOTREACHED();
     }
   }
 
   info->itemHeight = popup_container->menuItemHeight();
   info->selectedIndex = popup_container->selectedIndex();
   info->items.swap(output_items);
 }