Reverting 27711.

webkit/glue/dom_operations.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 "AnimationController.h"
@@ skipping 463 matching lines @@
                                          bool* is_frame_element) {
   *is_frame_element = false;
   if (element->hasTagName(WebCore::HTMLNames::iframeTag) ||
       element->hasTagName(WebCore::HTMLNames::frameTag)) {
     *is_frame_element = true;
     if (element->isFrameOwnerElement()) {
       // Check whether this frame has content.
       WebCore::HTMLFrameOwnerElement* frame_element =
           static_cast<WebCore::HTMLFrameOwnerElement*>(element);
       WebCore::Frame* content_frame = frame_element->contentFrame();
-      return content_frame ? WebFrameImpl::FromFrame(content_frame) : NULL;
+      return WebFrameImpl::FromFrame(content_frame);
     }
   }
   return NULL;
 }
 
 const WebCore::AtomicString* GetSubResourceLinkFromElement(
     const WebCore::Element* element) {
   const WebCore::QualifiedName* attribute_name = NULL;
   if (element->hasTagName(WebCore::HTMLNames::imgTag) ||
       element->hasTagName(WebCore::HTMLNames::scriptTag) ||
@@ skipping 383 matching lines @@
   return static_cast<WebCore::HTMLInputElement*>(element);
 }
 
 WebCore::HTMLInputElement* NodeToHTMLInputElement(WebCore::Node* node) {
   if (node->nodeType() != WebCore::Node::ELEMENT_NODE)
     return NULL;
   return ElementToHTMLInputElement(static_cast<WebCore::Element*>(node));
 }
 
 } // webkit_glue