Reverting 27711.

webkit/glue/webview_impl.cc

 // Copyright (c) 2007-2009 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 "build/build_config.h"
 
 #include "base/compiler_specific.h"
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "CSSStyleSelector.h"
@@ skipping 320 matching lines @@
 
 // WebView ----------------------------------------------------------------
 
 /*static*/
 WebView* WebView::Create(WebViewDelegate* delegate) {
   WebViewImpl* instance = new WebViewImpl(delegate);
   instance->AddRef();
   return instance;
 }
 
-void WebViewImpl::InitializeMainFrame(WebFrameClient* frame_client) {
+void WebViewImpl::initializeMainFrame(WebFrameClient* frame_client) {
   // NOTE: The WebFrameImpl takes a reference to itself within InitMainFrame
   // and releases that reference once the corresponding Frame is destroyed.
   scoped_refptr<WebFrameImpl> main_frame = new WebFrameImpl(frame_client);
 
   main_frame->InitMainFrame(this);
 
   if (delegate_) {
     WebDevToolsAgentDelegate* tools_delegate =
         delegate_->GetWebDevToolsAgentDelegate();
     if (tools_delegate)
@@ skipping 11 matching lines @@
   WebCore::Page::visitedStateChanged(
       WebCore::PageGroup::pageGroup(kPageGroupName), link_hash);
 }
 
 // static
 void WebView::ResetVisitedLinkState() {
   WebCore::Page::allVisitedStateChanged(
       WebCore::PageGroup::pageGroup(kPageGroupName));
 }
 
-
 WebViewImpl::WebViewImpl(WebViewDelegate* delegate)
     : delegate_(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(back_forward_list_client_impl_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(chrome_client_impl_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(context_menu_client_impl_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(drag_client_impl_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(editor_client_impl_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(inspector_client_impl_(this)),
       observed_new_navigation_(false),
 #ifndef NDEBUG
@@ skipping 34 matching lines @@
 }
 
 WebViewImpl::~WebViewImpl() {
   DCHECK(page_ == NULL);
 }
 
 RenderTheme* WebViewImpl::theme() const {
   return page_.get() ? page_->theme() : RenderTheme::defaultTheme().get();
 }
 
-void WebViewImpl::SetTabKeyCyclesThroughElements(bool value) {
+bool WebViewImpl::tabKeyCyclesThroughElements() const {
+  ASSERT(page_.get());
+  return page_->tabKeyCyclesThroughElements();
+}
+
+void WebViewImpl::setTabKeyCyclesThroughElements(bool value) {
   if (page_ != NULL) {
     page_->setTabKeyCyclesThroughElements(value);
   }
 }
 
 void WebViewImpl::MouseMove(const WebMouseEvent& event) {
   if (!main_frame() || !main_frame()->frameview())
     return;
 
   last_mouse_position_ = WebPoint(event.x, event.y);
@@ skipping 856 matching lines @@
   return main_frame();
 }
 
 WebFrame* WebViewImpl::findFrameByName(
     const WebString& name, WebFrame* relative_to_frame) {
   String name_str = webkit_glue::WebStringToString(name);
   if (!relative_to_frame)
     relative_to_frame = mainFrame();
   Frame* frame = static_cast<WebFrameImpl*>(relative_to_frame)->frame();
   frame = frame->tree()->find(name_str);
-  return frame ? WebFrameImpl::FromFrame(frame) : NULL;
+  return WebFrameImpl::FromFrame(frame);
 }
 
 WebFrame* WebViewImpl::focusedFrame() {
-  Frame* frame = GetFocusedWebCoreFrame();
-  return frame ? WebFrameImpl::FromFrame(frame) : NULL;
+  return WebFrameImpl::FromFrame(GetFocusedWebCoreFrame());
 }
 
 void WebViewImpl::setFocusedFrame(WebFrame* frame) {
   if (!frame) {
     // Clears the focused frame if any.
     Frame* frame = GetFocusedWebCoreFrame();
     if (frame)
       frame->selection()->setFocused(false);
     return;
   }
@@ skipping 279 matching lines @@
     page_->inspectorController()->inspect(result.innerNonSharedNode());
   }
 }
 
 // WebView --------------------------------------------------------------------
 
 WebViewDelegate* WebViewImpl::GetDelegate() {
   return delegate_;
 }
 
-WebFrame* WebViewImpl::GetPreviousFrameBefore(WebFrame* frame, bool wrap) {
-  WebFrameImpl* frame_impl = static_cast<WebFrameImpl*>(frame);
-  WebCore::Frame* previous =
-      frame_impl->frame()->tree()->traversePreviousWithWrap(wrap);
-  return previous ? WebFrameImpl::FromFrame(previous) : NULL;
-}
-
-WebFrame* WebViewImpl::GetNextFrameAfter(WebFrame* frame, bool wrap) {
-  WebFrameImpl* frame_impl = static_cast<WebFrameImpl*>(frame);
-  WebCore::Frame* next =
-      frame_impl->frame()->tree()->traverseNextWithWrap(wrap);
-  return next ? WebFrameImpl::FromFrame(next) : NULL;
-}
-
-// TODO(darin): these navigation methods should be killed
-
-void WebViewImpl::StopLoading() {
-  main_frame()->stopLoading();
-}
-
-void WebViewImpl::SetBackForwardListSize(int size) {
-  page_->backForwardList()->setCapacity(size);
-}
-
 const std::wstring& WebViewImpl::GetInspectorSettings() const {
   return inspector_settings_;
 }
 
 void WebViewImpl::SetInspectorSettings(const std::wstring& settings) {
   inspector_settings_ = settings;
 }
 
-void WebViewImpl::ShowJavaScriptConsole() {
-  page_->inspectorController()->showPanel(InspectorController::ConsolePanel);
-}
-
-bool WebViewImpl::SetDropEffect(bool accept) {
+bool WebViewImpl::setDropEffect(bool accept) {
   if (drag_target_dispatch_) {
     drop_effect_ = accept ? DROP_EFFECT_COPY : DROP_EFFECT_NONE;
     return true;
   } else {
     return false;
   }
 }
 
 void WebViewImpl::AutofillSuggestionsForNode(
       int64 node_id,
@@ skipping 57 matching lines @@
 }
 
 WebDevToolsAgent* WebViewImpl::GetWebDevToolsAgent() {
   return GetWebDevToolsAgentImpl();
 }
 
 WebDevToolsAgentImpl* WebViewImpl::GetWebDevToolsAgentImpl() {
   return devtools_agent_.get();
 }
 
-void WebViewImpl::SetIsTransparent(bool is_transparent) {
+void WebViewImpl::setIsTransparent(bool is_transparent) {
   // Set any existing frames to be transparent.
   WebCore::Frame* frame = page_->mainFrame();
   while (frame) {
     frame->view()->setTransparent(is_transparent);
     frame = frame->tree()->traverseNext();
   }
 
   // Future frames check this to know whether to be transparent.
   is_transparent_ = is_transparent;
 }
 
-bool WebViewImpl::GetIsTransparent() const {
+bool WebViewImpl::isTransparent() const {
   return is_transparent_;
 }
 
 void WebViewImpl::MediaPlayerActionAt(int x,
                                       int y,
                                       const MediaPlayerAction& action) {
   HitTestResult result = HitTestResultForWindowPos(IntPoint(x, y));
 
   WTF::RefPtr<WebCore::Node> node = result.innerNonSharedNode();
   if (node->hasTagName(WebCore::HTMLNames::videoTag) ||
@@ skipping 14 matching lines @@
     }
     if (action.command & MediaPlayerAction::LOOP) {
       media_element->setLoop(true);
     }
     if (action.command & MediaPlayerAction::NO_LOOP) {
       media_element->setLoop(false);
     }
   }
 }
 
-void WebViewImpl::SetActive(bool active) {
+void WebViewImpl::setIsActive(bool active) {
   if (page() && page()->focusController())
     page()->focusController()->setActive(active);
 }
 
-bool WebViewImpl::IsActive() {
+bool WebViewImpl::isActive() const {
   return (page() && page()->focusController())
       ? page()->focusController()->isActive()
       : false;
 }
 
 void WebViewImpl::DidCommitLoad(bool* is_new_navigation) {
   if (is_new_navigation)
     *is_new_navigation = observed_new_navigation_;
 
 #ifndef NDEBUG
@@ skipping 103 matching lines @@
 }
 
 void WebViewImpl::SetSpellingPanelVisibility(bool is_visible) {
   spelling_panel_is_visible_ = is_visible;
 }
 
 bool WebViewImpl::GetSpellingPanelVisibility() {
   return spelling_panel_is_visible_;
 }
 
-void WebViewImpl::SetTabsToLinks(bool enable) {
+void WebViewImpl::setTabsToLinks(bool enable) {
   tabs_to_links_ = enable;
 }
 
-bool WebViewImpl::GetTabsToLinks() const {
+bool WebViewImpl::tabsToLinks() const {
   return tabs_to_links_;
 }