Reverting 27711.

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 357 matching lines @@
 static WebDataSource* DataSourceForDocLoader(DocumentLoader* loader) {
   return loader ? WebDataSourceImpl::fromDocumentLoader(loader) : NULL;
 }
 
 // WebFrame -------------------------------------------------------------------
 
 // static
 WebFrame* WebFrame::frameForEnteredContext() {
   Frame* frame =
       WebCore::ScriptController::retrieveFrameForEnteredContext();
-  if (frame)
-    return WebFrameImpl::FromFrame(frame);
-  else
-    return NULL;
+  return WebFrameImpl::FromFrame(frame);
 }
 
 // static
 WebFrame* WebFrame::frameForCurrentContext() {
   Frame* frame =
       WebCore::ScriptController::retrieveFrameForCurrentContext();
-  if (frame)
-    return WebFrameImpl::FromFrame(frame);
-  else
-    return NULL;
+  return WebFrameImpl::FromFrame(frame);
 }
 
 WebString WebFrameImpl::name() const {
   return webkit_glue::StringToWebString(frame_->tree()->name());
 }
 
 WebURL WebFrameImpl::url() const {
   const WebDataSource* ds = dataSource();
   if (!ds)
     return WebURL();
@@ skipping 59 matching lines @@
 bool WebFrameImpl::hasVisibleContent() const {
   return frame()->view()->visibleWidth() > 0 &&
          frame()->view()->visibleHeight() > 0;
 }
 
 WebView* WebFrameImpl::view() const {
   return GetWebViewImpl();
 }
 
 WebFrame* WebFrameImpl::opener() const {
-  if (frame_) {
-    Frame* opener = frame_->loader()->opener();
-    if (opener)
-      return FromFrame(opener);
-  }
-  return NULL;
+  Frame* opener = NULL;
+  if (frame_)
+    opener = frame_->loader()->opener();
+  return FromFrame(opener);
 }
 
 WebFrame* WebFrameImpl::parent() const {
-  if (frame_) {
-    Frame *parent = frame_->tree()->parent();
-    if (parent)
-      return FromFrame(parent);
-  }
-  return NULL;
+  Frame *parent = NULL;
+  if (frame_)
+    parent = frame_->tree()->parent();
+  return FromFrame(parent);
 }
 
 WebFrame* WebFrameImpl::top() const {
   if (frame_)
     return FromFrame(frame_->tree()->top());
 
   return NULL;
 }
 
 WebFrame* WebFrameImpl::firstChild() const {
@@ skipping 1140 matching lines @@
   RefPtr<WebCore::FrameView> view;
   if (is_main_frame) {
     IntSize size = webkit_glue::WebSizeToIntSize(web_view->size());
     view = FrameView::create(frame_, size);
   } else {
     view = FrameView::create(frame_);
   }
 
   frame_->setView(view);
 
-  if (web_view->GetIsTransparent())
+  if (web_view->isTransparent())
     view->setTransparent(true);
 
   // TODO(darin): The Mac code has a comment about this possibly being
   // unnecessary.  See installInFrame in WebCoreFrameBridge.mm
   if (frame_->ownerRenderer())
     frame_->ownerRenderer()->setWidget(view.get());
 
   if (HTMLFrameOwnerElement* owner = frame_->ownerElement()) {
     view->setCanHaveScrollbars(
         owner->scrollingMode() != WebCore::ScrollbarAlwaysOff);
   }
 
   if (is_main_frame)
     view->setParentVisible(true);
 }
 
 // static
 WebFrameImpl* WebFrameImpl::FromFrame(WebCore::Frame* frame) {
+  if (!frame)
+    return NULL;
   return static_cast<WebFrameLoaderClient*>(
       frame->loader()->client())->webframe();
 }
 
 WebViewImpl* WebFrameImpl::GetWebViewImpl() const {
   if (!frame_ || !frame_->page())
     return NULL;
 
   // There are cases where a Frame may outlive its associated Page.  Get the
   // WebViewImpl by accessing it indirectly through the Frame's Page so that we
@@ skipping 145 matching lines @@
 
 void WebFrameImpl::SetMarkerActive(WebCore::Range* range, bool active) {
   if (!range)
     return;
 
   frame()->document()->setMarkersActive(range, active);
 }
 
 int WebFrameImpl::OrdinalOfFirstMatchForFrame(WebFrameImpl* frame) const {
   int ordinal = 0;
-  WebViewImpl* web_view = GetWebViewImpl();
-  WebFrameImpl* const main_frame_impl = GetWebViewImpl()->main_frame();
+  WebFrameImpl* main_frame_impl = GetWebViewImpl()->main_frame();
   // Iterate from the main frame up to (but not including) |frame| and
   // add up the number of matches found so far.
   for (WebFrameImpl* it = main_frame_impl;
        it != frame;
-       it = static_cast<WebFrameImpl*>(
-           web_view->GetNextFrameAfter(it, true))) {
+       it = static_cast<WebFrameImpl*>(it->traverseNext(true))) {
     if (it->last_match_count_ > 0)
       ordinal += it->last_match_count_;
   }
 
   return ordinal;
 }
 
 bool WebFrameImpl::ShouldScopeMatches(const string16& search_text) {
   // Don't scope if we can't find a frame or if the frame is not visible.
   // The user may have closed the tab/application, so abort.
@@ skipping 66 matching lines @@
 
   SecurityOrigin* security_origin = frame_->document()->securityOrigin();
 
   if (!frame_->loader()->isScheduledLocationChangePending()) {
     frame_->loader()->stopAllLoaders();
     frame_->loader()->begin(frame_->loader()->url(), true, security_origin);
     frame_->loader()->write(script_result);
     frame_->loader()->end();
   }
 }