Title: [131577] trunk/Source/WebCore
- Revision
- 131577
- Author
- [email protected]
- Date
- 2012-10-17 03:20:11 -0700 (Wed, 17 Oct 2012)
Log Message
Build fix for WinCE after r131365.
* platform/graphics/GlyphBuffer.h:
(WebCore::GlyphBufferAdvance::width):
* platform/graphics/wince/FontWinCE.cpp:
(WebCore::cursorToX):
* platform/graphics/wince/GraphicsContextWinCE.cpp:
(WebCore::GraphicsContext::drawText):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131576 => 131577)
--- trunk/Source/WebCore/ChangeLog 2012-10-17 10:08:53 UTC (rev 131576)
+++ trunk/Source/WebCore/ChangeLog 2012-10-17 10:20:11 UTC (rev 131577)
@@ -1,3 +1,14 @@
+2012-10-17 Patrick Gansterer <[email protected]>
+
+ Build fix for WinCE after r131365.
+
+ * platform/graphics/GlyphBuffer.h:
+ (WebCore::GlyphBufferAdvance::width):
+ * platform/graphics/wince/FontWinCE.cpp:
+ (WebCore::cursorToX):
+ * platform/graphics/wince/GraphicsContextWinCE.cpp:
+ (WebCore::GraphicsContext::drawText):
+
2012-10-17 Mike West <[email protected]>
V8 should throw a more descriptive exception when blocking 'eval' via CSP.
Modified: trunk/Source/WebCore/platform/graphics/GlyphBuffer.h (131576 => 131577)
--- trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2012-10-17 10:08:53 UTC (rev 131576)
+++ trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2012-10-17 10:20:11 UTC (rev 131577)
@@ -84,8 +84,7 @@
}
void setWidth(float width) { advance = width; }
- float& width() { return advance; }
- const float& width() const { return advance; }
+ float width() const { return advance; }
private:
float advance;
Modified: trunk/Source/WebCore/platform/graphics/wince/FontWinCE.cpp (131576 => 131577)
--- trunk/Source/WebCore/platform/graphics/wince/FontWinCE.cpp 2012-10-17 10:08:53 UTC (rev 131576)
+++ trunk/Source/WebCore/platform/graphics/wince/FontWinCE.cpp 2012-10-17 10:20:11 UTC (rev 131577)
@@ -313,7 +313,8 @@
return xs + pos * comp.m_width / comp.m_spaces;
}
WidthIterator it(font, comp.m_textRun);
- it.advance(pos);
+ GlyphBuffer glyphBuffer;
+ it.advance(pos, &glyphBuffer);
return xs + it.m_runWidthSoFar;
}
return width;
Modified: trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp (131576 => 131577)
--- trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp 2012-10-17 10:08:53 UTC (rev 131576)
+++ trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp 2012-10-17 10:20:11 UTC (rev 131577)
@@ -1626,10 +1626,10 @@
const GlyphBufferAdvance* advance = glyphBuffer.advances(from);
if (scaleX == 1.)
for (int i = 1; i < numGlyphs; ++i)
- offset += *advance++;
+ offset += (*advance++).width();
else
for (int i = 1; i < numGlyphs; ++i)
- offset += *advance++ * scaleX;
+ offset += (*advance++).width() * scaleX;
offset += width;
@@ -1687,7 +1687,7 @@
bool drawOneByOne = false;
if (scaleX == 1.) {
for (; srcChar < srcCharEnd; ++srcChar) {
- offset += *advance++;
+ offset += (*advance++).width();
int offsetInt = stableRound(offset);
if (isCharVisible(*srcChar)) {
if (!drawOneByOne && WTF::Unicode::direction(*srcChar) == WTF::Unicode::RightToLeft)
@@ -1699,7 +1699,7 @@
}
} else {
for (; srcChar < srcCharEnd; ++srcChar) {
- offset += *advance++ * scaleX;
+ offset += (*advance++).width() * scaleX;
int offsetInt = stableRound(offset);
if (isCharVisible(*srcChar)) {
if (!drawOneByOne && WTF::Unicode::direction(*srcChar) == WTF::Unicode::RightToLeft)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
