[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
eric at webkit.org
eric at webkit.org
Thu Dec 3 13:26:53 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 67de39850a2154d24ee5fa0feaaba10d168efefc
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 4 18:13:57 2009 +0000
2009-11-04 Vadim Zeitlin <vadim at wxwidgets.org>
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 <vadim at wxwidgets.org>
Reviewed by Eric Seidel.
[wx] Small cleanup: avoid unnecessary wxString::mb_str() calls.
* WebFrame.cpp:
(wxWebFrame::SetPageSource):
(wxWebFrame::LoadURL):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50516 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0b686ca..1d0b1d3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-04 Vadim Zeitlin <vadim at wxwidgets.org>
+
+ Reviewed by Eric Seidel.
+
+ [wx] Small cleanup: avoid unnecessary wxString::mb_str() calls.
+
+ * platform/graphics/wx/FontPlatformDataWx.cpp:
+ (WebCore::FontPlatformData::computeHash):
+
2009-11-04 Kelly Norton <knorton at google.com>
Reviewed by Pavel Feldman.
diff --git a/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp b/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp
index de92fcd..f600dd4 100644
--- a/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp
+++ b/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp
@@ -111,7 +111,7 @@ unsigned FontPlatformData::computeHash() const {
// a font whose properties are equal should generate the same hash
uintptr_t hashCodes[6] = { thisFont->GetPointSize(), thisFont->GetFamily(), thisFont->GetStyle(),
thisFont->GetWeight(), thisFont->GetUnderlined(),
- StringImpl::computeHash(thisFont->GetFaceName().mb_str(wxConvUTF8)) };
+ StringImpl::computeHash(thisFont->GetFaceName()) };
return StringImpl::computeHash(reinterpret_cast<UChar*>(hashCodes), sizeof(hashCodes) / sizeof(UChar));
}
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index a7bb44a..27d5101 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-04 Vadim Zeitlin <vadim at wxwidgets.org>
+
+ Reviewed by Eric Seidel.
+
+ [wx] Small cleanup: avoid unnecessary wxString::mb_str() calls.
+
+ * WebFrame.cpp:
+ (wxWebFrame::SetPageSource):
+ (wxWebFrame::LoadURL):
+
2009-10-30 Evan Stade <estade at chromium.org>
Reviewed by David Levin.
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index 9018d37..a497e65 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -146,9 +146,9 @@ wxString wxWebFrame::GetPageSource()
void wxWebFrame::SetPageSource(const wxString& source, const wxString& baseUrl)
{
if (m_impl->frame && m_impl->frame->loader()) {
- WebCore::KURL url(WebCore::KURL(), static_cast<const char*>(baseUrl.mb_str(wxConvUTF8)));
+ WebCore::KURL url(WebCore::KURL(), baseUrl);
- wxCharBuffer charBuffer(source.mb_str(wxConvUTF8));
+ const wxCharBuffer charBuffer(source.utf8_str());
const char* contents = charBuffer;
WTF::PassRefPtr<WebCore::SharedBuffer> sharedBuffer = WebCore::SharedBuffer::create(contents, strlen(contents));
@@ -206,7 +206,7 @@ bool wxWebFrame::FindString(const wxString& string, bool forward, bool caseSensi
void wxWebFrame::LoadURL(const wxString& url)
{
if (m_impl->frame && m_impl->frame->loader()) {
- WebCore::KURL kurl = WebCore::KURL(WebCore::KURL(), static_cast<const char*>(url.mb_str(wxConvUTF8)), WebCore::UTF8Encoding());
+ WebCore::KURL kurl = WebCore::KURL(WebCore::KURL(), url, WebCore::UTF8Encoding());
// NB: This is an ugly fix, but CURL won't load sub-resources if the
// protocol is omitted; sadly, it will not emit an error, either, so
// there's no way for us to catch this problem the correct way yet.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list