summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering
diff options
context:
space:
mode:
authorJulien Chaffraix <jchaffraix@codeaurora.org>2010-03-30 18:52:35 -0700
committerJulien Chaffraix <jchaffraix@codeaurora.org>2010-03-30 18:52:35 -0700
commit81f3384a95b23cdbfa589470ba70b6f21b9d303d (patch)
tree3f68ce83f72c5ee3cb987f0d66d6943c0d23556a /WebCore/rendering
parent8e03c5a1ccd98fdf4960318b8c0e3e0c7c5c225b (diff)
downloadexternal_webkit-81f3384a95b23cdbfa589470ba70b6f21b9d303d.zip
external_webkit-81f3384a95b23cdbfa589470ba70b6f21b9d303d.tar.gz
external_webkit-81f3384a95b23cdbfa589470ba70b6f21b9d303d.tar.bz2
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
Diffstat (limited to 'WebCore/rendering')
-rw-r--r--WebCore/rendering/RenderBlock.cpp4
1 files changed, 0 insertions, 4 deletions
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,