[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
joepeck at webkit.org
joepeck at webkit.org
Wed Dec 22 15:49:22 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 23159920d871a7e110394c0a8e27b1f9ef09df5a
Author: joepeck at webkit.org <joepeck at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Nov 13 01:39:39 2010 +0000
2010-11-12 Joseph Pecoraro <joepeck at webkit.org>
Reviewed by Alexey Proskuryakov.
Some FrameLoader.h Cleanup
https://bugs.webkit.org/show_bug.cgi?id=49484
Removed function signatures without any implementation. The functions
used to exist, and were nicely refactored into PageCache in r60688 and
the signatures were left behind.
Removed function signature setLoadType. Added in r17238 back when the
file was named WebFrameLoader, and the implementation was lost during
the transition from its mm implementation.
Removed function signature updateHistoryAfterClientRedirect. Implementation
and call points were removed in r18541 but the signature was left behind,
and jumped files!
Removed unused debug variable m_didDispatchDidCommitLoad. It was added
and used in Assertions in r28399. It was removed soon after, in r28464
because they were, "firing like crazy. Not sure why yet." It was
never used again.
Added const qualifier and moved interruptionForPolicyChangeError to
be more like its buddies.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::FrameLoader):
(WebCore::FrameLoader::checkLoadCompleteForThisFrame):
(WebCore::FrameLoader::interruptionForPolicyChangeError):
(WebCore::FrameLoader::dispatchDidCommitLoad):
* loader/FrameLoader.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71959 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a94c71a..51143be 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,37 @@
+2010-11-12 Joseph Pecoraro <joepeck at webkit.org>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Some FrameLoader.h Cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=49484
+
+ Removed function signatures without any implementation. The functions
+ used to exist, and were nicely refactored into PageCache in r60688 and
+ the signatures were left behind.
+
+ Removed function signature setLoadType. Added in r17238 back when the
+ file was named WebFrameLoader, and the implementation was lost during
+ the transition from its mm implementation.
+
+ Removed function signature updateHistoryAfterClientRedirect. Implementation
+ and call points were removed in r18541 but the signature was left behind,
+ and jumped files!
+
+ Removed unused debug variable m_didDispatchDidCommitLoad. It was added
+ and used in Assertions in r28399. It was removed soon after, in r28464
+ because they were, "firing like crazy. Not sure why yet." It was
+ never used again.
+
+ Added const qualifier and moved interruptionForPolicyChangeError to
+ be more like its buddies.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::FrameLoader):
+ (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+ (WebCore::FrameLoader::interruptionForPolicyChangeError):
+ (WebCore::FrameLoader::dispatchDidCommitLoad):
+ * loader/FrameLoader.h:
+
2010-11-12 Yael Aharon <yael.aharon at nokia.com>
Reviewed by David Hyatt.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 1f6b604..58113c2 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -202,9 +202,6 @@ FrameLoader::FrameLoader(Frame* frame, FrameLoaderClient* client)
, m_suppressOpenerInNewFrame(false)
, m_sandboxFlags(SandboxAll)
, m_forcedSandboxFlags(SandboxNone)
-#ifndef NDEBUG
- , m_didDispatchDidCommitLoad(false)
-#endif
{
}
@@ -1511,11 +1508,6 @@ bool FrameLoader::willLoadMediaElementURL(KURL& url)
return error.isNull();
}
-ResourceError FrameLoader::interruptionForPolicyChangeError(const ResourceRequest& request)
-{
- return m_client->interruptForPolicyChangeError(request);
-}
-
bool FrameLoader::shouldReloadToHandleUnreachableURL(DocumentLoader* docLoader)
{
KURL unreachableURL = docLoader->unreachableURL();
@@ -2414,9 +2406,6 @@ void FrameLoader::checkLoadCompleteForThisFrame()
return;
const ResourceError& error = dl->mainDocumentError();
-#ifndef NDEBUG
- m_didDispatchDidCommitLoad = false;
-#endif
if (!error.isNull())
m_client->dispatchDidFailLoad(error);
else
@@ -3300,6 +3289,11 @@ ResourceError FrameLoader::cannotShowURLError(const ResourceRequest& request) co
return m_client->cannotShowURLError(request);
}
+ResourceError FrameLoader::interruptionForPolicyChangeError(const ResourceRequest& request) const
+{
+ return m_client->interruptForPolicyChangeError(request);
+}
+
ResourceError FrameLoader::fileDoesNotExistError(const ResourceResponse& response) const
{
return m_client->fileDoesNotExistError(response);
@@ -3414,10 +3408,6 @@ void FrameLoader::dispatchDidCommitLoad()
if (m_stateMachine.creatingInitialEmptyDocument())
return;
-#ifndef NDEBUG
- m_didDispatchDidCommitLoad = true;
-#endif
-
m_client->dispatchDidCommitLoad();
#if ENABLE(INSPECTOR)
diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h
index 9ebef29..76ad977 100644
--- a/WebCore/loader/FrameLoader.h
+++ b/WebCore/loader/FrameLoader.h
@@ -167,7 +167,7 @@ public:
ResourceError fileDoesNotExistError(const ResourceResponse&) const;
ResourceError blockedError(const ResourceRequest&) const;
ResourceError cannotShowURLError(const ResourceRequest&) const;
- ResourceError interruptionForPolicyChangeError(const ResourceRequest&);
+ ResourceError interruptionForPolicyChangeError(const ResourceRequest&) const;
bool isHostedByObjectElement() const;
bool isLoadingMainFrame() const;
@@ -334,12 +334,6 @@ public:
NetworkingContext* networkingContext() const;
private:
- bool canCachePageContainingThisFrame();
-#ifndef NDEBUG
- void logCanCachePageDecision();
- bool logCanCacheFrameDecision(int indentLevel);
-#endif
-
void checkTimerFired(Timer<FrameLoader>*);
void navigateWithinDocument(HistoryItem*);
@@ -364,8 +358,6 @@ private:
void mainReceivedError(const ResourceError&, bool isComplete);
- void setLoadType(FrameLoadType);
-
static void callContinueLoadAfterNavigationPolicy(void*, const ResourceRequest&, PassRefPtr<FormState>, bool shouldContinue);
static void callContinueLoadAfterNewWindowPolicy(void*, const ResourceRequest&, PassRefPtr<FormState>, const String& frameName, const NavigationAction&, bool shouldContinue);
static void callContinueFragmentScrollAfterNavigationPolicy(void*, const ResourceRequest&, PassRefPtr<FormState>, bool shouldContinue);
@@ -387,8 +379,6 @@ private:
void closeOldDataSources();
void prepareForCachedPageRestore();
- void updateHistoryAfterClientRedirect();
-
bool shouldReloadToHandleUnreachableURL(DocumentLoader*);
void dispatchDidCommitLoad();
@@ -419,8 +409,6 @@ private:
void provisionalLoadStarted();
- bool canCachePage();
-
bool didOpenURL(const KURL&);
void scheduleCheckCompleted();
@@ -496,10 +484,6 @@ private:
SandboxFlags m_sandboxFlags;
SandboxFlags m_forcedSandboxFlags;
-#ifndef NDEBUG
- bool m_didDispatchDidCommitLoad;
-#endif
-
RefPtr<FrameNetworkingContext> m_networkingContext;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list