Title: [131000] trunk
- Revision
- 131000
- Author
- [email protected]
- Date
- 2012-10-10 19:47:06 -0700 (Wed, 10 Oct 2012)
Log Message
Tests failure on Chromium Mac after r130821
https://bugs.webkit.org/show_bug.cgi?id=98865
Reviewed by Adam Barth.
Source/WebCore:
Updating the check for USE(HARFBUZZ_NG) to check for Mac Chromium, as the HARFBUZZ_NG flag isn't
actually set, despite us using Harfbuzz. This unbreaks Chromium Mac as we diagnose the root
cause of this issue.
* rendering/RenderBlockLineLayout.cpp:
(WebCore::setLogicalWidthForTextRun):
LayoutTests:
Removing failing test entries.
* platform/chromium/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (130999 => 131000)
--- trunk/LayoutTests/ChangeLog 2012-10-11 02:40:44 UTC (rev 130999)
+++ trunk/LayoutTests/ChangeLog 2012-10-11 02:47:06 UTC (rev 131000)
@@ -1,3 +1,14 @@
+2012-10-10 Levi Weintraub <[email protected]>
+
+ Tests failure on Chromium Mac after r130821
+ https://bugs.webkit.org/show_bug.cgi?id=98865
+
+ Reviewed by Adam Barth.
+
+ Removing failing test entries.
+
+ * platform/chromium/TestExpectations:
+
2012-10-10 Stephen Chenney <[email protected]>
SVGTextRunRenderingContext changes font data in the glyph page, but it shouldn't
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (130999 => 131000)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-10-11 02:40:44 UTC (rev 130999)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-10-11 02:47:06 UTC (rev 131000)
@@ -4018,8 +4018,4 @@
webkit.org/b/98699 [ Lion ] fast/writing-mode/vertical-subst-font-vert-no-dflt.html [ Crash ]
webkit.org/b/98811 [ Mac ] fast/transforms/transformed-focused-text-input.html [ Pass ImageOnlyFailure ]
-webkit.org/b/98867 [ Mac ] fast/lists/003-vertical.html [ ImageOnlyFailure ]
-webkit.org/b/98867 [ Mac ] fast/text/international/vertical-text-glyph-test.html [ Failure ImageOnlyFailure ]
-webkit.org/b/98867 [ Mac ] fast/text/shaping/shaping-selection-rect.html [ Failure ImageOnlyFailure ]
-
webkit.org/b/98948 [ Linux Debug ] http/tests/media/media-source/video-media-source-play.html [ PASS CRASH ]
Modified: trunk/Source/WebCore/ChangeLog (130999 => 131000)
--- trunk/Source/WebCore/ChangeLog 2012-10-11 02:40:44 UTC (rev 130999)
+++ trunk/Source/WebCore/ChangeLog 2012-10-11 02:47:06 UTC (rev 131000)
@@ -1,3 +1,17 @@
+2012-10-10 Levi Weintraub <[email protected]>
+
+ Tests failure on Chromium Mac after r130821
+ https://bugs.webkit.org/show_bug.cgi?id=98865
+
+ Reviewed by Adam Barth.
+
+ Updating the check for USE(HARFBUZZ_NG) to check for Mac Chromium, as the HARFBUZZ_NG flag isn't
+ actually set, despite us using Harfbuzz. This unbreaks Chromium Mac as we diagnose the root
+ cause of this issue.
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::setLogicalWidthForTextRun):
+
2012-10-10 Stephen Chenney <[email protected]>
SVGTextRunRenderingContext changes font data in the glyph page, but it shouldn't
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (130999 => 131000)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-10-11 02:40:44 UTC (rev 130999)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-10-11 02:47:06 UTC (rev 131000)
@@ -712,7 +712,7 @@
static inline void setLogicalWidthForTextRun(RootInlineBox* lineBox, BidiRun* run, RenderText* renderer, float xPos, const LineInfo& lineInfo,
GlyphOverflowAndFallbackFontsMap& textBoxDataMap, VerticalPositionCache& verticalPositionCache, WordMeasurements& wordMeasurements)
{
-#if USE(HARFBUZZ_NG)
+#if !(PLATFORM(CHROMIUM) && OS(DARWIN))
UNUSED_PARAM(wordMeasurements);
#endif
HashSet<const SimpleFontData*> fallbackFonts;
@@ -740,7 +740,7 @@
}
float measuredWidth = 0;
-#if !USE(HARFBUZZ_NG)
+#if !(PLATFORM(CHROMIUM) && OS(DARWIN))
bool kerningIsEnabled = font.typesettingFeatures() & Kerning;
// Since we don't cache glyph overflows, we need to re-measure the run if
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
