Title: [99806] trunk/Source/WebCore
- Revision
- 99806
- Author
- kev...@webkit.org
- Date
- 2011-11-09 20:21:31 -0800 (Wed, 09 Nov 2011)
Log Message
[wx] Unreviewed build fix. Update how we hash the font after changes to the StringHasher APIs.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99805 => 99806)
--- trunk/Source/WebCore/ChangeLog 2011-11-10 04:17:53 UTC (rev 99805)
+++ trunk/Source/WebCore/ChangeLog 2011-11-10 04:21:31 UTC (rev 99806)
@@ -1,5 +1,13 @@
2011-11-09 Kevin Ollivier <kev...@theolliviers.com>
+ [wx] Unreviewed build fix. Update how we hash the font after
+ changes to the StringHasher APIs.
+
+ * platform/graphics/wx/FontPlatformDataWx.cpp:
+ (WebCore::FontPlatformData::computeHash):
+
+2011-11-09 Kevin Ollivier <kev...@theolliviers.com>
+
[wx] Unreviewed build fix. Remove from WebDOMEventTarget
bindings methods that have been removed from EventTarget.
Modified: trunk/Source/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp (99805 => 99806)
--- trunk/Source/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp 2011-11-10 04:17:53 UTC (rev 99805)
+++ trunk/Source/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp 2011-11-10 04:21:31 UTC (rev 99806)
@@ -122,13 +122,14 @@
// make a hash that is unique for this font, but not globally unique - that is,
// a font whose properties are equal should generate the same hash
+ const char* fontName = thisFont->GetFaceName().utf8_str();
uintptr_t hashCodes[6] = {
thisFont->GetPointSize(),
thisFont->GetFamily(),
thisFont->GetStyle(),
thisFont->GetWeight(),
- thisFont->GetUnderlined(),
- StringHasher::computeHash(thisFont->GetFaceName().utf8_str().data())
+ thisFont->GetUnderlined(),
+ (uintptr_t)thisFont
};
return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
