Title: [91832] branches/chromium/782/Source/WebCore/platform/graphics/chromium
Diff
Modified: branches/chromium/782/Source/WebCore/platform/graphics/chromium/ComplexTextControllerLinux.cpp (91831 => 91832)
--- branches/chromium/782/Source/WebCore/platform/graphics/chromium/ComplexTextControllerLinux.cpp 2011-07-27 10:24:08 UTC (rev 91831)
+++ branches/chromium/782/Source/WebCore/platform/graphics/chromium/ComplexTextControllerLinux.cpp 2011-07-27 10:30:02 UTC (rev 91832)
@@ -46,7 +46,7 @@
return value >> 6;
}
-ComplexTextController::ComplexTextController(const TextRun& run, unsigned startingX, unsigned startingY, const Font* font)
+ComplexTextController::ComplexTextController(const TextRun& run, int startingX, int startingY, const Font* font)
: m_font(font)
, m_run(getNormalizedTextRun(run, m_normalizedRun, m_normalizedBuffer))
, m_wordSpacingAdjustment(0)
@@ -137,7 +137,7 @@
m_padPerWordBreak = 0;
}
-void ComplexTextController::reset(unsigned offset)
+void ComplexTextController::reset(int offset)
{
m_indexOfNextScriptRun = 0;
m_offsetX = offset;
Modified: branches/chromium/782/Source/WebCore/platform/graphics/chromium/ComplexTextControllerLinux.h (91831 => 91832)
--- branches/chromium/782/Source/WebCore/platform/graphics/chromium/ComplexTextControllerLinux.h 2011-07-27 10:24:08 UTC (rev 91831)
+++ branches/chromium/782/Source/WebCore/platform/graphics/chromium/ComplexTextControllerLinux.h 2011-07-27 10:30:02 UTC (rev 91832)
@@ -61,7 +61,7 @@
// can call |reset| to start over again.
class ComplexTextController {
public:
- ComplexTextController(const TextRun&, unsigned, unsigned, const Font*);
+ ComplexTextController(const TextRun&, int, int, const Font*);
~ComplexTextController();
bool isWordBreak(unsigned);
@@ -69,7 +69,7 @@
// setPadding sets a number of pixels to be distributed across the TextRun.
// WebKit uses this to justify text.
void setPadding(int);
- void reset(unsigned offset);
+ void reset(int offset);
// Advance to the next script run, returning false when the end of the
// TextRun has been reached.
bool nextScriptRun();
@@ -140,8 +140,8 @@
uint16_t* m_glyphs16; // A vector of 16-bit glyph ids.
SkPoint* m_positions; // A vector of positions for each glyph.
ssize_t m_indexOfNextScriptRun; // Indexes the script run in |m_run|.
- unsigned m_offsetX; // Offset in pixels to the start of the next script run.
- unsigned m_startingY; // The Y starting point of the script run.
+ int m_offsetX; // Offset in pixels to the start of the next script run.
+ int m_startingY; // The Y starting point of the script run.
unsigned m_pixelWidth; // Width (in px) of the current script run.
unsigned m_glyphsArrayCapacity; // Current size of all the Harfbuzz arrays.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
