Changeset 18896 for S60/trunk/WebCore

Timestamp:

01/16/07 17:59:31 (2 years ago)

Author:

zbujtas

Message:

2007-01-16 w3liu <wei.liu@nokia.com>

Reviewed by Zalan Bujtas (zbujtas@gmail.com).
DESC: TSW Error ID: ELZG-6WUELW [S60] Browser is closed when attempting to cancel reloading saved deck.
http://bugs.webkit.org/show_bug.cgi?id=12292

WARNING: NO TEST CASES ADDED OR CHANGED

• bridge/WebCoreBridge.cpp: (CWebCoreBridge::GetPageDataL):

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/WebCoreBridge.cpp (modified) (1 diff)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-16  w3liu  <wei.liu@nokia.com>
+
+        Reviewed by Zalan Bujtas (zbujtas@gmail.com).
+        DESC: TSW Error ID: ELZG-6WUELW [S60] Browser is closed when attempting to cancel reloading saved deck.
+        http://bugs.webkit.org/show_bug.cgi?id=12292
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * bridge/WebCoreBridge.cpp:
+        (CWebCoreBridge::GetPageDataL):
+
 2007-01-16  yaharon  <yael.aharon@nokia.com>
 

S60/trunk/WebCore/bridge/WebCoreBridge.cpp

@@ -2105 +2105 @@
 {
     DOM::Document document = iPart->document();
-    khtml::DocLoader* loader = iPart->xmlDocImpl()->docLoader();
-    TPtrC ptrEncoding = iPart->encoding().Des();
+    khtml::DocLoader* loader = NULL;
+    if ( iPart->xmlDocImpl() )
+        {
+        loader = iPart->xmlDocImpl()->docLoader();
+        }
     User::LeaveIfNull( loader ); // if loader is null, we don't have a page loaded
     CArrayPtr<CWebCorePageDataItem>* itemArray =