Changeset 21333 in webkit

Timestamp:

May 9, 2007 7:00:26 AM (17 years ago)

Author:

yongjzha

Message:

2007-05-07 raalexan <​rasvan.alexandrescu@nokia.com>

Reviewed by Yongjun Zhang.
DESC: Browser back goes to the beginning of the previous page
​http://bugs.webkit.org/show_bug.cgi?id=13394
TSW ID : TMCN-6YDJDU

• BrowserView/src/LoadListeners.cpp: (CPageLoadListener::HeadersL):

Location:

S60/branches/3.1m/WebKit

Files:

• BrowserView/src/LoadListeners.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

S60/branches/3.1m/WebKit/BrowserView/src/LoadListeners.cpp

@@ -161 +161 @@
     // create new document only if
     if( headerInfo.HttpStatus() == EHttpOK )
-        {
+        {        
+        // Since the new page is loading fine, we should update the position of history
+        // the history list
+        iWebKitLoader->WebKitBridge().Frame().WebKitView().WebKitControl().HistoryController().UpdateCurrentEntryPosition();
+
+        //Reset all the flags in webkitview, do this only once
+        if (!iWebKitLoader->WebKitBridge().Frame().Parent())
+            {
+            iWebKitLoader->WebKitBridge().Frame().WebKitView().ResetFlags();
+            }
+
+        // Let the webcore know about the incoming data
+        // workaround for handling xhtml contents. webcore is able to
+        // parse xhtml contents but if we pass application/xhtml+xml type here, then
+        // it'll start xmlparsing it.
+        TPtrC contentType( headerInfo.ContentType() );
+
+        if( contentType.Find( KContentTypeApplicationXhtml ) == 0 )
+            {
+            //
+            contentType.Set( KContentTypeTextHtml );
+            }
+        CWebCoreBridge& bridge = iWebKitLoader->WebKitBridge().WebCoreBridge();
+
+        bridge.OpenURL( headerInfo.ResponseUrl(),
+            iWebKitLoader->IsReloading(), contentType, headerInfo.RefreshL(), headerInfo.LastModified() );
+
         // When the new page is loaded, the scroll position needs to be reset to (0,0) 
         // otherwise an unncessary draw() happens while changing the scrollposition to (0,0) 
@@ -167 +193 @@
         // TSW# SPIO-6W7GCZ
         iWebKitLoader->WebKitBridge().Frame().SetContentPosition(TPoint(0,0));
-        
-        // Since the new page is loading fine, we should update the position of history
-        // the history list
-        iWebKitLoader->WebKitBridge().Frame().WebKitView().WebKitControl().HistoryController().UpdateCurrentEntryPosition();
-
-        //Reset all the flags in webkitview, do this only once
-        if (!iWebKitLoader->WebKitBridge().Frame().Parent())
-            {
-            iWebKitLoader->WebKitBridge().Frame().WebKitView().ResetFlags();
-            }
-
-        // Let the webcore know about the incoming data
-        // workaround for handling xhtml contents. webcore is able to
-        // parse xhtml contents but if we pass application/xhtml+xml type here, then
-        // it'll start xmlparsing it.
-        TPtrC contentType( headerInfo.ContentType() );
-
-        if( contentType.Find( KContentTypeApplicationXhtml ) == 0 )
-            {
-            //
-            contentType.Set( KContentTypeTextHtml );
-            }
-        CWebCoreBridge& bridge = iWebKitLoader->WebKitBridge().WebCoreBridge();
-
-        bridge.OpenURL( headerInfo.ResponseUrl(),
-            iWebKitLoader->IsReloading(), contentType, headerInfo.RefreshL(), headerInfo.LastModified() );
 
         // certain broken operator proxies add ISO-8859-1 charset if

S60/branches/3.1m/WebKit/ChangeLog

@@ +1 @@
+2007-05-07  raalexan  <rasvan.alexandrescu@nokia.com>
+
+        Reviewed by Yongjun Zhang.
+        DESC: Browser back goes to the beginning of the previous page
+        http://bugs.webkit.org/show_bug.cgi?id=13394
+        TSW ID : TMCN-6YDJDU
+
+        * BrowserView/src/LoadListeners.cpp:
+        (CPageLoadListener::HeadersL):
+
 raalexan, reviewed by <sachin.padma@nokia.com>
  DESC:  Browser crashes while loading www.cnn.com