<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[20035] S60/trunk/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20035">20035</a></dd>
<dt>Author</dt> <dd>brmorris</dd>
<dt>Date</dt> <dd>2007-03-07 15:11:39 -0800 (Wed, 07 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>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</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60trunkWebKitBrowserViewincWebKitLoaderh">S60/trunk/WebKit/BrowserView/inc/WebKitLoader.h</a></li>
<li><a href="#S60trunkWebKitBrowserViewsrcWebKitLoadercpp">S60/trunk/WebKit/BrowserView/src/WebKitLoader.cpp</a></li>
<li><a href="#S60trunkWebKitChangeLog">S60/trunk/WebKit/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60trunkWebKitBrowserViewincWebKitLoaderh"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/BrowserView/inc/WebKitLoader.h (20034 => 20035)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/BrowserView/inc/WebKitLoader.h 2007-03-07 23:08:49 UTC (rev 20034)
+++ S60/trunk/WebKit/BrowserView/inc/WebKitLoader.h 2007-03-07 23:11:39 UTC (rev 20035)
</span><span class="lines">@@ -429,9 +429,9 @@
</span><span class="cx"> * Return cert info
</span><span class="cx"> * Public Class Method
</span><span class="cx"> * @since 3.1
</span><del>- * @return
</del><ins>+ * @return TCertInfo*, however, if page is loaded from cache, return NULL
</ins><span class="cx"> */
</span><del>- const TCertInfo* CertInfo() { return iPageLoadListener->CertInfo(); }
</del><ins>+ const TCertInfo* CertInfo();
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Load favicon
</span></span></pre></div>
<a id="S60trunkWebKitBrowserViewsrcWebKitLoadercpp"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/BrowserView/src/WebKitLoader.cpp (20034 => 20035)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/BrowserView/src/WebKitLoader.cpp 2007-03-07 23:08:49 UTC (rev 20034)
+++ S60/trunk/WebKit/BrowserView/src/WebKitLoader.cpp 2007-03-07 23:11:39 UTC (rev 20035)
</span><span class="lines">@@ -1031,4 +1031,20 @@
</span><span class="cx"> return( iWebKitControl->CacheMode() == TBrCtlDefs::ECacheModeNoCache );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// ----------------------------------------------------------------------------
+// CWebKitLoader::CertInfo
+//
+// ----------------------------------------------------------------------------
+const TCertInfo* CWebKitLoader::CertInfo()
+ {
+ if (iLoadedFromCache)
+ {
+ //If load from cache, no connection, no valid cert
+ return NULL;
+ }
+ else
+ {
+ return iPageLoadListener->CertInfo();
+ }
+ }
</ins><span class="cx"> // End of File
</span></span></pre></div>
<a id="S60trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/ChangeLog (20034 => 20035)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/ChangeLog 2007-03-07 23:08:49 UTC (rev 20034)
+++ S60/trunk/WebKit/ChangeLog 2007-03-07 23:11:39 UTC (rev 20035)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+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):
+
</ins><span class="cx"> yaharon, reviewed by sachin, brad (for sdk build)
</span><span class="cx"> DESC: Take new graphics into use when displaying the url
</span><span class="cx"> http://bugs.webkit.org/show_bug.cgi?id=12977
</span></span></pre>
</div>
</div>
</body>
</html>