Title: [131374] trunk/Source/WebCore
- Revision
- 131374
- Author
- [email protected]
- Date
- 2012-10-15 15:36:14 -0700 (Mon, 15 Oct 2012)
Log Message
Try to fix the Chromium Mac build after r131365.
* platform/graphics/GlyphBuffer.h:
(WebCore::GlyphBufferAdvance::height): Added.
* platform/graphics/skia/FontSkia.cpp:
(WebCore::Font::drawGlyphs): Changed to use accessors for the GlyphBufferAdvance’s width and height.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131373 => 131374)
--- trunk/Source/WebCore/ChangeLog 2012-10-15 22:31:08 UTC (rev 131373)
+++ trunk/Source/WebCore/ChangeLog 2012-10-15 22:36:14 UTC (rev 131374)
@@ -1,3 +1,12 @@
+2012-10-15 Dan Bernstein <[email protected]>
+
+ Try to fix the Chromium Mac build after r131365.
+
+ * platform/graphics/GlyphBuffer.h:
+ (WebCore::GlyphBufferAdvance::height): Added.
+ * platform/graphics/skia/FontSkia.cpp:
+ (WebCore::Font::drawGlyphs): Changed to use accessors for the GlyphBufferAdvance’s width and height.
+
2012-10-15 Simon Fraser <[email protected]>
Ensure that GraphicsLayer positions are updated while doing threaded scrolling
Modified: trunk/Source/WebCore/platform/graphics/GlyphBuffer.h (131373 => 131374)
--- trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2012-10-15 22:31:08 UTC (rev 131373)
+++ trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2012-10-15 22:36:14 UTC (rev 131374)
@@ -71,6 +71,7 @@
void setWidth(CGFloat width) { this->CGSize::width = width; }
CGFloat width() const { return this->CGSize::width; }
+ CGFloat height() const { return this->CGSize::height; }
};
#elif OS(WINCE)
// There is no cross-platform code that uses the height of GlyphBufferAdvance,
Modified: trunk/Source/WebCore/platform/graphics/skia/FontSkia.cpp (131373 => 131374)
--- trunk/Source/WebCore/platform/graphics/skia/FontSkia.cpp 2012-10-15 22:31:08 UTC (rev 131373)
+++ trunk/Source/WebCore/platform/graphics/skia/FontSkia.cpp 2012-10-15 22:36:14 UTC (rev 131374)
@@ -131,8 +131,8 @@
for (int i = 0; i < numGlyphs; i++) {
pos[i].set(x, y);
- x += SkFloatToScalar(adv[i].width);
- y += SkFloatToScalar(adv[i].height);
+ x += SkFloatToScalar(adv[i].width());
+ y += SkFloatToScalar(adv[i].height());
}
SkCanvas* canvas = gc->platformContext()->canvas();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
