Changeset 20035 in webkit

Timestamp:

Mar 7, 2007 3:11:39 PM (17 years ago)

Author:

brmorris

Message:

yinxcai, reviewed by Yongjun

DESC: Browser: page info not shown correctly after going back to secure page HMNN-6YNH7J
​http://bugs.webkit.org/show_bug.cgi?id=12989

Location:

S60/trunk/WebKit

Files:

• BrowserView/inc/WebKitLoader.h (modified) (1 diff)
• BrowserView/src/WebKitLoader.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

S60/trunk/WebKit/BrowserView/inc/WebKitLoader.h

@@ -430 +430 @@
         * Public Class Method
         * @since 3.1
-        * @return
-        */
-        const TCertInfo* CertInfo() { return iPageLoadListener->CertInfo(); }
+        * @return TCertInfo*, however, if page is loaded from cache, return NULL
+        */
+        const TCertInfo* CertInfo();
 
         /**

S60/trunk/WebKit/BrowserView/src/WebKitLoader.cpp

@@ -1032 +1032 @@
     }
 
+// ----------------------------------------------------------------------------
+// CWebKitLoader::CertInfo
+//
+// ----------------------------------------------------------------------------
+const TCertInfo* CWebKitLoader::CertInfo()
+    {
+    if (iLoadedFromCache)
+        {
+        //If load from cache, no connection, no valid cert
+        return NULL;
+        }
+    else
+        { 
+        return iPageLoadListener->CertInfo(); 
+        }
+    } 
 //  End of File

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+yinxcai, reviewed by Yongjun
+ DESC: Browser: page info not shown correctly after going back to secure page HMNN-6YNH7J 
+ http://bugs.webkit.org/show_bug.cgi?id=12989
+
+        * BrowserView/inc/WebKitLoader.h:
+        * BrowserView/src/WebKitLoader.cpp:
+        (CWebKitLoader::CertInfo):
+
 yaharon, reviewed by sachin, brad (for sdk build)
  DESC: Take new graphics into use when displaying the url