diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-02 11:08:51 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-04-02 11:08:51 -0700 |
| commit | f39b1b267d970c46ee0ce4fe42ab642ff42d5966 (patch) | |
| tree | 5073b0afb982fbba9477ef7640cf585961623208 /WebCore/rendering | |
| parent | 9dbbb4da177ba7592aaf8d18fbd85a9525bbb5f7 (diff) | |
| parent | d84a638c00a2c66685f37e34ec513bb9c6acf488 (diff) | |
| download | external_webkit-f39b1b267d970c46ee0ce4fe42ab642ff42d5966.zip external_webkit-f39b1b267d970c46ee0ce4fe42ab642ff42d5966.tar.gz external_webkit-f39b1b267d970c46ee0ce4fe42ab642ff42d5966.tar.bz2 | |
merge from open-source master
Change-Id: I87473a9657b8906b4933a7e22bf1125a65e44502
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, |