Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
2009-03-08 Cameron Zwarich <cwzwarich@uwaterloo.ca>
        Reviewed by Oliver Hunt.

        Remove the unused methods previousHistoryItem(), setPreviousHistoryItem()
        and provisionalHistoryItem() from FrameLoader.

        * WebCore.base.exp:
        * WebCore.order:
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::frameLoadCompleted):
        (WebCore::FrameLoader::loadItem):
        * loader/FrameLoader.h:


Canonical link: https://commits.webkit.org/33589@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41521 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Cameron Zwarich committed Mar 8, 2009
1 parent 89f53a2 commit d7b2dd1
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 22 deletions.
14 changes: 14 additions & 0 deletions WebCore/ChangeLog
@@ -1,3 +1,17 @@
2009-03-08 Cameron Zwarich <cwzwarich@uwaterloo.ca>

Reviewed by Oliver Hunt.

Remove the unused methods previousHistoryItem(), setPreviousHistoryItem()
and provisionalHistoryItem() from FrameLoader.

* WebCore.base.exp:
* WebCore.order:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::frameLoadCompleted):
(WebCore::FrameLoader::loadItem):
* loader/FrameLoader.h:

2009-03-08 Gustavo Noronha Silva <gns@gnome.org>

Reviewed by Holger Freyther.
Expand Down
1 change: 0 additions & 1 deletion WebCore/WebCore.base.exp
Expand Up @@ -159,7 +159,6 @@ __ZN7WebCore11FrameLoader20continueLoadWithDataEPNS_12SharedBufferERKNS_6StringE
__ZN7WebCore11FrameLoader21loadURLIntoChildFrameERKNS_4KURLERKNS_6StringEPNS_5FrameE
__ZN7WebCore11FrameLoader21setCurrentHistoryItemEN3WTF10PassRefPtrINS_11HistoryItemEEE
__ZN7WebCore11FrameLoader22findFrameForNavigationERKNS_12AtomicStringE
__ZN7WebCore11FrameLoader22setPreviousHistoryItemEN3WTF10PassRefPtrINS_11HistoryItemEEE
__ZN7WebCore11FrameLoader23timeOfLastCompletedLoadEv
__ZN7WebCore11FrameLoader24registerURLSchemeAsLocalERKNS_6StringE
__ZN7WebCore11FrameLoader25setProvisionalHistoryItemEN3WTF10PassRefPtrINS_11HistoryItemEEE
Expand Down
1 change: 0 additions & 1 deletion WebCore/WebCore.order
Expand Up @@ -509,7 +509,6 @@ __ZNK7WebCore11FrameLoader5stateEv
__ZNK7WebCore11FrameLoader17subframeIsLoadingEv
__ZN7WebCore11FrameLoader16markLoadCompleteEv
__ZN7WebCore11FrameLoader18frameLoadCompletedEv
__ZN7WebCore11FrameLoader22setPreviousHistoryItemEN3WTF10PassRefPtrINS_11HistoryItemEEE
__ZN7WebCore14DocumentLoader22stopRecordingResponsesEv
__ZN7WebCore11FrameLoader5beginERKNS_4KURLEbPNS_14SecurityOriginE
__ZN7WebCore11FrameLoader5clearEbb
Expand Down
19 changes: 2 additions & 17 deletions WebCore/loader/FrameLoader.cpp
Expand Up @@ -3373,7 +3373,7 @@ void FrameLoader::frameLoadCompleted()

// Even if already complete, we might have set a previous item on a frame that
// didn't do any data loading on the past transaction. Make sure to clear these out.
setPreviousHistoryItem(0);
m_previousHistoryItem = 0;

// After a canceled provisional load, firstLayoutDone is false.
// Reset it to true if we're displaying a page.
Expand Down Expand Up @@ -4851,33 +4851,18 @@ void FrameLoader::saveDocumentAndScrollState()
}
}

// FIXME: These 6 setter/getters are here for a dwindling number of users in WebKit, WebFrame
// FIXME: These 3 setter/getters are here for a dwindling number of users in WebKit, WebFrame
// being the primary one. After they're no longer needed there, they can be removed!
HistoryItem* FrameLoader::currentHistoryItem()
{
return m_currentHistoryItem.get();
}

HistoryItem* FrameLoader::previousHistoryItem()
{
return m_previousHistoryItem.get();
}

HistoryItem* FrameLoader::provisionalHistoryItem()
{
return m_provisionalHistoryItem.get();
}

void FrameLoader::setCurrentHistoryItem(PassRefPtr<HistoryItem> item)
{
m_currentHistoryItem = item;
}

void FrameLoader::setPreviousHistoryItem(PassRefPtr<HistoryItem> item)
{
m_previousHistoryItem = item;
}

void FrameLoader::setProvisionalHistoryItem(PassRefPtr<HistoryItem> item)
{
m_provisionalHistoryItem = item;
Expand Down
3 changes: 0 additions & 3 deletions WebCore/loader/FrameLoader.h
Expand Up @@ -407,10 +407,7 @@ namespace WebCore {
// FIXME: These accessors are here for a dwindling number of users in WebKit, WebFrame
// being the primary one. After they're no longer needed there, they can be removed!
HistoryItem* currentHistoryItem();
HistoryItem* previousHistoryItem();
HistoryItem* provisionalHistoryItem();
void setCurrentHistoryItem(PassRefPtr<HistoryItem>);
void setPreviousHistoryItem(PassRefPtr<HistoryItem>);
void setProvisionalHistoryItem(PassRefPtr<HistoryItem>);

void continueLoadWithData(SharedBuffer*, const String& mimeType, const String& textEncoding, const KURL&);
Expand Down

0 comments on commit d7b2dd1

Please sign in to comment.