<!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" />
<title>[50516] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/50516">50516</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2009-11-04 10:13:57 -0800 (Wed, 04 Nov 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-11-04  Vadim Zeitlin  &lt;vadim@wxwidgets.org&gt;

        Reviewed by Eric Seidel.

        [wx] Small cleanup: avoid unnecessary wxString::mb_str() calls.

        * platform/graphics/wx/FontPlatformDataWx.cpp:
        (WebCore::FontPlatformData::computeHash):
2009-11-04  Vadim Zeitlin  &lt;vadim@wxwidgets.org&gt;

        Reviewed by Eric Seidel.

        [wx] Small cleanup: avoid unnecessary wxString::mb_str() calls.

        * WebFrame.cpp:
        (wxWebFrame::SetPageSource):
        (wxWebFrame::LoadURL):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicswxFontPlatformDataWxcpp">trunk/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp</a></li>
<li><a href="#trunkWebKitwxChangeLog">trunk/WebKit/wx/ChangeLog</a></li>
<li><a href="#trunkWebKitwxWebFramecpp">trunk/WebKit/wx/WebFrame.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (50515 => 50516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-11-04 17:17:14 UTC (rev 50515)
+++ trunk/WebCore/ChangeLog        2009-11-04 18:13:57 UTC (rev 50516)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2009-11-04  Vadim Zeitlin  &lt;vadim@wxwidgets.org&gt;
+
+        Reviewed by Eric Seidel.
+
+        [wx] Small cleanup: avoid unnecessary wxString::mb_str() calls.
+
+        * platform/graphics/wx/FontPlatformDataWx.cpp:
+        (WebCore::FontPlatformData::computeHash):
+
</ins><span class="cx"> 2009-11-04  Kelly Norton  &lt;knorton@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Pavel Feldman.
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicswxFontPlatformDataWxcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp (50515 => 50516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp        2009-11-04 17:17:14 UTC (rev 50515)
+++ trunk/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp        2009-11-04 18:13:57 UTC (rev 50516)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">         // a font whose properties are equal should generate the same hash
</span><span class="cx">         uintptr_t hashCodes[6] = { thisFont-&gt;GetPointSize(), thisFont-&gt;GetFamily(), thisFont-&gt;GetStyle(), 
</span><span class="cx">                                     thisFont-&gt;GetWeight(), thisFont-&gt;GetUnderlined(), 
</span><del>-                                    StringImpl::computeHash(thisFont-&gt;GetFaceName().mb_str(wxConvUTF8)) };
</del><ins>+                                    StringImpl::computeHash(thisFont-&gt;GetFaceName()) };
</ins><span class="cx">         
</span><span class="cx">         return StringImpl::computeHash(reinterpret_cast&lt;UChar*&gt;(hashCodes), sizeof(hashCodes) / sizeof(UChar));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebKitwxChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/wx/ChangeLog (50515 => 50516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/wx/ChangeLog        2009-11-04 17:17:14 UTC (rev 50515)
+++ trunk/WebKit/wx/ChangeLog        2009-11-04 18:13:57 UTC (rev 50516)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2009-11-04  Vadim Zeitlin  &lt;vadim@wxwidgets.org&gt;
+
+        Reviewed by Eric Seidel.
+
+        [wx] Small cleanup: avoid unnecessary wxString::mb_str() calls.
+
+        * WebFrame.cpp:
+        (wxWebFrame::SetPageSource):
+        (wxWebFrame::LoadURL):
+
</ins><span class="cx"> 2009-10-30  Evan Stade  &lt;estade@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by David Levin.
</span></span></pre></div>
<a id="trunkWebKitwxWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/wx/WebFrame.cpp (50515 => 50516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/wx/WebFrame.cpp        2009-11-04 17:17:14 UTC (rev 50515)
+++ trunk/WebKit/wx/WebFrame.cpp        2009-11-04 18:13:57 UTC (rev 50516)
</span><span class="lines">@@ -146,9 +146,9 @@
</span><span class="cx"> void wxWebFrame::SetPageSource(const wxString&amp; source, const wxString&amp; baseUrl)
</span><span class="cx"> {
</span><span class="cx">     if (m_impl-&gt;frame &amp;&amp; m_impl-&gt;frame-&gt;loader()) {
</span><del>-        WebCore::KURL url(WebCore::KURL(), static_cast&lt;const char*&gt;(baseUrl.mb_str(wxConvUTF8)));
</del><ins>+        WebCore::KURL url(WebCore::KURL(), baseUrl);
</ins><span class="cx"> 
</span><del>-        wxCharBuffer charBuffer(source.mb_str(wxConvUTF8));
</del><ins>+        const wxCharBuffer charBuffer(source.utf8_str());
</ins><span class="cx">         const char* contents = charBuffer;
</span><span class="cx"> 
</span><span class="cx">         WTF::PassRefPtr&lt;WebCore::SharedBuffer&gt; sharedBuffer = WebCore::SharedBuffer::create(contents, strlen(contents));
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> void wxWebFrame::LoadURL(const wxString&amp; url)
</span><span class="cx"> {
</span><span class="cx">     if (m_impl-&gt;frame &amp;&amp; m_impl-&gt;frame-&gt;loader()) {
</span><del>-        WebCore::KURL kurl = WebCore::KURL(WebCore::KURL(), static_cast&lt;const char*&gt;(url.mb_str(wxConvUTF8)), WebCore::UTF8Encoding());
</del><ins>+        WebCore::KURL kurl = WebCore::KURL(WebCore::KURL(), url, WebCore::UTF8Encoding());
</ins><span class="cx">         // NB: This is an ugly fix, but CURL won't load sub-resources if the
</span><span class="cx">         // protocol is omitted; sadly, it will not emit an error, either, so
</span><span class="cx">         // there's no way for us to catch this problem the correct way yet.
</span></span></pre>
</div>
</div>

</body>
</html>