summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webview_impl.cc
diff options
context:
space:
mode:
authormal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-01 08:43:32 +0000
committermal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-01 08:43:32 +0000
commit4c4d056f81e01dc743b6f1cc5773a0686759be23 (patch)
treeb6245ce395c954efe0a49898cd8bc8faa1ca22c5 /webkit/glue/webview_impl.cc
parentdd805fef306e6ee0d6bade640ea3689b10e64bc7 (diff)
downloadchromium_src-4c4d056f81e01dc743b6f1cc5773a0686759be23.zip
chromium_src-4c4d056f81e01dc743b6f1cc5773a0686759be23.tar.gz
chromium_src-4c4d056f81e01dc743b6f1cc5773a0686759be23.tar.bz2
Revert 27705 - Move various methods from glue/webview.h to api/public/WebView.h
** browser_tests started failing at this revision. See: http://build.chromium.org/buildbot/waterfall/builders/Chromium%20XP/builds/7697/steps/browser_tests/logs/stdio ** I'll reorder the methods in webview_impl.cc in a followup CL. I wanted to keep this one easy to review. SetBackForwardListSize is no longer necessary given that BackForwardListChromium.cpp doesn't care about its capacity. R=dglazkov BUG=10033 TEST=none Review URL: http://codereview.chromium.org/251051 TBR=darin@chromium.org Review URL: http://codereview.chromium.org/246060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webview_impl.cc')
-rw-r--r--webkit/glue/webview_impl.cc52
1 files changed, 38 insertions, 14 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index cf4be81..86cca15 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -338,7 +338,7 @@ WebView* WebView::Create(WebViewDelegate* delegate) {
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);
@@ -370,6 +370,7 @@ void WebView::ResetVisitedLinkState() {
WebCore::PageGroup::pageGroup(kPageGroupName));
}
+
WebViewImpl::WebViewImpl(WebViewDelegate* delegate)
: delegate_(delegate),
ALLOW_THIS_IN_INITIALIZER_LIST(back_forward_list_client_impl_(this)),
@@ -424,12 +425,7 @@ RenderTheme* WebViewImpl::theme() const {
return page_.get() ? page_->theme() : RenderTheme::defaultTheme().get();
}
-bool WebViewImpl::tabKeyCyclesThroughElements() const {
- ASSERT(page_.get());
- return page_->tabKeyCyclesThroughElements();
-}
-
-void WebViewImpl::setTabKeyCyclesThroughElements(bool value) {
+void WebViewImpl::SetTabKeyCyclesThroughElements(bool value) {
if (page_ != NULL) {
page_->setTabKeyCyclesThroughElements(value);
}
@@ -1611,6 +1607,30 @@ 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_;
}
@@ -1619,7 +1639,11 @@ void WebViewImpl::SetInspectorSettings(const std::wstring& settings) {
inspector_settings_ = settings;
}
-bool WebViewImpl::setDropEffect(bool accept) {
+void WebViewImpl::ShowJavaScriptConsole() {
+ page_->inspectorController()->showPanel(InspectorController::ConsolePanel);
+}
+
+bool WebViewImpl::SetDropEffect(bool accept) {
if (drag_target_dispatch_) {
drop_effect_ = accept ? DROP_EFFECT_COPY : DROP_EFFECT_NONE;
return true;
@@ -1697,7 +1721,7 @@ 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) {
@@ -1709,7 +1733,7 @@ void WebViewImpl::setIsTransparent(bool is_transparent) {
is_transparent_ = is_transparent;
}
-bool WebViewImpl::isTransparent() const {
+bool WebViewImpl::GetIsTransparent() const {
return is_transparent_;
}
@@ -1744,12 +1768,12 @@ void WebViewImpl::MediaPlayerActionAt(int x,
}
}
-void WebViewImpl::setIsActive(bool active) {
+void WebViewImpl::SetActive(bool active) {
if (page() && page()->focusController())
page()->focusController()->setActive(active);
}
-bool WebViewImpl::isActive() const {
+bool WebViewImpl::IsActive() {
return (page() && page()->focusController())
? page()->focusController()->isActive()
: false;
@@ -1873,10 +1897,10 @@ bool WebViewImpl::GetSpellingPanelVisibility() {
return spelling_panel_is_visible_;
}
-void WebViewImpl::setTabsToLinks(bool enable) {
+void WebViewImpl::SetTabsToLinks(bool enable) {
tabs_to_links_ = enable;
}
-bool WebViewImpl::tabsToLinks() const {
+bool WebViewImpl::GetTabsToLinks() const {
return tabs_to_links_;
}