Changeset 58404 in webkit

Timestamp:

Apr 28, 2010 4:58:45 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-28 Marcus Bulach <​bulach@chromium.org>

Reviewed by Jeremy Orlow.

Reverts 58340 (​https://bugs.webkit.org/show_bug.cgi?id=38158) due to regression on fast/text/international/khmer-selection.html
​https://bugs.webkit.org/show_bug.cgi?id=38254

• platform/graphics/chromium/FontLinux.cpp: (WebCore::adjustTextRenderMode): (WebCore::TextRunWalker::getTextRun): (WebCore::TextRunWalker::getNormalizedTextRun): (WebCore::TextRunWalker::setGlyphXPositions): (WebCore::glyphIndexForXPositionInScriptRun): (WebCore::Font::offsetForPositionForComplexText): (WebCore::Font::selectionRectForComplexText):
• platform/graphics/chromium/FontPlatformDataLinux.cpp: (WebCore::FontPlatformData::setupPaint):
• platform/graphics/chromium/HarfbuzzSkia.cpp: (WebCore::getOutlinePoint):
• platform/graphics/skia/GraphicsContext3DSkia.cpp: (WebCore::GraphicsContext3D::getImageData):
• platform/graphics/skia/GraphicsContextSkia.cpp: (WebCore::isCoordinateSkiaSafe): (WebCore::GraphicsContext::fillRect): (WebCore::GraphicsContext::strokePath): (WebCore::GraphicsContext::strokeRect):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/FontLinux.cpp (modified) (8 diffs)
• platform/graphics/chromium/FontPlatformDataLinux.cpp (modified) (1 diff)
• platform/graphics/chromium/HarfbuzzSkia.cpp (modified) (1 diff)
• platform/graphics/skia/GraphicsContext3DSkia.cpp (modified) (1 diff)
• platform/graphics/skia/GraphicsContextSkia.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-28  Marcus Bulach  <bulach@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Reverts 58340 (https://bugs.webkit.org/show_bug.cgi?id=38158) due to regression on fast/text/international/khmer-selection.html
+        https://bugs.webkit.org/show_bug.cgi?id=38254
+
+        * platform/graphics/chromium/FontLinux.cpp:
+        (WebCore::adjustTextRenderMode):
+        (WebCore::TextRunWalker::getTextRun):
+        (WebCore::TextRunWalker::getNormalizedTextRun):
+        (WebCore::TextRunWalker::setGlyphXPositions):
+        (WebCore::glyphIndexForXPositionInScriptRun):
+        (WebCore::Font::offsetForPositionForComplexText):
+        (WebCore::Font::selectionRectForComplexText):
+        * platform/graphics/chromium/FontPlatformDataLinux.cpp:
+        (WebCore::FontPlatformData::setupPaint):
+        * platform/graphics/chromium/HarfbuzzSkia.cpp:
+        (WebCore::getOutlinePoint):
+        * platform/graphics/skia/GraphicsContext3DSkia.cpp:
+        (WebCore::GraphicsContext3D::getImageData):
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::isCoordinateSkiaSafe):
+        (WebCore::GraphicsContext::fillRect):
+        (WebCore::GraphicsContext::strokePath):
+        (WebCore::GraphicsContext::strokeRect):
+
 2010-04-28  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/WebCore/platform/graphics/chromium/FontLinux.cpp

@@ -65 +65 @@
 }
 
-static void adjustTextRenderMode(SkPaint* paint, bool isCanvasMultiLayered)
+static bool adjustTextRenderMode(SkPaint* paint, bool isCanvasMultiLayered)
 {
     // Our layers only have a single alpha channel. This means that subpixel
@@ -325 +325 @@
         // 2) Convert spacing characters into plain spaces, as some fonts will provide glyphs
         // for characters like '\n' otherwise.
-        for (int i = 0; i < originalRun.length(); ++i) {
+        for (unsigned i = 0; i < originalRun.length(); ++i) {
             UChar ch = originalRun[i];
             UBlockCode block = ::ublock_getCode(ch);
@@ -347 +347 @@
         ASSERT(U_SUCCESS(error));
 
-        for (int i = 0; i < normalizedString.length(); ++i) {
+        for (unsigned i = 0; i < normalizedString.length(); ++i) {
             if (Font::treatAsSpace(m_normalizedBuffer[i]))
                 m_normalizedBuffer[i] = ' ';
@@ -440 +440 @@
     {
         double position = 0;
-        for (int iter = 0; iter < static_cast<int>(m_item.num_glyphs); ++iter) {
+        for (int iter = 0; iter < m_item.num_glyphs; ++iter) {
             // Glyphs are stored in logical order, but for layout purposes we always go left to right.
             int i = isRTL ? m_item.num_glyphs - iter - 1 : iter;
@@ -539 +539 @@
         }
     } else {
-        for (glyphIndex = 0; glyphIndex < static_cast<int>(walker.length()); ++glyphIndex) {
+        for (glyphIndex = 0; glyphIndex < walker.length(); ++glyphIndex) {
             if (x < truncateFixedPointToInteger(advances[glyphIndex]))
                 break;
@@ -591 +591 @@
             basePosition -= walker.numCodePoints();
 
-        if (x < static_cast<int>(walker.width())) {
+        if (x < walker.width()) {
             // The x value in question is within this script run. We consider
             // each glyph in presentation order and stop when we find the one
@@ -651 +651 @@
             base -= walker.width();
 
-        if (fromX == -1 && from < static_cast<int>(walker.numCodePoints())) {
+        if (fromX == -1 && from < walker.numCodePoints()) {
             // |from| is within this script run. So we index the clusters log to
             // find which glyph this code-point contributed to and find its x
@@ -661 +661 @@
             from -= walker.numCodePoints();
 
-        if (toX == -1 && to < static_cast<int>(walker.numCodePoints())) {
+        if (toX == -1 && to < walker.numCodePoints()) {
             int glyph = walker.logClusters()[to];
             toX = base + walker.xPositions()[glyph];

trunk/WebCore/platform/graphics/chromium/FontPlatformDataLinux.cpp

@@ -149 +149 @@
     paint->setTextSkewX(m_fakeItalic ? -SK_Scalar1 / 4 : 0);
 
-    if (m_style.useAntiAlias == 1 || (m_style.useAntiAlias == FontRenderStyle::NoPreference && isSkiaAntiAlias))
+    if (m_style.useAntiAlias == 1 || m_style.useAntiAlias == FontRenderStyle::NoPreference && isSkiaAntiAlias)
         paint->setLCDRenderText(m_style.useSubpixel == FontRenderStyle::NoPreference ? isSkiaSubpixelGlyphs : m_style.useSubpixel);
 }

trunk/WebCore/platform/graphics/chromium/HarfbuzzSkia.cpp

@@ -140 +140 @@
     SkPath path;
     paint.getTextPath(&glyph16, sizeof(glyph16), 0, 0, &path);
-    unsigned numPoints = path.getPoints(0, 0);
+    int numPoints = path.getPoints(NULL, 0);
     if (point >= numPoints)
         return HB_Err_Invalid_SubTable;

trunk/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp

@@ -56 +56 @@
     SkBitmap& skiaImageRef = *skiaImage;
     SkAutoLockPixels lock(skiaImageRef);
+    int width = skiaImage->width();
     int height = skiaImage->height();
     int rowBytes = skiaImage->rowBytes();
-    ASSERT(rowBytes == skiaImage->width() * 4);
+    ASSERT(rowBytes == width * 4);
     uint8_t* pixels = reinterpret_cast<uint8_t*>(skiaImage->getPixels());
     outputVector.resize(rowBytes * height);

trunk/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp

@@ -92 +92 @@
 // #define ENSURE_VALUE_SAFETY_FOR_SKIA
 
+static bool isCoordinateSkiaSafe(float coord)
+{
 #ifdef ENSURE_VALUE_SAFETY_FOR_SKIA
-static bool isCoordinateSkiaSafe(float coord)
-{
     // First check for valid floats.
 #if defined(_MSC_VER)
@@ -111 +111 @@
 
     return true;
-}
+#else
+    return true;
 #endif
+}
 
 static bool isPointSkiaSafe(const SkMatrix& transform, const SkPoint& pt)
@@ -733 +735 @@
     }
 
+    const GraphicsContextState& state = m_common->state;
+
     SkPaint paint;
     platformContext()->setupPaintForFilling(&paint);
@@ -1119 +1123 @@
         return;
 
+    const GraphicsContextState& state = m_common->state;
+
     SkPaint paint;
     platformContext()->setupPaintForStroking(&paint, 0, 0);
+
     platformContext()->canvas()->drawPath(path, paint);
 }
@@ -1131 +1138 @@
     if (!isRectSkiaSafe(getCTM(), rect))
         return;
+
+    const GraphicsContextState& state = m_common->state;
 
     SkPaint paint;
     platformContext()->setupPaintForStroking(&paint, 0, 0);
     paint.setStrokeWidth(WebCoreFloatToSkScalar(lineWidth));
+
     platformContext()->canvas()->drawRect(rect, paint);
 }