Title: [152456] trunk/Source/WebCore
- Revision
- 152456
- Author
- [email protected]
- Date
- 2013-07-08 10:07:07 -0700 (Mon, 08 Jul 2013)
Log Message
Unreviewed, rolling out r152416.
http://trac.webkit.org/changeset/152416
https://bugs.webkit.org/show_bug.cgi?id=118476
Wrong fix for the bug (Requested by ap on #webkit).
* platform/text/TextEncodingRegistry.cpp:
(WebCore::newTextCodec):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152455 => 152456)
--- trunk/Source/WebCore/ChangeLog 2013-07-08 15:57:38 UTC (rev 152455)
+++ trunk/Source/WebCore/ChangeLog 2013-07-08 17:07:07 UTC (rev 152456)
@@ -1,3 +1,14 @@
+2013-07-08 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r152416.
+ http://trac.webkit.org/changeset/152416
+ https://bugs.webkit.org/show_bug.cgi?id=118476
+
+ Wrong fix for the bug (Requested by ap on #webkit).
+
+ * platform/text/TextEncodingRegistry.cpp:
+ (WebCore::newTextCodec):
+
2013-07-08 Andreas Kling <[email protected]>
REGRESSION(r125294): A style rule with more than 8192 selectors can cause style corruption.
Modified: trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp (152455 => 152456)
--- trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2013-07-08 15:57:38 UTC (rev 152455)
+++ trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2013-07-08 17:07:07 UTC (rev 152456)
@@ -310,14 +310,9 @@
PassOwnPtr<TextCodec> newTextCodec(const TextEncoding& encoding)
{
MutexLocker lock(encodingRegistryMutex());
+
ASSERT(textCodecMap);
TextCodecFactory factory = textCodecMap->get(encoding.name());
-
- if (factory.function)
- return factory.function(encoding, factory.additionalData);
-
- // If encoding is unavailable, we use Latin1 encoding.
- factory = textCodecMap->get("ISO-8859-1");
ASSERT(factory.function);
return factory.function(encoding, factory.additionalData);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
