diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-02 11:24:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 11:24:03 -0700 |
| commit | b7a96380ff617738735dc16a1672ff6a4b3a3081 (patch) | |
| tree | 24bef4265238c55af7fe3a96a2ac7bff65df1d2e /WebCore/rendering | |
| parent | e2e1476126d4407c19f73cf2651365a0f33ab6ca (diff) | |
| parent | f39b1b267d970c46ee0ce4fe42ab642ff42d5966 (diff) | |
| download | external_webkit-b7a96380ff617738735dc16a1672ff6a4b3a3081.zip external_webkit-b7a96380ff617738735dc16a1672ff6a4b3a3081.tar.gz external_webkit-b7a96380ff617738735dc16a1672ff6a4b3a3081.tar.bz2 | |
am f39b1b26: merge from open-source master
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/RenderBlock.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp index bffade7..eabb054 100644 --- a/WebCore/rendering/RenderBlock.cpp +++ b/WebCore/rendering/RenderBlock.cpp @@ -4225,11 +4225,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, |