am 9d4701f9: Push a local reference frame to avoid table overflow.
Merge commit '9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be' into gingerbread
* commit '9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be':
Push a local reference frame to avoid table overflow.
diff --git a/WebCore/html/HTMLCollection.cpp b/WebCore/html/HTMLCollection.cpp
index 5e42d30..8a942c3 100644
--- a/WebCore/html/HTMLCollection.cpp
+++ b/WebCore/html/HTMLCollection.cpp
@@ -251,14 +251,6 @@
Node* HTMLCollection::nextItem() const
{
resetCollectionInfo();
-
-#ifdef ANDROID_FIX
- // resetCollectionInfo() can set info->current to be 0. If this is the
- // case, we need to go back to the firstItem. Otherwise traverseNextItem
- // will crash.
- if (!m_info->current)
- return firstItem();
-#endif
// Look for the 'second' item. The first one is currentItem, already given back.
Element* retval = itemAfter(m_info->current);
diff --git a/WebCore/platform/graphics/android/FontAndroid.cpp b/WebCore/platform/graphics/android/FontAndroid.cpp
index 36c6248..c783a0b 100644
--- a/WebCore/platform/graphics/android/FontAndroid.cpp
+++ b/WebCore/platform/graphics/android/FontAndroid.cpp
@@ -188,7 +188,7 @@
SkScalar spacing = paint.getFontMetrics(&metrics);
return FloatRect(point.x(),
- point.y() - floorf(SkScalarToFloat(-metrics.fAscent)),
+ point.y(),
roundf(SkScalarToFloat(width)),
roundf(SkScalarToFloat(spacing)));
}
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 @@
// 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,
diff --git a/WebKit/android/plugins/ANPSurfaceInterface.cpp b/WebKit/android/plugins/ANPSurfaceInterface.cpp
index 8830191..4b99b31 100644
--- a/WebKit/android/plugins/ANPSurfaceInterface.cpp
+++ b/WebKit/android/plugins/ANPSurfaceInterface.cpp
@@ -64,7 +64,7 @@
jclass surfaceClass = env->FindClass("android/view/Surface");
gSurfaceJavaGlue.surfacePointer = env->GetFieldID(surfaceClass,
- "mSurface", "I");
+ ANDROID_VIEW_SURFACE_JNI_ID, "I");
env->DeleteLocalRef(surfaceClass);
env->DeleteLocalRef(surfaceViewClass);
