diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 06:02:39 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 06:02:39 +0000 |
commit | efdb3e59f68fe34ef19dd6e52a5555e19f9b26b4 (patch) | |
tree | 717f7caca9e5b8191c0f1ff4cb1f3b00c0281e75 /webkit/glue/webhistoryitem_impl.cc | |
parent | 235df3ac876638d8f09eb62c6b8504446e19b63b (diff) | |
download | chromium_src-efdb3e59f68fe34ef19dd6e52a5555e19f9b26b4.zip chromium_src-efdb3e59f68fe34ef19dd6e52a5555e19f9b26b4.tar.gz chromium_src-efdb3e59f68fe34ef19dd6e52a5555e19f9b26b4.tar.bz2 |
Re-do r15244 again.
Originally reviewed at http://codereview.chromium.org/100353
Eliminate webkit/glue/webhistoryitem* in favor of adding a
NavigateBackForwardSoon method WebViewDelegate. This moves
all of the hacky details of how we intercept "history.{back,
forward,go}" into the webkit layer. My eventual plan is to
teach WebCore how to make this not hacky.
In this version of the CL, TestWebViewDelegate performs the
back/forward navigation directly in NavigateBackForwardSoon
instead of using PostTask to delay it. I'm doing this to
minimize regressions so that I can hopefully get the rest of
this CL landed.
I also already made the changes to WebKit to force history.
{back,forward,go} to be processed asynchronously.
BUG=11423
TBR=mpcomplete
Review URL: http://codereview.chromium.org/115288
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webhistoryitem_impl.cc')
-rw-r--r-- | webkit/glue/webhistoryitem_impl.cc | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/webkit/glue/webhistoryitem_impl.cc b/webkit/glue/webhistoryitem_impl.cc deleted file mode 100644 index c381eed..0000000 --- a/webkit/glue/webhistoryitem_impl.cc +++ /dev/null @@ -1,90 +0,0 @@ -/* - * 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 - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "webkit/glue/webhistoryitem_impl.h" - -#include "webkit/glue/glue_serialize.h" -#include "webkit/glue/glue_util.h" - -#include "base/compiler_specific.h" - -MSVC_PUSH_WARNING_LEVEL(0); -#include "HistoryItem.h" -MSVC_POP_WARNING(); - - -WebHistoryItem* WebHistoryItem::Create(const GURL& url, - const std::wstring& title, - const std::string& history_state, - WebRequest::ExtraData* extra_data) { - return new WebHistoryItemImpl(url, title, history_state, extra_data); -} - -WebHistoryItemImpl::WebHistoryItemImpl(const GURL& url, - const std::wstring& title, - const std::string& history_state, - WebRequest::ExtraData* extra_data) : - url_(url), - title_(title), - history_state_(history_state), - history_item_(NULL), - extra_data_(extra_data) { -} - -WebHistoryItemImpl::~WebHistoryItemImpl() { -} - -const std::wstring& WebHistoryItemImpl::GetTitle() const { - return title_; -} - -const std::string& WebHistoryItemImpl::GetHistoryState() const { - return history_state_; -} - -WebRequest::ExtraData* WebHistoryItemImpl::GetExtraData() const { - return extra_data_.get(); -} - -WebCore::HistoryItem* WebHistoryItemImpl::GetHistoryItem() const { - if (history_item_) - return history_item_.get(); - - if (history_state_.size() > 0) { - history_item_ = webkit_glue::HistoryItemFromString(history_state_); - } else { - history_item_ = WebCore::HistoryItem::create( - webkit_glue::StdStringToString(url_.spec()), - webkit_glue::StdWStringToString(title_), - 0.0); - } - - return history_item_.get(); -} - -const GURL& WebHistoryItemImpl::GetURL() const { - return url_; -} |