Title: [91425] branches/safari-534.51-branch/Source/WebCore
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (91424 => 91425)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-20 23:41:27 UTC (rev 91424)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-20 23:59:39 UTC (rev 91425)
@@ -1,5 +1,21 @@
2011-07-20 Lucas Forschler <[email protected]>
+ Merged 88277.
+
+ 2011-06-07 Abhishek Arya <[email protected]>
+
+ Reviewed by Dan Bernstein.
+
+ Replicate WidthIterator.cpp fix from r88139.
+ https://bugs.webkit.org/show_bug.cgi?id=62238
+
+ No new tests. Covered by existing layout tests on XP debug bots.
+
+ * platform/graphics/win/UniscribeController.cpp:
+ (WebCore::UniscribeController::advance):
+
+2011-07-20 Lucas Forschler <[email protected]>
+
Merged 88137.
2011-06-05 Kent Tamura <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/platform/graphics/win/UniscribeController.cpp (91424 => 91425)
--- branches/safari-534.51-branch/Source/WebCore/platform/graphics/win/UniscribeController.cpp 2011-07-20 23:41:27 UTC (rev 91424)
+++ branches/safari-534.51-branch/Source/WebCore/platform/graphics/win/UniscribeController.cpp 2011-07-20 23:59:39 UTC (rev 91425)
@@ -101,12 +101,12 @@
if (static_cast<int>(offset) > m_end)
offset = m_end;
- // Itemize the string.
- const UChar* cp = m_run.data(m_currentCharacter);
int length = offset - m_currentCharacter;
if (length <= 0)
return;
+ // Itemize the string.
+ const UChar* cp = m_run.data(m_currentCharacter);
unsigned baseCharacter = m_currentCharacter;
// We break up itemization of the string by fontData and (if needed) the use of small caps.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
