Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1248)

Unified Diff: Source/core/loader/HistoryController.cpp

Issue 20294002: Fix trailing whitespace in .cpp, .h, and .idl files (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/loader/HistoryController.h ('k') | Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/HistoryController.cpp
diff --git a/Source/core/loader/HistoryController.cpp b/Source/core/loader/HistoryController.cpp
index ea09e0b03ad1b72e3ee7890fc98d55c0a7a156b2..b6c163349c2219acae64498a17d9e3d9ae27ecf5 100644
--- a/Source/core/loader/HistoryController.cpp
+++ b/Source/core/loader/HistoryController.cpp
@@ -8,13 +8,13 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * 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.
+ * documentation and/or other materials provided with the distribution.
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -83,7 +83,7 @@ void HistoryController::clearScrollPositionAndViewState()
/*
There is a race condition between the layout and load completion that affects restoring the scroll position.
We try to restore the scroll position at both the first layout and upon load completion.
-
+
1) If first layout happens before the load completes, we want to restore the scroll position then so that the
first time we draw the page is already scrolled to the right place, instead of starting at the top and later
jumping down. It is possible that the old scroll position is past the part of the doc laid out so far, in
@@ -97,11 +97,11 @@ void HistoryController::restoreScrollPositionAndViewState()
return;
ASSERT(m_currentItem);
-
+
// FIXME: As the ASSERT attests, it seems we should always have a currentItem here.
// One counterexample is <rdar://problem/4917290>
// For now, to cover this issue in release builds, there is no technical harm to returning
- // early and from a user standpoint - as in the above radar - the previous page load failed
+ // early and from a user standpoint - as in the above radar - the previous page load failed
// so there *is* no scroll or view state to restore!
if (!m_currentItem)
return;
@@ -146,7 +146,7 @@ void HistoryController::saveDocumentState()
Document* document = m_frame->document();
ASSERT(document);
-
+
if (item->isCurrentDocument(document) && document->attached()) {
LOG(Loading, "WebCoreLoading %s: saving form state to %p", m_frame->tree()->uniqueName().string().utf8().data(), item);
item->setDocumentState(document->formElementsState());
@@ -182,9 +182,9 @@ static inline bool isAssociatedToRequestedHistoryItem(const HistoryItem* current
void HistoryController::restoreDocumentState()
{
Document* doc = m_frame->document();
-
+
HistoryItem* itemToRestore = 0;
-
+
switch (m_frame->loader()->loadType()) {
case FrameLoadTypeReload:
case FrameLoadTypeReloadFromOrigin:
@@ -195,9 +195,9 @@ void HistoryController::restoreDocumentState()
case FrameLoadTypeRedirectWithLockedBackForwardList:
case FrameLoadTypeInitialInChildFrame:
case FrameLoadTypeStandard:
- itemToRestore = m_currentItem.get();
+ itemToRestore = m_currentItem.get();
}
-
+
if (!itemToRestore)
return;
if (isAssociatedToRequestedHistoryItem(itemToRestore, m_frame, m_frame->loader()->requestedHistoryItem()) && !m_frame->loader()->documentLoader()->isClientRedirect()) {
@@ -223,7 +223,7 @@ bool HistoryController::shouldStopLoadingForHistoryItem(HistoryItem* targetItem)
void HistoryController::goToItem(HistoryItem* targetItem)
{
ASSERT(!m_frame->tree()->parent());
-
+
// shouldGoToHistoryItem is a private delegate method. This is needed to fix:
// <rdar://problem/3951283> can view pages from the back/forward cache that should be disallowed by Parental Controls
// Ultimately, history item navigations should go through the policy delegate. That's covered in:
@@ -527,11 +527,11 @@ void HistoryController::initializeItem(HistoryItem* item)
// deal with such things, so we nip that in the bud here.
// Later we may want to learn to live with nil for URL.
// See bug 3368236 and related bugs for more information.
- if (url.isEmpty())
+ if (url.isEmpty())
url = blankURL();
if (originalURL.isEmpty())
originalURL = blankURL();
-
+
Frame* parentFrame = m_frame->tree()->parent();
String parent = parentFrame ? parentFrame->tree()->uniqueName() : "";
StringWithDirection title = documentLoader->title();
@@ -551,12 +551,12 @@ PassRefPtr<HistoryItem> HistoryController::createItem()
{
RefPtr<HistoryItem> item = HistoryItem::create();
initializeItem(item.get());
-
+
// Set the item for which we will save document state
m_frameLoadComplete = false;
m_previousItem = m_currentItem;
m_currentItem = item;
-
+
return item.release();
}
@@ -668,25 +668,25 @@ bool HistoryController::currentFramesMatchItem(HistoryItem* item) const
{
if ((!m_frame->tree()->uniqueName().isEmpty() || !item->target().isEmpty()) && m_frame->tree()->uniqueName() != item->target())
return false;
-
+
const HistoryItemVector& childItems = item->children();
if (childItems.size() != m_frame->tree()->childCount())
return false;
-
+
unsigned size = childItems.size();
for (unsigned i = 0; i < size; ++i) {
if (!m_frame->tree()->child(childItems[i]->target()))
return false;
}
-
+
return true;
}
void HistoryController::updateBackForwardListClippedAtTarget(bool doClip)
{
- // In the case of saving state about a page with frames, we store a tree of items that mirrors the frame tree.
- // The item that was the target of the user's navigation is designated as the "targetItem".
- // When this function is called with doClip=true we're able to create the whole tree except for the target's children,
+ // In the case of saving state about a page with frames, we store a tree of items that mirrors the frame tree.
+ // The item that was the target of the user's navigation is designated as the "targetItem".
+ // When this function is called with doClip=true we're able to create the whole tree except for the target's children,
// which will be loaded in the future. That part of the tree will be filled out as the child loads are committed.
Page* page = m_frame->page();
@@ -739,7 +739,7 @@ void HistoryController::pushState(PassRefPtr<SerializedScriptValue> stateObject,
// Get a HistoryItem tree for the current frame tree.
RefPtr<HistoryItem> topItem = page->mainFrame()->loader()->history()->createItemTree(m_frame, false);
-
+
// Override data in the current item (created by createItemTree) to reflect
// the pushState() arguments.
m_currentItem->setTitle(title);
« no previous file with comments | « Source/core/loader/HistoryController.h ('k') | Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698