Changeset 27729 in webkit

Timestamp:

Nov 12, 2007 2:28:01 PM (16 years ago)

Author:

Darin Adler

Message:

Reviewed by Tim.

• ​http://bugs.webkit.org/show_bug.cgi?id=15947 speed up page loading a bit by inlining

• loader/FrameLoader.cpp: (WebCore::FrameLoader::isLocationChange): Factored out the slow case of isScheduledLocationChangePending into this.

• loader/FrameLoader.h: (WebCore::FrameLoader::isScheduledLocationChangePending): Added an inline check of the far and away most common case, where m_scheduledRedirection is 0; the rest is in the isLocationChange function.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)
• loader/FrameLoader.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-11-12  Darin Adler  <darin@apple.com>
+
+        Reviewed by Tim.
+
+        - http://bugs.webkit.org/show_bug.cgi?id=15947
+          speed up page loading a bit by inlining
+
+        * loader/FrameLoader.cpp: (WebCore::FrameLoader::isLocationChange):
+        Factored out the slow case of isScheduledLocationChangePending into this.
+
+        * loader/FrameLoader.h:
+        (WebCore::FrameLoader::isScheduledLocationChangePending): Added an
+        inline check of the far and away most common case, where m_scheduledRedirection
+        is 0; the rest is in the isLocationChange function.
+
 2007-11-12  George Staikos  <staikos@kde.org>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -1377 +1377 @@
 }
 
-bool FrameLoader::isScheduledLocationChangePending() const
-{
-    if (!m_scheduledRedirection)
-        return false;
-    switch (m_scheduledRedirection->type) {
+bool FrameLoader::isLocationChange(const ScheduledRedirection& redirection)
+{
+    switch (redirection.type) {
         case ScheduledRedirection::redirection:
             return false;

trunk/WebCore/loader/FrameLoader.h

@@ -299 +299 @@
         KURL dataURLBaseFromRequest(const ResourceRequest& request) const;
 
-        bool isScheduledLocationChangePending() const;
+        bool isScheduledLocationChangePending() const { return m_scheduledRedirection && isLocationChange(*m_scheduledRedirection); }
         void scheduleHTTPRedirection(double delay, const String& URL);
         void scheduleLocationChange(const String& URL, const String& referrer, bool lockHistory = true, bool userGesture = false);
@@ -561 +561 @@
         bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length);
 
+        static bool isLocationChange(const ScheduledRedirection&);
+
         Frame* m_frame;
         FrameLoaderClient* m_client;