<!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>[24804] S60/trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/24804">24804</a></dd>
<dt>Author</dt> <dd>yongjzha</dd>
<dt>Date</dt> <dd>2007-08-01 09:53:12 -0700 (Wed, 01 Aug 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>w3liu, reviewed by <yongjun.zhang@nokia.com>
DESC: FPER-74HDN2: Strange character are shown instead of Chinese on www.sina.com.cn
http://bugs.webkit.org/show_bug.cgi?id=14830
WARNING: NO TEST CASES ADDED OR CHANGED
* khtml/khtml_part.cpp:
(KHTMLPart::write):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60trunkWebCoreChangeLog">S60/trunk/WebCore/ChangeLog</a></li>
<li><a href="#S60trunkWebCorekhtmlkhtml_partcpp">S60/trunk/WebCore/khtml/khtml_part.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebCore/ChangeLog (24803 => 24804)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebCore/ChangeLog 2007-08-01 04:30:42 UTC (rev 24803)
+++ S60/trunk/WebCore/ChangeLog 2007-08-01 16:53:12 UTC (rev 24804)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+w3liu, reviewed by <yongjun.zhang@nokia.com>
+ DESC: FPER-74HDN2: Strange character are shown instead of Chinese on www.sina.com.cn
+ http://bugs.webkit.org/show_bug.cgi?id=14830
+
+ WARNING: NO TEST CASES ADDED OR CHANGED
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::write):
+
</ins><span class="cx"> yadavall, reviewed by <Zalan>
</span><span class="cx"> DESC: Fixes for widget menu API
</span><span class="cx"> http://bugs.webkit.org/show_bug.cgi?id=14763
</span></span></pre></div>
<a id="S60trunkWebCorekhtmlkhtml_partcpp"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebCore/khtml/khtml_part.cpp (24803 => 24804)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebCore/khtml/khtml_part.cpp 2007-08-01 04:30:42 UTC (rev 24803)
+++ S60/trunk/WebCore/khtml/khtml_part.cpp 2007-08-01 16:53:12 UTC (rev 24804)
</span><span class="lines">@@ -1694,7 +1694,7 @@
</span><span class="cx"> {
</span><span class="cx"> if ( !d->m_decoder ) {
</span><span class="cx"> d->m_decoder = new Decoder;
</span><del>- if (!d->m_encoding.isNull())
</del><ins>+ if (!d->m_encoding.isNull() && d->m_encType!=Decoder::DefaultEncoding)
</ins><span class="cx"> d->m_decoder->setEncoding(d->m_encoding.latin1(), d->m_encType);
</span><span class="cx"> else {
</span><span class="cx"> // Inherit the default encoding from the parent frame if there is one.
</span></span></pre>
</div>
</div>
</body>
</html>