<!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>[189465] trunk/Source/WebCore</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/189465">189465</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-09-07 10:42:50 -0700 (Mon, 07 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unneeded offset and length arguments from glyph page filling functions
https://bugs.webkit.org/show_bug.cgi?id=148929
Reviewed by Andreas Kling.
They are always passed 0/GlyphPage::size.
* platform/graphics/Font.cpp:
(WebCore::Font::~Font):
(WebCore::fillGlyphPage):
(WebCore::createAndFillGlyphPage):
* platform/graphics/Font.h:
* platform/graphics/GlyphPage.h:
(WebCore::GlyphPage::setGlyphDataForIndex):
* platform/graphics/mac/GlyphPageMac.cpp:
(WebCore::GlyphPage::mayUseMixedFontsWhenFilling):
(WebCore::GlyphPage::fill):
* platform/graphics/win/GlyphPageTreeNodeCGWin.cpp:
(WebCore::GlyphPage::fill):
* platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp:
(WebCore::GlyphPage::fill):
* svg/SVGFontData.cpp:
(WebCore::SVGFontData::applySVGGlyphSelection):
(WebCore::SVGFontData::fillSVGGlyphPage):
(WebCore::SVGFontData::fillBMPGlyphs):
(WebCore::SVGFontData::fillNonBMPGlyphs):
* svg/SVGFontData.h:
(WebCore::SVGFontData::verticalAdvanceY):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontcpp">trunk/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFonth">trunk/Source/WebCore/platform/graphics/Font.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGlyphPageh">trunk/Source/WebCore/platform/graphics/GlyphPage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfreetypeGlyphPageTreeNodeFreeTypecpp">trunk/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGlyphPageMaccpp">trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopentypeOpenTypeVerticalDatacpp">trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopentypeOpenTypeVerticalDatah">trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinGlyphPageTreeNodeCGWincpp">trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCGWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinGlyphPageTreeNodeCairoWincpp">trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFontDatacpp">trunk/Source/WebCore/svg/SVGFontData.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFontDatah">trunk/Source/WebCore/svg/SVGFontData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189464 => 189465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-07 12:34:42 UTC (rev 189464)
+++ trunk/Source/WebCore/ChangeLog 2015-09-07 17:42:50 UTC (rev 189465)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-09-07 Antti Koivisto <antti@apple.com>
+
+ Remove unneeded offset and length arguments from glyph page filling functions
+ https://bugs.webkit.org/show_bug.cgi?id=148929
+
+ Reviewed by Andreas Kling.
+
+ They are always passed 0/GlyphPage::size.
+
+ * platform/graphics/Font.cpp:
+ (WebCore::Font::~Font):
+ (WebCore::fillGlyphPage):
+ (WebCore::createAndFillGlyphPage):
+ * platform/graphics/Font.h:
+ * platform/graphics/GlyphPage.h:
+ (WebCore::GlyphPage::setGlyphDataForIndex):
+ * platform/graphics/mac/GlyphPageMac.cpp:
+ (WebCore::GlyphPage::mayUseMixedFontsWhenFilling):
+ (WebCore::GlyphPage::fill):
+ * platform/graphics/win/GlyphPageTreeNodeCGWin.cpp:
+ (WebCore::GlyphPage::fill):
+ * platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp:
+ (WebCore::GlyphPage::fill):
+ * svg/SVGFontData.cpp:
+ (WebCore::SVGFontData::applySVGGlyphSelection):
+ (WebCore::SVGFontData::fillSVGGlyphPage):
+ (WebCore::SVGFontData::fillBMPGlyphs):
+ (WebCore::SVGFontData::fillNonBMPGlyphs):
+ * svg/SVGFontData.h:
+ (WebCore::SVGFontData::verticalAdvanceY):
+
</ins><span class="cx"> 2015-09-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> dispatchEvent() should throw an InvalidStateError if the event's initialized flag is not set
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (189464 => 189465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.cpp 2015-09-07 12:34:42 UTC (rev 189464)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2015-09-07 17:42:50 UTC (rev 189465)
</span><span class="lines">@@ -149,16 +149,16 @@
</span><span class="cx"> removeFromSystemFallbackCache();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool fillGlyphPage(GlyphPage& pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font* font)
</del><ins>+static bool fillGlyphPage(GlyphPage& pageToFill, UChar* buffer, unsigned bufferLength, const Font* font)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> if (auto* svgData = font->svgData())
</span><del>- return svgData->fillSVGGlyphPage(&pageToFill, offset, length, buffer, bufferLength, font);
</del><ins>+ return svgData->fillSVGGlyphPage(&pageToFill, buffer, bufferLength, font);
</ins><span class="cx"> #endif
</span><del>- bool hasGlyphs = pageToFill.fill(offset, length, buffer, bufferLength, font);
</del><ins>+ bool hasGlyphs = pageToFill.fill(buffer, bufferLength, font);
</ins><span class="cx"> #if ENABLE(OPENTYPE_VERTICAL)
</span><span class="cx"> if (hasGlyphs && font->verticalData())
</span><del>- font->verticalData()->substituteWithVerticalGlyphs(font, &pageToFill, offset, length);
</del><ins>+ font->verticalData()->substituteWithVerticalGlyphs(font, &pageToFill);
</ins><span class="cx"> #endif
</span><span class="cx"> return hasGlyphs;
</span><span class="cx"> }
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> else
</span><span class="cx"> glyphPage = GlyphPage::createForSingleFont(font);
</span><span class="cx">
</span><del>- bool haveGlyphs = fillGlyphPage(*glyphPage, 0, GlyphPage::size, buffer, bufferLength, font);
</del><ins>+ bool haveGlyphs = fillGlyphPage(*glyphPage, buffer, bufferLength, font);
</ins><span class="cx"> if (!haveGlyphs)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.h (189464 => 189465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.h 2015-09-07 12:34:42 UTC (rev 189464)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2015-09-07 17:42:50 UTC (rev 189465)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void initializeFont(Font*, float fontSize) = 0;
</span><span class="cx"> virtual float widthForSVGGlyph(Glyph, float fontSize) const = 0;
</span><del>- virtual bool fillSVGGlyphPage(GlyphPage*, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font*) const = 0;
</del><ins>+ virtual bool fillSVGGlyphPage(GlyphPage*, UChar* buffer, unsigned bufferLength, const Font*) const = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Used to create platform fonts.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGlyphPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GlyphPage.h (189464 => 189465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GlyphPage.h 2015-09-07 12:34:42 UTC (rev 189464)
+++ trunk/Source/WebCore/platform/graphics/GlyphPage.h 2015-09-07 17:42:50 UTC (rev 189465)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Implemented by the platform.
</span><del>- bool fill(unsigned offset, unsigned length, UChar* characterBuffer, unsigned bufferLength, const Font*);
</del><ins>+ bool fill(UChar* characterBuffer, unsigned bufferLength, const Font*);
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> static bool mayUseMixedFontsWhenFilling(const UChar* characterBuffer, unsigned bufferLength, const Font*);
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeGlyphPageTreeNodeFreeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp (189464 => 189465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp 2015-09-07 12:34:42 UTC (rev 189464)
+++ trunk/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp 2015-09-07 17:42:50 UTC (rev 189465)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font* fontData)
</del><ins>+bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
</ins><span class="cx"> {
</span><span class="cx"> cairo_scaled_font_t* scaledFont = fontData->platformData().scaledFont();
</span><span class="cx"> ASSERT(scaledFont);
</span><span class="lines">@@ -50,16 +50,16 @@
</span><span class="cx">
</span><span class="cx"> bool haveGlyphs = false;
</span><span class="cx"> UTF16UChar32Iterator iterator(buffer, bufferLength);
</span><del>- for (unsigned i = 0; i < length; i++) {
</del><ins>+ for (unsigned i = 0; i < GlyphPage::size; i++) {
</ins><span class="cx"> UChar32 character = iterator.next();
</span><span class="cx"> if (character == iterator.end())
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> Glyph glyph = FcFreeTypeCharIndex(face, character);
</span><span class="cx"> if (!glyph)
</span><del>- setGlyphDataForIndex(offset + i, 0, 0);
</del><ins>+ setGlyphDataForIndex(i, 0, 0);
</ins><span class="cx"> else {
</span><del>- setGlyphDataForIndex(offset + i, glyph, fontData);
</del><ins>+ setGlyphDataForIndex(i, glyph, fontData);
</ins><span class="cx"> haveGlyphs = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGlyphPageMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp (189464 => 189465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2015-09-07 12:34:42 UTC (rev 189464)
+++ trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2015-09-07 17:42:50 UTC (rev 189465)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font* fontData)
</del><ins>+bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
</ins><span class="cx"> {
</span><span class="cx"> bool haveGlyphs = false;
</span><span class="cx">
</span><span class="lines">@@ -82,11 +82,11 @@
</span><span class="cx"> // we pass in must be 512. If we get back more than 256 glyphs though we'll ignore all the ones after 256,
</span><span class="cx"> // this should not happen as the only time we pass in 512 characters is when they are surrogates.
</span><span class="cx"> CGFontGetGlyphsForUnichars(fontData->platformData().cgFont(), buffer, glyphs.data(), bufferLength);
</span><del>- for (unsigned i = 0; i < length; ++i) {
</del><ins>+ for (unsigned i = 0; i < GlyphPage::size; ++i) {
</ins><span class="cx"> if (!glyphs[i])
</span><del>- setGlyphDataForIndex(offset + i, 0, 0);
</del><ins>+ setGlyphDataForIndex(i, 0, 0);
</ins><span class="cx"> else {
</span><del>- setGlyphDataForIndex(offset + i, glyphs[i], fontData);
</del><ins>+ setGlyphDataForIndex(i, glyphs[i], fontData);
</ins><span class="cx"> haveGlyphs = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -99,13 +99,13 @@
</span><span class="cx"> CTFontGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength);
</span><span class="cx"> // When buffer consists of surrogate pairs, CTFontGetVerticalGlyphsForCharacters and CTFontGetGlyphsForCharacters
</span><span class="cx"> // place the glyphs at indices corresponding to the first character of each pair.
</span><del>- ASSERT(!(bufferLength % length) && (bufferLength / length == 1 || bufferLength / length == 2));
- unsigned glyphStep = bufferLength / length;
- for (unsigned i = 0; i < length; ++i) {
</del><ins>+ ASSERT(bufferLength == GlyphPage::size || bufferLength == 2 * GlyphPage::size);
+ unsigned glyphStep = bufferLength / GlyphPage::size;
+ for (unsigned i = 0; i < GlyphPage::size; ++i) {
</ins><span class="cx"> if (!glyphs[i * glyphStep])
</span><del>- setGlyphDataForIndex(offset + i, 0, 0);
</del><ins>+ setGlyphDataForIndex(i, 0, 0);
</ins><span class="cx"> else {
</span><del>- setGlyphDataForIndex(offset + i, glyphs[i * glyphStep], fontData);
</del><ins>+ setGlyphDataForIndex(i, glyphs[i * glyphStep], fontData);
</ins><span class="cx"> haveGlyphs = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopentypeOpenTypeVerticalDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp (189464 => 189465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp 2015-09-07 12:34:42 UTC (rev 189464)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp 2015-09-07 17:42:50 UTC (rev 189465)
</span><span class="lines">@@ -535,13 +535,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void OpenTypeVerticalData::substituteWithVerticalGlyphs(const Font* font, GlyphPage* glyphPage, unsigned offset, unsigned length) const
</del><ins>+void OpenTypeVerticalData::substituteWithVerticalGlyphs(const Font* font, GlyphPage* glyphPage) const
</ins><span class="cx"> {
</span><span class="cx"> const HashMap<Glyph, Glyph>& map = m_verticalGlyphMap;
</span><span class="cx"> if (map.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (unsigned index = offset, end = offset + length; index < end; ++index) {
</del><ins>+ for (unsigned index = 0; index < GlyphPage::size; ++index) {
</ins><span class="cx"> Glyph glyph = glyphPage->glyphAt(index);
</span><span class="cx"> if (glyph) {
</span><span class="cx"> ASSERT(glyphPage->glyphDataForIndex(index).font == font);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopentypeOpenTypeVerticalDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.h (189464 => 189465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.h 2015-09-07 12:34:42 UTC (rev 189464)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.h 2015-09-07 17:42:50 UTC (rev 189465)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> bool hasVerticalMetrics() const { return !m_advanceHeights.isEmpty(); }
</span><span class="cx"> float advanceHeight(const Font*, Glyph) const;
</span><span class="cx"> void getVerticalTranslationsForGlyphs(const Font*, const Glyph*, size_t, float* outXYArray) const;
</span><del>- void substituteWithVerticalGlyphs(const Font*, GlyphPage*, unsigned offset, unsigned length) const;
</del><ins>+ void substituteWithVerticalGlyphs(const Font*, GlyphPage*) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit OpenTypeVerticalData(const FontPlatformData&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinGlyphPageTreeNodeCGWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCGWin.cpp (189464 => 189465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCGWin.cpp 2015-09-07 12:34:42 UTC (rev 189464)
+++ trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCGWin.cpp 2015-09-07 17:42:50 UTC (rev 189465)
</span><span class="lines">@@ -34,22 +34,22 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font* fontData)
</del><ins>+bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
</ins><span class="cx"> {
</span><span class="cx"> // bufferLength will be greater than the requested number of glyphs if the buffer contains surrogate pairs.
</span><span class="cx"> // We won't support this for now.
</span><del>- if (bufferLength > length)
</del><ins>+ if (bufferLength > GlyphPage::size)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool haveGlyphs = false;
</span><span class="cx"> CGGlyph localGlyphBuffer[GlyphPage::size];
</span><span class="cx"> wkGetGlyphs(fontData->platformData().cgFont(), buffer, localGlyphBuffer, bufferLength);
</span><del>- for (unsigned i = 0; i < length; i++) {
</del><ins>+ for (unsigned i = 0; i < GlyphPage::size; i++) {
</ins><span class="cx"> Glyph glyph = localGlyphBuffer[i];
</span><span class="cx"> if (!glyph)
</span><del>- setGlyphDataForIndex(offset + i, 0, 0);
</del><ins>+ setGlyphDataForIndex(i, 0, 0);
</ins><span class="cx"> else {
</span><del>- setGlyphDataForIndex(offset + i, glyph, fontData);
</del><ins>+ setGlyphDataForIndex(i, glyph, fontData);
</ins><span class="cx"> haveGlyphs = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinGlyphPageTreeNodeCairoWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp (189464 => 189465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp 2015-09-07 12:34:42 UTC (rev 189464)
+++ trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp 2015-09-07 17:42:50 UTC (rev 189465)
</span><span class="lines">@@ -34,11 +34,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font* fontData)
</del><ins>+bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
</ins><span class="cx"> {
</span><span class="cx"> // bufferLength will be greater than the requested number of glyphs if the buffer contains surrogate pairs.
</span><span class="cx"> // We won't support this for now.
</span><del>- if (bufferLength > length)
</del><ins>+ if (bufferLength > GlyphPage::size)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool haveGlyphs = false;
</span><span class="lines">@@ -51,12 +51,12 @@
</span><span class="cx"> DWORD result = GetGlyphIndices(dc, buffer, bufferLength, localGlyphBuffer, GGI_MARK_NONEXISTING_GLYPHS);
</span><span class="cx"> bool success = result != GDI_ERROR && static_cast<unsigned>(result) == bufferLength;
</span><span class="cx"> if (success) {
</span><del>- for (unsigned i = 0; i < length; i++) {
</del><ins>+ for (unsigned i = 0; i < GlyphPage::size; i++) {
</ins><span class="cx"> Glyph glyph = localGlyphBuffer[i];
</span><span class="cx"> if (glyph == 0xffff)
</span><del>- setGlyphDataForIndex(offset + i, 0, 0);
</del><ins>+ setGlyphDataForIndex(i, 0, 0);
</ins><span class="cx"> else {
</span><del>- setGlyphDataForIndex(offset + i, glyph, fontData);
</del><ins>+ setGlyphDataForIndex(i, glyph, fontData);
</ins><span class="cx"> haveGlyphs = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontData.cpp (189464 => 189465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontData.cpp 2015-09-07 12:34:42 UTC (rev 189464)
+++ trunk/Source/WebCore/svg/SVGFontData.cpp 2015-09-07 17:42:50 UTC (rev 189465)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGFontData::fillSVGGlyphPage(GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font* font) const
</del><ins>+bool SVGFontData::fillSVGGlyphPage(GlyphPage* pageToFill, UChar* buffer, unsigned bufferLength, const Font* font) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(font->isCustomFont());
</span><span class="cx"> ASSERT(font->isSVGFont());
</span><span class="lines">@@ -215,22 +215,22 @@
</span><span class="cx"> SVGFontElement* fontElement = fontFaceElement->associatedFontElement();
</span><span class="cx"> ASSERT(fontElement);
</span><span class="cx">
</span><del>- if (bufferLength == length)
- return fillBMPGlyphs(fontElement, pageToFill, offset, length, buffer, font);
</del><ins>+ if (bufferLength == GlyphPage::size)
+ return fillBMPGlyphs(fontElement, pageToFill, buffer, font);
</ins><span class="cx">
</span><del>- ASSERT(bufferLength == 2 * length);
- return fillNonBMPGlyphs(fontElement, pageToFill, offset, length, buffer, font);
</del><ins>+ ASSERT(bufferLength == 2 * GlyphPage::size);
+ return fillNonBMPGlyphs(fontElement, pageToFill, buffer, font);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGFontData::fillBMPGlyphs(SVGFontElement* fontElement, GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, const Font* font) const
</del><ins>+bool SVGFontData::fillBMPGlyphs(SVGFontElement* fontElement, GlyphPage* pageToFill, UChar* buffer, const Font* font) const
</ins><span class="cx"> {
</span><span class="cx"> bool haveGlyphs = false;
</span><span class="cx"> Vector<SVGGlyph> glyphs;
</span><del>- for (unsigned i = 0; i < length; ++i) {
</del><ins>+ for (unsigned i = 0; i < GlyphPage::size; ++i) {
</ins><span class="cx"> String lookupString(buffer + i, 1);
</span><span class="cx"> fontElement->collectGlyphsForString(lookupString, glyphs);
</span><span class="cx"> if (glyphs.isEmpty()) {
</span><del>- pageToFill->setGlyphDataForIndex(offset + i, 0, 0);
</del><ins>+ pageToFill->setGlyphDataForIndex(i, 0, 0);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -239,23 +239,23 @@
</span><span class="cx"> // care of matching to the correct glyph, if multiple ones are available, as that's
</span><span class="cx"> // only possible within the context of a string (eg. arabic form matching).
</span><span class="cx"> haveGlyphs = true;
</span><del>- pageToFill->setGlyphDataForIndex(offset + i, glyphs.first().tableEntry, font);
</del><ins>+ pageToFill->setGlyphDataForIndex(i, glyphs.first().tableEntry, font);
</ins><span class="cx"> glyphs.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return haveGlyphs;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGFontData::fillNonBMPGlyphs(SVGFontElement* fontElement, GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, const Font* font) const
</del><ins>+bool SVGFontData::fillNonBMPGlyphs(SVGFontElement* fontElement, GlyphPage* pageToFill, UChar* buffer, const Font* font) const
</ins><span class="cx"> {
</span><span class="cx"> bool haveGlyphs = false;
</span><span class="cx"> Vector<SVGGlyph> glyphs;
</span><del>- for (unsigned i = 0; i < length; ++i) {
</del><ins>+ for (unsigned i = 0; i < GlyphPage::size; ++i) {
</ins><span class="cx"> // Each character here consists of a surrogate pair
</span><span class="cx"> String lookupString(buffer + i * 2, 2);
</span><span class="cx"> fontElement->collectGlyphsForString(lookupString, glyphs);
</span><span class="cx"> if (glyphs.isEmpty()) {
</span><del>- pageToFill->setGlyphDataForIndex(offset + i, 0, 0);
</del><ins>+ pageToFill->setGlyphDataForIndex(i, 0, 0);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> // care of matching to the correct glyph, if multiple ones are available, as that's
</span><span class="cx"> // only possible within the context of a string (eg. arabic form matching).
</span><span class="cx"> haveGlyphs = true;
</span><del>- pageToFill->setGlyphDataForIndex(offset + i, glyphs.first().tableEntry, font);
</del><ins>+ pageToFill->setGlyphDataForIndex(i, glyphs.first().tableEntry, font);
</ins><span class="cx"> glyphs.clear();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontData.h (189464 => 189465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontData.h 2015-09-07 12:34:42 UTC (rev 189464)
+++ trunk/Source/WebCore/svg/SVGFontData.h 2015-09-07 17:42:50 UTC (rev 189465)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void initializeFont(Font*, float fontSize) override;
</span><span class="cx"> virtual float widthForSVGGlyph(Glyph, float fontSize) const override;
</span><del>- virtual bool fillSVGGlyphPage(GlyphPage*, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font*) const override;
</del><ins>+ virtual bool fillSVGGlyphPage(GlyphPage*, UChar* buffer, unsigned bufferLength, const Font*) const override;
</ins><span class="cx">
</span><span class="cx"> bool applySVGGlyphSelection(WidthIterator&, GlyphData&, bool mirror, int currentCharacter, unsigned& advanceLength, String& normalizedSpacesStringCache) const;
</span><span class="cx">
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> float verticalAdvanceY() const { return m_verticalAdvanceY; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- bool fillBMPGlyphs(SVGFontElement*, GlyphPage* , unsigned offset, unsigned length, UChar* buffer, const Font*) const;
- bool fillNonBMPGlyphs(SVGFontElement*, GlyphPage* , unsigned offset, unsigned length, UChar* buffer, const Font*) const;
</del><ins>+ bool fillBMPGlyphs(SVGFontElement*, GlyphPage*, UChar* buffer, const Font*) const;
+ bool fillNonBMPGlyphs(SVGFontElement*, GlyphPage*, UChar* buffer, const Font*) const;
</ins><span class="cx">
</span><span class="cx"> bool applyTransforms(GlyphBufferGlyph*, GlyphBufferAdvance*, size_t, TypesettingFeatures) const = delete;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>