From 81f3384a95b23cdbfa589470ba70b6f21b9d303d Mon Sep 17 00:00:00 2001 From: Julien Chaffraix Date: Tue, 30 Mar 2010 18:52:35 -0700 Subject: Remove old code that was fixed in WebKit r35902 This code was based on WebKit r30711 which has now been integrated into Android (this fix was introduced in october 2008). Change-Id: I1faf6e611dfe226771ca8f28ee6a9e0cd80535ae --- WebCore/rendering/RenderBlock.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'WebCore/rendering') diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp index b568a4f..73648d1 100644 --- a/WebCore/rendering/RenderBlock.cpp +++ b/WebCore/rendering/RenderBlock.cpp @@ -4250,11 +4250,7 @@ void RenderBlock::calcInlinePrefWidths() // check. bool hasBreakableChar, hasBreak; int beginMin, endMin; -#ifdef ANDROID_FIX // bug found by valgrind - bool beginWS = false, endWS = false; -#else bool beginWS, endWS; -#endif int beginMax, endMax; t->trimmedPrefWidths(inlineMax, beginMin, beginWS, endMin, endWS, hasBreakableChar, hasBreak, beginMax, endMax, -- cgit v1.1