Changeset 40627 in webkit

Timestamp:

Feb 4, 2009 1:12:26 PM (15 years ago)

Author:

sfalken@apple.com

Message:

Merge r40365.

Location:

branches/Safari-6528/WebKit/win

Files:

• . (modified) (1 prop)
• ChangeLog (modified) (1 diff)
• WebCoreSupport (modified) (1 prop)
• WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)

branches/Safari-6528/WebKit/win/ChangeLog

@@ +1 @@
+2009-02-04  Steve Falkenburg  <sfalken@apple.com>
+    
+        Merge r40365.
+
+    2009-01-29  Adam Roben  <aroben@apple.com>
+
+        Build fix after r40353
+
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::loadURLIntoChild): Removed the check for
+        FrameLoadTypeReloadAllowingStaleData.
+
 2009-02-04  Steve Falkenburg  <sfalken@apple.com>
     

branches/Safari-6528/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -605 +605 @@
     // of this child frame with whatever was there at that point.
     // Reload will maintain the frame contents, LoadSame will not.
-    if (parentItem && parentItem->children().size() &&
-        (isBackForwardLoadType(loadType)
-         || loadType == FrameLoadTypeReloadAllowingStaleData))
-    {
+    if (parentItem && parentItem->children().size() && isBackForwardLoadType(loadType)) {
         if (HistoryItem* childItem = parentItem->childItemWithName(core(childFrame)->tree()->name())) {
             // Use the original URL to ensure we get all the side-effects, such as