Changeset 24299 in webkit

Timestamp:

Jul 15, 2007, 6:44:46 PM (18 years ago)

Author:

ggaren

Message:

Reviewed by Maciej Stachowiak.

Removed incorrect error log, seen while running layout tests.

Perhaps at some point FrameLoadTypeInteral had a specific meaning
that prevented it from being used in non-child frame, non-redirect
situations. However, that meaning has been lost and nobody remembers
how to get it back.

We currently use FrameLoadTypeInternal for any load that is not
initiated by a user gesture, so it's trivial to produce this error
log, even though nothing has gone wrong.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::updateHistoryForInternalLoad):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-15  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+        
+        Removed incorrect error log, seen while running layout tests.
+        
+        Perhaps at some point FrameLoadTypeInteral had a specific meaning
+        that prevented it from being used in non-child frame, non-redirect
+        situations. However, that meaning has been lost and nobody remembers
+        how to get it back.
+        
+        We currently use FrameLoadTypeInternal for any load that is not
+        initiated by a user gesture, so it's trivial to produce this error
+        log, even though nothing has gone wrong.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::updateHistoryForInternalLoad):
+
 2007-07-15  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -4139 +4139 @@
         // Add an item to the item tree for this frame
         Frame* parentFrame = m_frame->tree()->parent();
-        // The only case where parentItem is NULL should be when a parent frame loaded an
-        // empty URL, which doesn't set up a current item in that parent.
-        if (parentFrame) {
-            if (parentFrame->loader()->m_currentHistoryItem)
-                parentFrame->loader()->m_currentHistoryItem->addChildItem(createHistoryItem(true));
-        } else {
-            // See 3556159. It's not clear if it's valid to be in FrameLoadTypeOnLoadEvent
-            // for a top-level frame, but that was a likely explanation for those crashes,
-            // so let's guard against it.
-            // ...and all FrameLoadTypeOnLoadEvent uses were folded to WebFrameLoadTypeInternal
-            LOG_ERROR("No parent frame in transitionToCommitted:, FrameLoadTypeInternal");
-        }
+        if (parentFrame && parentFrame->loader()->m_currentHistoryItem)
+            parentFrame->loader()->m_currentHistoryItem->addChildItem(createHistoryItem(true));
     }
 }