From eb74247a9a9a62774c3f6f3df389b3d6924872c7 Mon Sep 17 00:00:00 2001
From: "julian.reschke@gmx.de" <julian.reschke@gmx.de>
Date: Sun, 29 Apr 2012 13:40:00 -0700
Subject: [PATCH 001/162] Bug 693806: RFC2231/5987 encoding: charset
 information should be treated as authoritative. r=jduell

---
 netwerk/mime/nsMIMEHeaderParamImpl.cpp | 46 ++++++++++++++++++++++++--
 netwerk/test/unit/test_MIME_params.js  | 32 ++++++++++++++++++
 2 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/netwerk/mime/nsMIMEHeaderParamImpl.cpp b/netwerk/mime/nsMIMEHeaderParamImpl.cpp
index 1d6ac5de7ae..6a2654c5226 100644
--- a/netwerk/mime/nsMIMEHeaderParamImpl.cpp
+++ b/netwerk/mime/nsMIMEHeaderParamImpl.cpp
@@ -298,6 +298,35 @@ PRInt32 parseSegmentNumber(const char *aValue, PRInt32 aLen)
   return segmentNumber;
 }
 
+// validate a given octet sequence for compliance with the specified
+// encoding
+bool IsValidOctetSequenceForCharset(nsACString& aCharset, const char *aOctets)
+{
+  nsCOMPtr<nsIUTF8ConverterService> cvtUTF8(do_GetService
+    (NS_UTF8CONVERTERSERVICE_CONTRACTID));
+  if (!cvtUTF8) {
+    NS_WARNING("Can't get UTF8ConverterService\n");
+    return false;
+  }
+
+  nsCAutoString tmpRaw;
+  tmpRaw.Assign(aOctets);
+  nsCAutoString tmpDecoded;
+
+  nsresult rv = cvtUTF8->ConvertStringToUTF8(tmpRaw,
+                                             PromiseFlatCString(aCharset).get(),
+                                             true, tmpDecoded);
+
+  if (rv != NS_OK) {
+    // we can't decode; charset may be unsupported, or the octet sequence
+    // is broken (illegal or incomplete octet sequence contained)
+    NS_WARNING("RFC2231/5987 parameter value does not decode according to specified charset\n");
+    return false;
+  }
+
+  return true;
+}
+
 // moved almost verbatim from mimehdrs.cpp
 // char *
 // MimeHeaders_get_parameter (const char *header_value, const char *parm_name,
@@ -617,6 +646,20 @@ increment_str:
 
   caseCDResult = combineContinuations(segments);
 
+  if (caseBResult && !charsetB.IsEmpty()) {
+    // check that the 2231/5987 result decodes properly given the
+    // specified character set
+    if (!IsValidOctetSequenceForCharset(charsetB, caseBResult))
+      caseBResult = NULL;
+  }
+
+  if (caseCDResult && !charsetCD.IsEmpty()) {
+    // check that the 2231/5987 result decodes properly given the
+    // specified character set
+    if (!IsValidOctetSequenceForCharset(charsetCD, caseCDResult))
+      caseCDResult = NULL;
+  }
+
   if (caseBResult) {
     // prefer simple 5987 format over 2231 with continuations
     *aResult = caseBResult;
@@ -716,9 +759,8 @@ nsMIMEHeaderParamImpl::DecodeParameter(const nsACString& aParamValue,
   {
     nsCOMPtr<nsIUTF8ConverterService> cvtUTF8(do_GetService(NS_UTF8CONVERTERSERVICE_CONTRACTID));
     if (cvtUTF8)
-      // skip ASCIIness/UTF8ness test if aCharset is 7bit non-ascii charset.
       return cvtUTF8->ConvertStringToUTF8(aParamValue, aCharset,
-          IS_7BIT_NON_ASCII_CHARSET(aCharset), aResult);
+          true, aResult);
   }
 
   const nsAFlatCString& param = PromiseFlatCString(aParamValue);
diff --git a/netwerk/test/unit/test_MIME_params.js b/netwerk/test/unit/test_MIME_params.js
index 165aa5dd239..29873d1576f 100644
--- a/netwerk/test/unit/test_MIME_params.js
+++ b/netwerk/test/unit/test_MIME_params.js
@@ -330,6 +330,38 @@ var tests = [
   // previously with the fix for 692574:
   // "attachment", "bar.html"],
 
+  // Bug 693806: RFC2231/5987 encoding: charset information should be treated
+  // as authoritative
+
+  // UTF-8 labeled ISO-8859-1
+  ["attachment; filename*=ISO-8859-1''%c3%a4", 
+   "attachment", "\u00c3\u00a4"],
+
+  // UTF-8 labeled ISO-8859-1, but with octets not allowed in ISO-8859-1
+  // accepts x82, understands it as Win1252, maps it to Unicode \u20a1
+  ["attachment; filename*=ISO-8859-1''%e2%82%ac", 
+   "attachment", "\u00e2\u201a\u00ac"],
+
+  // defective UTF-8
+  ["attachment; filename*=UTF-8''A%e4B", 
+   "attachment", Cr.NS_ERROR_INVALID_ARG],
+
+  // defective UTF-8, with fallback
+  ["attachment; filename*=UTF-8''A%e4B; filename=fallback", 
+   "attachment", "fallback"],
+
+  // defective UTF-8 (continuations), with fallback
+  ["attachment; filename*0*=UTF-8''A%e4B; filename=fallback", 
+   "attachment", "fallback"],
+
+  // check that charsets aren't mixed up
+  ["attachment; filename*0*=ISO-8859-15''euro-sign%3d%a4; filename*=ISO-8859-1''currency-sign%3d%a4", 
+   "attachment", "currency-sign=\u00a4"],
+
+  // same as above, except reversed
+  ["attachment; filename*=ISO-8859-1''currency-sign%3d%a4; filename*0*=ISO-8859-15''euro-sign%3d%a4", 
+   "attachment", "currency-sign=\u00a4"],
+
   // Bug 704989: add workaround for broken Outlook Web App (OWA)
   // attachment handling
 

From fd7631eab2241c26a1b40b66e2945f857f0c4dba Mon Sep 17 00:00:00 2001
From: Mark Capella <markcapella@twcny.rr.com>
Date: Fri, 27 Apr 2012 12:47:00 +0200
Subject: [PATCH 002/162] Bug 723530 - double error reporting in ctype JS api
 implementation, r=bholley

---
 js/src/ctypes/CTypes.cpp              | 79 +++++++++++++++++++--------
 js/src/ctypes/Library.cpp             | 12 +++-
 js/xpconnect/wrappers/XrayWrapper.cpp |  4 +-
 3 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp
index 1f9e337f024..1c479a929b0 100644
--- a/js/src/ctypes/CTypes.cpp
+++ b/js/src/ctypes/CTypes.cpp
@@ -3404,7 +3404,9 @@ JSBool
 CType::CreateArray(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* baseType = JS_THIS_OBJECT(cx, vp);
-  if (!baseType || !CType::IsCType(baseType)) {
+  if (!baseType)
+    return JS_FALSE;
+  if (!CType::IsCType(baseType)) {
     JS_ReportError(cx, "not a CType");
     return JS_FALSE;
   }
@@ -3435,7 +3437,9 @@ JSBool
 CType::ToString(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !(CType::IsCType(obj) || CType::IsCTypeProto(obj))) {
+  if (!obj)
+    return JS_FALSE;
+  if (!CType::IsCType(obj) && !CType::IsCTypeProto(obj)) {
     JS_ReportError(cx, "not a CType");
     return JS_FALSE;
   }
@@ -3463,8 +3467,9 @@ JSBool
 CType::ToSource(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj ||
-      !(CType::IsCType(obj) || CType::IsCTypeProto(obj)))
+  if (!obj)
+    return JS_FALSE;
+  if (!CType::IsCType(obj) && !CType::IsCTypeProto(obj))
   {
     JS_ReportError(cx, "not a CType");
     return JS_FALSE;
@@ -3699,7 +3704,9 @@ JSBool
 PointerType::IsNull(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !CData::IsCData(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!CData::IsCData(obj)) {
     JS_ReportError(cx, "not a CData");
     return JS_FALSE;
   }
@@ -3721,7 +3728,9 @@ JSBool
 PointerType::OffsetBy(JSContext* cx, int offset, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !CData::IsCData(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!CData::IsCData(obj)) {
     JS_ReportError(cx, "not a CData");
     return JS_FALSE;
   }
@@ -4226,7 +4235,9 @@ JSBool
 ArrayType::AddressOfElement(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !CData::IsCData(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!CData::IsCData(obj)) {
     JS_ReportError(cx, "not a CData");
     return JS_FALSE;
   }
@@ -4602,8 +4613,9 @@ JSBool
 StructType::Define(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj ||
-      !CType::IsCType(obj) ||
+  if (!obj)
+    return JS_FALSE;
+  if (!CType::IsCType(obj) ||
       CType::GetTypeCode(obj) != TYPE_struct) {
     JS_ReportError(cx, "not a StructType");
     return JS_FALSE;
@@ -4849,7 +4861,9 @@ JSBool
 StructType::AddressOfField(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !CData::IsCData(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!CData::IsCData(obj)) {
     JS_ReportError(cx, "not a CData");
     return JS_FALSE;
   }
@@ -6075,7 +6089,9 @@ CData::Address(JSContext* cx, unsigned argc, jsval* vp)
   }
 
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !IsCData(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!IsCData(obj)) {
     JS_ReportError(cx, "not a CData");
     return JS_FALSE;
   }
@@ -6183,7 +6199,9 @@ CData::ReadString(JSContext* cx, unsigned argc, jsval* vp)
   }
 
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !IsCData(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!IsCData(obj)) {
     JS_ReportError(cx, "not a CData");
     return JS_FALSE;
   }
@@ -6294,8 +6312,9 @@ CData::ToSource(JSContext* cx, unsigned argc, jsval* vp)
   }
 
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj ||
-      !(CData::IsCData(obj) || CData::IsCDataProto(obj))) {
+  if (!obj)
+    return JS_FALSE;
+  if (!CData::IsCData(obj) && !CData::IsCDataProto(obj)) {
     JS_ReportError(cx, "not a CData");
     return JS_FALSE;
   }
@@ -6348,7 +6367,9 @@ JSBool
 CDataFinalizer::Methods::ToSource(JSContext *cx, unsigned argc, jsval *vp)
 {
   JSObject* objThis = JS_THIS_OBJECT(cx, vp);
-  if (!objThis || !CDataFinalizer::IsCDataFinalizer(objThis)) {
+  if (!objThis)
+    return JS_FALSE;
+  if (!CDataFinalizer::IsCDataFinalizer(objThis)) {
     JS_ReportError(cx, "not a CDataFinalizer");
     return JS_FALSE;
   }
@@ -6405,7 +6426,9 @@ JSBool
 CDataFinalizer::Methods::ToString(JSContext *cx, unsigned argc, jsval *vp)
 {
   JSObject* objThis = JS_THIS_OBJECT(cx, vp);
-  if (!objThis || !CDataFinalizer::IsCDataFinalizer(objThis)) {
+  if (!objThis)
+    return JS_FALSE;
+  if (!CDataFinalizer::IsCDataFinalizer(objThis)) {
     JS_ReportError(cx, "not a CDataFinalizer");
     return JS_FALSE;
   }
@@ -6697,7 +6720,9 @@ CDataFinalizer::Methods::Forget(JSContext* cx, unsigned argc, jsval *vp)
   }
 
   JSObject *obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !CDataFinalizer::IsCDataFinalizer(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!CDataFinalizer::IsCDataFinalizer(obj)) {
     return TypeError(cx, "a CDataFinalizer", OBJECT_TO_JSVAL(obj));
   }
 
@@ -6740,7 +6765,9 @@ CDataFinalizer::Methods::Dispose(JSContext* cx, unsigned argc, jsval *vp)
   }
 
   JSObject *obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !CDataFinalizer::IsCDataFinalizer(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!CDataFinalizer::IsCDataFinalizer(obj)) {
     return TypeError(cx, "a CDataFinalizer", OBJECT_TO_JSVAL(obj));
   }
 
@@ -7008,7 +7035,9 @@ JSBool
 Int64::ToString(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !Int64::IsInt64(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!Int64::IsInt64(obj)) {
     JS_ReportError(cx, "not an Int64");
     return JS_FALSE;
   }
@@ -7020,7 +7049,9 @@ JSBool
 Int64::ToSource(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !Int64::IsInt64(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!Int64::IsInt64(obj)) {
     JS_ReportError(cx, "not an Int64");
     return JS_FALSE;
   }
@@ -7179,7 +7210,9 @@ JSBool
 UInt64::ToString(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !UInt64::IsUInt64(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!UInt64::IsUInt64(obj)) {
     JS_ReportError(cx, "not a UInt64");
     return JS_FALSE;
   }
@@ -7191,7 +7224,9 @@ JSBool
 UInt64::ToSource(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !UInt64::IsUInt64(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!UInt64::IsUInt64(obj)) {
     JS_ReportError(cx, "not a UInt64");
     return JS_FALSE;
   }
diff --git a/js/src/ctypes/Library.cpp b/js/src/ctypes/Library.cpp
index 8aaccb47d12..6e946afb068 100644
--- a/js/src/ctypes/Library.cpp
+++ b/js/src/ctypes/Library.cpp
@@ -223,7 +223,9 @@ JSBool
 Library::Open(JSContext* cx, unsigned argc, jsval *vp)
 {
   JSObject* ctypesObj = JS_THIS_OBJECT(cx, vp);
-  if (!ctypesObj || !IsCTypesGlobal(ctypesObj)) {
+  if (!ctypesObj)
+    return JS_FALSE;
+  if (!IsCTypesGlobal(ctypesObj)) {
     JS_ReportError(cx, "not a ctypes object");
     return JS_FALSE;
   }
@@ -245,7 +247,9 @@ JSBool
 Library::Close(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !IsLibrary(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!IsLibrary(obj)) {
     JS_ReportError(cx, "not a library");
     return JS_FALSE;
   }
@@ -267,7 +271,9 @@ JSBool
 Library::Declare(JSContext* cx, unsigned argc, jsval* vp)
 {
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj || !IsLibrary(obj)) {
+  if (!obj)
+    return JS_FALSE;
+  if (!IsLibrary(obj)) {
     JS_ReportError(cx, "not a library");
     return JS_FALSE;
   }
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index 69ed63f6b09..1ee6ea4c599 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -1012,7 +1012,9 @@ static JSBool
 XrayToString(JSContext *cx, unsigned argc, jsval *vp)
 {
     JSObject *wrapper = JS_THIS_OBJECT(cx, vp);
-    if (!wrapper || !IsWrapper(wrapper) || !WrapperFactory::IsXrayWrapper(wrapper)) {
+    if (!wrapper)
+        return false;
+    if (!IsWrapper(wrapper) || !WrapperFactory::IsXrayWrapper(wrapper)) {
         JS_ReportError(cx, "XrayToString called on an incompatible object");
         return false;
     }

From 29f191e9a6ee5b6c7b8855ae0a8b5d27a0e2024e Mon Sep 17 00:00:00 2001
From: Andreas Gal <gal@mozilla.com>
Date: Sun, 29 Apr 2012 14:41:13 -0700
Subject: [PATCH 003/162] Render active layers at full resolution and transform
 them on the GPU (bug 750006, r=roc).

---
 gfx/thebes/gfxUtils.cpp           | 4 +++-
 layout/base/FrameLayerBuilder.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gfx/thebes/gfxUtils.cpp b/gfx/thebes/gfxUtils.cpp
index c59c20b78d4..5247b399d76 100644
--- a/gfx/thebes/gfxUtils.cpp
+++ b/gfx/thebes/gfxUtils.cpp
@@ -547,7 +547,9 @@ gfxUtils::ClampToScaleFactor(gfxFloat aVal)
     power = ceil(power);
   }
 
-  return pow(kScaleResolution, power);
+  gfxFloat scale = pow(kScaleResolution, power);
+
+  return NS_MAX(scale, 1.0);
 }
 
 
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index e0bf5424062..e6daff4aa6f 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -1810,7 +1810,7 @@ ChooseScaleAndSetTransform(FrameLayerBuilder* aLayerBuilder,
     // If the scale factors are too small, just use 1.0. The content is being
     // scaled out of sight anyway.
     if (fabs(scale.width) < 1e-8 || fabs(scale.height) < 1e-8) {
-      scale.width = scale.height = 1.0;
+      scale = gfxSize(1.0, 1.0);
     }
   } else {
     scale = gfxSize(1.0, 1.0);

From 39eedd06d716a7c3451b6007904e90b880e15047 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Mon, 30 Apr 2012 08:43:21 +0900
Subject: [PATCH 004/162] Bug 749500 Define new API for 10.5 SDK r=smichaud

---
 widget/cocoa/nsChildView.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h
index 1837eca90f9..6905b2d73d6 100644
--- a/widget/cocoa/nsChildView.h
+++ b/widget/cocoa/nsChildView.h
@@ -170,6 +170,13 @@ extern "C" long TSMProcessRawKeyEvent(EventRef carbonEvent);
 - (long long)_scrollPhase;
 @end
 
+#if !defined(MAC_OS_X_VERSION_10_6) || \
+MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
+@interface NSEvent (SnowLeopardEventFeatures)
++ (NSUInteger)pressedMouseButtons;
+@end
+#endif
+
 // The following section, required to support fluid swipe tracking on OS X 10.7
 // and up, contains defines/declarations that are only available on 10.7 and up.
 // [NSEvent trackSwipeEventWithOptions:...] also requires that the compiler

From 6a48592e95615c7dbde7be255507ba0c354f3fcb Mon Sep 17 00:00:00 2001
From: Thomas Powell <twilliampowell@gmail.com>
Date: Sun, 29 Apr 2012 22:37:04 -0400
Subject: [PATCH 005/162] Bug 742736 - Change box shadows to match rounded or
 sharp corners of shadowed object when round/sharp alternate corners; r=dbaron

---
 layout/base/nsCSSRendering.cpp                | 28 ++++------------
 layout/base/nsCSSRenderingBorders.cpp         | 32 +++++++++++++++++++
 layout/base/nsCSSRenderingBorders.h           |  8 +++++
 .../boxshadow-threecorners-ref.html           |  3 ++
 .../box-shadow/boxshadow-threecorners.html    |  2 ++
 .../box-shadow/boxshadow-twocorners-ref.html  |  3 ++
 .../box-shadow/boxshadow-twocorners.html      |  2 ++
 layout/reftests/box-shadow/reftest.list       |  2 ++
 8 files changed, 59 insertions(+), 21 deletions(-)
 create mode 100644 layout/reftests/box-shadow/boxshadow-threecorners-ref.html
 create mode 100644 layout/reftests/box-shadow/boxshadow-threecorners.html
 create mode 100644 layout/reftests/box-shadow/boxshadow-twocorners-ref.html
 create mode 100644 layout/reftests/box-shadow/boxshadow-twocorners.html

diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 95ccce192a8..9555564c4fe 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -1247,30 +1247,16 @@ nsCSSRendering::PaintBoxShadowOuter(nsPresContext* aPresContext,
       shadowContext->NewPath();
       if (hasBorderRadius) {
         gfxCornerSizes clipRectRadii;
-        gfxFloat spreadDistance = -shadowItem->mSpread / twipsPerPixel;
-        gfxFloat borderSizes[4] = { 0, 0, 0, 0 };
+        gfxFloat spreadDistance = shadowItem->mSpread / twipsPerPixel;
 
-        // We only give the spread radius to corners with a radius on them, otherwise we'll
-        // give a rounded shadow corner to a frame corner with 0 border radius, should
-        // the author use non-uniform border radii sizes (border-top-left-radius etc)
-        // (bug 514670)
-        if (borderRadii[C_TL].width > 0 || borderRadii[C_BL].width > 0) {
-          borderSizes[NS_SIDE_LEFT] = spreadDistance;
-        }
+        gfxFloat borderSizes[4];
 
-        if (borderRadii[C_TL].height > 0 || borderRadii[C_TR].height > 0) {
-          borderSizes[NS_SIDE_TOP] = spreadDistance;
-        }
+        borderSizes[NS_SIDE_LEFT] = spreadDistance;
+        borderSizes[NS_SIDE_TOP] = spreadDistance;
+        borderSizes[NS_SIDE_RIGHT] = spreadDistance;
+        borderSizes[NS_SIDE_BOTTOM] = spreadDistance;
 
-        if (borderRadii[C_TR].width > 0 || borderRadii[C_BR].width > 0) {
-          borderSizes[NS_SIDE_RIGHT] = spreadDistance;
-        }
-
-        if (borderRadii[C_BL].height > 0 || borderRadii[C_BR].height > 0) {
-          borderSizes[NS_SIDE_BOTTOM] = spreadDistance;
-        }
-
-        nsCSSBorderRenderer::ComputeInnerRadii(borderRadii, borderSizes,
+        nsCSSBorderRenderer::ComputeOuterRadii(borderRadii, borderSizes,
             &clipRectRadii);
         shadowContext->RoundedRectangle(shadowGfxRect, clipRectRadii);
       } else {
diff --git a/layout/base/nsCSSRenderingBorders.cpp b/layout/base/nsCSSRenderingBorders.cpp
index 1470ef73c7b..b266b2b52dd 100644
--- a/layout/base/nsCSSRenderingBorders.cpp
+++ b/layout/base/nsCSSRenderingBorders.cpp
@@ -221,6 +221,38 @@ nsCSSBorderRenderer::ComputeInnerRadii(const gfxCornerSizes& aRadii,
   iRadii[C_BL].height = NS_MAX(0.0, aRadii[C_BL].height - aBorderSizes[NS_SIDE_BOTTOM]);
 }
 
+/* static */ void
+nsCSSBorderRenderer::ComputeOuterRadii(const gfxCornerSizes& aRadii,
+                                       const gfxFloat *aBorderSizes,
+                                       gfxCornerSizes *aOuterRadiiRet)
+{
+  gfxCornerSizes& oRadii = *aOuterRadiiRet;
+
+  // default all corners to sharp corners
+  oRadii = gfxCornerSizes(0.0);
+
+  // round the edges that have radii > 0.0 to start with
+  if (aRadii[C_TL].width > 0.0 && aRadii[C_TL].height > 0.0) {
+    oRadii[C_TL].width = NS_MAX(0.0, aRadii[C_TL].width + aBorderSizes[NS_SIDE_LEFT]);
+    oRadii[C_TL].height = NS_MAX(0.0, aRadii[C_TL].height + aBorderSizes[NS_SIDE_TOP]);
+  }
+
+  if (aRadii[C_TR].width > 0.0 && aRadii[C_TR].height > 0.0) {
+    oRadii[C_TR].width = NS_MAX(0.0, aRadii[C_TR].width + aBorderSizes[NS_SIDE_RIGHT]);
+    oRadii[C_TR].height = NS_MAX(0.0, aRadii[C_TR].height + aBorderSizes[NS_SIDE_TOP]);
+  }
+
+  if (aRadii[C_BR].width > 0.0 && aRadii[C_BR].height > 0.0) {
+    oRadii[C_BR].width = NS_MAX(0.0, aRadii[C_BR].width + aBorderSizes[NS_SIDE_RIGHT]);
+    oRadii[C_BR].height = NS_MAX(0.0, aRadii[C_BR].height + aBorderSizes[NS_SIDE_BOTTOM]);
+  }
+
+  if (aRadii[C_BL].width > 0.0 && aRadii[C_BL].height > 0.0) {
+    oRadii[C_BL].width = NS_MAX(0.0, aRadii[C_BL].width + aBorderSizes[NS_SIDE_LEFT]);
+    oRadii[C_BL].height = NS_MAX(0.0, aRadii[C_BL].height + aBorderSizes[NS_SIDE_BOTTOM]);
+  }
+}
+
 /*static*/ void
 ComputeBorderCornerDimensions(const gfxRect& aOuterRect,
                               const gfxRect& aInnerRect,
diff --git a/layout/base/nsCSSRenderingBorders.h b/layout/base/nsCSSRenderingBorders.h
index 648a660dfcf..f35a3a7820e 100644
--- a/layout/base/nsCSSRenderingBorders.h
+++ b/layout/base/nsCSSRenderingBorders.h
@@ -236,6 +236,14 @@ struct nsCSSBorderRenderer {
   static void ComputeInnerRadii(const gfxCornerSizes& aRadii,
                                 const gfxFloat *aBorderSizes,
                                 gfxCornerSizes *aInnerRadiiRet);
+
+  // Given aRadii as the border radii for a rectangle, compute the
+  // appropriate radii for another rectangle *outside* that rectangle
+  // by increasing the radii, except keeping sharp corners sharp.
+  // Used for spread box-shadows
+  static void ComputeOuterRadii(const gfxCornerSizes& aRadii,
+                                const gfxFloat *aBorderSizes,
+                                gfxCornerSizes *aOuterRadiiRet);
 };
 
 #ifdef DEBUG_NEW_BORDERS
diff --git a/layout/reftests/box-shadow/boxshadow-threecorners-ref.html b/layout/reftests/box-shadow/boxshadow-threecorners-ref.html
new file mode 100644
index 00000000000..cd9f383e1f8
--- /dev/null
+++ b/layout/reftests/box-shadow/boxshadow-threecorners-ref.html
@@ -0,0 +1,3 @@
+<!DOCTYPE HTML>
+<div style="position: absolute; top: 300px; left: 70px; width: 360px; height: 160px; border-bottom-left-radius: 40px; border-top-left-radius: 40px; border-top-right-radius: 40px; background: red;">&nbsp;</div>
+<div style="position: absolute; top: 30px; left: 100px; width: 300px; height: 100px; border-bottom-left-radius: 10px; border-top-left-radius: 10px; border-top-right-radius: 10px; background: yellow;">Test</div>
diff --git a/layout/reftests/box-shadow/boxshadow-threecorners.html b/layout/reftests/box-shadow/boxshadow-threecorners.html
new file mode 100644
index 00000000000..f00135f9597
--- /dev/null
+++ b/layout/reftests/box-shadow/boxshadow-threecorners.html
@@ -0,0 +1,2 @@
+<!DOCTYPE HTML>
+<div style="position: absolute; top: 30px; left: 100px; width: 300px; height: 100px; border-bottom-left-radius: 10px; border-top-left-radius: 10px; border-top-right-radius: 10px; box-shadow: 0 300px 0 30px red; background: yellow;">Test</div>
diff --git a/layout/reftests/box-shadow/boxshadow-twocorners-ref.html b/layout/reftests/box-shadow/boxshadow-twocorners-ref.html
new file mode 100644
index 00000000000..bc3263cdb17
--- /dev/null
+++ b/layout/reftests/box-shadow/boxshadow-twocorners-ref.html
@@ -0,0 +1,3 @@
+<!DOCTYPE HTML>
+<div style="position: absolute; top: 300px; left: 70px; width: 360px; height: 160px; border-bottom-left-radius: 40px; border-top-right-radius: 40px; background: red;">&nbsp;</div>
+<div style="position: absolute; top: 30px; left: 100px; width: 300px; height: 100px; border-bottom-left-radius: 10px; border-top-right-radius: 10px; background: yellow;">Test</div>
diff --git a/layout/reftests/box-shadow/boxshadow-twocorners.html b/layout/reftests/box-shadow/boxshadow-twocorners.html
new file mode 100644
index 00000000000..e62c316f2b6
--- /dev/null
+++ b/layout/reftests/box-shadow/boxshadow-twocorners.html
@@ -0,0 +1,2 @@
+<!DOCTYPE HTML>
+<div style="position: absolute; top: 30px; left: 100px; width: 300px; height: 100px; border-bottom-left-radius: 10px; border-top-right-radius: 10px; box-shadow: 0 300px 0 30px red; background: yellow;">Test</div>
diff --git a/layout/reftests/box-shadow/reftest.list b/layout/reftests/box-shadow/reftest.list
index abe0be23547..5289bf29cd5 100644
--- a/layout/reftests/box-shadow/reftest.list
+++ b/layout/reftests/box-shadow/reftest.list
@@ -16,6 +16,8 @@ random-if(layersGPUAccelerated) == boxshadow-mixed.html boxshadow-mixed-ref.html
 random-if(d2d) == boxshadow-rounded-spread.html boxshadow-rounded-spread-ref.html
 HTTP(..) == boxshadow-dynamic.xul boxshadow-dynamic-ref.xul
 random-if(d2d) == boxshadow-onecorner.html boxshadow-onecorner-ref.html
+random-if(d2d) == boxshadow-twocorners.html boxshadow-twocorners-ref.html
+random-if(d2d) == boxshadow-threecorners.html boxshadow-threecorners-ref.html
 == boxshadow-skiprect.html boxshadow-skiprect-ref.html
 
 == overflow-not-scrollable-1.html overflow-not-scrollable-1-ref.html

From 79f3c0fd8a0bbd8bc08dd7cbd40cd23ad5b061be Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:11:00 +1200
Subject: [PATCH 006/162] Bug 664918. Part 0: Refactor nsMediaCache's handling
 of principals into a helper method in nsContentUtils. r=bzbarsky

---
 content/base/public/nsContentUtils.h | 17 +++++++++++++++
 content/base/src/nsContentUtils.cpp  | 26 ++++++++++++++++++++++-
 content/media/nsMediaCache.cpp       | 31 ++--------------------------
 content/media/nsMediaCache.h         |  7 ++-----
 4 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index 36710c369e0..d6d8c41019b 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -1372,6 +1372,23 @@ public:
    */
   static bool IsSystemPrincipal(nsIPrincipal* aPrincipal);
 
+  /**
+   * *aResourcePrincipal is a principal describing who may access the contents
+   * of a resource. The resource can only be consumed by a principal that
+   * subsumes *aResourcePrincipal. MAKE SURE THAT NOTHING EVER ACTS WITH THE
+   * AUTHORITY OF *aResourcePrincipal.
+   * It may be null to indicate that the resource has no data from any origin
+   * in it yet and anything may access the resource.
+   * Additional data is being mixed into the resource from aExtraPrincipal
+   * (which may be null; if null, no data is being mixed in and this function
+   * will do nothing). Update *aResourcePrincipal to reflect the new data.
+   * If *aResourcePrincipal subsumes aExtraPrincipal, nothing needs to change,
+   * otherwise *aResourcePrincipal is replaced with the system principal.
+   * Returns true if *aResourcePrincipal changed.
+   */
+  static bool CombineResourcePrincipals(nsCOMPtr<nsIPrincipal>* aResourcePrincipal,
+                                        nsIPrincipal* aExtraPrincipal);
+
   /**
    * Trigger a link with uri aLinkURI. If aClick is false, this triggers a
    * mouseover on the link, otherwise it triggers a load after doing a
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index a926cf7b4da..c6180205b0c 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -147,6 +147,7 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
 #include "nsIPermissionManager.h"
 #include "nsIContentPrefService.h"
 #include "nsIScriptObjectPrincipal.h"
+#include "nsNullPrincipal.h"
 #include "nsIRunnable.h"
 #include "nsDOMJSUtils.h"
 #include "nsGenericHTMLElement.h"
@@ -4120,7 +4121,7 @@ nsContentUtils::ConvertToPlainText(const nsAString& aSourceBuffer,
   nsCOMPtr<nsIURI> uri;
   NS_NewURI(getter_AddRefs(uri), "about:blank");
   nsCOMPtr<nsIPrincipal> principal =
-    do_CreateInstance("@mozilla.org/nullprincipal;1");
+    do_CreateInstance(NS_NULLPRINCIPAL_CONTRACTID);
   nsCOMPtr<nsIDOMDocument> domDocument;
   nsresult rv = nsContentUtils::CreateDocument(EmptyString(),
                                                EmptyString(),
@@ -4466,6 +4467,29 @@ nsContentUtils::IsSystemPrincipal(nsIPrincipal* aPrincipal)
   return NS_SUCCEEDED(rv) && isSystem;
 }
 
+bool
+nsContentUtils::CombineResourcePrincipals(nsCOMPtr<nsIPrincipal>* aResourcePrincipal,
+                                          nsIPrincipal* aExtraPrincipal)
+{
+  if (!aExtraPrincipal) {
+    return false;
+  }
+  if (!*aResourcePrincipal) {
+    *aResourcePrincipal = aExtraPrincipal;
+    return true;
+  }
+  if (*aResourcePrincipal == aExtraPrincipal) {
+    return false;
+  }
+  bool subsumes;
+  if (NS_SUCCEEDED((*aResourcePrincipal)->Subsumes(aExtraPrincipal, &subsumes)) &&
+      subsumes) {
+    return false;
+  }
+  sSecurityManager->GetSystemPrincipal(getter_AddRefs(*aResourcePrincipal));
+  return true;
+}
+
 /* static */
 void
 nsContentUtils::TriggerLink(nsIContent *aContent, nsPresContext *aPresContext,
diff --git a/content/media/nsMediaCache.cpp b/content/media/nsMediaCache.cpp
index f4a263d624e..0ee5f98dca8 100644
--- a/content/media/nsMediaCache.cpp
+++ b/content/media/nsMediaCache.cpp
@@ -45,6 +45,7 @@
 #include "nsXULAppAPI.h"
 #include "nsNetUtil.h"
 #include "prio.h"
+#include "nsContentUtils.h"
 #include "nsThreadUtils.h"
 #include "MediaResource.h"
 #include "nsMathUtils.h"
@@ -1705,35 +1706,7 @@ nsMediaCacheStream::NotifyDataStarted(PRInt64 aOffset)
 void
 nsMediaCacheStream::UpdatePrincipal(nsIPrincipal* aPrincipal)
 {
-  if (!mPrincipal) {
-    NS_ASSERTION(!mUsingNullPrincipal, "Are we using a null principal or not?");
-    if (mUsingNullPrincipal) {
-      // Don't let mPrincipal be set to anything
-      return;
-    }
-    mPrincipal = aPrincipal;
-    return;
-  }
-
-  if (mPrincipal == aPrincipal) {
-    // Common case
-    NS_ASSERTION(!mUsingNullPrincipal, "We can't receive data from a null principal");
-    return;
-  }
-  if (mUsingNullPrincipal) {
-    // We've already fallen back to a null principal, so nothing more
-    // to do.
-    return;
-  }
-
-  bool equal;
-  nsresult rv = mPrincipal->Equals(aPrincipal, &equal);
-  if (NS_SUCCEEDED(rv) && equal)
-    return;
-
-  // Principals are not equal, so set mPrincipal to a null principal.
-  mPrincipal = do_CreateInstance("@mozilla.org/nullprincipal;1");
-  mUsingNullPrincipal = true;
+  nsContentUtils::CombineResourcePrincipals(&mPrincipal, aPrincipal);
 }
 
 void
diff --git a/content/media/nsMediaCache.h b/content/media/nsMediaCache.h
index 045b5a7820d..fe0a17b700f 100644
--- a/content/media/nsMediaCache.h
+++ b/content/media/nsMediaCache.h
@@ -236,7 +236,6 @@ public:
       mDidNotifyDataEnded(false),
       mIsSeekable(false), mCacheSuspended(false),
       mChannelEnded(false),
-      mUsingNullPrincipal(false),
       mChannelOffset(0), mStreamLength(-1),  
       mStreamOffset(0), mPlaybackBytesPerSecond(10000),
       mPinCount(0), mCurrentMode(MODE_PLAYBACK),
@@ -273,7 +272,8 @@ public:
     return !mClosed &&
       (!mDidNotifyDataEnded || NS_SUCCEEDED(mNotifyDataEndedStatus));
   }
-  // Get the principal for this stream.
+  // Get the principal for this stream. Anything accessing the contents of
+  // this stream must have a principal that subsumes this principal.
   nsIPrincipal* GetCurrentPrincipal() { return mPrincipal; }
   // Ensure a global media cache update has run with this stream present.
   // This ensures the cache has had a chance to suspend or unsuspend this stream.
@@ -490,9 +490,6 @@ private:
   bool mCacheSuspended;
   // True if the channel ended and we haven't seeked it again.
   bool mChannelEnded;
-  // True if mPrincipal is a null principal because we saw data from
-  // multiple origins
-  bool mUsingNullPrincipal;
   // The offset where the next data from the channel will arrive
   PRInt64      mChannelOffset;
   // The reported or discovered length of the data, or -1 if nothing is

From c0f9814cc011ef723022bc865572f244dcc9f116 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:11:08 +1200
Subject: [PATCH 007/162] Bug 664918. Part 1: Create TimeVarying<T> class to
 represent values that change over time. r=jesup

---
 content/media/Makefile.in   |  13 ++-
 content/media/TimeVarying.h | 223 ++++++++++++++++++++++++++++++++++++
 2 files changed, 230 insertions(+), 6 deletions(-)
 create mode 100644 content/media/TimeVarying.h

diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index e670698df2d..c01f3736484 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -47,26 +47,27 @@ LIBXUL_LIBRARY = 1
 
 EXPORTS = \
   FileBlockCache.h \
+  MediaResource.h \
   nsAudioAvailableEventManager.h \
-  nsMediaDecoder.h \
-  nsMediaCache.h \
   nsBuiltinDecoder.h \
   nsBuiltinDecoderStateMachine.h \
   nsBuiltinDecoderReader.h \
-  MediaResource.h \
+  nsMediaCache.h \
+  nsMediaDecoder.h \
+  TimeVarying.h \
   VideoFrameContainer.h \
   VideoUtils.h \
   $(NULL)
 
 CPPSRCS = \
   FileBlockCache.cpp \
+  MediaResource.cpp \
   nsAudioAvailableEventManager.cpp \
-  nsMediaDecoder.cpp \
-  nsMediaCache.cpp \
   nsBuiltinDecoder.cpp \
   nsBuiltinDecoderStateMachine.cpp \
   nsBuiltinDecoderReader.cpp \
-  MediaResource.cpp \
+  nsMediaCache.cpp \
+  nsMediaDecoder.cpp \
   VideoFrameContainer.cpp \
   VideoUtils.cpp \
   $(NULL)
diff --git a/content/media/TimeVarying.h b/content/media/TimeVarying.h
new file mode 100644
index 00000000000..3cce63a023f
--- /dev/null
+++ b/content/media/TimeVarying.h
@@ -0,0 +1,223 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef MOZILLA_TIMEVARYING_H_
+#define MOZILLA_TIMEVARYING_H_
+
+#include "nsTArray.h"
+
+namespace mozilla {
+
+/**
+ * This is just for CTOR/DTOR tracking. We can't put this in
+ * TimeVarying directly because the different template instances have
+ * different sizes and that confuses things.
+ */
+class TimeVaryingBase {
+protected:
+  TimeVaryingBase()
+  {
+    MOZ_COUNT_CTOR(TimeVaryingBase);
+  }
+  ~TimeVaryingBase()
+  {
+    MOZ_COUNT_DTOR(TimeVaryingBase);
+  }
+};
+
+/**
+ * Objects of this class represent values that can change over time ---
+ * a mathematical function of time.
+ * Time is the type of time values, T is the value that changes over time.
+ * There are a finite set of "change times"; at each change time, the function
+ * instantly changes to a new value.
+ * There is also a "current time" which must always advance (not go backward).
+ * The function is constant for all times less than the current time.
+ * When the current time is advanced, the value of the function at the new
+ * current time replaces the values for all previous times.
+ *
+ * The implementation records a mCurrent (the value at the current time)
+ * and an array of "change times" (greater than the current time) and the
+ * new value for each change time. This is a simple but dumb implementation.
+ */
+template <typename Time, typename T>
+class TimeVarying : public TimeVaryingBase {
+public:
+  TimeVarying(const T& aInitial) : mCurrent(aInitial) {}
+  /**
+   * This constructor can only be called if mCurrent has a no-argument
+   * constructor.
+   */
+  TimeVarying() : mCurrent() {}
+
+  /**
+   * Sets the value for all times >= aTime to aValue.
+   */
+  void SetAtAndAfter(Time aTime, const T& aValue)
+  {
+    for (PRInt32 i = mChanges.Length() - 1; i >= 0; --i) {
+      NS_ASSERTION(i == PRInt32(mChanges.Length() - 1),
+                   "Always considering last element of array");
+      if (aTime > mChanges[i].mTime) {
+        if (mChanges[i].mValue != aValue) {
+          mChanges.AppendElement(Entry(aTime, aValue));
+        }
+        return;
+      }
+      if (aTime == mChanges[i].mTime) {
+        if ((i > 0 ? mChanges[i - 1].mValue : mCurrent) == aValue) {
+          mChanges.RemoveElementAt(i);
+          return;
+        }
+        mChanges[i].mValue = aValue;
+        return;
+      }
+      mChanges.RemoveElementAt(i);
+    }
+    mChanges.InsertElementAt(0, Entry(aTime, aValue));
+  }
+  /**
+   * Returns the final value of the function. If aTime is non-null,
+   * sets aTime to the time at which the function changes to that final value.
+   * If there are no changes after the current time, returns PR_INT64_MIN in aTime.
+   */
+  const T& GetLast(Time* aTime = nsnull) const
+  {
+    if (mChanges.IsEmpty()) {
+      if (aTime) {
+        *aTime = PR_INT64_MIN;
+      }
+      return mCurrent;
+    }
+    if (aTime) {
+      *aTime = mChanges[mChanges.Length() - 1].mTime;
+    }
+    return mChanges[mChanges.Length() - 1].mValue;
+  }
+  /**
+   * Returns the value of the function just before time aTime.
+   */
+  const T& GetBefore(Time aTime) const
+  {
+    if (mChanges.IsEmpty() || aTime <= mChanges[0].mTime) {
+      return mCurrent;
+    }
+    PRInt32 changesLength = mChanges.Length();
+    if (mChanges[changesLength - 1].mTime < aTime) {
+      return mChanges[changesLength - 1].mValue;
+    }
+    for (PRUint32 i = 1; ; ++i) {
+      if (aTime <= mChanges[i].mTime) {
+        NS_ASSERTION(mChanges[i].mValue != mChanges[i - 1].mValue,
+                     "Only changed values appear in array");
+        return mChanges[i - 1].mValue;
+      }
+    }
+  }
+  /**
+   * Returns the value of the function at time aTime.
+   * If aEnd is non-null, sets *aEnd to the time at which the function will
+   * change from the returned value to a new value, or PR_INT64_MAX if that
+   * never happens.
+   * If aStart is non-null, sets *aStart to the time at which the function
+   * changed to the returned value, or PR_INT64_MIN if that happened at or
+   * before the current time.
+   *
+   * Currently uses a linear search, but could use a binary search.
+   */
+  const T& GetAt(Time aTime, Time* aEnd = nsnull, Time* aStart = nsnull) const
+  {
+    if (mChanges.IsEmpty() || aTime < mChanges[0].mTime) {
+      if (aStart) {
+        *aStart = PR_INT64_MIN;
+      }
+      if (aEnd) {
+        *aEnd = mChanges.IsEmpty() ? PR_INT64_MAX : mChanges[0].mTime;
+      }
+      return mCurrent;
+    }
+    PRInt32 changesLength = mChanges.Length();
+    if (mChanges[changesLength - 1].mTime <= aTime) {
+      if (aEnd) {
+        *aEnd = PR_INT64_MAX;
+      }
+      if (aStart) {
+        *aStart = mChanges[changesLength - 1].mTime;
+      }
+      return mChanges[changesLength - 1].mValue;
+    }
+
+    for (PRUint32 i = 1; ; ++i) {
+      if (aTime < mChanges[i].mTime) {
+        if (aEnd) {
+          *aEnd = mChanges[i].mTime;
+        }
+        if (aStart) {
+          *aStart = mChanges[i - 1].mTime;
+        }
+        NS_ASSERTION(mChanges[i].mValue != mChanges[i - 1].mValue,
+                     "Only changed values appear in array");
+        return mChanges[i - 1].mValue;
+      }
+    }
+  }
+  /**
+   * Advance the current time to aTime.
+   */
+  void AdvanceCurrentTime(Time aTime)
+  {
+    for (PRUint32 i = 0; i < mChanges.Length(); ++i) {
+      if (aTime < mChanges[i].mTime) {
+        mChanges.RemoveElementsAt(0, i);
+        return;
+      }
+      mCurrent = mChanges[i].mValue;
+    }
+    mChanges.Clear();
+  }
+  /**
+   * Make all currently pending changes happen aDelta later than their
+   * current change times.
+   */
+  void InsertTimeAtStart(Time aDelta)
+  {
+    for (PRUint32 i = 0; i < mChanges.Length(); ++i) {
+      mChanges[i].mTime += aDelta;
+    }
+  }
+
+  /**
+   * Replace the values of this function at aTimeOffset and later with the
+   * values of aOther taken from zero, so if aOther is V at time T >= 0
+   * then this function will be V at time T + aTimeOffset. aOther's current
+   * time must be >= 0.
+   */
+  void Append(const TimeVarying& aOther, Time aTimeOffset)
+  {
+    NS_ASSERTION(aOther.mChanges.IsEmpty() || aOther.mChanges[0].mTime >= 0,
+                 "Negative time not allowed here");
+    NS_ASSERTION(&aOther != this, "Can't self-append");
+    SetAtAndAfter(aTimeOffset, aOther.mCurrent);
+    for (PRUint32 i = 0; i < aOther.mChanges.Length(); ++i) {
+      const Entry& e = aOther.mChanges[i];
+      SetAtAndAfter(aTimeOffset + e.mTime, e.mValue);
+    }
+  }
+
+private:
+  struct Entry {
+    Entry(Time aTime, const T& aValue) : mTime(aTime), mValue(aValue) {}
+
+    // The time at which the value changes to mValue
+    Time mTime;
+    T mValue;
+  };
+  nsTArray<Entry> mChanges;
+  T mCurrent;
+};
+
+}
+
+#endif /* MOZILLA_TIMEVARYING_H_ */

From cbe41ae9066faa2c122d27aaf9568657868cd6c7 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:11:19 +1200
Subject: [PATCH 008/162] Bug 664918. Part 2: Create MediaSegment, AudioSegment
 and VideoSegment classes to manage intervals of media data. r=jesup Also
 introduces a SharedBuffer class, representing a blob of binary data with
 threadsafe refcounting.

---
 content/media/AudioSegment.cpp | 193 ++++++++++++++++++++++
 content/media/AudioSegment.h   | 151 +++++++++++++++++
 content/media/Makefile.in      |   7 +
 content/media/MediaSegment.h   | 270 +++++++++++++++++++++++++++++++
 content/media/SharedBuffer.h   |  45 ++++++
 content/media/StreamBuffer.cpp |  60 +++++++
 content/media/StreamBuffer.h   | 286 +++++++++++++++++++++++++++++++++
 content/media/VideoSegment.h   | 117 ++++++++++++++
 8 files changed, 1129 insertions(+)
 create mode 100644 content/media/AudioSegment.cpp
 create mode 100644 content/media/AudioSegment.h
 create mode 100644 content/media/MediaSegment.h
 create mode 100644 content/media/SharedBuffer.h
 create mode 100644 content/media/StreamBuffer.cpp
 create mode 100644 content/media/StreamBuffer.h
 create mode 100644 content/media/VideoSegment.h

diff --git a/content/media/AudioSegment.cpp b/content/media/AudioSegment.cpp
new file mode 100644
index 00000000000..242c2d83822
--- /dev/null
+++ b/content/media/AudioSegment.cpp
@@ -0,0 +1,193 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "AudioSegment.h"
+
+namespace mozilla {
+
+static PRUint16
+FlipByteOrderIfBigEndian(PRUint16 aValue)
+{
+  PRUint16 s = aValue;
+#if defined(IS_BIG_ENDIAN)
+  s = (s << 8) | (s >> 8);
+#endif
+  return s;
+}
+
+/*
+ * Use "2^N" conversion since it's simple, fast, "bit transparent", used by
+ * many other libraries and apparently behaves reasonably.
+ * http://blog.bjornroche.com/2009/12/int-float-int-its-jungle-out-there.html
+ * http://blog.bjornroche.com/2009/12/linearity-and-dynamic-range-in-int.html
+ */
+static float
+SampleToFloat(float aValue)
+{
+  return aValue;
+}
+static float
+SampleToFloat(PRUint8 aValue)
+{
+  return (aValue - 128)/128.0f;
+}
+static float
+SampleToFloat(PRInt16 aValue)
+{
+  return PRInt16(FlipByteOrderIfBigEndian(aValue))/32768.0f;
+}
+
+static void
+FloatToSample(float aValue, float* aOut)
+{
+  *aOut = aValue;
+}
+static void
+FloatToSample(float aValue, PRUint8* aOut)
+{
+  float v = aValue*128 + 128;
+  float clamped = NS_MAX(0.0f, NS_MIN(255.0f, v));
+  *aOut = PRUint8(clamped);
+}
+static void
+FloatToSample(float aValue, PRInt16* aOut)
+{
+  float v = aValue*32768.0f;
+  float clamped = NS_MAX(-32768.0f, NS_MIN(32767.0f, v));
+  *aOut = PRInt16(FlipByteOrderIfBigEndian(PRInt16(clamped)));
+}
+
+template <class SrcT, class DestT>
+static void
+InterleaveAndConvertBuffer(const SrcT* aSource, PRInt32 aSourceLength,
+                           PRInt32 aLength,
+                           float aVolume,
+                           PRInt32 aChannels,
+                           DestT* aOutput)
+{
+  DestT* output = aOutput;
+  for (PRInt32 i = 0; i < aLength; ++i) {
+    for (PRInt32 channel = 0; channel < aChannels; ++channel) {
+      float v = SampleToFloat(aSource[channel*aSourceLength + i])*aVolume;
+      FloatToSample(v, output);
+      ++output;
+    }
+  }
+}
+
+static void
+InterleaveAndConvertBuffer(const PRInt16* aSource, PRInt32 aSourceLength,
+                           PRInt32 aLength,
+                           float aVolume,
+                           PRInt32 aChannels,
+                           PRInt16* aOutput)
+{
+  PRInt16* output = aOutput;
+  float v = NS_MAX(NS_MIN(aVolume, 1.0f), -1.0f);
+  PRInt32 volume = PRInt32((1 << 16) * v);
+  for (PRInt32 i = 0; i < aLength; ++i) {
+    for (PRInt32 channel = 0; channel < aChannels; ++channel) {
+      PRInt16 s = FlipByteOrderIfBigEndian(aSource[channel*aSourceLength + i]);
+      *output = FlipByteOrderIfBigEndian(PRInt16((PRInt32(s) * volume) >> 16));
+      ++output;
+    }
+  }
+}
+
+template <class SrcT>
+static void
+InterleaveAndConvertBuffer(const SrcT* aSource, PRInt32 aSourceLength,
+                           PRInt32 aLength,
+                           float aVolume,
+                           PRInt32 aChannels,
+                           void* aOutput, nsAudioStream::SampleFormat aOutputFormat)
+{
+  switch (aOutputFormat) {
+  case nsAudioStream::FORMAT_FLOAT32:
+    InterleaveAndConvertBuffer(aSource, aSourceLength, aLength, aVolume,
+                               aChannels, static_cast<float*>(aOutput));
+    break;
+  case nsAudioStream::FORMAT_S16_LE:
+    InterleaveAndConvertBuffer(aSource, aSourceLength, aLength, aVolume,
+                               aChannels, static_cast<PRInt16*>(aOutput));
+    break;
+  case nsAudioStream::FORMAT_U8:
+    InterleaveAndConvertBuffer(aSource, aSourceLength, aLength, aVolume,
+                               aChannels, static_cast<PRUint8*>(aOutput));
+    break;
+  }
+}
+
+static void
+InterleaveAndConvertBuffer(const void* aSource, nsAudioStream::SampleFormat aSourceFormat,
+                           PRInt32 aSourceLength,
+                           PRInt32 aOffset, PRInt32 aLength,
+                           float aVolume,
+                           PRInt32 aChannels,
+                           void* aOutput, nsAudioStream::SampleFormat aOutputFormat)
+{
+  switch (aSourceFormat) {
+  case nsAudioStream::FORMAT_FLOAT32:
+    InterleaveAndConvertBuffer(static_cast<const float*>(aSource) + aOffset, aSourceLength,
+                               aLength,
+                               aVolume,
+                               aChannels,
+                               aOutput, aOutputFormat);
+    break;
+  case nsAudioStream::FORMAT_S16_LE:
+    InterleaveAndConvertBuffer(static_cast<const PRInt16*>(aSource) + aOffset, aSourceLength,
+                               aLength,
+                               aVolume,
+                               aChannels,
+                               aOutput, aOutputFormat);
+    break;
+  case nsAudioStream::FORMAT_U8:
+    InterleaveAndConvertBuffer(static_cast<const PRUint8*>(aSource) + aOffset, aSourceLength,
+                               aLength,
+                               aVolume,
+                               aChannels,
+                               aOutput, aOutputFormat);
+    break;
+  }
+}
+
+void
+AudioSegment::ApplyVolume(float aVolume)
+{
+  for (ChunkIterator ci(*this); !ci.IsEnded(); ci.Next()) {
+    ci->mVolume *= aVolume;
+  }
+}
+
+static const int STATIC_AUDIO_BUFFER_BYTES = 50000;
+
+void
+AudioSegment::WriteTo(nsAudioStream* aOutput)
+{
+  NS_ASSERTION(mChannels == aOutput->GetChannels(), "Wrong number of channels");
+  nsAutoTArray<PRUint8,STATIC_AUDIO_BUFFER_BYTES> buf;
+  PRUint32 frameSize = GetSampleSize(aOutput->GetFormat())*mChannels;
+  for (ChunkIterator ci(*this); !ci.IsEnded(); ci.Next()) {
+    AudioChunk& c = *ci;
+    if (frameSize*c.mDuration > PR_UINT32_MAX) {
+      NS_ERROR("Buffer overflow");
+      return;
+    }
+    buf.SetLength(PRInt32(frameSize*c.mDuration));
+    if (c.mBuffer) {
+      InterleaveAndConvertBuffer(c.mBuffer->Data(), c.mBufferFormat, c.mBufferLength,
+                                 c.mOffset, PRInt32(c.mDuration),
+                                 c.mVolume,
+                                 aOutput->GetChannels(),
+                                 buf.Elements(), aOutput->GetFormat());
+    } else {
+      // Assumes that a bit pattern of zeroes == 0.0f
+      memset(buf.Elements(), 0, buf.Length());
+    }
+    aOutput->Write(buf.Elements(), PRInt32(c.mDuration));
+  }
+}
+
+}
diff --git a/content/media/AudioSegment.h b/content/media/AudioSegment.h
new file mode 100644
index 00000000000..396fabb452f
--- /dev/null
+++ b/content/media/AudioSegment.h
@@ -0,0 +1,151 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef MOZILLA_AUDIOSEGMENT_H_
+#define MOZILLA_AUDIOSEGMENT_H_
+
+#include "MediaSegment.h"
+#include "nsISupportsImpl.h"
+#include "nsAudioStream.h"
+#include "SharedBuffer.h"
+
+namespace mozilla {
+
+struct AudioChunk {
+  typedef nsAudioStream::SampleFormat SampleFormat;
+
+  // Generic methods
+  void SliceTo(TrackTicks aStart, TrackTicks aEnd)
+  {
+    NS_ASSERTION(aStart >= 0 && aStart < aEnd && aEnd <= mDuration,
+                 "Slice out of bounds");
+    if (mBuffer) {
+      mOffset += PRInt32(aStart);
+    }
+    mDuration = aEnd - aStart;
+  }
+  TrackTicks GetDuration() const { return mDuration; }
+  bool CanCombineWithFollowing(const AudioChunk& aOther) const
+  {
+    if (aOther.mBuffer != mBuffer) {
+      return false;
+    }
+    if (mBuffer) {
+      NS_ASSERTION(aOther.mBufferFormat == mBufferFormat && aOther.mBufferLength == mBufferLength,
+                   "Wrong metadata about buffer");
+      return aOther.mOffset == mOffset + mDuration && aOther.mVolume == mVolume;
+    }
+    return true;
+  }
+  bool IsNull() const { return mBuffer == nsnull; }
+  void SetNull(TrackTicks aDuration)
+  {
+    mBuffer = nsnull;
+    mDuration = aDuration;
+    mOffset = 0;
+    mVolume = 1.0f;
+  }
+
+  TrackTicks mDuration;           // in frames within the buffer
+  nsRefPtr<SharedBuffer> mBuffer; // null means data is all zeroes
+  PRInt32 mBufferLength;          // number of frames in mBuffer (only meaningful if mBuffer is nonnull)
+  SampleFormat mBufferFormat;     // format of frames in mBuffer (only meaningful if mBuffer is nonnull)
+  PRInt32 mOffset;                // in frames within the buffer (zero if mBuffer is null)
+  float mVolume;                  // volume multiplier to apply (1.0f if mBuffer is nonnull)
+};
+
+/**
+ * A list of audio samples consisting of a sequence of slices of SharedBuffers.
+ * The audio rate is determined by the track, not stored in this class.
+ */
+class AudioSegment : public MediaSegmentBase<AudioSegment, AudioChunk> {
+public:
+  typedef nsAudioStream::SampleFormat SampleFormat;
+
+  static int GetSampleSize(SampleFormat aFormat)
+  {
+    switch (aFormat) {
+    case nsAudioStream::FORMAT_U8: return 1;
+    case nsAudioStream::FORMAT_S16_LE: return 2;
+    case nsAudioStream::FORMAT_FLOAT32: return 4;
+    }
+    NS_ERROR("Bad format");
+    return 0;
+  }
+
+  AudioSegment() : MediaSegmentBase<AudioSegment, AudioChunk>(AUDIO), mChannels(0) {}
+
+  bool IsInitialized()
+  {
+    return mChannels > 0;
+  }
+  void Init(PRInt32 aChannels)
+  {
+    NS_ASSERTION(aChannels > 0, "Bad number of channels");
+    NS_ASSERTION(!IsInitialized(), "Already initialized");
+    mChannels = aChannels;
+  }
+  PRInt32 GetChannels()
+  {
+    NS_ASSERTION(IsInitialized(), "Not initialized");
+    return mChannels;
+  }
+  /**
+   * Returns the format of the first audio frame that has data, or
+   * FORMAT_FLOAT32 if there is none.
+   */
+  SampleFormat GetFirstFrameFormat()
+  {
+    for (ChunkIterator ci(*this); !ci.IsEnded(); ci.Next()) {
+      if (ci->mBuffer) {
+        return ci->mBufferFormat;
+      }
+    }
+    return nsAudioStream::FORMAT_FLOAT32;
+  }
+  void AppendFrames(already_AddRefed<SharedBuffer> aBuffer, PRInt32 aBufferLength,
+                    PRInt32 aStart, PRInt32 aEnd, SampleFormat aFormat)
+  {
+    NS_ASSERTION(mChannels > 0, "Not initialized");
+    AudioChunk* chunk = AppendChunk(aEnd - aStart);
+    chunk->mBuffer = aBuffer;
+    chunk->mBufferFormat = aFormat;
+    chunk->mBufferLength = aBufferLength;
+    chunk->mOffset = aStart;
+    chunk->mVolume = 1.0f;
+  }
+  void ApplyVolume(float aVolume);
+  /**
+   * aOutput must have a matching number of channels, but we will automatically
+   * convert sample formats.
+   */
+  void WriteTo(nsAudioStream* aOutput);
+
+  void AppendFrom(AudioSegment* aSource)
+  {
+    NS_ASSERTION(aSource->mChannels == mChannels, "Non-matching channels");
+    MediaSegmentBase<AudioSegment, AudioChunk>::AppendFrom(aSource);
+  }
+
+  // Segment-generic methods not in MediaSegmentBase
+  void InitFrom(const AudioSegment& aOther)
+  {
+    NS_ASSERTION(mChannels == 0, "Channels already set");
+    mChannels = aOther.mChannels;
+  }
+  void SliceFrom(const AudioSegment& aOther, TrackTicks aStart, TrackTicks aEnd)
+  {
+    InitFrom(aOther);
+    BaseSliceFrom(aOther, aStart, aEnd);
+  }
+  static Type StaticType() { return AUDIO; }
+
+protected:
+  PRInt32 mChannels;
+};
+
+}
+
+#endif /* MOZILLA_AUDIOSEGMENT_H_ */
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index c01f3736484..a794d080400 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -46,20 +46,26 @@ LIBRARY_NAME = gkconmedia_s
 LIBXUL_LIBRARY = 1
 
 EXPORTS = \
+  AudioSegment.h \
   FileBlockCache.h \
   MediaResource.h \
+  MediaSegment.h \
   nsAudioAvailableEventManager.h \
   nsBuiltinDecoder.h \
   nsBuiltinDecoderStateMachine.h \
   nsBuiltinDecoderReader.h \
   nsMediaCache.h \
   nsMediaDecoder.h \
+  SharedBuffer.h \
+  StreamBuffer.h \
   TimeVarying.h \
   VideoFrameContainer.h \
   VideoUtils.h \
+  VideoSegment.h \
   $(NULL)
 
 CPPSRCS = \
+  AudioSegment.cpp \
   FileBlockCache.cpp \
   MediaResource.cpp \
   nsAudioAvailableEventManager.cpp \
@@ -68,6 +74,7 @@ CPPSRCS = \
   nsBuiltinDecoderReader.cpp \
   nsMediaCache.cpp \
   nsMediaDecoder.cpp \
+  StreamBuffer.cpp \
   VideoFrameContainer.cpp \
   VideoUtils.cpp \
   $(NULL)
diff --git a/content/media/MediaSegment.h b/content/media/MediaSegment.h
new file mode 100644
index 00000000000..6ad098a789d
--- /dev/null
+++ b/content/media/MediaSegment.h
@@ -0,0 +1,270 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef MOZILLA_MEDIASEGMENT_H_
+#define MOZILLA_MEDIASEGMENT_H_
+
+#include "nsTArray.h"
+
+namespace mozilla {
+
+/**
+ * We represent media times in 64-bit fixed point. So 1 MediaTime is
+ * 1/(2^MEDIA_TIME_FRAC_BITS) seconds.
+ */
+typedef PRInt64 MediaTime;
+const PRInt64 MEDIA_TIME_FRAC_BITS = 20;
+const PRInt64 MEDIA_TIME_MAX = PR_INT64_MAX;
+
+inline MediaTime MillisecondsToMediaTime(PRInt32 aMS)
+{
+  return (MediaTime(aMS) << MEDIA_TIME_FRAC_BITS)/1000;
+}
+
+inline MediaTime SecondsToMediaTime(double aS)
+{
+  NS_ASSERTION(aS <= (MEDIA_TIME_MAX >> MEDIA_TIME_FRAC_BITS),
+               "Out of range");
+  return MediaTime(aS * (1 << MEDIA_TIME_FRAC_BITS));
+}
+
+inline double MediaTimeToSeconds(MediaTime aTime)
+{
+  return aTime*(1.0/(1 << MEDIA_TIME_FRAC_BITS));
+}
+
+/**
+ * A number of ticks at a rate determined by some underlying track (e.g.
+ * audio sample rate). We want to make sure that multiplying TrackTicks by
+ * 2^MEDIA_TIME_FRAC_BITS doesn't overflow, so we set its max accordingly.
+ */
+typedef PRInt64 TrackTicks;
+const PRInt64 TRACK_TICKS_MAX = PR_INT64_MAX >> MEDIA_TIME_FRAC_BITS;
+
+/**
+ * A MediaSegment is a chunk of media data sequential in time. Different
+ * types of data have different subclasses of MediaSegment, all inheriting
+ * from MediaSegmentBase.
+ * All MediaSegment data is timed using TrackTicks. The actual tick rate
+ * is defined on a per-track basis. For some track types, this can be
+ * a fixed constant for all tracks of that type (e.g. 1MHz for video).
+ *
+ * Each media segment defines a concept of "null media data" (e.g. silence
+ * for audio or "no video frame" for video), which can be efficiently
+ * represented. This is used for padding.
+ */
+class MediaSegment {
+public:
+  virtual ~MediaSegment()
+  {
+    MOZ_COUNT_DTOR(MediaSegment);
+  }
+
+  enum Type {
+    AUDIO,
+    VIDEO,
+    TYPE_COUNT
+  };
+
+  /**
+   * Gets the total duration of the segment.
+   */
+  TrackTicks GetDuration() { return mDuration; }
+  Type GetType() { return mType; }
+
+  /**
+   * Create a MediaSegment of the same type.
+   */
+  virtual MediaSegment* CreateEmptyClone() = 0;
+  /**
+   * Moves contents of aSource to the end of this segment.
+   */
+  virtual void AppendFrom(MediaSegment* aSource) = 0;
+  /**
+   * Replace all contents up to aDuration with null data.
+   */
+  virtual void ForgetUpTo(TrackTicks aDuration) = 0;
+  /**
+   * Insert aDuration of null data at the start of the segment.
+   */
+  virtual void InsertNullDataAtStart(TrackTicks aDuration) = 0;
+
+protected:
+  MediaSegment(Type aType) : mDuration(0), mType(aType)
+  {
+    MOZ_COUNT_CTOR(MediaSegment);
+  }
+
+  TrackTicks mDuration; // total of mDurations of all chunks
+  Type mType;
+};
+
+/**
+ * C is the implementation class subclassed from MediaSegmentBase.
+ * C must contain a Chunk class.
+ */
+template <class C, class Chunk> class MediaSegmentBase : public MediaSegment {
+public:
+  virtual MediaSegment* CreateEmptyClone()
+  {
+    C* s = new C();
+    s->InitFrom(*static_cast<C*>(this));
+    return s;
+  }
+
+  /**
+   * Appends the contents of aSource to this segment, clearing aSource.
+   */
+  virtual void AppendFrom(MediaSegmentBase<C, Chunk>* aSource)
+  {
+    mDuration += aSource->mDuration;
+    aSource->mDuration = 0;
+    if (!mChunks.IsEmpty() && !aSource->mChunks.IsEmpty() &&
+        mChunks[mChunks.Length() - 1].CanCombineWithFollowing(aSource->mChunks[0])) {
+      mChunks[mChunks.Length() - 1].mDuration += aSource->mChunks[0].mDuration;
+      aSource->mChunks.RemoveElementAt(0);
+    }
+    mChunks.MoveElementsFrom(aSource->mChunks);
+  }
+  void RemoveLeading(TrackTicks aDuration)
+  {
+    RemoveLeadingInternal(aDuration, 0);
+  }
+  virtual void AppendFrom(MediaSegment* aSource)
+  {
+    NS_ASSERTION(aSource->GetType() == C::StaticType(), "Wrong type");
+    AppendFrom(static_cast<C*>(aSource));
+  }
+  /**
+   * Replace the first aDuration ticks with null media data, because the data
+   * will not be required again.
+   */
+  virtual void ForgetUpTo(TrackTicks aDuration)
+  {
+    if (mChunks.IsEmpty() || aDuration <= 0) {
+      return;
+    }
+    if (mChunks[0].IsNull()) {
+      TrackTicks extraToForget = NS_MIN(aDuration, mDuration) - mChunks[0].GetDuration();
+      if (extraToForget > 0) {
+        RemoveLeadingInternal(extraToForget, 1);
+        mChunks[0].mDuration += extraToForget;
+        mDuration += extraToForget;
+      }
+      return;
+    }
+    RemoveLeading(aDuration);
+    mChunks.InsertElementAt(0)->SetNull(aDuration);
+    mDuration += aDuration;
+  }
+  virtual void InsertNullDataAtStart(TrackTicks aDuration)
+  {
+    if (aDuration <= 0) {
+      return;
+    }
+    if (!mChunks.IsEmpty() && mChunks[0].IsNull()) {
+      mChunks[0].mDuration += aDuration;
+    } else {
+      mChunks.InsertElementAt(0)->SetNull(aDuration);
+    }
+    mDuration += aDuration;
+  }
+
+protected:
+  MediaSegmentBase(Type aType) : MediaSegment(aType) {}
+
+  void BaseSliceFrom(const MediaSegmentBase<C, Chunk>& aOther,
+                     TrackTicks aStart, TrackTicks aEnd)
+  {
+    NS_ASSERTION(aStart >= 0 && aEnd <= aOther.mDuration,
+                 "Slice out of range");
+    TrackTicks offset = 0;
+    for (PRUint32 i = 0; i < aOther.mChunks.Length() && offset < aEnd; ++i) {
+      const Chunk& c = aOther.mChunks[i];
+      TrackTicks start = NS_MAX(aStart, offset);
+      TrackTicks nextOffset = offset + c.GetDuration();
+      TrackTicks end = NS_MIN(aEnd, nextOffset);
+      if (start < end) {
+        mChunks.AppendElement(c)->SliceTo(start - offset, end - offset);
+      }
+      offset = nextOffset;
+    }
+  }
+
+  Chunk* AppendChunk(TrackTicks aDuration)
+  {
+    Chunk* c = mChunks.AppendElement();
+    c->mDuration = aDuration;
+    mDuration += aDuration;
+    return c;
+  }
+
+  Chunk* FindChunkContaining(TrackTicks aOffset, TrackTicks* aStart = nsnull)
+  {
+    if (aOffset < 0) {
+      return nsnull;
+    }
+    TrackTicks offset = 0;
+    for (PRUint32 i = 0; i < mChunks.Length(); ++i) {
+      Chunk& c = mChunks[i];
+      TrackTicks nextOffset = offset + c.GetDuration();
+      if (aOffset < nextOffset) {
+        if (aStart) {
+          *aStart = offset;
+        }
+        return &c;
+      }
+      offset = nextOffset;
+    }
+    return nsnull;
+  }
+
+  Chunk* GetLastChunk()
+  {
+    if (mChunks.IsEmpty()) {
+      return nsnull;
+    }
+    return &mChunks[mChunks.Length() - 1];
+  }
+
+  class ChunkIterator {
+  public:
+    ChunkIterator(MediaSegmentBase<C, Chunk>& aSegment)
+      : mSegment(aSegment), mIndex(0) {}
+    bool IsEnded() { return mIndex >= mSegment.mChunks.Length(); }
+    void Next() { ++mIndex; }
+    Chunk& operator*() { return mSegment.mChunks[mIndex]; }
+    Chunk* operator->() { return &mSegment.mChunks[mIndex]; }
+  private:
+    MediaSegmentBase<C, Chunk>& mSegment;
+    PRUint32 mIndex;
+  };
+
+protected:
+  void RemoveLeadingInternal(TrackTicks aDuration, PRUint32 aStartIndex)
+  {
+    NS_ASSERTION(aDuration >= 0, "Can't remove negative duration");
+    TrackTicks t = aDuration;
+    PRUint32 chunksToRemove = 0;
+    for (PRUint32 i = aStartIndex; i < mChunks.Length() && t > 0; ++i) {
+      Chunk* c = &mChunks[i];
+      if (c->GetDuration() > t) {
+        c->SliceTo(t, c->GetDuration());
+        t = 0;
+        break;
+      }
+      t -= c->GetDuration();
+      chunksToRemove = i + 1 - aStartIndex;
+    }
+    mChunks.RemoveElementsAt(aStartIndex, chunksToRemove);
+    mDuration -= aDuration - t;
+  }
+
+  nsTArray<Chunk> mChunks;
+};
+
+}
+
+#endif /* MOZILLA_MEDIASEGMENT_H_ */
diff --git a/content/media/SharedBuffer.h b/content/media/SharedBuffer.h
new file mode 100644
index 00000000000..49ad6b59fe4
--- /dev/null
+++ b/content/media/SharedBuffer.h
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef MOZILLA_SHAREDBUFFER_H_
+#define MOZILLA_SHAREDBUFFER_H_
+
+#include "mozilla/mozalloc.h"
+
+namespace mozilla {
+
+/**
+ * Heap-allocated chunk of arbitrary data with threadsafe refcounting.
+ * Typically you would allocate one of these, fill it in, and then treat it as
+ * immutable while it's shared.
+ * This only guarantees 4-byte alignment of the data. For alignment we
+ * simply assume that the refcount is at least 4-byte aligned and its size
+ * is divisible by 4.
+ */
+class SharedBuffer {
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SharedBuffer)
+  ~SharedBuffer() {}
+
+  void* Data() { return this + 1; }
+
+  // Takes ownership of aData (which will be freed via moz_free()).
+  // aData consists of aChannels consecutive buffers, each of aLength samples.
+  static already_AddRefed<SharedBuffer> Create(size_t aSize)
+  {
+    void* m = moz_xmalloc(sizeof(SharedBuffer) + aSize);
+    nsRefPtr<SharedBuffer> p = new (m) SharedBuffer();
+    NS_ASSERTION((reinterpret_cast<char*>(p.get() + 1) - reinterpret_cast<char*>(p.get())) % 4 == 0,
+                 "SharedBuffers should be at least 4-byte aligned");
+    return p.forget();
+  }
+
+private:
+  SharedBuffer() {}
+};
+
+}
+
+#endif /* MOZILLA_SHAREDBUFFER_H_ */
diff --git a/content/media/StreamBuffer.cpp b/content/media/StreamBuffer.cpp
new file mode 100644
index 00000000000..bac42d3878f
--- /dev/null
+++ b/content/media/StreamBuffer.cpp
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "StreamBuffer.h"
+
+namespace mozilla {
+
+StreamTime
+StreamBuffer::GetEnd() const
+{
+  StreamTime t = mTracksKnownTime;
+  for (PRUint32 i = 0; i < mTracks.Length(); ++i) {
+    Track* track = mTracks[i];
+    if (!track->IsEnded()) {
+      t = NS_MIN(t, track->GetEndTimeRoundDown());
+    }
+  }
+  return t;
+}
+
+StreamBuffer::Track*
+StreamBuffer::FindTrack(TrackID aID)
+{
+  if (aID == TRACK_NONE)
+    return nsnull;
+  for (PRUint32 i = 0; i < mTracks.Length(); ++i) {
+    Track* track = mTracks[i];
+    if (track->GetID() == aID) {
+      return track;
+    }
+  }
+  return nsnull;
+}
+
+void
+StreamBuffer::ForgetUpTo(StreamTime aTime)
+{
+  // Round to nearest 50ms so we don't spend too much time pruning segments.
+  const int roundTo = MillisecondsToMediaTime(50);
+  StreamTime forget = (aTime/roundTo)*roundTo;
+  if (forget <= mForgottenTime) {
+    return;
+  }
+  mForgottenTime = forget;
+
+  for (PRUint32 i = 0; i < mTracks.Length(); ++i) {
+    Track* track = mTracks[i];
+    if (track->IsEnded() && track->GetEndTimeRoundDown() <= forget) {
+      mTracks.RemoveElementAt(i);
+      --i;
+      continue;
+    }
+    TrackTicks forgetTo = NS_MIN(track->GetEnd() - 1, track->TimeToTicksRoundDown(forget));
+    track->ForgetUpTo(forgetTo);
+  }
+}
+
+}
diff --git a/content/media/StreamBuffer.h b/content/media/StreamBuffer.h
new file mode 100644
index 00000000000..1cda4870231
--- /dev/null
+++ b/content/media/StreamBuffer.h
@@ -0,0 +1,286 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef MOZILLA_STREAMBUFFER_H_
+#define MOZILLA_STREAMBUFFER_H_
+
+#include "mozilla/Util.h"
+#include "MediaSegment.h"
+#include "nsAutoPtr.h"
+
+namespace mozilla {
+
+/**
+ * Media time relative to the start of a StreamBuffer.
+ */
+typedef MediaTime StreamTime;
+const StreamTime STREAM_TIME_MAX = MEDIA_TIME_MAX;
+
+/**
+ * Track rate in Hz. Maximum 1 << MEDIA_TIME_FRAC_BITS Hz. This ensures
+ * calculations below don't overflow.
+ */
+typedef PRInt32 TrackRate;
+const TrackRate TRACK_RATE_MAX = 1 << MEDIA_TIME_FRAC_BITS;
+
+/**
+ * Unique ID for track within a StreamBuffer. Tracks from different
+ * StreamBuffers may have the same ID; this matters when appending StreamBuffers,
+ * since tracks with the same ID are matched. Only IDs greater than 0 are allowed.
+ */
+typedef PRInt32 TrackID;
+const TrackID TRACK_NONE = 0;
+
+inline TrackTicks TimeToTicksRoundUp(TrackRate aRate, StreamTime aMicroseconds)
+{
+  NS_ASSERTION(0 < aRate && aRate <= TRACK_RATE_MAX, "Bad rate");
+  NS_ASSERTION(0 <= aMicroseconds && aMicroseconds <= STREAM_TIME_MAX, "Bad microseconds");
+  return (aMicroseconds*aRate + (1 << MEDIA_TIME_FRAC_BITS) - 1) >> MEDIA_TIME_FRAC_BITS;
+}
+
+inline TrackTicks TimeToTicksRoundDown(TrackRate aRate, StreamTime aMicroseconds)
+{
+  NS_ASSERTION(0 < aRate && aRate <= TRACK_RATE_MAX, "Bad rate");
+  NS_ASSERTION(0 <= aMicroseconds && aMicroseconds <= STREAM_TIME_MAX, "Bad microseconds");
+  return (aMicroseconds*aRate) >> MEDIA_TIME_FRAC_BITS;
+}
+
+inline StreamTime TicksToTimeRoundUp(TrackRate aRate, TrackTicks aTicks)
+{
+  NS_ASSERTION(0 < aRate && aRate <= TRACK_RATE_MAX, "Bad rate");
+  NS_ASSERTION(0 <= aTicks && aTicks <= TRACK_TICKS_MAX, "Bad samples");
+  return ((aTicks << MEDIA_TIME_FRAC_BITS) + aRate - 1)/aRate;
+}
+
+inline StreamTime TicksToTimeRound(TrackRate aRate, TrackTicks aTicks)
+{
+  NS_ASSERTION(0 < aRate && aRate <= TRACK_RATE_MAX, "Bad rate");
+  NS_ASSERTION(0 <= aTicks && aTicks <= TRACK_TICKS_MAX, "Bad samples");
+  return ((aTicks << MEDIA_TIME_FRAC_BITS) + aRate/2)/aRate;
+}
+
+inline StreamTime TicksToTimeRoundDown(TrackRate aRate, TrackTicks aTicks)
+{
+  NS_ASSERTION(0 < aRate && aRate <= TRACK_RATE_MAX, "Bad rate");
+  NS_ASSERTION(0 <= aTicks && aTicks <= TRACK_TICKS_MAX, "Bad samples");
+  return (aTicks << MEDIA_TIME_FRAC_BITS)/aRate;
+}
+
+/**
+ * This object contains the decoded data for a stream's tracks.
+ * A StreamBuffer can be appended to. Logically a StreamBuffer only gets longer,
+ * but we also have the ability to "forget" data before a certain time that
+ * we know won't be used again. (We prune a whole number of seconds internally.)
+ *
+ * StreamBuffers should only be used from one thread at a time.
+ *
+ * A StreamBuffer has a set of tracks that can be of arbitrary types ---
+ * the data for each track is a MediaSegment. The set of tracks can vary
+ * over the timeline of the StreamBuffer.
+ */
+class StreamBuffer {
+public:
+  /**
+   * Every track has a start time --- when it started in the StreamBuffer.
+   * It has an end flag; when false, no end point is known; when true,
+   * the track ends when the data we have for the track runs out.
+   * Tracks have a unique ID assigned at creation. This allows us to identify
+   * the same track across StreamBuffers. A StreamBuffer should never have
+   * two tracks with the same ID (even if they don't overlap in time).
+   * TODO Tracks can also be enabled and disabled over time.
+   * TODO Add TimeVarying<TrackTicks,bool> mEnabled.
+   */
+  class Track {
+  public:
+    Track(TrackID aID, TrackRate aRate, TrackTicks aStart, MediaSegment* aSegment)
+      : mStart(aStart),
+        mSegment(aSegment),
+        mRate(aRate),
+        mID(aID),
+        mEnded(false)
+    {
+      MOZ_COUNT_CTOR(Track);
+
+      NS_ASSERTION(aID > TRACK_NONE, "Bad track ID");
+      NS_ASSERTION(0 < aRate && aRate <= TRACK_RATE_MAX, "Invalid rate");
+      NS_ASSERTION(0 <= aStart && aStart <= aSegment->GetDuration(), "Bad start position");
+    }
+    ~Track()
+    {
+      MOZ_COUNT_DTOR(Track);
+    }
+    template <class T> T* Get() const
+    {
+      if (mSegment->GetType() == T::StaticType()) {
+        return static_cast<T*>(mSegment.get());
+      }
+      return nsnull;
+    }
+    MediaSegment* GetSegment() const { return mSegment; }
+    TrackRate GetRate() const { return mRate; }
+    TrackID GetID() const { return mID; }
+    bool IsEnded() const { return mEnded; }
+    TrackTicks GetStart() const { return mStart; }
+    TrackTicks GetEnd() const { return mSegment->GetDuration(); }
+    StreamTime GetEndTimeRoundDown() const
+    {
+      return mozilla::TicksToTimeRoundDown(mRate, mSegment->GetDuration());
+    }
+    StreamTime GetStartTimeRoundDown() const
+    {
+      return mozilla::TicksToTimeRoundDown(mRate, mStart);
+    }
+    TrackTicks TimeToTicksRoundDown(StreamTime aTime) const
+    {
+      return mozilla::TimeToTicksRoundDown(mRate, aTime);
+    }
+    StreamTime TicksToTimeRoundDown(TrackTicks aTicks) const
+    {
+      return mozilla::TicksToTimeRoundDown(mRate, aTicks);
+    }
+    MediaSegment::Type GetType() const { return mSegment->GetType(); }
+
+    void SetEnded() { mEnded = true; }
+    void AppendFrom(Track* aTrack)
+    {
+      NS_ASSERTION(!mEnded, "Can't append to ended track");
+      NS_ASSERTION(aTrack->mID == mID, "IDs must match");
+      NS_ASSERTION(aTrack->mStart == 0, "Source track must start at zero");
+      NS_ASSERTION(aTrack->mSegment->GetType() == GetType(), "Track types must match");
+      NS_ASSERTION(aTrack->mRate == mRate, "Track rates must match");
+
+      mSegment->AppendFrom(aTrack->mSegment);
+      mEnded = aTrack->mEnded;
+    }
+    MediaSegment* RemoveSegment()
+    {
+      return mSegment.forget();
+    }
+    void ForgetUpTo(TrackTicks aTime)
+    {
+      mSegment->ForgetUpTo(aTime);
+    }
+
+  protected:
+    friend class StreamBuffer;
+
+    // Start offset is in ticks at rate mRate
+    TrackTicks mStart;
+    // The segment data starts at the start of the owning StreamBuffer, i.e.,
+    // there's mStart silence/no video at the beginning.
+    nsAutoPtr<MediaSegment> mSegment;
+    TrackRate mRate; // rate in ticks per second
+    // Unique ID
+    TrackID mID;
+    // True when the track ends with the data in mSegment
+    bool mEnded;
+  };
+
+  class CompareTracksByID {
+  public:
+    bool Equals(Track* aA, Track* aB) const {
+      return aA->GetID() == aB->GetID();
+    }
+    bool LessThan(Track* aA, Track* aB) const {
+      return aA->GetID() < aB->GetID();
+    }
+  };
+
+  StreamBuffer()
+    : mTracksKnownTime(0), mForgottenTime(0)
+  {
+    MOZ_COUNT_CTOR(StreamBuffer);
+  }
+  ~StreamBuffer()
+  {
+    MOZ_COUNT_DTOR(StreamBuffer);
+  }
+
+  /**
+   * Takes ownership of aSegment. Don't do this while iterating, or while
+   * holding a Track reference.
+   * aSegment must have aStart worth of null data.
+   */
+  Track& AddTrack(TrackID aID, TrackRate aRate, TrackTicks aStart, MediaSegment* aSegment)
+  {
+    NS_ASSERTION(TimeToTicksRoundDown(aRate, mTracksKnownTime) <= aStart,
+                 "Start time too early");
+    NS_ASSERTION(!FindTrack(aID), "Track with this ID already exists");
+
+    return **mTracks.InsertElementSorted(new Track(aID, aRate, aStart, aSegment),
+                                         CompareTracksByID());
+  }
+  void AdvanceKnownTracksTime(StreamTime aKnownTime)
+  {
+    NS_ASSERTION(aKnownTime >= mTracksKnownTime, "Can't move tracks-known time earlier");
+    mTracksKnownTime = aKnownTime;
+  }
+
+  /**
+   * The end time for the StreamBuffer is the latest time for which we have
+   * data for all tracks that haven't ended by that time.
+   */
+  StreamTime GetEnd() const;
+
+  Track* FindTrack(TrackID aID);
+
+  class TrackIter {
+  public:
+    /**
+     * Iterate through the tracks of aBuffer in order of ID.
+     */
+    TrackIter(const StreamBuffer& aBuffer) :
+      mBuffer(&aBuffer.mTracks), mIndex(0), mMatchType(false) {}
+    /**
+     * Iterate through the tracks of aBuffer with type aType, in order of ID.
+     */
+    TrackIter(const StreamBuffer& aBuffer, MediaSegment::Type aType) :
+      mBuffer(&aBuffer.mTracks), mIndex(0), mType(aType), mMatchType(true) { FindMatch(); }
+    bool IsEnded() { return mIndex >= mBuffer->Length(); }
+    void Next()
+    {
+      ++mIndex;
+      FindMatch();
+    }
+    Track& operator*() { return *mBuffer->ElementAt(mIndex); }
+    Track* operator->() { return mBuffer->ElementAt(mIndex); }
+  private:
+    void FindMatch()
+    {
+      if (!mMatchType)
+        return;
+      while (mIndex < mBuffer->Length() &&
+             mBuffer->ElementAt(mIndex)->GetType() != mType) {
+        ++mIndex;
+      }
+    }
+
+    const nsTArray<nsAutoPtr<Track> >* mBuffer;
+    PRUint32 mIndex;
+    MediaSegment::Type mType;
+    bool mMatchType;
+  };
+  friend class TrackIter;
+
+  /**
+   * Forget stream data before aTime; they will no longer be needed.
+   * Also can forget entire tracks that have ended at or before aTime.
+   * Can't be used to forget beyond GetEnd().
+   */
+  void ForgetUpTo(StreamTime aTime);
+
+protected:
+  // Any new tracks added will start at or after this time. In other words, the track
+  // list is complete and correct for all times less than this time.
+  StreamTime mTracksKnownTime;
+  StreamTime mForgottenTime;
+  // All known tracks for this StreamBuffer
+  nsTArray<nsAutoPtr<Track> > mTracks;
+};
+
+}
+
+#endif /* MOZILLA_STREAMBUFFER_H_ */
+
diff --git a/content/media/VideoSegment.h b/content/media/VideoSegment.h
new file mode 100644
index 00000000000..99973cb9115
--- /dev/null
+++ b/content/media/VideoSegment.h
@@ -0,0 +1,117 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef MOZILLA_VIDEOSEGMENT_H_
+#define MOZILLA_VIDEOSEGMENT_H_
+
+#include "MediaSegment.h"
+#include "ImageLayers.h"
+
+namespace mozilla {
+
+class VideoFrame {
+public:
+  typedef mozilla::layers::Image Image;
+
+  VideoFrame(already_AddRefed<Image> aImage, const gfxIntSize& aIntrinsicSize)
+    : mImage(aImage), mIntrinsicSize(aIntrinsicSize) {}
+  VideoFrame() : mIntrinsicSize(0, 0) {}
+
+  bool operator==(const VideoFrame& aFrame) const
+  {
+    return mImage == aFrame.mImage && mIntrinsicSize == aFrame.mIntrinsicSize;
+  }
+  bool operator!=(const VideoFrame& aFrame) const
+  {
+    return !operator==(aFrame);
+  }
+
+  Image* GetImage() const { return mImage; }
+  const gfxIntSize& GetIntrinsicSize() const { return mIntrinsicSize; }
+  void SetNull() { mImage = nsnull; mIntrinsicSize = gfxIntSize(0, 0); }
+  void TakeFrom(VideoFrame* aFrame)
+  {
+    mImage = aFrame->mImage.forget();
+    mIntrinsicSize = aFrame->mIntrinsicSize;
+  }
+
+protected:
+  // mImage can be null to indicate "no video" (aka "empty frame"). It can
+  // still have an intrinsic size in this case.
+  nsRefPtr<Image> mImage;
+  // The desired size to render the video frame at.
+  gfxIntSize mIntrinsicSize;
+};
+
+
+struct VideoChunk {
+  void SliceTo(TrackTicks aStart, TrackTicks aEnd)
+  {
+    NS_ASSERTION(aStart >= 0 && aStart < aEnd && aEnd <= mDuration,
+                 "Slice out of bounds");
+    mDuration = aEnd - aStart;
+  }
+  TrackTicks GetDuration() const { return mDuration; }
+  bool CanCombineWithFollowing(const VideoChunk& aOther) const
+  {
+    return aOther.mFrame == mFrame;
+  }
+  bool IsNull() const { return !mFrame.GetImage(); }
+  void SetNull(TrackTicks aDuration)
+  {
+    mDuration = aDuration;
+    mFrame.SetNull();
+  }
+
+  TrackTicks mDuration;
+  VideoFrame mFrame;
+};
+
+class VideoSegment : public MediaSegmentBase<VideoSegment, VideoChunk> {
+public:
+  typedef mozilla::layers::Image Image;
+
+  VideoSegment() : MediaSegmentBase<VideoSegment, VideoChunk>(VIDEO) {}
+
+  void AppendFrame(already_AddRefed<Image> aImage, TrackTicks aDuration,
+                   const gfxIntSize& aIntrinsicSize)
+  {
+    VideoChunk* chunk = AppendChunk(aDuration);
+    VideoFrame frame(aImage, aIntrinsicSize);
+    chunk->mFrame.TakeFrom(&frame);
+  }
+  const VideoFrame* GetFrameAt(TrackTicks aOffset, TrackTicks* aStart = nsnull)
+  {
+    VideoChunk* c = FindChunkContaining(aOffset, aStart);
+    if (!c) {
+      return nsnull;
+    }
+    return &c->mFrame;
+  }
+  const VideoFrame* GetLastFrame(TrackTicks* aStart = nsnull)
+  {
+    VideoChunk* c = GetLastChunk();
+    if (!c) {
+      return nsnull;
+    }
+    if (aStart) {
+      *aStart = mDuration - c->mDuration;
+    }
+    return &c->mFrame;
+  }
+
+  // Segment-generic methods not in MediaSegmentBase
+  void InitFrom(const VideoSegment& aOther)
+  {
+  }
+  void SliceFrom(const VideoSegment& aOther, TrackTicks aStart, TrackTicks aEnd) {
+    BaseSliceFrom(aOther, aStart, aEnd);
+  }
+  static Type StaticType() { return VIDEO; }
+};
+
+}
+
+#endif /* MOZILLA_VIDEOSEGMENT_H_ */

From a619144e05886657aabd20bb4bfd98e1acbcb1b9 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:11:26 +1200
Subject: [PATCH 009/162] Bug 664918. Part 3: Create MediaStream and
 MediaGraphManager for internal management of real-time media processing.
 r=jesup

---
 content/media/Makefile.in          |    2 +
 content/media/MediaStreamGraph.cpp | 1772 ++++++++++++++++++++++++++++
 content/media/MediaStreamGraph.h   |  394 +++++++
 3 files changed, 2168 insertions(+)
 create mode 100644 content/media/MediaStreamGraph.cpp
 create mode 100644 content/media/MediaStreamGraph.h

diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index a794d080400..e1b217e4e39 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -50,6 +50,7 @@ EXPORTS = \
   FileBlockCache.h \
   MediaResource.h \
   MediaSegment.h \
+  MediaStreamGraph.h \
   nsAudioAvailableEventManager.h \
   nsBuiltinDecoder.h \
   nsBuiltinDecoderStateMachine.h \
@@ -68,6 +69,7 @@ CPPSRCS = \
   AudioSegment.cpp \
   FileBlockCache.cpp \
   MediaResource.cpp \
+  MediaStreamGraph.cpp \
   nsAudioAvailableEventManager.cpp \
   nsBuiltinDecoder.cpp \
   nsBuiltinDecoderStateMachine.cpp \
diff --git a/content/media/MediaStreamGraph.cpp b/content/media/MediaStreamGraph.cpp
new file mode 100644
index 00000000000..96e09babc27
--- /dev/null
+++ b/content/media/MediaStreamGraph.cpp
@@ -0,0 +1,1772 @@
+/*-*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "MediaStreamGraph.h"
+
+#include "mozilla/Monitor.h"
+#include "mozilla/TimeStamp.h"
+#include "AudioSegment.h"
+#include "VideoSegment.h"
+#include "nsContentUtils.h"
+#include "nsIAppShell.h"
+#include "nsIObserver.h"
+#include "nsServiceManagerUtils.h"
+#include "nsWidgetsCID.h"
+#include "nsXPCOMCIDInternal.h"
+#include "prlog.h"
+#include "VideoUtils.h"
+
+using namespace mozilla::layers;
+
+namespace mozilla {
+
+namespace {
+
+#ifdef PR_LOGGING
+PRLogModuleInfo* gMediaStreamGraphLog;
+#define LOG(type, msg) PR_LOG(gMediaStreamGraphLog, type, msg)
+#else
+#define LOG(type, msg)
+#endif
+
+/**
+ * Assume we can run an iteration of the MediaStreamGraph loop in this much time
+ * or less.
+ * We try to run the control loop at this rate.
+ */
+const int MEDIA_GRAPH_TARGET_PERIOD_MS = 10;
+
+/**
+ * Assume that we might miss our scheduled wakeup of the MediaStreamGraph by
+ * this much.
+ */
+const int SCHEDULE_SAFETY_MARGIN_MS = 10;
+
+/**
+ * Try have this much audio buffered in streams and queued to the hardware.
+ * The maximum delay to the end of the next control loop
+ * is 2*MEDIA_GRAPH_TARGET_PERIOD_MS + SCHEDULE_SAFETY_MARGIN_MS.
+ * There is no point in buffering more audio than this in a stream at any
+ * given time (until we add processing).
+ * This is not optimal yet.
+ */
+const int AUDIO_TARGET_MS = 2*MEDIA_GRAPH_TARGET_PERIOD_MS +
+    SCHEDULE_SAFETY_MARGIN_MS;
+
+/**
+ * Try have this much video buffered. Video frames are set
+ * near the end of the iteration of the control loop. The maximum delay
+ * to the setting of the next video frame is 2*MEDIA_GRAPH_TARGET_PERIOD_MS +
+ * SCHEDULE_SAFETY_MARGIN_MS. This is not optimal yet.
+ */
+const int VIDEO_TARGET_MS = 2*MEDIA_GRAPH_TARGET_PERIOD_MS +
+    SCHEDULE_SAFETY_MARGIN_MS;
+
+/**
+ * A per-stream update message passed from the media graph thread to the
+ * main thread.
+ */
+struct StreamUpdate {
+  PRInt64 mGraphUpdateIndex;
+  nsRefPtr<MediaStream> mStream;
+  StreamTime mNextMainThreadCurrentTime;
+  bool mNextMainThreadFinished;
+};
+
+/**
+ * This represents a message passed from the main thread to the graph thread.
+ * A ControlMessage always references a particular affected stream.
+ */
+class ControlMessage {
+public:
+  ControlMessage(MediaStream* aStream) : mStream(aStream)
+  {
+    MOZ_COUNT_CTOR(ControlMessage);
+  }
+  // All these run on the graph thread
+  virtual ~ControlMessage()
+  {
+    MOZ_COUNT_DTOR(ControlMessage);
+  }
+  // Executed before we know what the action time for this message will be.
+  // Call NoteStreamAffected on the stream whose output will be
+  // modified by this message. Default implementation calls
+  // NoteStreamAffected(mStream).
+  virtual void UpdateAffectedStream();
+  // Executed after we know what the action time for this message will be.
+  virtual void Process() {}
+  // When we're shutting down the application, most messages are ignored but
+  // some cleanup messages should still be processed (on the main thread).
+  virtual void ProcessDuringShutdown() {}
+
+protected:
+  // We do not hold a reference to mStream. The main thread will be holding
+  // a reference to the stream while this message is in flight. The last message
+  // referencing a stream is the Destroy message for that stream.
+  MediaStream* mStream;
+};
+
+}
+
+/**
+ * The implementation of a media stream graph. This class is private to this
+ * file. It's not in the anonymous namespace because MediaStream needs to
+ * be able to friend it.
+ *
+ * Currently we only have one per process.
+ */
+class MediaStreamGraphImpl : public MediaStreamGraph {
+public:
+  MediaStreamGraphImpl();
+  ~MediaStreamGraphImpl()
+  {
+    NS_ASSERTION(IsEmpty(),
+                 "All streams should have been destroyed by messages from the main thread");
+    LOG(PR_LOG_DEBUG, ("MediaStreamGraph %p destroyed", this));
+  }
+
+  // Main thread only.
+  /**
+   * This runs every time we need to sync state from the media graph thread
+   * to the main thread while the main thread is not in the middle
+   * of a script. It runs during a "stable state" (per HTML5) or during
+   * an event posted to the main thread.
+   */
+  void RunInStableState();
+  /**
+   * Ensure a runnable to run RunInStableState is posted to the appshell to
+   * run at the next stable state (per HTML5).
+   * See EnsureStableStateEventPosted.
+   */
+  void EnsureRunInStableState();
+  /**
+   * Called to apply a StreamUpdate to its stream.
+   */
+  void ApplyStreamUpdate(StreamUpdate* aUpdate);
+  /**
+   * Append a ControlMessage to the message queue. This queue is drained
+   * during RunInStableState; the messages will run on the graph thread.
+   */
+  void AppendMessage(ControlMessage* aMessage);
+  /**
+   * Make this MediaStreamGraph enter forced-shutdown state. This state
+   * will be noticed by the media graph thread, which will shut down all streams
+   * and other state controlled by the media graph thread.
+   * This is called during application shutdown.
+   */
+  void ForceShutDown();
+  /**
+   * Shutdown() this MediaStreamGraph's threads and return when they've shut down.
+   */
+  void ShutdownThreads();
+
+  // The following methods run on the graph thread (or possibly the main thread if
+  // mLifecycleState > LIFECYCLE_RUNNING)
+  /**
+   * Runs main control loop on the graph thread. Normally a single invocation
+   * of this runs for the entire lifetime of the graph thread.
+   */
+  void RunThread();
+  /**
+   * Call this to indicate that another iteration of the control loop is
+   * required on its regular schedule. The monitor must not be held.
+   */
+  void EnsureNextIteration();
+  /**
+   * As above, but with the monitor already held.
+   */
+  void EnsureNextIterationLocked(MonitorAutoLock& aLock);
+  /**
+   * Call this to indicate that another iteration of the control loop is
+   * required immediately. The monitor must already be held.
+   */
+  void EnsureImmediateWakeUpLocked(MonitorAutoLock& aLock);
+  /**
+   * Ensure there is an event posted to the main thread to run RunInStableState.
+   * mMonitor must be held.
+   * See EnsureRunInStableState
+   */
+  void EnsureStableStateEventPosted();
+  /**
+   * Generate messages to the main thread to update it for all state changes.
+   * mMonitor must be held.
+   */
+  void PrepareUpdatesToMainThreadState();
+  // The following methods are the various stages of RunThread processing.
+  /**
+   * Compute a new current time for the graph and advance all on-graph-thread
+   * state to the new current time.
+   */
+  void UpdateCurrentTime();
+  /**
+   * Update mLastActionTime to the time at which the current set of messages
+   * will take effect.
+   */
+  void ChooseActionTime();
+  /**
+   * Compute the blocking states of streams from mBlockingDecisionsMadeUntilTime
+   * until the desired future time (determined by heuristic).
+   * Updates mBlockingDecisionsMadeUntilTime and sets MediaStream::mBlocked
+   * for all streams.
+   */
+  void RecomputeBlocking();
+  // The following methods are used to help RecomputeBlocking.
+  /**
+   * Mark a stream blocked at time aTime. If this results in decisions that need
+   * to be revisited at some point in the future, *aEnd will be reduced to the
+   * first time in the future to recompute those decisions.
+   */
+  void MarkStreamBlocked(MediaStream* aStream, GraphTime aTime, GraphTime* aEnd);
+  /**
+   * Recompute blocking for all streams for the interval starting at aTime.
+   * If this results in decisions that need to be revisited at some point
+   * in the future, *aEnd will be reduced to the first time in the future to
+   * recompute those decisions.
+   */
+  void RecomputeBlockingAt(GraphTime aTime, GraphTime aEndBlockingDecisions,
+                           GraphTime* aEnd);
+  /**
+   * Returns true if aStream will underrun at aTime for its own playback.
+   * aEndBlockingDecisions is when we plan to stop making blocking decisions.
+   * *aEnd will be reduced to the first time in the future to recompute these
+   * decisions.
+   */
+  bool WillUnderrun(MediaStream* aStream, GraphTime aTime,
+                    GraphTime aEndBlockingDecisions, GraphTime* aEnd);
+  /**
+   * Return true if there is an explicit blocker set from the current time
+   * indefinitely far into the future.
+   */
+  bool IsAlwaysExplicitlyBlocked(MediaStream* aStream);
+  /**
+   * Given a graph time aTime, convert it to a stream time taking into
+   * account the time during which aStream is scheduled to be blocked.
+   */
+  StreamTime GraphTimeToStreamTime(MediaStream* aStream, StreamTime aTime);
+  enum {
+    INCLUDE_TRAILING_BLOCKED_INTERVAL = 0x01
+  };
+  /**
+   * Given a stream time aTime, convert it to a graph time taking into
+   * account the time during which aStream is scheduled to be blocked.
+   * aTime must be <= mBlockingDecisionsMadeUntilTime since blocking decisions
+   * are only known up to that point.
+   * If aTime is exactly at the start of a blocked interval, then the blocked
+   * interval is included in the time returned if and only if
+   * aFlags includes INCLUDE_TRAILING_BLOCKED_INTERVAL.
+   */
+  GraphTime StreamTimeToGraphTime(MediaStream* aStream, StreamTime aTime,
+                                  PRUint32 aFlags = 0);
+  /**
+   * Get the current audio position of the stream's audio output.
+   */
+  GraphTime GetAudioPosition(MediaStream* aStream);
+  /**
+   * If aStream needs an audio stream but doesn't have one, create it.
+   * If aStream doesn't need an audio stream but has one, destroy it.
+   */
+  void CreateOrDestroyAudioStream(GraphTime aAudioOutputStartTime,
+                                  MediaStream* aStream);
+  /**
+   * Update aStream->mFirstActiveTracks.
+   */
+  void UpdateFirstActiveTracks(MediaStream* aStream);
+  /**
+   * Queue audio (mix of stream audio and silence for blocked intervals)
+   * to the audio output stream.
+   */
+  void PlayAudio(MediaStream* aStream, GraphTime aFrom, GraphTime aTo);
+  /**
+   * Set the correct current video frame for stream aStream.
+   */
+  void PlayVideo(MediaStream* aStream);
+  /**
+   * No more data will be forthcoming for aStream. The stream will end
+   * at the current buffer end point. The StreamBuffer's tracks must be
+   * explicitly set to finished by the caller.
+   */
+  void FinishStream(MediaStream* aStream);
+  /**
+   * Compute how much stream data we would like to buffer for aStream.
+   */
+  StreamTime GetDesiredBufferEnd(MediaStream* aStream);
+  /**
+   * Returns true when there are no active streams.
+   */
+  bool IsEmpty() { return mStreams.IsEmpty(); }
+
+  // For use by control messages
+  /**
+   * Identify which graph update index we are currently processing.
+   */
+  PRInt64 GetProcessingGraphUpdateIndex() { return mProcessingGraphUpdateIndex; }
+  /**
+   * Marks aStream as affected by a change in its output at desired time aTime
+   * (in the timeline of aStream). The change may not actually happen at this time,
+   * it may be delayed until later if there is buffered data we can't change.
+   */
+  void NoteStreamAffected(MediaStream* aStream, double aTime);
+  /**
+   * Marks aStream as affected by a change in its output at the earliest
+   * possible time.
+   */
+  void NoteStreamAffected(MediaStream* aStream);
+  /**
+   * Add aStream to the graph and initializes its graph-specific state.
+   */
+  void AddStream(MediaStream* aStream);
+  /**
+   * Remove aStream from the graph. Ensures that pending messages about the
+   * stream back to the main thread are flushed.
+   */
+  void RemoveStream(MediaStream* aStream);
+
+  /**
+   * Compute the earliest time at which an action be allowed to occur on any
+   * stream. Actions cannot be earlier than the previous action time, and
+   * cannot affect already-committed blocking decisions (and associated
+   * buffered audio).
+   */
+  GraphTime GetEarliestActionTime()
+  {
+    return NS_MAX(mCurrentTime, NS_MAX(mLastActionTime, mBlockingDecisionsMadeUntilTime));
+  }
+
+  // Data members
+
+  /**
+   * Media graph thread.
+   * Readonly after initialization on the main thread.
+   */
+  nsCOMPtr<nsIThread> mThread;
+
+  // The following state is managed on the graph thread only, unless
+  // mLifecycleState > LIFECYCLE_RUNNING in which case the graph thread
+  // is not running and this state can be used from the main thread.
+
+  nsTArray<nsRefPtr<MediaStream> > mStreams;
+  /**
+   * The time the last action was deemed to have occurred. This could be
+   * later than mCurrentTime if actions have to be delayed during data
+   * buffering, or before mCurrentTime if mCurrentTime has advanced since
+   * the last action happened. In ControlMessage::Process calls,
+   * mLastActionTime has always been updated to be >= mCurrentTime.
+   */
+  GraphTime mLastActionTime;
+  /**
+   * The current graph time for the current iteration of the RunThread control
+   * loop.
+   */
+  GraphTime mCurrentTime;
+  /**
+   * Blocking decisions have been made up to this time. We also buffer audio
+   * up to this time.
+   */
+  GraphTime mBlockingDecisionsMadeUntilTime;
+  /**
+   * This is only used for logging.
+   */
+  TimeStamp mInitialTimeStamp;
+  /**
+   * The real timestamp of the latest run of UpdateCurrentTime.
+   */
+  TimeStamp mCurrentTimeStamp;
+  /**
+   * Which update batch we are currently processing.
+   */
+  PRInt64 mProcessingGraphUpdateIndex;
+
+  // mMonitor guards the data below.
+  // MediaStreamGraph normally does its work without holding mMonitor, so it is
+  // not safe to just grab mMonitor from some thread and start monkeying with
+  // the graph. Instead, communicate with the graph thread using provided
+  // mechanisms such as the ControlMessage queue.
+  Monitor mMonitor;
+
+  // Data guarded by mMonitor (must always be accessed with mMonitor held,
+  // regardless of the value of mLifecycleState.
+
+  /**
+   * State to copy to main thread
+   */
+  nsTArray<StreamUpdate> mStreamUpdates;
+  /**
+   * Runnables to run after the next update to main thread state.
+   */
+  nsTArray<nsCOMPtr<nsIRunnable> > mUpdateRunnables;
+  struct MessageBlock {
+    PRInt64 mGraphUpdateIndex;
+    nsTArray<nsAutoPtr<ControlMessage> > mMessages;
+  };
+  /**
+   * A list of batches of messages to process. Each batch is processed
+   * as an atomic unit.
+   */
+  nsTArray<MessageBlock> mMessageQueue;
+  /**
+   * This enum specifies where this graph is in its lifecycle. This is used
+   * to control shutdown.
+   * Shutdown is tricky because it can happen in two different ways:
+   * 1) Shutdown due to inactivity. RunThread() detects that it has no
+   * pending messages and no streams, and exits. The next RunInStableState()
+   * checks if there are new pending messages from the main thread (true only
+   * if new stream creation raced with shutdown); if there are, it revives
+   * RunThread(), otherwise it commits to shutting down the graph. New stream
+   * creation after this point will create a new graph. An async event is
+   * dispatched to Shutdown() the graph's threads and then delete the graph
+   * object.
+   * 2) Forced shutdown at application shutdown. A flag is set, RunThread()
+   * detects the flag and exits, the next RunInStableState() detects the flag,
+   * and dispatches the async event to Shutdown() the graph's threads. However
+   * the graph object is not deleted. New messages for the graph are processed
+   * synchronously on the main thread if necessary. When the last stream is
+   * destroyed, the graph object is deleted.
+   */
+  enum LifecycleState {
+    // The graph thread hasn't started yet.
+    LIFECYCLE_THREAD_NOT_STARTED,
+    // RunThread() is running normally.
+    LIFECYCLE_RUNNING,
+    // In the following states, the graph thread is not running so
+    // all "graph thread only" state in this class can be used safely
+    // on the main thread.
+    // RunThread() has exited and we're waiting for the next
+    // RunInStableState(), at which point we can clean up the main-thread
+    // side of the graph.
+    LIFECYCLE_WAITING_FOR_MAIN_THREAD_CLEANUP,
+    // RunInStableState() posted a ShutdownRunnable, and we're waiting for it
+    // to shut down the graph thread(s).
+    LIFECYCLE_WAITING_FOR_THREAD_SHUTDOWN,
+    // Graph threads have shut down but we're waiting for remaining streams
+    // to be destroyed. Only happens during application shutdown since normally
+    // we'd only shut down a graph when it has no streams.
+    LIFECYCLE_WAITING_FOR_STREAM_DESTRUCTION
+  };
+  LifecycleState mLifecycleState;
+  /**
+   * This enum specifies the wait state of the graph thread.
+   */
+  enum WaitState {
+    // RunThread() is running normally
+    WAITSTATE_RUNNING,
+    // RunThread() is paused waiting for its next iteration, which will
+    // happen soon
+    WAITSTATE_WAITING_FOR_NEXT_ITERATION,
+    // RunThread() is paused indefinitely waiting for something to change
+    WAITSTATE_WAITING_INDEFINITELY,
+    // Something has signaled RunThread() to wake up immediately,
+    // but it hasn't done so yet
+    WAITSTATE_WAKING_UP
+  };
+  WaitState mWaitState;
+  /**
+   * True when another iteration of the control loop is required.
+   */
+  bool mNeedAnotherIteration;
+  /**
+   * True when we need to do a forced shutdown during application shutdown.
+   */
+  bool mForceShutDown;
+  /**
+   * True when we have posted an event to the main thread to run
+   * RunInStableState() and the event hasn't run yet.
+   */
+  bool mPostedRunInStableStateEvent;
+
+  // Main thread only
+
+  /**
+   * Messages posted by the current event loop task. These are forwarded to
+   * the media graph thread during RunInStableState. We can't forward them
+   * immediately because we want all messages between stable states to be
+   * processed as an atomic batch.
+   */
+  nsTArray<nsAutoPtr<ControlMessage> > mCurrentTaskMessageQueue;
+  /**
+   * True when RunInStableState has determined that mLifecycleState is >
+   * LIFECYCLE_RUNNING. Since only the main thread can reset mLifecycleState to
+   * LIFECYCLE_RUNNING, this can be relied on to not change unexpectedly.
+   */
+  bool mDetectedNotRunning;
+  /**
+   * True when a stable state runner has been posted to the appshell to run
+   * RunInStableState at the next stable state.
+   */
+  bool mPostedRunInStableState;
+};
+
+/**
+ * The singleton graph instance.
+ */
+static MediaStreamGraphImpl* gGraph;
+
+StreamTime
+MediaStreamGraphImpl::GetDesiredBufferEnd(MediaStream* aStream)
+{
+  StreamTime current = mCurrentTime - aStream->mBufferStartTime;
+  StreamTime desiredEnd = current;
+  if (!aStream->mAudioOutputs.IsEmpty()) {
+    desiredEnd = NS_MAX(desiredEnd, current + MillisecondsToMediaTime(AUDIO_TARGET_MS));
+  }
+  if (!aStream->mVideoOutputs.IsEmpty()) {
+    desiredEnd = NS_MAX(desiredEnd, current + MillisecondsToMediaTime(VIDEO_TARGET_MS));
+  }
+  return desiredEnd;
+}
+
+bool
+MediaStreamGraphImpl::IsAlwaysExplicitlyBlocked(MediaStream* aStream)
+{
+  GraphTime t = mCurrentTime;
+  while (true) {
+    GraphTime end;
+    if (aStream->mExplicitBlockerCount.GetAt(t, &end) == 0)
+      return false;
+    if (end >= GRAPH_TIME_MAX)
+      return true;
+    t = end;
+  }
+}
+
+void
+MediaStreamGraphImpl::FinishStream(MediaStream* aStream)
+{
+  if (aStream->mFinished)
+    return;
+  LOG(PR_LOG_DEBUG, ("MediaStream %p will finish", aStream));
+  aStream->mFinished = true;
+  // Force at least one more iteration of the control loop, since we rely
+  // on UpdateCurrentTime to notify our listeners once the stream end
+  // has been reached.
+  EnsureNextIteration();
+}
+
+void
+MediaStreamGraphImpl::NoteStreamAffected(MediaStream* aStream, double aTime)
+{
+  NS_ASSERTION(aTime >= 0, "Bad time");
+  GraphTime t =
+      NS_MAX(GetEarliestActionTime(),
+          StreamTimeToGraphTime(aStream, SecondsToMediaTime(aTime),
+                                INCLUDE_TRAILING_BLOCKED_INTERVAL));
+  aStream->mMessageAffectedTime = NS_MIN(aStream->mMessageAffectedTime, t);
+}
+
+void
+MediaStreamGraphImpl::NoteStreamAffected(MediaStream* aStream)
+{
+  GraphTime t = GetEarliestActionTime();
+  aStream->mMessageAffectedTime = NS_MIN(aStream->mMessageAffectedTime, t);
+}
+
+void
+ControlMessage::UpdateAffectedStream()
+{
+  NS_ASSERTION(mStream, "Must have stream for default UpdateAffectedStream");
+  mStream->GraphImpl()->NoteStreamAffected(mStream);
+}
+
+void
+MediaStreamGraphImpl::AddStream(MediaStream* aStream)
+{
+  aStream->mBufferStartTime = mCurrentTime;
+  aStream->mMessageAffectedTime = GetEarliestActionTime();
+  *mStreams.AppendElement() = already_AddRefed<MediaStream>(aStream);
+  LOG(PR_LOG_DEBUG, ("Adding media stream %p to the graph", aStream));
+}
+
+void
+MediaStreamGraphImpl::RemoveStream(MediaStream* aStream)
+{
+  // Remove references in mStreamUpdates before we allow aStream to die.
+  // Pending updates are not needed (since the main thread has already given
+  // up the stream) so we will just drop them.
+  {
+    MonitorAutoLock lock(mMonitor);
+    for (PRUint32 i = 0; i < mStreamUpdates.Length(); ++i) {
+      if (mStreamUpdates[i].mStream == aStream) {
+        mStreamUpdates[i].mStream = nsnull;
+      }
+    }
+  }
+
+  // This unrefs the stream, probably destroying it
+  mStreams.RemoveElement(aStream);
+
+  LOG(PR_LOG_DEBUG, ("Removing media stream %p from the graph", aStream));
+}
+
+void
+MediaStreamGraphImpl::ChooseActionTime()
+{
+  mLastActionTime = GetEarliestActionTime();
+}
+
+StreamTime
+MediaStreamGraphImpl::GraphTimeToStreamTime(MediaStream* aStream,
+                                            GraphTime aTime)
+{
+  NS_ASSERTION(aTime <= mBlockingDecisionsMadeUntilTime,
+               "Don't ask about times where we haven't made blocking decisions yet");
+  if (aTime <= mCurrentTime) {
+    return NS_MAX<StreamTime>(0, aTime - aStream->mBufferStartTime);
+  }
+  GraphTime t = mCurrentTime;
+  StreamTime s = t - aStream->mBufferStartTime;
+  while (t < aTime) {
+    GraphTime end;
+    if (!aStream->mBlocked.GetAt(t, &end)) {
+      s += NS_MIN(aTime, end) - t;
+    }
+    t = end;
+  }
+  return NS_MAX<StreamTime>(0, s);
+}  
+
+GraphTime
+MediaStreamGraphImpl::StreamTimeToGraphTime(MediaStream* aStream,
+                                            StreamTime aTime, PRUint32 aFlags)
+{
+  if (aTime >= STREAM_TIME_MAX) {
+    return GRAPH_TIME_MAX;
+  }
+  MediaTime bufferElapsedToCurrentTime = mCurrentTime - aStream->mBufferStartTime;
+  if (aTime < bufferElapsedToCurrentTime ||
+      (aTime == bufferElapsedToCurrentTime && !(aFlags & INCLUDE_TRAILING_BLOCKED_INTERVAL))) {
+    return aTime + aStream->mBufferStartTime;
+  }
+
+  MediaTime streamAmount = aTime - bufferElapsedToCurrentTime;
+  NS_ASSERTION(streamAmount >= 0, "Can't answer queries before current time");
+
+  GraphTime t = mCurrentTime;
+  while (t < GRAPH_TIME_MAX) {
+    bool blocked;
+    GraphTime end;
+    if (t < mBlockingDecisionsMadeUntilTime) {
+      blocked = aStream->mBlocked.GetAt(t, &end);
+      end = NS_MIN(end, mBlockingDecisionsMadeUntilTime);
+    } else {
+      blocked = false;
+      end = GRAPH_TIME_MAX;
+    }
+    if (blocked) {
+      t = end;
+    } else {
+      if (streamAmount == 0) {
+        // No more stream time to consume at time t, so we're done.
+        break;
+      }
+      MediaTime consume = NS_MIN(end - t, streamAmount);
+      streamAmount -= consume;
+      t += consume;
+    }
+  }
+  return t;
+}
+
+GraphTime
+MediaStreamGraphImpl::GetAudioPosition(MediaStream* aStream)
+{
+  if (!aStream->mAudioOutput) {
+    return mCurrentTime;
+  }
+  return aStream->mAudioPlaybackStartTime +
+      TicksToTimeRoundDown(aStream->mAudioOutput->GetRate(),
+                           aStream->mAudioOutput->GetPositionInFrames());
+}
+
+void
+MediaStreamGraphImpl::UpdateCurrentTime()
+{
+  GraphTime prevCurrentTime = mCurrentTime;
+
+  TimeStamp now = TimeStamp::Now();
+  // The earliest buffer end time for streams that haven't finished. We can't
+  // advance the current time past this point.
+  GraphTime minBufferEndTime = GRAPH_TIME_MAX;
+  for (PRUint32 i = 0; i < mStreams.Length(); ++i) {
+    MediaStream* stream = mStreams[i];
+    GraphTime blockedBufferEndTime =
+      StreamTimeToGraphTime(stream, stream->GetBufferEnd(), INCLUDE_TRAILING_BLOCKED_INTERVAL);
+    if (stream->mAudioOutput &&
+        (!stream->mFinished || mBlockingDecisionsMadeUntilTime <= blockedBufferEndTime)) {
+      // XXX We should take audio positions into account when determining how
+      // far to advance the current time. Basically the current time should
+      // track the average or minimum of the audio positions. We don't do this
+      // currently since the audio positions aren't accurate enough. This
+      // logging code is helpful to track the accuracy of audio positions.
+      GraphTime audioPosition = GetAudioPosition(stream);
+      LOG(PR_LOG_DEBUG, ("Audio position for stream %p is %f", stream,
+                         MediaTimeToSeconds(audioPosition)));
+    }
+    if (!stream->mFinished) {
+      minBufferEndTime = NS_MIN(minBufferEndTime, blockedBufferEndTime);
+    }
+  }
+
+  NS_ASSERTION(mCurrentTime <= minBufferEndTime,
+               "We shouldn't have already advanced beyond buffer end!");
+  GraphTime nextCurrentTime =
+    SecondsToMediaTime((now - mCurrentTimeStamp).ToSeconds()) + mCurrentTime;
+  if (minBufferEndTime < nextCurrentTime) {
+    LOG(PR_LOG_WARNING, ("Reducing current time to minimum buffer end"));
+    nextCurrentTime = minBufferEndTime;
+  }
+  mCurrentTimeStamp = now;
+
+  mBlockingDecisionsMadeUntilTime =
+    NS_MAX(nextCurrentTime, mBlockingDecisionsMadeUntilTime);
+  LOG(PR_LOG_DEBUG, ("Updating current time to %f (minBufferEndTime %f, real %f, mBlockingDecisionsMadeUntilTime %f)",
+                     MediaTimeToSeconds(nextCurrentTime),
+                     MediaTimeToSeconds(minBufferEndTime),
+                     (now - mInitialTimeStamp).ToSeconds(),
+                     MediaTimeToSeconds(mBlockingDecisionsMadeUntilTime)));
+
+  if (prevCurrentTime >= nextCurrentTime) {
+    NS_ASSERTION(prevCurrentTime == nextCurrentTime, "Time can't go backwards!");
+    // This could happen due to low clock resolution, maybe?
+    LOG(PR_LOG_DEBUG, ("Time did not advance"));
+    return;
+  }
+
+  for (PRUint32 i = 0; i < mStreams.Length(); ++i) {
+    MediaStream* stream = mStreams[i];
+
+    // Calculate blocked time and fire Blocked/Unblocked events
+    GraphTime blockedTime = 0;
+    GraphTime t = prevCurrentTime;
+    // Save current blocked status
+    bool wasBlocked = stream->mBlocked.GetAt(prevCurrentTime);
+    while (t < nextCurrentTime) {
+      GraphTime end;
+      bool blocked = stream->mBlocked.GetAt(t, &end);
+      if (blocked) {
+        blockedTime += NS_MIN(end, nextCurrentTime) - t;
+      }
+      if (blocked != wasBlocked) {
+        for (PRUint32 j = 0; j < stream->mListeners.Length(); ++j) {
+          MediaStreamListener* l = stream->mListeners[j];
+          l->NotifyBlockingChanged(this,
+              blocked ? MediaStreamListener::BLOCKED : MediaStreamListener::UNBLOCKED);
+        }
+        wasBlocked = blocked;
+      }
+      t = end;
+    }
+
+    stream->AdvanceTimeVaryingValuesToCurrentTime(nextCurrentTime, blockedTime);
+    // Advance mBlocked last so that implementations of
+    // AdvanceTimeVaryingValuesToCurrentTime can rely on the value of mBlocked.
+    stream->mBlocked.AdvanceCurrentTime(nextCurrentTime);
+
+    if (blockedTime < nextCurrentTime - mCurrentTime) {
+      for (PRUint32 i = 0; i < stream->mListeners.Length(); ++i) {
+        MediaStreamListener* l = stream->mListeners[i];
+        l->NotifyOutput(this);
+      }
+    }
+
+    if (stream->mFinished && !stream->mNotifiedFinished &&
+        stream->mBufferStartTime + stream->GetBufferEnd() <= nextCurrentTime) {
+      stream->mNotifiedFinished = true;
+      for (PRUint32 j = 0; j < stream->mListeners.Length(); ++j) {
+        MediaStreamListener* l = stream->mListeners[j];
+        l->NotifyFinished(this);
+      }
+    }
+
+    LOG(PR_LOG_DEBUG, ("MediaStream %p bufferStartTime=%f blockedTime=%f",
+                       stream, MediaTimeToSeconds(stream->mBufferStartTime),
+                       MediaTimeToSeconds(blockedTime)));
+  }
+
+  mCurrentTime = nextCurrentTime;
+}
+
+void
+MediaStreamGraphImpl::MarkStreamBlocked(MediaStream* aStream,
+                                        GraphTime aTime, GraphTime* aEnd)
+{
+  NS_ASSERTION(!aStream->mBlocked.GetAt(aTime), "MediaStream already blocked");
+
+  aStream->mBlocked.SetAtAndAfter(aTime, true);
+}
+
+bool
+MediaStreamGraphImpl::WillUnderrun(MediaStream* aStream, GraphTime aTime,
+                                   GraphTime aEndBlockingDecisions, GraphTime* aEnd)
+{
+  // Finished streams, or streams that aren't being played back, can't underrun.
+  if (aStream->mFinished ||
+      (aStream->mAudioOutputs.IsEmpty() && aStream->mVideoOutputs.IsEmpty())) {
+    return false;
+  }
+  GraphTime bufferEnd =
+    StreamTimeToGraphTime(aStream, aStream->GetBufferEnd(),
+                          INCLUDE_TRAILING_BLOCKED_INTERVAL);
+  NS_ASSERTION(bufferEnd >= mCurrentTime, "Buffer underran");
+  // We should block after bufferEnd.
+  if (bufferEnd <= aTime) {
+    LOG(PR_LOG_DEBUG, ("MediaStream %p will block due to data underrun, "
+                       "bufferEnd %f",
+                       aStream, MediaTimeToSeconds(bufferEnd)));
+    return true;
+  }
+  // We should keep blocking if we're currently blocked and we don't have
+  // data all the way through to aEndBlockingDecisions. If we don't have
+  // data all the way through to aEndBlockingDecisions, we'll block soon,
+  // but we might as well remain unblocked and play the data we've got while
+  // we can.
+  if (bufferEnd <= aEndBlockingDecisions && aStream->mBlocked.GetBefore(aTime)) {
+    LOG(PR_LOG_DEBUG, ("MediaStream %p will block due to speculative data underrun, "
+                       "bufferEnd %f",
+                       aStream, MediaTimeToSeconds(bufferEnd)));
+    return true;
+  }
+  // Reconsider decisions at bufferEnd
+  *aEnd = NS_MIN(*aEnd, bufferEnd);
+  return false;
+}
+
+void
+MediaStreamGraphImpl::RecomputeBlocking()
+{
+  PRInt32 writeAudioUpTo = AUDIO_TARGET_MS;
+  GraphTime endBlockingDecisions =
+    mCurrentTime + MillisecondsToMediaTime(writeAudioUpTo);
+
+  bool blockingDecisionsWillChange = false;
+  // mBlockingDecisionsMadeUntilTime has been set in UpdateCurrentTime
+  while (mBlockingDecisionsMadeUntilTime < endBlockingDecisions) {
+    LOG(PR_LOG_DEBUG, ("Media graph %p computing blocking for time %f",
+                       this, MediaTimeToSeconds(mBlockingDecisionsMadeUntilTime)));
+    GraphTime end = GRAPH_TIME_MAX;
+    RecomputeBlockingAt(mBlockingDecisionsMadeUntilTime, endBlockingDecisions, &end);
+    LOG(PR_LOG_DEBUG, ("Media graph %p computed blocking for interval %f to %f",
+                       this, MediaTimeToSeconds(mBlockingDecisionsMadeUntilTime),
+                       MediaTimeToSeconds(end)));
+    mBlockingDecisionsMadeUntilTime = end;
+    if (end < GRAPH_TIME_MAX) {
+      blockingDecisionsWillChange = true;
+    }
+  }
+  mBlockingDecisionsMadeUntilTime = endBlockingDecisions;
+
+  for (PRUint32 i = 0; i < mStreams.Length(); ++i) {
+    MediaStream* stream = mStreams[i];
+    GraphTime end;
+    stream->mBlocked.GetAt(mCurrentTime, &end);
+    if (end < GRAPH_TIME_MAX) {
+      blockingDecisionsWillChange = true;
+    }
+  }
+  if (blockingDecisionsWillChange) {
+    // Make sure we wake up to notify listeners about these changes.
+    EnsureNextIteration();
+  }
+}
+
+void
+MediaStreamGraphImpl::RecomputeBlockingAt(GraphTime aTime,
+                                          GraphTime aEndBlockingDecisions,
+                                          GraphTime* aEnd)
+{
+  for (PRUint32 i = 0; i < mStreams.Length(); ++i) {
+    MediaStream* stream = mStreams[i];
+    stream->mBlocked.SetAtAndAfter(aTime, false);
+  }
+
+  for (PRUint32 i = 0; i < mStreams.Length(); ++i) {
+    MediaStream* stream = mStreams[i];
+    // Stream might be blocked by some other stream (due to processing
+    // constraints)
+    if (stream->mBlocked.GetAt(aTime)) {
+      continue;
+    }
+
+    if (stream->mFinished) {
+      GraphTime endTime = StreamTimeToGraphTime(stream, stream->GetBufferEnd());
+      if (endTime <= aTime) {
+        LOG(PR_LOG_DEBUG, ("MediaStream %p is blocked due to being finished", stream));
+        MarkStreamBlocked(stream, aTime, aEnd);
+        continue;
+      } else {
+        LOG(PR_LOG_DEBUG, ("MediaStream %p is finished, but not blocked yet (end at %f, with blocking at %f)",
+                           stream, MediaTimeToSeconds(stream->GetBufferEnd()),
+                           MediaTimeToSeconds(endTime)));
+        *aEnd = NS_MIN(*aEnd, endTime);
+      }
+    }
+
+    // We don't need to explicitly check for cycles; streams in a cycle will
+    // just never be able to produce data, and WillUnderrun will trigger.
+    GraphTime end;
+    bool explicitBlock = stream->mExplicitBlockerCount.GetAt(aTime, &end) > 0;
+    *aEnd = NS_MIN(*aEnd, end);
+    if (explicitBlock) {
+      LOG(PR_LOG_DEBUG, ("MediaStream %p is blocked due to explicit blocker", stream));
+      MarkStreamBlocked(stream, aTime, aEnd);
+      continue;
+    }
+
+    bool underrun = WillUnderrun(stream, aTime, aEndBlockingDecisions, aEnd);
+    if (underrun) {
+      MarkStreamBlocked(stream, aTime, aEnd);
+      continue;
+    }
+
+    if (stream->mAudioOutputs.IsEmpty() && stream->mVideoOutputs.IsEmpty()) {
+      // See if the stream is being consumed anywhere. If not, it should block.
+      LOG(PR_LOG_DEBUG, ("MediaStream %p is blocked due to having no consumers", stream));
+      MarkStreamBlocked(stream, aTime, aEnd);
+      continue;
+    }
+  }
+
+  NS_ASSERTION(*aEnd > aTime, "Failed to advance!");
+}
+
+void
+MediaStreamGraphImpl::UpdateFirstActiveTracks(MediaStream* aStream)
+{
+  StreamBuffer::Track* newTracksByType[MediaSegment::TYPE_COUNT];
+  for (PRUint32 i = 0; i < ArrayLength(newTracksByType); ++i) {
+    newTracksByType[i] = nsnull;
+  }
+
+  for (StreamBuffer::TrackIter iter(aStream->mBuffer);
+       !iter.IsEnded(); iter.Next()) {
+    MediaSegment::Type type = iter->GetType();
+    if ((newTracksByType[type] &&
+         iter->GetStartTimeRoundDown() < newTracksByType[type]->GetStartTimeRoundDown()) ||
+         aStream->mFirstActiveTracks[type] == TRACK_NONE) {
+      newTracksByType[type] = &(*iter);
+      aStream->mFirstActiveTracks[type] = iter->GetID();
+    }
+  }
+}
+
+void
+MediaStreamGraphImpl::CreateOrDestroyAudioStream(GraphTime aAudioOutputStartTime,
+                                                 MediaStream* aStream)
+{
+  StreamBuffer::Track* track;
+
+  if (aStream->mAudioOutputs.IsEmpty() ||
+      !(track = aStream->mBuffer.FindTrack(aStream->mFirstActiveTracks[MediaSegment::AUDIO]))) {
+    if (aStream->mAudioOutput) {
+      aStream->mAudioOutput->Shutdown();
+      aStream->mAudioOutput = nsnull;
+    }
+    return;
+  }
+
+  if (aStream->mAudioOutput)
+    return;
+
+  // No output stream created yet. Check if it's time to create one.
+  GraphTime startTime =
+    StreamTimeToGraphTime(aStream, track->GetStartTimeRoundDown(),
+                          INCLUDE_TRAILING_BLOCKED_INTERVAL);
+  if (startTime >= mBlockingDecisionsMadeUntilTime) {
+    // The stream wants to play audio, but nothing will play for the forseeable
+    // future, so don't create the stream.
+    return;
+  }
+
+  // Don't bother destroying the nsAudioStream for ended tracks yet.
+
+  // XXX allocating a nsAudioStream could be slow so we're going to have to do
+  // something here ... preallocation, async allocation, multiplexing onto a single
+  // stream ...
+
+  AudioSegment* audio = track->Get<AudioSegment>();
+  aStream->mAudioPlaybackStartTime = aAudioOutputStartTime;
+  aStream->mAudioOutput = nsAudioStream::AllocateStream();
+  aStream->mAudioOutput->Init(audio->GetChannels(),
+                              track->GetRate(),
+                              audio->GetFirstFrameFormat());
+}
+
+void
+MediaStreamGraphImpl::PlayAudio(MediaStream* aStream,
+                                GraphTime aFrom, GraphTime aTo)
+{
+  if (!aStream->mAudioOutput)
+    return;
+
+  StreamBuffer::Track* track =
+    aStream->mBuffer.FindTrack(aStream->mFirstActiveTracks[MediaSegment::AUDIO]);
+  AudioSegment* audio = track->Get<AudioSegment>();
+
+  // When we're playing multiple copies of this stream at the same time, they're
+  // perfectly correlated so adding volumes is the right thing to do.
+  float volume = 0.0f;
+  for (PRUint32 i = 0; i < aStream->mAudioOutputs.Length(); ++i) {
+    volume += aStream->mAudioOutputs[i].mVolume;
+  }
+
+  // We don't update aStream->mBufferStartTime here to account for
+  // time spent blocked. Instead, we'll update it in UpdateCurrentTime after the
+  // blocked period has completed. But we do need to make sure we play from the
+  // right offsets in the stream buffer, even if we've already written silence for
+  // some amount of blocked time after the current time.
+  GraphTime t = aFrom;
+  while (t < aTo) {
+    GraphTime end;
+    bool blocked = aStream->mBlocked.GetAt(t, &end);
+    end = NS_MIN(end, aTo);
+
+    AudioSegment output;
+    if (blocked) {
+      // Track total blocked time in aStream->mBlockedAudioTime so that
+      // the amount of silent samples we've inserted for blocking never gets
+      // more than one sample away from the ideal amount.
+      TrackTicks startTicks =
+          TimeToTicksRoundDown(track->GetRate(), aStream->mBlockedAudioTime);
+      aStream->mBlockedAudioTime += end - t;
+      TrackTicks endTicks =
+          TimeToTicksRoundDown(track->GetRate(), aStream->mBlockedAudioTime);
+
+      output.InitFrom(*audio);
+      output.InsertNullDataAtStart(endTicks - startTicks);
+      LOG(PR_LOG_DEBUG, ("MediaStream %p writing blocking-silence samples for %f to %f",
+                         aStream, MediaTimeToSeconds(t), MediaTimeToSeconds(end)));
+    } else {
+      TrackTicks startTicks =
+          track->TimeToTicksRoundDown(GraphTimeToStreamTime(aStream, t));
+      TrackTicks endTicks =
+          track->TimeToTicksRoundDown(GraphTimeToStreamTime(aStream, end));
+
+      output.SliceFrom(*audio, startTicks, endTicks);
+      output.ApplyVolume(volume);
+      LOG(PR_LOG_DEBUG, ("MediaStream %p writing samples for %f to %f (samples %lld to %lld)",
+                         aStream, MediaTimeToSeconds(t), MediaTimeToSeconds(end),
+                         startTicks, endTicks));
+    }
+    output.WriteTo(aStream->mAudioOutput);
+    t = end;
+  }
+}
+
+void
+MediaStreamGraphImpl::PlayVideo(MediaStream* aStream)
+{
+  if (aStream->mVideoOutputs.IsEmpty())
+    return;
+
+  StreamBuffer::Track* track =
+    aStream->mBuffer.FindTrack(aStream->mFirstActiveTracks[MediaSegment::VIDEO]);
+  if (!track)
+    return;
+  VideoSegment* video = track->Get<VideoSegment>();
+
+  // Display the next frame a bit early. This is better than letting the current
+  // frame be displayed for too long.
+  GraphTime framePosition = mCurrentTime + MEDIA_GRAPH_TARGET_PERIOD_MS;
+  NS_ASSERTION(framePosition >= aStream->mBufferStartTime, "frame position before buffer?");
+  StreamTime frameBufferTime = GraphTimeToStreamTime(aStream, framePosition);
+  TrackTicks start;
+  const VideoFrame* frame =
+    video->GetFrameAt(track->TimeToTicksRoundDown(frameBufferTime), &start);
+  if (!frame) {
+    frame = video->GetLastFrame(&start);
+    if (!frame)
+      return;
+  }
+
+  if (*frame != aStream->mLastPlayedVideoFrame) {
+    LOG(PR_LOG_DEBUG, ("MediaStream %p writing video frame %p (%dx%d)",
+                       aStream, frame->GetImage(), frame->GetIntrinsicSize().width,
+                       frame->GetIntrinsicSize().height));
+    GraphTime startTime = StreamTimeToGraphTime(aStream,
+        track->TicksToTimeRoundDown(start), INCLUDE_TRAILING_BLOCKED_INTERVAL);
+    TimeStamp targetTime = mCurrentTimeStamp +
+        TimeDuration::FromMilliseconds(double(startTime - mCurrentTime));
+    for (PRUint32 i = 0; i < aStream->mVideoOutputs.Length(); ++i) {
+      VideoFrameContainer* output = aStream->mVideoOutputs[i];
+      output->SetCurrentFrame(frame->GetIntrinsicSize(), frame->GetImage(),
+                              targetTime);
+      nsCOMPtr<nsIRunnable> event =
+        NS_NewRunnableMethod(output, &VideoFrameContainer::Invalidate);
+      NS_DispatchToMainThread(event, NS_DISPATCH_NORMAL);
+    }
+    aStream->mLastPlayedVideoFrame = *frame;
+  }
+}
+
+void
+MediaStreamGraphImpl::PrepareUpdatesToMainThreadState()
+{
+  mMonitor.AssertCurrentThreadOwns();
+
+  for (PRUint32 i = 0; i < mStreams.Length(); ++i) {
+    MediaStream* stream = mStreams[i];
+    StreamUpdate* update = mStreamUpdates.AppendElement();
+    update->mGraphUpdateIndex = stream->mGraphUpdateIndices.GetAt(mCurrentTime);
+    update->mStream = stream;
+    update->mNextMainThreadCurrentTime =
+      GraphTimeToStreamTime(stream, mCurrentTime);
+    update->mNextMainThreadFinished =
+      stream->mFinished &&
+      StreamTimeToGraphTime(stream, stream->GetBufferEnd()) <= mCurrentTime;
+  }
+  mUpdateRunnables.MoveElementsFrom(mPendingUpdateRunnables);
+
+  EnsureStableStateEventPosted();
+}
+
+void
+MediaStreamGraphImpl::EnsureImmediateWakeUpLocked(MonitorAutoLock& aLock)
+{
+  if (mWaitState == WAITSTATE_WAITING_FOR_NEXT_ITERATION ||
+      mWaitState == WAITSTATE_WAITING_INDEFINITELY) {
+    mWaitState = WAITSTATE_WAKING_UP;
+    aLock.Notify();
+  }
+}
+
+void
+MediaStreamGraphImpl::EnsureNextIteration()
+{
+  MonitorAutoLock lock(mMonitor);
+  EnsureNextIterationLocked(lock);
+}
+
+void
+MediaStreamGraphImpl::EnsureNextIterationLocked(MonitorAutoLock& aLock)
+{
+  if (mNeedAnotherIteration)
+    return;
+  mNeedAnotherIteration = true;
+  if (mWaitState == WAITSTATE_WAITING_INDEFINITELY) {
+    mWaitState = WAITSTATE_WAKING_UP;
+    aLock.Notify();
+  }
+}
+
+void
+MediaStreamGraphImpl::RunThread()
+{
+  nsTArray<MessageBlock> messageQueue;
+  {
+    MonitorAutoLock lock(mMonitor);
+    messageQueue.SwapElements(mMessageQueue);
+  }
+  NS_ASSERTION(!messageQueue.IsEmpty(),
+               "Shouldn't have started a graph with empty message queue!");
+
+  for (;;) {
+    // Update mCurrentTime to the min of the playing audio times, or using the
+    // wall-clock time change if no audio is playing.
+    UpdateCurrentTime();
+
+    // Calculate independent action times for each batch of messages (each
+    // batch corresponding to an event loop task). This isolates the performance
+    // of different scripts to some extent.
+    for (PRUint32 i = 0; i < messageQueue.Length(); ++i) {
+      mProcessingGraphUpdateIndex = messageQueue[i].mGraphUpdateIndex;
+      nsTArray<nsAutoPtr<ControlMessage> >& messages = messageQueue[i].mMessages;
+
+      for (PRUint32 j = 0; j < mStreams.Length(); ++j) {
+        mStreams[j]->mMessageAffectedTime = GRAPH_TIME_MAX;
+      }
+      for (PRUint32 j = 0; j < messages.Length(); ++j) {
+        messages[j]->UpdateAffectedStream();
+      }
+
+      ChooseActionTime();
+
+      for (PRUint32 j = 0; j < messages.Length(); ++j) {
+        messages[j]->Process();
+      }
+    }
+    messageQueue.Clear();
+
+    GraphTime prevBlockingDecisionsMadeUntilTime = mBlockingDecisionsMadeUntilTime;
+    RecomputeBlocking();
+
+    PRUint32 audioStreamsActive = 0;
+    bool allBlockedForever = true;
+    // Figure out what each stream wants to do
+    for (PRUint32 i = 0; i < mStreams.Length(); ++i) {
+      MediaStream* stream = mStreams[i];
+      UpdateFirstActiveTracks(stream);
+      CreateOrDestroyAudioStream(prevBlockingDecisionsMadeUntilTime, stream);
+      PlayAudio(stream, prevBlockingDecisionsMadeUntilTime,
+                mBlockingDecisionsMadeUntilTime);
+      if (stream->mAudioOutput) {
+        ++audioStreamsActive;
+      }
+      PlayVideo(stream);
+      GraphTime end;
+      if (!stream->mBlocked.GetAt(mCurrentTime, &end) || end < GRAPH_TIME_MAX) {
+        allBlockedForever = false;
+      }
+    }
+    if (!allBlockedForever || audioStreamsActive > 0) {
+      EnsureNextIteration();
+    }
+
+    {
+      MonitorAutoLock lock(mMonitor);
+      PrepareUpdatesToMainThreadState();
+      if (mForceShutDown || (IsEmpty() && mMessageQueue.IsEmpty())) {
+        // Enter shutdown mode. The stable-state handler will detect this
+        // and complete shutdown. Destroy any streams immediately.
+        for (PRUint32 i = 0; i < mStreams.Length(); ++i) {
+          mStreams[i]->DestroyImpl();
+        }
+        LOG(PR_LOG_DEBUG, ("MediaStreamGraph %p waiting for main thread cleanup", this));
+        mLifecycleState = LIFECYCLE_WAITING_FOR_MAIN_THREAD_CLEANUP;
+        return;
+      }
+
+      PRIntervalTime timeout = PR_INTERVAL_NO_TIMEOUT;
+      TimeStamp now = TimeStamp::Now();
+      if (mNeedAnotherIteration) {
+        PRInt64 timeoutMS = MEDIA_GRAPH_TARGET_PERIOD_MS -
+          PRInt64((now - mCurrentTimeStamp).ToMilliseconds());
+        // Make sure timeoutMS doesn't overflow 32 bits by waking up at
+        // least once a minute, if we need to wake up at all
+        timeoutMS = NS_MAX<PRInt64>(0, NS_MIN<PRInt64>(timeoutMS, 60*1000));
+        timeout = PR_MillisecondsToInterval(PRUint32(timeoutMS));
+        LOG(PR_LOG_DEBUG, ("Waiting for next iteration; at %f, timeout=%f",
+                           (now - mInitialTimeStamp).ToSeconds(), timeoutMS/1000.0));
+        mWaitState = WAITSTATE_WAITING_FOR_NEXT_ITERATION;
+      } else {
+        mWaitState = WAITSTATE_WAITING_INDEFINITELY;
+      }
+      if (timeout > 0) {
+        lock.Wait(timeout);
+        LOG(PR_LOG_DEBUG, ("Resuming after timeout; at %f, elapsed=%f",
+                           (TimeStamp::Now() - mInitialTimeStamp).ToSeconds(),
+                           (TimeStamp::Now() - now).ToSeconds()));
+      }
+      mWaitState = WAITSTATE_RUNNING;
+      mNeedAnotherIteration = false;
+      messageQueue.SwapElements(mMessageQueue);
+    }
+  }
+}
+
+void
+MediaStreamGraphImpl::ApplyStreamUpdate(StreamUpdate* aUpdate)
+{
+  mMonitor.AssertCurrentThreadOwns();
+
+  MediaStream* stream = aUpdate->mStream;
+  if (!stream)
+    return;
+  stream->mMainThreadCurrentTime = aUpdate->mNextMainThreadCurrentTime;
+  stream->mMainThreadFinished = aUpdate->mNextMainThreadFinished;
+}
+
+void
+MediaStreamGraphImpl::ShutdownThreads()
+{
+  NS_ASSERTION(NS_IsMainThread(), "Must be called on main thread");
+  // mGraph's thread is not running so it's OK to do whatever here
+  LOG(PR_LOG_DEBUG, ("Stopping threads for MediaStreamGraph %p", this));
+
+  if (mThread) {
+    mThread->Shutdown();
+    mThread = nsnull;
+  }
+}
+
+void
+MediaStreamGraphImpl::ForceShutDown()
+{
+  NS_ASSERTION(NS_IsMainThread(), "Must be called on main thread");
+  LOG(PR_LOG_DEBUG, ("MediaStreamGraph %p ForceShutdown", this));
+  {
+    MonitorAutoLock lock(mMonitor);
+    mForceShutDown = true;
+    EnsureImmediateWakeUpLocked(lock);
+  }
+}
+
+namespace {
+
+class MediaStreamGraphThreadRunnable : public nsRunnable {
+public:
+  NS_IMETHOD Run()
+  {
+    gGraph->RunThread();
+    return NS_OK;
+  }
+};
+
+class MediaStreamGraphShutDownRunnable : public nsRunnable {
+public:
+  MediaStreamGraphShutDownRunnable(MediaStreamGraphImpl* aGraph) : mGraph(aGraph) {}
+  NS_IMETHOD Run()
+  {
+    NS_ASSERTION(mGraph->mDetectedNotRunning,
+                 "We should know the graph thread control loop isn't running!");
+    // mGraph's thread is not running so it's OK to do whatever here
+    if (mGraph->IsEmpty()) {
+      // mGraph is no longer needed, so delete it. If the graph is not empty
+      // then we must be in a forced shutdown and some later AppendMessage will
+      // detect that the manager has been emptied, and delete it.
+      delete mGraph;
+    } else {
+      NS_ASSERTION(mGraph->mForceShutDown, "Not in forced shutdown?");
+      mGraph->mLifecycleState =
+        MediaStreamGraphImpl::LIFECYCLE_WAITING_FOR_STREAM_DESTRUCTION;
+    }
+    return NS_OK;
+  }
+private:
+  MediaStreamGraphImpl* mGraph;
+};
+
+class MediaStreamGraphStableStateRunnable : public nsRunnable {
+public:
+  NS_IMETHOD Run()
+  {
+    if (gGraph) {
+      gGraph->RunInStableState();
+    }
+    return NS_OK;
+  }
+};
+
+/*
+ * Control messages forwarded from main thread to graph manager thread
+ */
+class CreateMessage : public ControlMessage {
+public:
+  CreateMessage(MediaStream* aStream) : ControlMessage(aStream) {}
+  virtual void UpdateAffectedStream()
+  {
+    mStream->GraphImpl()->AddStream(mStream);
+  }
+  virtual void Process()
+  {
+    mStream->Init();
+  }
+};
+
+class MediaStreamGraphShutdownObserver : public nsIObserver
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+};
+
+}
+
+void
+MediaStreamGraphImpl::RunInStableState()
+{
+  NS_ASSERTION(NS_IsMainThread(), "Must be called on main thread");
+
+  nsTArray<nsCOMPtr<nsIRunnable> > runnables;
+
+  {
+    MonitorAutoLock lock(mMonitor);
+    mPostedRunInStableStateEvent = false;
+
+    runnables.SwapElements(mUpdateRunnables);
+    for (PRUint32 i = 0; i < mStreamUpdates.Length(); ++i) {
+      StreamUpdate* update = &mStreamUpdates[i];
+      if (update->mStream) {
+        ApplyStreamUpdate(update);
+      }
+    }
+    mStreamUpdates.Clear();
+
+    if (mLifecycleState == LIFECYCLE_WAITING_FOR_MAIN_THREAD_CLEANUP && mForceShutDown) {
+      for (PRUint32 i = 0; i < mMessageQueue.Length(); ++i) {
+        MessageBlock& mb = mMessageQueue[i];
+        for (PRUint32 j = 0; j < mb.mMessages.Length(); ++j) {
+          mb.mMessages[j]->ProcessDuringShutdown();
+        }
+      }
+      mMessageQueue.Clear();
+      for (PRUint32 i = 0; i < mCurrentTaskMessageQueue.Length(); ++i) {
+        mCurrentTaskMessageQueue[i]->ProcessDuringShutdown();
+      }
+      mCurrentTaskMessageQueue.Clear();
+      // Stop MediaStreamGraph threads. Do not clear gGraph since
+      // we have outstanding DOM objects that may need it.
+      mLifecycleState = LIFECYCLE_WAITING_FOR_THREAD_SHUTDOWN;
+      nsCOMPtr<nsIRunnable> event = new MediaStreamGraphShutDownRunnable(this);
+      NS_DispatchToMainThread(event);
+    }
+
+    if (mLifecycleState == LIFECYCLE_THREAD_NOT_STARTED) {
+      mLifecycleState = LIFECYCLE_RUNNING;
+      // Start the thread now. We couldn't start it earlier because
+      // the graph might exit immediately on finding it has no streams. The
+      // first message for a new graph must create a stream.
+      nsCOMPtr<nsIRunnable> event = new MediaStreamGraphThreadRunnable();
+      NS_NewThread(getter_AddRefs(mThread), event);
+    }
+
+    if (mCurrentTaskMessageQueue.IsEmpty()) {
+      if (mLifecycleState == LIFECYCLE_WAITING_FOR_MAIN_THREAD_CLEANUP && IsEmpty()) {
+        NS_ASSERTION(gGraph == this, "Not current graph??");
+        // Complete shutdown. First, ensure that this graph is no longer used.
+        // A new graph graph will be created if one is needed.
+        LOG(PR_LOG_DEBUG, ("Disconnecting MediaStreamGraph %p", gGraph));
+        gGraph = nsnull;
+        // Asynchronously clean up old graph. We don't want to do this
+        // synchronously because it spins the event loop waiting for threads
+        // to shut down, and we don't want to do that in a stable state handler.
+        mLifecycleState = LIFECYCLE_WAITING_FOR_THREAD_SHUTDOWN;
+        nsCOMPtr<nsIRunnable> event = new MediaStreamGraphShutDownRunnable(this);
+        NS_DispatchToMainThread(event);
+      }
+    } else {
+      if (mLifecycleState <= LIFECYCLE_WAITING_FOR_MAIN_THREAD_CLEANUP) {
+        MessageBlock* block = mMessageQueue.AppendElement();
+        block->mMessages.SwapElements(mCurrentTaskMessageQueue);
+        block->mGraphUpdateIndex = mGraphUpdatesSent;
+        ++mGraphUpdatesSent;
+        EnsureNextIterationLocked(lock);
+      }
+
+      if (mLifecycleState == LIFECYCLE_WAITING_FOR_MAIN_THREAD_CLEANUP) {
+        mLifecycleState = LIFECYCLE_RUNNING;
+        // Revive the MediaStreamGraph since we have more messages going to it.
+        // Note that we need to put messages into its queue before reviving it,
+        // or it might exit immediately.
+        nsCOMPtr<nsIRunnable> event = new MediaStreamGraphThreadRunnable();
+        mThread->Dispatch(event, 0);
+      }
+    }
+
+    mDetectedNotRunning = mLifecycleState > LIFECYCLE_RUNNING;
+  }
+
+  // Make sure we get a new current time in the next event loop task
+  mPostedRunInStableState = false;
+
+  for (PRUint32 i = 0; i < runnables.Length(); ++i) {
+    runnables[i]->Run();
+  }
+}
+
+static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
+
+void
+MediaStreamGraphImpl::EnsureRunInStableState()
+{
+  NS_ASSERTION(NS_IsMainThread(), "main thread only");
+
+  if (mPostedRunInStableState)
+    return;
+  mPostedRunInStableState = true;
+  nsCOMPtr<nsIRunnable> event = new MediaStreamGraphStableStateRunnable();
+  nsCOMPtr<nsIAppShell> appShell = do_GetService(kAppShellCID);
+  if (appShell) {
+    appShell->RunInStableState(event);
+  } else {
+    NS_ERROR("Appshell already destroyed?");
+  }
+}
+
+void
+MediaStreamGraphImpl::EnsureStableStateEventPosted()
+{
+  mMonitor.AssertCurrentThreadOwns();
+
+  if (mPostedRunInStableStateEvent)
+    return;
+  mPostedRunInStableStateEvent = true;
+  nsCOMPtr<nsIRunnable> event = new MediaStreamGraphStableStateRunnable();
+  NS_DispatchToMainThread(event);
+}
+
+void
+MediaStreamGraphImpl::AppendMessage(ControlMessage* aMessage)
+{
+  NS_ASSERTION(NS_IsMainThread(), "main thread only");
+
+  if (mDetectedNotRunning &&
+      mLifecycleState > LIFECYCLE_WAITING_FOR_MAIN_THREAD_CLEANUP) {
+    // The graph control loop is not running and main thread cleanup has
+    // happened. From now on we can't append messages to mCurrentTaskMessageQueue,
+    // because that will never be processed again, so just ProcessDuringShutdown
+    // this message.
+    // This should only happen during forced shutdown.
+    aMessage->ProcessDuringShutdown();
+    delete aMessage;
+    if (IsEmpty()) {
+      NS_ASSERTION(gGraph == this, "Switched managers during forced shutdown?");
+      gGraph = nsnull;
+      delete this;
+    }
+    return;
+  }
+
+  mCurrentTaskMessageQueue.AppendElement(aMessage);
+  EnsureRunInStableState();
+}
+
+void
+MediaStream::Init()
+{
+  MediaStreamGraphImpl* graph = GraphImpl();
+  mBlocked.SetAtAndAfter(graph->mCurrentTime, true);
+  mExplicitBlockerCount.SetAtAndAfter(graph->mCurrentTime, true);
+  mExplicitBlockerCount.SetAtAndAfter(graph->mLastActionTime, false);
+}
+
+MediaStreamGraphImpl*
+MediaStream::GraphImpl()
+{
+  return gGraph;
+}
+
+void
+MediaStream::DestroyImpl()
+{
+  if (mAudioOutput) {
+    mAudioOutput->Shutdown();
+    mAudioOutput = nsnull;
+  }
+}
+
+void
+MediaStream::Destroy()
+{
+  class Message : public ControlMessage {
+  public:
+    Message(MediaStream* aStream) : ControlMessage(aStream) {}
+    virtual void UpdateAffectedStream()
+    {
+      mStream->DestroyImpl();
+      mStream->GraphImpl()->RemoveStream(mStream);
+    }
+    virtual void ProcessDuringShutdown()
+    { UpdateAffectedStream(); }
+  };
+  mWrapper = nsnull;
+  GraphImpl()->AppendMessage(new Message(this));
+}
+
+void
+MediaStream::AddAudioOutput(void* aKey)
+{
+  class Message : public ControlMessage {
+  public:
+    Message(MediaStream* aStream, void* aKey) : ControlMessage(aStream), mKey(aKey) {}
+    virtual void UpdateAffectedStream()
+    {
+      mStream->AddAudioOutputImpl(mKey);
+    }
+    void* mKey;
+  };
+  GraphImpl()->AppendMessage(new Message(this, aKey));
+}
+
+void
+MediaStream::SetAudioOutputVolumeImpl(void* aKey, float aVolume)
+{
+  for (PRUint32 i = 0; i < mAudioOutputs.Length(); ++i) {
+    if (mAudioOutputs[i].mKey == aKey) {
+      mAudioOutputs[i].mVolume = aVolume;
+      return;
+    }
+  }
+  NS_ERROR("Audio output key not found");
+}
+
+void
+MediaStream::SetAudioOutputVolume(void* aKey, float aVolume)
+{
+  class Message : public ControlMessage {
+  public:
+    Message(MediaStream* aStream, void* aKey, float aVolume) :
+      ControlMessage(aStream), mKey(aKey), mVolume(aVolume) {}
+    virtual void UpdateAffectedStream()
+    {
+      mStream->SetAudioOutputVolumeImpl(mKey, mVolume);
+    }
+    void* mKey;
+    float mVolume;
+  };
+  GraphImpl()->AppendMessage(new Message(this, aKey, aVolume));
+}
+
+void
+MediaStream::RemoveAudioOutputImpl(void* aKey)
+{
+  for (PRUint32 i = 0; i < mAudioOutputs.Length(); ++i) {
+    if (mAudioOutputs[i].mKey == aKey) {
+      mAudioOutputs.RemoveElementAt(i);
+      return;
+    }
+  }
+  NS_ERROR("Audio output key not found");
+}
+
+void
+MediaStream::RemoveAudioOutput(void* aKey)
+{
+  class Message : public ControlMessage {
+  public:
+    Message(MediaStream* aStream, void* aKey) :
+      ControlMessage(aStream), mKey(aKey) {}
+    virtual void UpdateAffectedStream()
+    {
+      mStream->RemoveAudioOutputImpl(mKey);
+    }
+    void* mKey;
+  };
+  GraphImpl()->AppendMessage(new Message(this, aKey));
+}
+
+void
+MediaStream::AddVideoOutput(VideoFrameContainer* aContainer)
+{
+  class Message : public ControlMessage {
+  public:
+    Message(MediaStream* aStream, VideoFrameContainer* aContainer) :
+      ControlMessage(aStream), mContainer(aContainer) {}
+    virtual void UpdateAffectedStream()
+    {
+      mStream->AddVideoOutputImpl(mContainer.forget());
+    }
+    nsRefPtr<VideoFrameContainer> mContainer;
+  };
+  GraphImpl()->AppendMessage(new Message(this, aContainer));
+}
+
+void
+MediaStream::RemoveVideoOutput(VideoFrameContainer* aContainer)
+{
+  class Message : public ControlMessage {
+  public:
+    Message(MediaStream* aStream, VideoFrameContainer* aContainer) :
+      ControlMessage(aStream), mContainer(aContainer) {}
+    virtual void UpdateAffectedStream()
+    {
+      mStream->RemoveVideoOutputImpl(mContainer);
+    }
+    nsRefPtr<VideoFrameContainer> mContainer;
+  };
+  GraphImpl()->AppendMessage(new Message(this, aContainer));
+}
+
+void
+MediaStream::ChangeExplicitBlockerCount(PRInt32 aDelta)
+{
+  class Message : public ControlMessage {
+  public:
+    Message(MediaStream* aStream, PRInt32 aDelta) :
+      ControlMessage(aStream), mDelta(aDelta) {}
+    virtual void UpdateAffectedStream()
+    {
+      mStream->ChangeExplicitBlockerCountImpl(
+          mStream->GraphImpl()->mLastActionTime, mDelta);
+    }
+    PRInt32 mDelta;
+  };
+  GraphImpl()->AppendMessage(new Message(this, aDelta));
+}
+
+void
+MediaStream::AddListener(MediaStreamListener* aListener)
+{
+  class Message : public ControlMessage {
+  public:
+    Message(MediaStream* aStream, MediaStreamListener* aListener) :
+      ControlMessage(aStream), mListener(aListener) {}
+    virtual void UpdateAffectedStream()
+    {
+      mStream->AddListenerImpl(mListener.forget());
+    }
+    nsRefPtr<MediaStreamListener> mListener;
+  };
+  GraphImpl()->AppendMessage(new Message(this, aListener));
+}
+
+void
+MediaStream::RemoveListener(MediaStreamListener* aListener)
+{
+  class Message : public ControlMessage {
+  public:
+    Message(MediaStream* aStream, MediaStreamListener* aListener) :
+      ControlMessage(aStream), mListener(aListener) {}
+    virtual void UpdateAffectedStream()
+    {
+      mStream->RemoveListenerImpl(mListener);
+    }
+    nsRefPtr<MediaStreamListener> mListener;
+  };
+  GraphImpl()->AppendMessage(new Message(this, aListener));
+}
+
+static const PRUint32 kThreadLimit = 4;
+static const PRUint32 kIdleThreadLimit = 4;
+static const PRUint32 kIdleThreadTimeoutMs = 2000;
+
+MediaStreamGraphImpl::MediaStreamGraphImpl()
+  : mLastActionTime(1)
+  , mCurrentTime(1)
+  , mBlockingDecisionsMadeUntilTime(1)
+  , mProcessingGraphUpdateIndex(0)
+  , mMonitor("MediaStreamGraphImpl")
+  , mLifecycleState(LIFECYCLE_THREAD_NOT_STARTED)
+  , mWaitState(WAITSTATE_RUNNING)
+  , mNeedAnotherIteration(false)
+  , mForceShutDown(false)
+  , mPostedRunInStableStateEvent(false)
+  , mDetectedNotRunning(false)
+  , mPostedRunInStableState(false)
+{
+#ifdef PR_LOGGING
+  if (!gMediaStreamGraphLog) {
+    gMediaStreamGraphLog = PR_NewLogModule("MediaStreamGraph");
+  }
+#endif
+
+  mCurrentTimeStamp = mInitialTimeStamp = TimeStamp::Now();
+}
+
+NS_IMPL_ISUPPORTS1(MediaStreamGraphShutdownObserver, nsIObserver)
+
+static bool gShutdownObserverRegistered = false;
+
+NS_IMETHODIMP
+MediaStreamGraphShutdownObserver::Observe(nsISupports *aSubject,
+                                          const char *aTopic,
+                                          const PRUnichar *aData)
+{
+  if (strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
+    if (gGraph) {
+      gGraph->ForceShutDown();
+    }
+    nsContentUtils::UnregisterShutdownObserver(this);
+    gShutdownObserverRegistered = false;
+  }
+  return NS_OK;
+}
+
+MediaStreamGraph*
+MediaStreamGraph::GetInstance()
+{
+  NS_ASSERTION(NS_IsMainThread(), "Main thread only");
+
+  if (!gGraph) {
+    if (!gShutdownObserverRegistered) {
+      gShutdownObserverRegistered = true;
+      nsContentUtils::RegisterShutdownObserver(new MediaStreamGraphShutdownObserver());
+    }
+
+    gGraph = new MediaStreamGraphImpl();
+    LOG(PR_LOG_DEBUG, ("Starting up MediaStreamGraph %p", gGraph));
+  }
+
+  return gGraph;
+}
+
+}
diff --git a/content/media/MediaStreamGraph.h b/content/media/MediaStreamGraph.h
new file mode 100644
index 00000000000..5179f1d0db9
--- /dev/null
+++ b/content/media/MediaStreamGraph.h
@@ -0,0 +1,394 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef MOZILLA_MEDIASTREAMGRAPH_H_
+#define MOZILLA_MEDIASTREAMGRAPH_H_
+
+#include "mozilla/Mutex.h"
+#include "nsAudioStream.h"
+#include "nsTArray.h"
+#include "nsIRunnable.h"
+#include "nsISupportsImpl.h"
+#include "StreamBuffer.h"
+#include "TimeVarying.h"
+#include "VideoFrameContainer.h"
+#include "VideoSegment.h"
+
+class nsDOMMediaStream;
+
+namespace mozilla {
+
+/**
+ * Microseconds relative to the start of the graph timeline.
+ */
+typedef PRInt64 GraphTime;
+const GraphTime GRAPH_TIME_MAX = MEDIA_TIME_MAX;
+
+/*
+ * MediaStreamGraph is a framework for synchronized audio/video processing
+ * and playback. It is designed to be used by other browser components such as
+ * HTML media elements, media capture APIs, real-time media streaming APIs,
+ * multitrack media APIs, and advanced audio APIs.
+ *
+ * The MediaStreamGraph uses a dedicated thread to process media --- the media
+ * graph thread. This ensures that we can process media through the graph
+ * without blocking on main-thread activity. The media graph is only modified
+ * on the media graph thread, to ensure graph changes can be processed without
+ * interfering with media processing. All interaction with the media graph
+ * thread is done with message passing.
+ *
+ * APIs that modify the graph or its properties are described as "control APIs".
+ * These APIs are asynchronous; they queue graph changes internally and
+ * those changes are processed all-at-once by the MediaStreamGraph. The
+ * MediaStreamGraph monitors the main thread event loop via nsIAppShell::RunInStableState
+ * to ensure that graph changes from a single event loop task are always
+ * processed all together. Control APIs should only be used on the main thread,
+ * currently; we may be able to relax that later.
+ *
+ * To allow precise synchronization of times in the control API, the
+ * MediaStreamGraph maintains a "media timeline". Control APIs that take or
+ * return times use that timeline. Those times never advance during
+ * an event loop task. This time is returned by MediaStreamGraph::GetCurrentTime().
+ *
+ * Media decoding, audio processing and media playback use thread-safe APIs to
+ * the media graph to ensure they can continue while the main thread is blocked.
+ *
+ * When the graph is changed, we may need to throw out buffered data and
+ * reprocess it. This is triggered automatically by the MediaStreamGraph.
+ *
+ * Streams that use different sampling rates complicate things a lot. We
+ * considered forcing all streams to have the same audio sample rate, resampling
+ * at inputs and outputs only, but that would create situations where a stream
+ * is resampled from X to Y and then back to X unnecessarily. It seems easier
+ * to just live with streams having different sample rates. We do require that
+ * the sample rate for a stream be constant for the life of a stream.
+ *
+ * XXX does not yet support blockInput/blockOutput functionality.
+ */
+
+class MediaStreamGraph;
+
+/**
+ * This is a base class for listener callbacks. Override methods to be
+ * notified of audio or video data or changes in stream state.
+ *
+ * This can be used by stream recorders or network connections that receive
+ * stream input. It could also be used for debugging.
+ *
+ * All notification methods are called from the media graph thread. Overriders
+ * of these methods are responsible for all synchronization. Beware!
+ * These methods are called without the media graph monitor held, so
+ * reentry into media graph methods is possible, although very much discouraged!
+ * You should do something non-blocking and non-reentrant (e.g. dispatch an
+ * event to some thread) and return.
+ */
+class MediaStreamListener {
+public:
+  virtual ~MediaStreamListener() {}
+
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaStreamListener)
+
+  enum Blocking {
+    BLOCKED,
+    UNBLOCKED
+  };
+  /**
+   * Notify that the blocking status of the stream changed.
+   */
+  virtual void NotifyBlockingChanged(MediaStreamGraph* aGraph, Blocking aBlocked) {}
+
+  /**
+   * Notify that the stream output is advancing.
+   */
+  virtual void NotifyOutput(MediaStreamGraph* aGraph) {}
+
+  /**
+   * Notify that the stream finished.
+   */
+  virtual void NotifyFinished(MediaStreamGraph* aGraph) {}
+};
+
+class MediaStreamGraphImpl;
+
+/**
+ * A stream of synchronized audio and video data. All (not blocked) streams
+ * progress at the same rate --- "real time". Streams cannot seek. The only
+ * operation readers can perform on a stream is to read the next data.
+ *
+ * Consumers of a stream can be reading from it at different offsets, but that
+ * should only happen due to the order in which consumers are being run.
+ * Those offsets must not diverge in the long term, otherwise we would require
+ * unbounded buffering.
+ *
+ * Streams can be in a "blocked" state. While blocked, a stream does not
+ * produce data. A stream can be explicitly blocked via the control API,
+ * or implicitly blocked by whatever's generating it (e.g. an underrun in the
+ * source resource), or implicitly blocked because something consuming it
+ * blocks, or implicitly because it has finished.
+ *
+ * A stream can be in a "finished" state. "Finished" streams are permanently
+ * blocked.
+ *
+ * Transitions into and out of the "blocked" and "finished" states are managed
+ * by the MediaStreamGraph on the media graph thread.
+ *
+ * We buffer media data ahead of the consumers' reading offsets. It is possible
+ * to have buffered data but still be blocked.
+ *
+ * Any stream can have its audio and video playing when requested. The media
+ * stream graph plays audio by constructing audio output streams as necessary.
+ * Video is played by setting video frames into an VideoFrameContainer at the right
+ * time. To ensure video plays in sync with audio, make sure that the same
+ * stream is playing both the audio and video.
+ *
+ * The data in a stream is managed by StreamBuffer. It consists of a set of
+ * tracks of various types that can start and end over time.
+ *
+ * Streams are explicitly managed. The client creates them via
+ * MediaStreamGraph::CreateInput/ProcessedMediaStream, and releases them by calling
+ * Destroy() when no longer needed (actual destruction will be deferred).
+ * The actual object is owned by the MediaStreamGraph. The basic idea is that
+ * main thread objects will keep Streams alive as long as necessary (using the
+ * cycle collector to clean up whenever needed).
+ *
+ * We make them refcounted only so that stream-related messages with MediaStream*
+ * pointers can be sent to the main thread safely.
+ */
+class MediaStream {
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaStream)
+
+  MediaStream(nsDOMMediaStream* aWrapper)
+    : mBufferStartTime(0)
+    , mExplicitBlockerCount(0)
+    , mBlocked(false)
+    , mGraphUpdateIndices(0)
+    , mFinished(false)
+    , mNotifiedFinished(false)
+    , mAudioPlaybackStartTime(0)
+    , mBlockedAudioTime(0)
+    , mMessageAffectedTime(0)
+    , mWrapper(aWrapper)
+    , mMainThreadCurrentTime(0)
+    , mMainThreadFinished(false)
+  {
+    for (PRUint32 i = 0; i < ArrayLength(mFirstActiveTracks); ++i) {
+      mFirstActiveTracks[i] = TRACK_NONE;
+    }
+  }
+  virtual ~MediaStream() {}
+
+  /**
+   * Returns the graph that owns this stream.
+   */
+  MediaStreamGraphImpl* GraphImpl();
+
+  // Control API.
+  // Since a stream can be played multiple ways, we need to combine independent
+  // volume settings. The aKey parameter is used to keep volume settings
+  // separate. Since the stream is always playing the same contents, only
+  // a single audio output stream is used; the volumes are combined.
+  // Currently only the first enabled audio track is played.
+  // XXX change this so all enabled audio tracks are mixed and played.
+  void AddAudioOutput(void* aKey);
+  void SetAudioOutputVolume(void* aKey, float aVolume);
+  void RemoveAudioOutput(void* aKey);
+  // Since a stream can be played multiple ways, we need to be able to
+  // play to multiple VideoFrameContainers.
+  // Only the first enabled video track is played.
+  void AddVideoOutput(VideoFrameContainer* aContainer);
+  void RemoveVideoOutput(VideoFrameContainer* aContainer);
+  // Explicitly block. Useful for example if a media element is pausing
+  // and we need to stop its stream emitting its buffered data.
+  void ChangeExplicitBlockerCount(PRInt32 aDelta);
+  // Events will be dispatched by calling methods of aListener.
+  void AddListener(MediaStreamListener* aListener);
+  void RemoveListener(MediaStreamListener* aListener);
+  // Signal that the client is done with this MediaStream. It will be deleted later.
+  void Destroy();
+  // Returns the main-thread's view of how much data has been processed by
+  // this stream.
+  StreamTime GetCurrentTime() { return mMainThreadCurrentTime; }
+  // Return the main thread's view of whether this stream has finished.
+  bool IsFinished() { return mMainThreadFinished; }
+
+  friend class MediaStreamGraphImpl;
+
+  // media graph thread only
+  void Init();
+  // These Impl methods perform the core functionality of the control methods
+  // above, on the media graph thread.
+  /**
+   * Stop all stream activity and disconnect it from all inputs and outputs.
+   * This must be idempotent.
+   */
+  virtual void DestroyImpl();
+  StreamTime GetBufferEnd() { return mBuffer.GetEnd(); }
+  void SetAudioOutputVolumeImpl(void* aKey, float aVolume);
+  void AddAudioOutputImpl(void* aKey)
+  {
+    mAudioOutputs.AppendElement(AudioOutput(aKey));
+  }
+  void RemoveAudioOutputImpl(void* aKey);
+  void AddVideoOutputImpl(already_AddRefed<VideoFrameContainer> aContainer)
+  {
+    *mVideoOutputs.AppendElement() = aContainer;
+  }
+  void RemoveVideoOutputImpl(VideoFrameContainer* aContainer)
+  {
+    mVideoOutputs.RemoveElement(aContainer);
+  }
+  void ChangeExplicitBlockerCountImpl(StreamTime aTime, PRInt32 aDelta)
+  {
+    mExplicitBlockerCount.SetAtAndAfter(aTime, mExplicitBlockerCount.GetAt(aTime) + aDelta);
+  }
+  void AddListenerImpl(already_AddRefed<MediaStreamListener> aListener)
+  {
+    *mListeners.AppendElement() = aListener;
+  }
+  void RemoveListenerImpl(MediaStreamListener* aListener)
+  {
+    mListeners.RemoveElement(aListener);
+  }
+
+#ifdef DEBUG
+  const StreamBuffer& GetStreamBuffer() { return mBuffer; }
+#endif
+
+protected:
+  virtual void AdvanceTimeVaryingValuesToCurrentTime(GraphTime aCurrentTime, GraphTime aBlockedTime)
+  {
+    mBufferStartTime += aBlockedTime;
+    mGraphUpdateIndices.InsertTimeAtStart(aBlockedTime);
+    mGraphUpdateIndices.AdvanceCurrentTime(aCurrentTime);
+    mExplicitBlockerCount.AdvanceCurrentTime(aCurrentTime);
+
+    mBuffer.ForgetUpTo(aCurrentTime - mBufferStartTime);
+  }
+
+  // This state is all initialized on the main thread but
+  // otherwise modified only on the media graph thread.
+
+  // Buffered data. The start of the buffer corresponds to mBufferStartTime.
+  // Conceptually the buffer contains everything this stream has ever played,
+  // but we forget some prefix of the buffered data to bound the space usage.
+  StreamBuffer mBuffer;
+  // The time when the buffered data could be considered to have started playing.
+  // This increases over time to account for time the stream was blocked before
+  // mCurrentTime.
+  GraphTime mBufferStartTime;
+
+  // Client-set volume of this stream
+  struct AudioOutput {
+    AudioOutput(void* aKey) : mKey(aKey), mVolume(1.0f) {}
+    void* mKey;
+    float mVolume;
+  };
+  nsTArray<AudioOutput> mAudioOutputs;
+  nsTArray<nsRefPtr<VideoFrameContainer> > mVideoOutputs;
+  // We record the last played video frame to avoid redundant setting
+  // of the current video frame.
+  VideoFrame mLastPlayedVideoFrame;
+  // The number of times this stream has been explicitly blocked by the control
+  // API, minus the number of times it has been explicitly unblocked.
+  TimeVarying<GraphTime,PRUint32> mExplicitBlockerCount;
+  nsTArray<nsRefPtr<MediaStreamListener> > mListeners;
+
+  // Precomputed blocking status (over GraphTime).
+  // This is only valid between the graph's mCurrentTime and
+  // mBlockingDecisionsMadeUntilTime. The stream is considered to have
+  // not been blocked before mCurrentTime (its mBufferStartTime is increased
+  // as necessary to account for that time instead) --- this avoids us having to
+  // record the entire history of the stream's blocking-ness in mBlocked.
+  TimeVarying<GraphTime,bool> mBlocked;
+  // Maps graph time to the graph update that affected this stream at that time
+  TimeVarying<GraphTime,PRInt64> mGraphUpdateIndices;
+
+  /**
+   * When true, this means the stream will be finished once all
+   * buffered data has been consumed.
+   */
+  bool mFinished;
+  /**
+   * When true, mFinished is true and we've played all the data in this stream
+   * and fired NotifyFinished notifications.
+   */
+  bool mNotifiedFinished;
+
+  // Where audio output is going
+  nsRefPtr<nsAudioStream> mAudioOutput;
+  // When we started audio playback for this stream.
+  // Add mAudioOutput->GetPosition() to find the current audio playback position.
+  GraphTime mAudioPlaybackStartTime;
+  // Amount of time that we've wanted to play silence because of the stream
+  // blocking.
+  MediaTime mBlockedAudioTime;
+
+  // For each track type, this is the first active track found for that type.
+  // The first active track is the track that started earliest; if multiple
+  // tracks start at the same time, the one with the lowest ID.
+  TrackID mFirstActiveTracks[MediaSegment::TYPE_COUNT];
+
+  // Temporary data used by MediaStreamGraph on the graph thread
+  // The earliest time for which we would like to change this stream's output.
+  GraphTime mMessageAffectedTime;
+
+  // This state is only used on the main thread.
+  nsDOMMediaStream* mWrapper;
+  // Main-thread views of state
+  StreamTime mMainThreadCurrentTime;
+  bool mMainThreadFinished;
+};
+
+/**
+ * Initially, at least, we will have a singleton MediaStreamGraph per
+ * process.
+ */
+class MediaStreamGraph {
+public:
+  // Main thread only
+  static MediaStreamGraph* GetInstance();
+  // Control API.
+  /**
+   * Returns the number of graph updates sent. This can be used to track
+   * whether a given update has been processed by the graph thread and reflected
+   * in main-thread stream state.
+   */
+  PRInt64 GetCurrentGraphUpdateIndex() { return mGraphUpdatesSent; }
+
+  /**
+   * Media graph thread only.
+   * Dispatches a runnable that will run on the main thread after all
+   * main-thread stream state has been next updated.
+   * Should only be called during MediaStreamListener callbacks.
+   */
+  void DispatchToMainThreadAfterStreamStateUpdate(nsIRunnable* aRunnable)
+  {
+    mPendingUpdateRunnables.AppendElement(aRunnable);
+  }
+
+protected:
+  MediaStreamGraph()
+    : mGraphUpdatesSent(1)
+  {
+    MOZ_COUNT_CTOR(MediaStreamGraph);
+  }
+  ~MediaStreamGraph()
+  {
+    MOZ_COUNT_DTOR(MediaStreamGraph);
+  }
+
+  // Media graph thread only
+  nsTArray<nsCOMPtr<nsIRunnable> > mPendingUpdateRunnables;
+
+  // Main thread only
+  // The number of updates we have sent to the media graph thread. We start
+  // this at 1 just to ensure that 0 is usable as a special value.
+  PRInt64 mGraphUpdatesSent;
+};
+
+}
+
+#endif /* MOZILLA_MEDIASTREAMGRAPH_H_ */

From 00a409b20fe763bb7b974209f6be61dbb61bc3c4 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:11:34 +1200
Subject: [PATCH 010/162] Bug 664918. Part 4: Create nsDOMMediaStream, a DOM
 object wrapping an underlying MediaStream. r=smaug,jesup

---
 b2g/installer/package-manifest.in            |  1 +
 browser/installer/package-manifest.in        |  1 +
 content/media/Makefile.in                    |  9 ++++
 content/media/nsDOMMediaStream.cpp           | 49 +++++++++++++++++
 content/media/nsDOMMediaStream.h             | 55 ++++++++++++++++++++
 content/media/nsIDOMMediaStream.idl          | 12 +++++
 dom/base/nsDOMClassInfo.cpp                  |  7 +++
 dom/base/nsDOMClassInfoClasses.h             |  3 ++
 mobile/android/installer/package-manifest.in |  1 +
 mobile/xul/installer/package-manifest.in     |  1 +
 10 files changed, 139 insertions(+)
 create mode 100644 content/media/nsDOMMediaStream.cpp
 create mode 100644 content/media/nsDOMMediaStream.h
 create mode 100644 content/media/nsIDOMMediaStream.idl

diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index 70befef465b..41143b1e652 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -138,6 +138,7 @@
 @BINPATH@/components/content_canvas.xpt
 @BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_html.xpt
+@BINPATH@/components/content_media.xpt
 @BINPATH@/components/content_xslt.xpt
 @BINPATH@/components/content_xtf.xpt
 @BINPATH@/components/cookie.xpt
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index cef9d6ee054..24329988630 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -142,6 +142,7 @@
 @BINPATH@/components/content_canvas.xpt
 @BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_html.xpt
+@BINPATH@/components/content_media.xpt
 @BINPATH@/components/content_xslt.xpt
 @BINPATH@/components/content_xtf.xpt
 @BINPATH@/components/cookie.xpt
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index e1b217e4e39..63f974a0304 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -44,6 +44,11 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = content
 LIBRARY_NAME = gkconmedia_s
 LIBXUL_LIBRARY = 1
+XPIDL_MODULE = content_media
+
+XPIDLSRCS = \
+  nsIDOMMediaStream.idl \
+  $(NULL)
 
 EXPORTS = \
   AudioSegment.h \
@@ -55,6 +60,7 @@ EXPORTS = \
   nsBuiltinDecoder.h \
   nsBuiltinDecoderStateMachine.h \
   nsBuiltinDecoderReader.h \
+  nsDOMMediaStream.h \
   nsMediaCache.h \
   nsMediaDecoder.h \
   SharedBuffer.h \
@@ -74,6 +80,7 @@ CPPSRCS = \
   nsBuiltinDecoder.cpp \
   nsBuiltinDecoderStateMachine.cpp \
   nsBuiltinDecoderReader.cpp \
+  nsDOMMediaStream.cpp \
   nsMediaCache.cpp \
   nsMediaDecoder.cpp \
   StreamBuffer.cpp \
@@ -124,3 +131,5 @@ INCLUDES += \
   -I$(srcdir)/../base/src \
   -I$(srcdir)/../html/content/src \
   $(NULL)
+
+DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/content/media/nsDOMMediaStream.cpp b/content/media/nsDOMMediaStream.cpp
new file mode 100644
index 00000000000..928d1d3f7a9
--- /dev/null
+++ b/content/media/nsDOMMediaStream.cpp
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsDOMMediaStream.h"
+#include "nsDOMClassInfoID.h"
+#include "nsContentUtils.h"
+
+using namespace mozilla;
+
+DOMCI_DATA(MediaStream, nsDOMMediaStream)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMMediaStream)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMMediaStream)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MediaStream)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMMediaStream)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMMediaStream)
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(nsDOMMediaStream)
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMMediaStream)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDOMMediaStream)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+nsDOMMediaStream::~nsDOMMediaStream()
+{
+  if (mStream) {
+    mStream->Destroy();
+  }
+}
+
+NS_IMETHODIMP
+nsDOMMediaStream::GetCurrentTime(double *aCurrentTime)
+{
+  *aCurrentTime = mStream ? MediaTimeToSeconds(mStream->GetCurrentTime()) : 0.0;
+  return NS_OK;
+}
+
+bool
+nsDOMMediaStream::CombineWithPrincipal(nsIPrincipal* aPrincipal)
+{
+  return nsContentUtils::CombineResourcePrincipals(&mPrincipal, aPrincipal);
+}
diff --git a/content/media/nsDOMMediaStream.h b/content/media/nsDOMMediaStream.h
new file mode 100644
index 00000000000..0b4827c981b
--- /dev/null
+++ b/content/media/nsDOMMediaStream.h
@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef NSDOMMEDIASTREAM_H_
+#define NSDOMMEDIASTREAM_H_
+
+#include "nsIDOMMediaStream.h"
+#include "MediaStreamGraph.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsIPrincipal.h"
+
+/**
+ * DOM wrapper for MediaStreams.
+ */
+class nsDOMMediaStream : public nsIDOMMediaStream
+{
+  typedef mozilla::MediaStream MediaStream;
+
+public:
+  nsDOMMediaStream() : mStream(nsnull) {}
+  virtual ~nsDOMMediaStream();
+
+  NS_DECL_CYCLE_COLLECTION_CLASS(nsDOMMediaStream)
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+
+  NS_DECL_NSIDOMMEDIASTREAM
+
+  MediaStream* GetStream() { return mStream; }
+  bool IsFinished() { return !mStream || mStream->IsFinished(); }
+  /**
+   * Returns a principal indicating who may access this stream. The stream contents
+   * can only be accessed by principals subsuming this principal.
+   */
+  nsIPrincipal* GetPrincipal() { return mPrincipal; }
+
+  /**
+   * Indicate that data will be contributed to this stream from origin aPrincipal.
+   * If aPrincipal is null, this is ignored. Otherwise, from now on the contents
+   * of this stream can only be accessed by principals that subsume aPrincipal.
+   * Returns true if the stream's principal changed.
+   */
+  bool CombineWithPrincipal(nsIPrincipal* aPrincipal);
+
+protected:
+  // MediaStream is owned by the graph, but we tell it when to die, and it won't
+  // die until we let it.
+  MediaStream* mStream;
+  // Principal identifying who may access the contents of this stream.
+  // If null, this stream can be used by anyone because it has no content yet.
+  nsCOMPtr<nsIPrincipal> mPrincipal;
+};
+
+#endif /* NSDOMMEDIASTREAM_H_ */
diff --git a/content/media/nsIDOMMediaStream.idl b/content/media/nsIDOMMediaStream.idl
new file mode 100644
index 00000000000..cc748ae1752
--- /dev/null
+++ b/content/media/nsIDOMMediaStream.idl
@@ -0,0 +1,12 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+ 
+[scriptable, builtinclass, uuid(f37c2871-4cb7-4672-bb28-c2d601f7cc9e)]
+interface nsIDOMMediaStream : nsISupports
+{
+  readonly attribute double currentTime;
+};
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index c9ca767e9ca..a7ddf188f88 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -309,6 +309,7 @@
 #include "nsIDOMHTMLSourceElement.h"
 #include "nsIDOMHTMLVideoElement.h"
 #include "nsIDOMHTMLAudioElement.h"
+#include "nsIDOMMediaStream.h"
 #include "nsIDOMProgressEvent.h"
 #include "nsIDOMCSS2Properties.h"
 #include "nsIDOMCSSCharsetRule.h"
@@ -1480,6 +1481,8 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(TimeRanges, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
+  NS_DEFINE_CLASSINFO_DATA(MediaStream, nsDOMGenericSH,
+                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
 #endif
 
   NS_DEFINE_CLASSINFO_DATA(ProgressEvent, nsDOMGenericSH,
@@ -4135,6 +4138,10 @@ nsDOMClassInfo::Init()
   DOM_CLASSINFO_MAP_BEGIN(TimeRanges, nsIDOMTimeRanges)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMTimeRanges)
   DOM_CLASSINFO_MAP_END  
+
+  DOM_CLASSINFO_MAP_BEGIN(MediaStream, nsIDOMMediaStream)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMMediaStream)
+  DOM_CLASSINFO_MAP_END
 #endif
 
   DOM_CLASSINFO_MAP_BEGIN(ProgressEvent, nsIDOMProgressEvent)
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index 4becd364d34..e2415471a49 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -449,6 +449,9 @@ DOMCI_CLASS(HTMLSourceElement)
 DOMCI_CLASS(MediaError)
 DOMCI_CLASS(HTMLAudioElement)
 DOMCI_CLASS(TimeRanges)
+
+// Media streams
+DOMCI_CLASS(MediaStream)
 #endif
 
 DOMCI_CLASS(ProgressEvent)
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index 34d7235c33a..60f1bb1e9ee 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -144,6 +144,7 @@
 @BINPATH@/components/content_canvas.xpt
 @BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_html.xpt
+@BINPATH@/components/content_media.xpt
 @BINPATH@/components/content_xslt.xpt
 @BINPATH@/components/content_xtf.xpt
 @BINPATH@/components/cookie.xpt
diff --git a/mobile/xul/installer/package-manifest.in b/mobile/xul/installer/package-manifest.in
index e836e6d08c3..897891a1e5e 100644
--- a/mobile/xul/installer/package-manifest.in
+++ b/mobile/xul/installer/package-manifest.in
@@ -144,6 +144,7 @@
 @BINPATH@/components/content_canvas.xpt
 @BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_html.xpt
+@BINPATH@/components/content_media.xpt
 @BINPATH@/components/content_xslt.xpt
 @BINPATH@/components/content_xtf.xpt
 @BINPATH@/components/cookie.xpt

From a94e4412e86c80f15c4e2c2e2182b0f387b5ac8c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:11:40 +1200
Subject: [PATCH 011/162] Bug 664918. Part 5: Create SourceMediaStream, a
 MediaStream with an API allowing data to be injected into it by some source.
 r=jesup

---
 content/media/MediaStreamGraph.cpp | 172 +++++++++++++++++++++++++++++
 content/media/MediaStreamGraph.h   | 121 ++++++++++++++++++++
 content/media/nsDOMMediaStream.cpp |   9 ++
 content/media/nsDOMMediaStream.h   |   5 +
 4 files changed, 307 insertions(+)

diff --git a/content/media/MediaStreamGraph.cpp b/content/media/MediaStreamGraph.cpp
index 96e09babc27..bc346493326 100644
--- a/content/media/MediaStreamGraph.cpp
+++ b/content/media/MediaStreamGraph.cpp
@@ -205,6 +205,14 @@ public:
    * will take effect.
    */
   void ChooseActionTime();
+  /**
+   * Extract any state updates pending in aStream, and apply them.
+   */
+  void ExtractPendingInput(SourceMediaStream* aStream);
+  /**
+   * Update "have enough data" flags in aStream.
+   */
+  void UpdateBufferSufficiencyState(SourceMediaStream* aStream);
   /**
    * Compute the blocking states of streams from mBlockingDecisionsMadeUntilTime
    * until the desired future time (determined by heuristic).
@@ -604,6 +612,72 @@ MediaStreamGraphImpl::ChooseActionTime()
   mLastActionTime = GetEarliestActionTime();
 }
 
+void
+MediaStreamGraphImpl::ExtractPendingInput(SourceMediaStream* aStream)
+{
+  bool finished;
+  {
+    MutexAutoLock lock(aStream->mMutex);
+    finished = aStream->mUpdateFinished;
+    for (PRInt32 i = aStream->mUpdateTracks.Length() - 1; i >= 0; --i) {
+      SourceMediaStream::TrackData* data = &aStream->mUpdateTracks[i];
+      if (data->mCommands & SourceMediaStream::TRACK_CREATE) {
+        MediaSegment* segment = data->mData.forget();
+        LOG(PR_LOG_DEBUG, ("SourceMediaStream %p creating track %d, rate %d, start %lld, initial end %lld",
+                           aStream, data->mID, data->mRate, PRInt64(data->mStart),
+                           PRInt64(segment->GetDuration())));
+        aStream->mBuffer.AddTrack(data->mID, data->mRate, data->mStart, segment);
+        // The track has taken ownership of data->mData, so let's replace
+        // data->mData with an empty clone.
+        data->mData = segment->CreateEmptyClone();
+        data->mCommands &= ~SourceMediaStream::TRACK_CREATE;
+      } else if (data->mData->GetDuration() > 0) {
+        MediaSegment* dest = aStream->mBuffer.FindTrack(data->mID)->GetSegment();
+        LOG(PR_LOG_DEBUG, ("SourceMediaStream %p track %d, advancing end from %lld to %lld",
+                           aStream, data->mID,
+                           PRInt64(dest->GetDuration()),
+                           PRInt64(dest->GetDuration() + data->mData->GetDuration())));
+        dest->AppendFrom(data->mData);
+      }
+      if (data->mCommands & SourceMediaStream::TRACK_END) {
+        aStream->mBuffer.FindTrack(data->mID)->SetEnded();
+        aStream->mUpdateTracks.RemoveElementAt(i);
+      }
+    }
+    aStream->mBuffer.AdvanceKnownTracksTime(aStream->mUpdateKnownTracksTime);
+  }
+  if (finished) {
+    FinishStream(aStream);
+  }
+}
+
+void
+MediaStreamGraphImpl::UpdateBufferSufficiencyState(SourceMediaStream* aStream)
+{
+  StreamTime desiredEnd = GetDesiredBufferEnd(aStream);
+  nsTArray<SourceMediaStream::ThreadAndRunnable> runnables;
+
+  {
+    MutexAutoLock lock(aStream->mMutex);
+    for (PRUint32 i = 0; i < aStream->mUpdateTracks.Length(); ++i) {
+      SourceMediaStream::TrackData* data = &aStream->mUpdateTracks[i];
+      if (data->mCommands & SourceMediaStream::TRACK_CREATE) {
+        continue;
+      }
+      StreamBuffer::Track* track = aStream->mBuffer.FindTrack(data->mID);
+      data->mHaveEnough = track->GetEndTimeRoundDown() >= desiredEnd;
+      if (!data->mHaveEnough) {
+        runnables.MoveElementsFrom(data->mDispatchWhenNotEnough);
+      }
+    }
+  }
+
+  for (PRUint32 i = 0; i < runnables.Length(); ++i) {
+    runnables[i].mThread->Dispatch(runnables[i].mRunnable, 0);
+  }
+}
+
+
 StreamTime
 MediaStreamGraphImpl::GraphTimeToStreamTime(MediaStream* aStream,
                                             GraphTime aTime)
@@ -1186,6 +1260,14 @@ MediaStreamGraphImpl::RunThread()
     }
     messageQueue.Clear();
 
+    // Grab pending ProcessingEngine results.
+    for (PRUint32 i = 0; i < mStreams.Length(); ++i) {
+      SourceMediaStream* is = mStreams[i]->AsSourceStream();
+      if (is) {
+        ExtractPendingInput(is);
+      }
+    }
+
     GraphTime prevBlockingDecisionsMadeUntilTime = mBlockingDecisionsMadeUntilTime;
     RecomputeBlocking();
 
@@ -1202,6 +1284,10 @@ MediaStreamGraphImpl::RunThread()
         ++audioStreamsActive;
       }
       PlayVideo(stream);
+      SourceMediaStream* is = stream->AsSourceStream();
+      if (is) {
+        UpdateBufferSufficiencyState(is);
+      }
       GraphTime end;
       if (!stream->mBlocked.GetAt(mCurrentTime, &end) || end < GRAPH_TIME_MAX) {
         allBlockedForever = false;
@@ -1705,6 +1791,83 @@ MediaStream::RemoveListener(MediaStreamListener* aListener)
   GraphImpl()->AppendMessage(new Message(this, aListener));
 }
 
+void
+SourceMediaStream::AddTrack(TrackID aID, TrackRate aRate, TrackTicks aStart,
+                            MediaSegment* aSegment)
+{
+  {
+    MutexAutoLock lock(mMutex);
+    TrackData* data = mUpdateTracks.AppendElement();
+    data->mID = aID;
+    data->mRate = aRate;
+    data->mStart = aStart;
+    data->mCommands = TRACK_CREATE;
+    data->mData = aSegment;
+    data->mHaveEnough = false;
+  }
+  GraphImpl()->EnsureNextIteration();
+}
+
+void
+SourceMediaStream::AppendToTrack(TrackID aID, MediaSegment* aSegment)
+{
+  {
+    MutexAutoLock lock(mMutex);
+    FindDataForTrack(aID)->mData->AppendFrom(aSegment);
+  }
+  GraphImpl()->EnsureNextIteration();
+}
+
+bool
+SourceMediaStream::HaveEnoughBuffered(TrackID aID)
+{
+  MutexAutoLock lock(mMutex);
+  return FindDataForTrack(aID)->mHaveEnough;
+}
+
+void
+SourceMediaStream::DispatchWhenNotEnoughBuffered(TrackID aID,
+    nsIThread* aSignalThread, nsIRunnable* aSignalRunnable)
+{
+  MutexAutoLock lock(mMutex);
+  TrackData* data = FindDataForTrack(aID);
+  if (data->mHaveEnough) {
+    data->mDispatchWhenNotEnough.AppendElement()->Init(aSignalThread, aSignalRunnable);
+  } else {
+    aSignalThread->Dispatch(aSignalRunnable, 0);
+  }
+}
+
+void
+SourceMediaStream::EndTrack(TrackID aID)
+{
+  {
+    MutexAutoLock lock(mMutex);
+    FindDataForTrack(aID)->mCommands |= TRACK_END;
+  }
+  GraphImpl()->EnsureNextIteration();
+}
+
+void
+SourceMediaStream::AdvanceKnownTracksTime(StreamTime aKnownTime)
+{
+  {
+    MutexAutoLock lock(mMutex);
+    mUpdateKnownTracksTime = aKnownTime;
+  }
+  GraphImpl()->EnsureNextIteration();
+}
+
+void
+SourceMediaStream::Finish()
+{
+  {
+    MutexAutoLock lock(mMutex);
+    mUpdateFinished = true;
+  }
+  GraphImpl()->EnsureNextIteration();
+}
+
 static const PRUint32 kThreadLimit = 4;
 static const PRUint32 kIdleThreadLimit = 4;
 static const PRUint32 kIdleThreadTimeoutMs = 2000;
@@ -1769,4 +1932,13 @@ MediaStreamGraph::GetInstance()
   return gGraph;
 }
 
+SourceMediaStream*
+MediaStreamGraph::CreateInputStream(nsDOMMediaStream* aWrapper)
+{
+  SourceMediaStream* stream = new SourceMediaStream(aWrapper);
+  NS_ADDREF(stream);
+  static_cast<MediaStreamGraphImpl*>(this)->AppendMessage(new CreateMessage(stream));
+  return stream;
+}
+
 }
diff --git a/content/media/MediaStreamGraph.h b/content/media/MediaStreamGraph.h
index 5179f1d0db9..8d372f9eb5f 100644
--- a/content/media/MediaStreamGraph.h
+++ b/content/media/MediaStreamGraph.h
@@ -111,6 +111,7 @@ public:
 };
 
 class MediaStreamGraphImpl;
+class SourceMediaStream;
 
 /**
  * A stream of synchronized audio and video data. All (not blocked) streams
@@ -216,6 +217,8 @@ public:
 
   friend class MediaStreamGraphImpl;
 
+  virtual SourceMediaStream* AsSourceStream() { return nsnull; }
+
   // media graph thread only
   void Init();
   // These Impl methods perform the core functionality of the control methods
@@ -342,6 +345,119 @@ protected:
   bool mMainThreadFinished;
 };
 
+/**
+ * This is a stream into which a decoder can write audio and video.
+ *
+ * Audio and video can be written on any thread, but you probably want to
+ * always write from the same thread to avoid unexpected interleavings.
+ */
+class SourceMediaStream : public MediaStream {
+public:
+  SourceMediaStream(nsDOMMediaStream* aWrapper) :
+    MediaStream(aWrapper), mMutex("mozilla::media::SourceMediaStream"),
+    mUpdateKnownTracksTime(0), mUpdateFinished(false)
+  {}
+
+  virtual SourceMediaStream* AsSourceStream() { return this; }
+
+  // Call these on any thread.
+  /**
+   * Add a new track to the stream starting at the given base time (which
+   * must be greater than or equal to the last time passed to
+   * AdvanceKnownTracksTime). Takes ownership of aSegment. aSegment should
+   * contain data starting after aStart.
+   */
+  void AddTrack(TrackID aID, TrackRate aRate, TrackTicks aStart,
+                MediaSegment* aSegment);
+  /**
+   * Append media data to a track. Ownership of aSegment remains with the caller,
+   * but aSegment is emptied.
+   */
+  void AppendToTrack(TrackID aID, MediaSegment* aSegment);
+  /**
+   * Returns true if the buffer currently has enough data.
+   */
+  bool HaveEnoughBuffered(TrackID aID);
+  /**
+   * Ensures that aSignalRunnable will be dispatched to aSignalThread
+   * when we don't have enough buffered data in the track (which could be
+   * immediately).
+   */
+  void DispatchWhenNotEnoughBuffered(TrackID aID,
+      nsIThread* aSignalThread, nsIRunnable* aSignalRunnable);
+  /**
+   * Indicate that a track has ended. Do not do any more API calls
+   * affecting this track.
+   */
+  void EndTrack(TrackID aID);
+  /**
+   * Indicate that no tracks will be added starting before time aKnownTime.
+   * aKnownTime must be >= its value at the last call to AdvanceKnownTracksTime.
+   */
+  void AdvanceKnownTracksTime(StreamTime aKnownTime);
+  /**
+   * Indicate that this stream should enter the "finished" state. All tracks
+   * must have been ended via EndTrack. The finish time of the stream is
+   * when all tracks have ended and when latest time sent to
+   * AdvanceKnownTracksTime() has been reached.
+   */
+  void Finish();
+
+  // XXX need a Reset API
+
+  friend class MediaStreamGraph;
+  friend class MediaStreamGraphImpl;
+
+  struct ThreadAndRunnable {
+    void Init(nsIThread* aThread, nsIRunnable* aRunnable)
+    {
+      mThread = aThread;
+      mRunnable = aRunnable;
+    }
+
+    nsCOMPtr<nsIThread> mThread;
+    nsCOMPtr<nsIRunnable> mRunnable;
+  };
+  enum TrackCommands {
+    TRACK_CREATE = 0x01,
+    TRACK_END = 0x02
+  };
+  /**
+   * Data for each track that hasn't ended.
+   */
+  struct TrackData {
+    TrackID mID;
+    TrackRate mRate;
+    TrackTicks mStart;
+    // Each time the track updates are flushed to the media graph thread,
+    // this is cleared.
+    PRUint32 mCommands;
+    // Each time the track updates are flushed to the media graph thread,
+    // the segment buffer is emptied.
+    nsAutoPtr<MediaSegment> mData;
+    nsTArray<ThreadAndRunnable> mDispatchWhenNotEnough;
+    bool mHaveEnough;
+  };
+
+protected:
+  TrackData* FindDataForTrack(TrackID aID)
+  {
+    for (PRUint32 i = 0; i < mUpdateTracks.Length(); ++i) {
+      if (mUpdateTracks[i].mID == aID) {
+        return &mUpdateTracks[i];
+      }
+    }
+    NS_ERROR("Bad track ID!");
+    return nsnull;
+  }
+
+  Mutex mMutex;
+  // protected by mMutex
+  StreamTime mUpdateKnownTracksTime;
+  nsTArray<TrackData> mUpdateTracks;
+  bool mUpdateFinished;
+};
+
 /**
  * Initially, at least, we will have a singleton MediaStreamGraph per
  * process.
@@ -351,6 +467,11 @@ public:
   // Main thread only
   static MediaStreamGraph* GetInstance();
   // Control API.
+  /**
+   * Create a stream that a media decoder (or some other source of
+   * media data, such as a camera) can write to.
+   */
+  SourceMediaStream* CreateInputStream(nsDOMMediaStream* aWrapper);
   /**
    * Returns the number of graph updates sent. This can be used to track
    * whether a given update has been processed by the graph thread and reflected
diff --git a/content/media/nsDOMMediaStream.cpp b/content/media/nsDOMMediaStream.cpp
index 928d1d3f7a9..2b217bcb45b 100644
--- a/content/media/nsDOMMediaStream.cpp
+++ b/content/media/nsDOMMediaStream.cpp
@@ -42,6 +42,15 @@ nsDOMMediaStream::GetCurrentTime(double *aCurrentTime)
   return NS_OK;
 }
 
+already_AddRefed<nsDOMMediaStream>
+nsDOMMediaStream::CreateInputStream()
+{
+  nsRefPtr<nsDOMMediaStream> stream = new nsDOMMediaStream();
+  MediaStreamGraph* gm = MediaStreamGraph::GetInstance();
+  stream->mStream = gm->CreateInputStream(stream);
+  return stream.forget();
+}
+
 bool
 nsDOMMediaStream::CombineWithPrincipal(nsIPrincipal* aPrincipal)
 {
diff --git a/content/media/nsDOMMediaStream.h b/content/media/nsDOMMediaStream.h
index 0b4827c981b..3b42c335f84 100644
--- a/content/media/nsDOMMediaStream.h
+++ b/content/media/nsDOMMediaStream.h
@@ -43,6 +43,11 @@ public:
    */
   bool CombineWithPrincipal(nsIPrincipal* aPrincipal);
 
+  /**
+   * Create an nsDOMMediaStream whose underlying stream is a SourceMediaStream.
+   */
+  static already_AddRefed<nsDOMMediaStream> CreateInputStream();
+
 protected:
   // MediaStream is owned by the graph, but we tell it when to die, and it won't
   // die until we let it.

From cb775dfed8a010e11b87749565150f31b20e3de7 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:11:47 +1200
Subject: [PATCH 012/162] Bug 664918. Part 6:
 ImageContainer::GetCurrentAsSurface shouldn't crash when mActiveImage is
 null. r=bas

---
 gfx/layers/ImageLayers.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gfx/layers/ImageLayers.cpp b/gfx/layers/ImageLayers.cpp
index b561ef69c81..19b93722a23 100644
--- a/gfx/layers/ImageLayers.cpp
+++ b/gfx/layers/ImageLayers.cpp
@@ -231,12 +231,15 @@ ImageContainer::GetCurrentAsSurface(gfxIntSize *aSize)
     CrossProcessMutexAutoLock autoLock(*mRemoteDataMutex);
     EnsureActiveImage();
 
+    if (!mActiveImage)
+      return nsnull;
     *aSize = mRemoteData->mSize;
-    return mActiveImage ? mActiveImage->GetAsSurface() : nsnull;
+  } else {
+    if (!mActiveImage)
+      return nsnull;
+    *aSize = mActiveImage->GetSize();
   }
-
-  *aSize = mActiveImage->GetSize();
-  return mActiveImage ? mActiveImage->GetAsSurface() : nsnull;
+  return mActiveImage->GetAsSurface();
 }
 
 gfxIntSize

From 53a92c834ad5b4e03c221ab13ec611732e09d39f Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:12:28 +1200
Subject: [PATCH 013/162] Bug 664918. Part 7: Let the "src" attribute of HTML
 media elements accept a MediaStream DOM object, to make the media element
 play back the contents of the given stream. r=cpearce,jesup

---
 .../html/content/public/nsHTMLMediaElement.h  |  46 ++-
 content/html/content/src/Makefile.in          |   1 +
 .../html/content/src/nsHTMLAudioElement.cpp   |  20 +-
 .../html/content/src/nsHTMLMediaElement.cpp   | 356 +++++++++++++++---
 .../html/nsIDOMHTMLAudioElement.idl           |   2 +-
 .../html/nsIDOMHTMLMediaElement.idl           |   4 +-
 .../html/nsIDOMHTMLVideoElement.idl           |   2 +-
 7 files changed, 354 insertions(+), 77 deletions(-)

diff --git a/content/html/content/public/nsHTMLMediaElement.h b/content/html/content/public/nsHTMLMediaElement.h
index 0c40ac5ae14..8f11d18a318 100644
--- a/content/html/content/public/nsHTMLMediaElement.h
+++ b/content/html/content/public/nsHTMLMediaElement.h
@@ -51,6 +51,8 @@
 #include "nsAudioStream.h"
 #include "VideoFrameContainer.h"
 #include "mozilla/CORSMode.h"
+#include "nsDOMMediaStream.h"
+#include "mozilla/Mutex.h"
 
 // Define to output information on decoding and painting framerate
 /* #define DEBUG_FRAME_RATE 1 */
@@ -58,6 +60,10 @@
 typedef PRUint16 nsMediaNetworkState;
 typedef PRUint16 nsMediaReadyState;
 
+namespace mozilla {
+class MediaResource;
+}
+
 class nsHTMLMediaElement : public nsGenericHTMLElement,
                            public nsIObserver
 {
@@ -65,6 +71,8 @@ public:
   typedef mozilla::TimeStamp TimeStamp;
   typedef mozilla::layers::ImageContainer ImageContainer;
   typedef mozilla::VideoFrameContainer VideoFrameContainer;
+  typedef mozilla::MediaStream MediaStream;
+  typedef mozilla::MediaResource MediaResource;
 
   enum CanPlayStatus {
     CANPLAY_NO,
@@ -252,7 +260,9 @@ public:
   // http://www.whatwg.org/specs/web-apps/current-work/#ended
   bool IsPlaybackEnded() const;
 
-  // principal of the currently playing stream
+  // principal of the currently playing resource. Anything accessing the contents
+  // of this element must have a principal that subsumes this principal.
+  // Returns null if nothing is playing.
   already_AddRefed<nsIPrincipal> GetCurrentPrincipal();
 
   // Update the visual size of the media. Called from the decoder on the
@@ -370,8 +380,15 @@ public:
    */
   void FireTimeUpdate(bool aPeriodic);
 
+  MediaStream* GetMediaStream()
+  {
+    NS_ASSERTION(mStream, "Don't call this when not playing a stream");
+    return mStream->GetStream();
+  }
+
 protected:
   class MediaLoadListener;
+  class StreamListener;
 
   /**
    * Logs a warning message to the web console to report various failures.
@@ -390,6 +407,15 @@ protected:
    */
   void SetPlayedOrSeeked(bool aValue);
 
+  /**
+   * Initialize the media element for playback of mSrcAttrStream
+   */
+  void SetupMediaStreamPlayback();
+  /**
+   * Stop playback on mStream.
+   */
+  void EndMediaStreamPlayback();
+
   /**
    * Create a decoder for the given aMIMEType. Returns null if we
    * were unable to create the decoder.
@@ -415,7 +441,10 @@ protected:
    * Finish setting up the decoder after Load() has been called on it.
    * Called by InitializeDecoderForChannel/InitializeDecoderAsClone.
    */
-  nsresult FinishDecoderSetup(nsMediaDecoder* aDecoder);
+  nsresult FinishDecoderSetup(nsMediaDecoder* aDecoder,
+                              MediaResource* aStream,
+                              nsIStreamListener **aListener,
+                              nsMediaDecoder* aCloneDonor);
 
   /**
    * Call this after setting up mLoadingSrc and mDecoder.
@@ -588,12 +617,25 @@ protected:
   void ProcessMediaFragmentURI();
 
   // The current decoder. Load() has been called on this decoder.
+  // At most one of mDecoder and mStream can be non-null.
   nsRefPtr<nsMediaDecoder> mDecoder;
 
   // A reference to the VideoFrameContainer which contains the current frame
   // of video to display.
   nsRefPtr<VideoFrameContainer> mVideoFrameContainer;
 
+  // Holds a reference to the DOM wrapper for the MediaStream that has been
+  // set in the src attribute.
+  nsRefPtr<nsDOMMediaStream> mSrcAttrStream;
+
+  // Holds a reference to the DOM wrapper for the MediaStream that we're
+  // actually playing.
+  // At most one of mDecoder and mStream can be non-null.
+  nsRefPtr<nsDOMMediaStream> mStream;
+
+  // Holds a reference to the MediaStreamListener attached to mStream. STRONG!
+  StreamListener* mStreamListener;
+
   // Holds a reference to the first channel we open to the media resource.
   // Once the decoder is created, control over the channel passes to the
   // decoder, and we null out this reference. We must store this in case
diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in
index 2df9999372d..961b89e7110 100644
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -149,6 +149,7 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../../editor/libeditor/base \
 		-I$(srcdir)/../../../../editor/libeditor/text \
 		-I$(srcdir) \
+		-I$(topsrcdir)/js/xpconnect/src \
 		-I$(topsrcdir)/xpcom/ds \
 		$(NULL)
 
diff --git a/content/html/content/src/nsHTMLAudioElement.cpp b/content/html/content/src/nsHTMLAudioElement.cpp
index d43ad8db685..398b5dbadcd 100644
--- a/content/html/content/src/nsHTMLAudioElement.cpp
+++ b/content/html/content/src/nsHTMLAudioElement.cpp
@@ -132,23 +132,9 @@ nsHTMLAudioElement::Initialize(nsISupports* aOwner, JSContext* aContext,
     return NS_OK;
   }
 
-  // The only (optional) argument is the url of the audio
-  JSString* jsstr = JS_ValueToString(aContext, argv[0]);
-  if (!jsstr)
-    return NS_ERROR_FAILURE;
-
-  nsDependentJSString str;
-  if (!str.init(aContext, jsstr))
-    return NS_ERROR_FAILURE;
-
-  rv = SetAttr(kNameSpaceID_None, nsGkAtoms::src, str, true);
-  if (NS_FAILED(rv))
-    return rv;
-
-  // We have been specified with a src URL. Begin a load.
-  QueueSelectResourceTask();
-
-  return NS_OK;
+  // The only (optional) argument is the src of the audio (which can
+  // be a URL string or a MediaStream object)
+  return SetSrc(aContext, argv[0]);
 }
 
 NS_IMETHODIMP
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index c3f02cf2f34..b96adc4aea9 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -54,6 +54,7 @@
 #include "nsNodeInfoManager.h"
 #include "nsNetUtil.h"
 #include "nsXPCOMStrings.h"
+#include "xpcpublic.h"
 #include "nsThreadUtils.h"
 #include "nsIThreadInternal.h"
 #include "nsContentUtils.h"
@@ -92,6 +93,9 @@
 #include "nsIDOMNotifyAudioAvailableEvent.h"
 #include "nsMediaFragmentURIParser.h"
 #include "nsURIHashKey.h"
+#include "nsJSUtils.h"
+#include "MediaStreamGraph.h"
+#include "nsDOMMediaStream.h"
 #include "nsIScriptError.h"
 
 #ifdef MOZ_OGG
@@ -418,12 +422,20 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLMediaElement, nsGenericHTMLElement)
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsHTMLMediaElement)
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsHTMLMediaElement, nsGenericHTMLElement)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mStream)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mSrcAttrStream)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mSourcePointer)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mLoadBlockedDoc)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mSourceLoadCandidate)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsHTMLMediaElement, nsGenericHTMLElement)
+  if (tmp->mStream) {
+    // Need to EndMediaStreamPlayback to clear mStream and make sure everything
+    // gets unhooked correctly.
+    tmp->EndMediaStreamPlayback();
+  }
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mSrcAttrStream)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mSourcePointer)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mLoadBlockedDoc)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mSourceLoadCandidate)
@@ -434,13 +446,56 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsHTMLMediaElement)
 NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement)
 
 // nsIDOMHTMLMediaElement
-NS_IMPL_URI_ATTR(nsHTMLMediaElement, Src, src)
 NS_IMPL_BOOL_ATTR(nsHTMLMediaElement, Controls, controls)
 NS_IMPL_BOOL_ATTR(nsHTMLMediaElement, Autoplay, autoplay)
 NS_IMPL_BOOL_ATTR(nsHTMLMediaElement, Loop, loop)
 NS_IMPL_BOOL_ATTR(nsHTMLMediaElement, DefaultMuted, muted)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLMediaElement, Preload, preload, NULL)
 
+NS_IMETHODIMP
+nsHTMLMediaElement::GetSrc(JSContext* aCtx, jsval *aParams)
+{
+  if (mSrcAttrStream) {
+    NS_ASSERTION(mSrcAttrStream->GetStream(), "MediaStream should have been set up properly");
+    return nsContentUtils::WrapNative(aCtx, JS_GetGlobalForScopeChain(aCtx),
+                                      mSrcAttrStream, aParams);
+  }
+
+  nsAutoString str;
+  nsresult rv = GetURIAttr(nsGkAtoms::src, nsnull, str);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (!xpc::StringToJsval(aCtx, str, aParams)) {
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLMediaElement::SetSrc(JSContext* aCtx, const jsval & aParams)
+{
+  if (JSVAL_IS_OBJECT(aParams)) {
+    nsCOMPtr<nsIDOMMediaStream> stream;
+    stream = do_QueryInterface(nsContentUtils::XPConnect()->
+        GetNativeOfWrapper(aCtx, JSVAL_TO_OBJECT(aParams)));
+    if (stream) {
+      mSrcAttrStream = static_cast<nsDOMMediaStream*>(stream.get());
+      UnsetAttr(kNameSpaceID_None, nsGkAtoms::src, true);
+      Load();
+      return NS_OK;
+    }
+  }
+
+  mSrcAttrStream = nsnull;
+  JSString* jsStr = JS_ValueToString(aCtx, aParams);
+  if (!jsStr)
+    return NS_ERROR_DOM_TYPE_MISMATCH_ERR;
+  nsDependentJSString str;
+  if (!str.init(aCtx, jsStr))
+    return NS_ERROR_DOM_TYPE_MISMATCH_ERR;
+  // Will trigger Load()
+  return SetAttrHelper(nsGkAtoms::src, str);
+}
+
 /* readonly attribute nsIDOMHTMLMediaElement mozAutoplayEnabled; */
 NS_IMETHODIMP nsHTMLMediaElement::GetMozAutoplayEnabled(bool *aAutoplayEnabled)
 {
@@ -460,8 +515,11 @@ NS_IMETHODIMP nsHTMLMediaElement::GetError(nsIDOMMediaError * *aError)
 /* readonly attribute boolean ended; */
 NS_IMETHODIMP nsHTMLMediaElement::GetEnded(bool *aEnded)
 {
-  *aEnded = mDecoder ? mDecoder->IsEnded() : false;
-
+  if (mStream) {
+    *aEnded = GetMediaStream()->IsFinished();
+  } else if (mDecoder) {
+    *aEnded = mDecoder->IsEnded();
+  }
   return NS_OK;
 }
 
@@ -528,6 +586,9 @@ void nsHTMLMediaElement::AbortExistingLoads()
     mDecoder->Shutdown();
     mDecoder = nsnull;
   }
+  if (mStream) {
+    EndMediaStreamPlayback();
+  }
   mLoadingSrc = nsnull;
 
   if (mNetworkState == nsIDOMHTMLMediaElement::NETWORK_LOADING ||
@@ -550,6 +611,7 @@ void nsHTMLMediaElement::AbortExistingLoads()
 
   if (mNetworkState != nsIDOMHTMLMediaElement::NETWORK_EMPTY) {
     mNetworkState = nsIDOMHTMLMediaElement::NETWORK_EMPTY;
+    NS_ASSERTION(!mDecoder && !mStream, "How did someone setup a new stream/decoder already?");
     ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_NOTHING);
     mPaused = true;
 
@@ -672,7 +734,8 @@ void nsHTMLMediaElement::SelectResourceWrapper()
 
 void nsHTMLMediaElement::SelectResource()
 {
-  if (!HasAttr(kNameSpaceID_None, nsGkAtoms::src) && !HasSourceChildren(this)) {
+  if (!mSrcAttrStream && !HasAttr(kNameSpaceID_None, nsGkAtoms::src) &&
+      !HasSourceChildren(this)) {
     // The media element has neither a src attribute nor any source
     // element children, abort the load.
     mNetworkState = nsIDOMHTMLMediaElement::NETWORK_EMPTY;
@@ -696,7 +759,9 @@ void nsHTMLMediaElement::SelectResource()
 
   // If we have a 'src' attribute, use that exclusively.
   nsAutoString src;
-  if (GetAttr(kNameSpaceID_None, nsGkAtoms::src, src)) {
+  if (mSrcAttrStream) {
+    SetupMediaStreamPlayback();
+  } else if (GetAttr(kNameSpaceID_None, nsGkAtoms::src, src)) {
     nsCOMPtr<nsIURI> uri;
     nsresult rv = NewURIFromString(src, getter_AddRefs(uri));
     if (NS_SUCCEEDED(rv)) {
@@ -1064,7 +1129,12 @@ nsresult nsHTMLMediaElement::LoadWithChannel(nsIChannel *aChannel,
 
   *aListener = nsnull;
 
+  // Make sure we don't reenter during synchronous abort events.
+  if (mIsRunningLoadMethod)
+    return NS_OK;
+  mIsRunningLoadMethod = true;
   AbortExistingLoads();
+  mIsRunningLoadMethod = false;
 
   nsresult rv = aChannel->GetOriginalURI(getter_AddRefs(mLoadingSrc));
   NS_ENSURE_SUCCESS(rv, rv);
@@ -1085,7 +1155,12 @@ NS_IMETHODIMP nsHTMLMediaElement::MozLoadFrom(nsIDOMHTMLMediaElement* aOther)
 {
   NS_ENSURE_ARG_POINTER(aOther);
 
+  // Make sure we don't reenter during synchronous abort events.
+  if (mIsRunningLoadMethod)
+    return NS_OK;
+  mIsRunningLoadMethod = true;
   AbortExistingLoads();
+  mIsRunningLoadMethod = false;
 
   nsCOMPtr<nsIContent> content = do_QueryInterface(aOther);
   nsHTMLMediaElement* other = static_cast<nsHTMLMediaElement*>(content.get());
@@ -1125,7 +1200,13 @@ NS_IMETHODIMP nsHTMLMediaElement::GetSeeking(bool *aSeeking)
 /* attribute double currentTime; */
 NS_IMETHODIMP nsHTMLMediaElement::GetCurrentTime(double *aCurrentTime)
 {
-  *aCurrentTime = mDecoder ? mDecoder->GetCurrentTime() : 0.0;
+  if (mStream) {
+    *aCurrentTime = MediaTimeToSeconds(GetMediaStream()->GetCurrentTime());
+  } else if (mDecoder) {
+    *aCurrentTime = mDecoder->GetCurrentTime();
+  } else {
+    *aCurrentTime = 0.0;
+  }
   return NS_OK;
 }
 
@@ -1133,6 +1214,12 @@ NS_IMETHODIMP nsHTMLMediaElement::SetCurrentTime(double aCurrentTime)
 {
   StopSuspendingAfterFirstFrame();
 
+  if (mStream) {
+    // do nothing since streams aren't seekable; we effectively clamp to
+    // the current time.
+    return NS_ERROR_DOM_INVALID_STATE_ERR;
+  }
+
   if (!mDecoder) {
     LOG(PR_LOG_DEBUG, ("%p SetCurrentTime(%f) failed: no decoder", this, aCurrentTime));
     return NS_ERROR_DOM_INVALID_STATE_ERR;
@@ -1171,7 +1258,13 @@ NS_IMETHODIMP nsHTMLMediaElement::SetCurrentTime(double aCurrentTime)
 /* readonly attribute double duration; */
 NS_IMETHODIMP nsHTMLMediaElement::GetDuration(double *aDuration)
 {
-  *aDuration = mDecoder ? mDecoder->GetDuration() : std::numeric_limits<double>::quiet_NaN();
+  if (mStream) {
+    *aDuration = std::numeric_limits<double>::infinity();
+  } else if (mDecoder) {
+    *aDuration = mDecoder->GetDuration();
+  } else {
+    *aDuration = std::numeric_limits<double>::quiet_NaN();
+  }
   return NS_OK;
 }
 
@@ -1213,6 +1306,9 @@ NS_IMETHODIMP nsHTMLMediaElement::Pause()
   AddRemoveSelfReference();
 
   if (!oldPaused) {
+    if (mStream) {
+      GetMediaStream()->ChangeExplicitBlockerCount(1);
+    }
     FireTimeUpdate(false);
     DispatchAsyncEvent(NS_LITERAL_STRING("pause"));
   }
@@ -1238,10 +1334,14 @@ NS_IMETHODIMP nsHTMLMediaElement::SetVolume(double aVolume)
 
   mVolume = aVolume;
 
-  if (mDecoder && !mMuted) {
-    mDecoder->SetVolume(mVolume);
-  } else if (mAudioStream && !mMuted) {
-    mAudioStream->SetVolume(mVolume);
+  if (!mMuted) {
+    if (mDecoder) {
+      mDecoder->SetVolume(mVolume);
+    } else if (mAudioStream) {
+      mAudioStream->SetVolume(mVolume);
+    } else if (mStream) {
+      GetMediaStream()->SetAudioOutputVolume(this, float(mVolume));
+    }
   }
 
   DispatchAsyncEvent(NS_LITERAL_STRING("volumechange"));
@@ -1308,10 +1408,13 @@ NS_IMETHODIMP nsHTMLMediaElement::SetMuted(bool aMuted)
 
   mMuted = aMuted;
 
+  float effectiveVolume = mMuted ? 0.0f : float(mVolume);
   if (mDecoder) {
-    mDecoder->SetVolume(mMuted ? 0.0 : mVolume);
+    mDecoder->SetVolume(effectiveVolume);
   } else if (mAudioStream) {
-    mAudioStream->SetVolume(mMuted ? 0.0 : mVolume);
+    mAudioStream->SetVolume(effectiveVolume);
+  } else if (mStream) {
+    GetMediaStream()->SetAudioOutputVolume(this, effectiveVolume);
   }
 
   DispatchAsyncEvent(NS_LITERAL_STRING("volumechange"));
@@ -1425,6 +1528,7 @@ nsHTMLMediaElement::LookupMediaElementURITable(nsIURI* aURI)
 
 nsHTMLMediaElement::nsHTMLMediaElement(already_AddRefed<nsINodeInfo> aNodeInfo)
   : nsGenericHTMLElement(aNodeInfo),
+    mStreamListener(nsnull),
     mCurrentLoadID(0),
     mNetworkState(nsIDOMHTMLMediaElement::NETWORK_EMPTY),
     mReadyState(nsIDOMHTMLMediaElement::HAVE_NOTHING),
@@ -1488,6 +1592,9 @@ nsHTMLMediaElement::~nsHTMLMediaElement()
     RemoveMediaElementFromURITable();
     mDecoder->Shutdown();
   }
+  if (mStream) {
+    EndMediaStreamPlayback();
+  }
 
   NS_ASSERTION(MediaElementTableCount(this, mLoadingSrc) == 0,
     "Destroyed media element should no longer be in element table");
@@ -1557,6 +1664,9 @@ NS_IMETHODIMP nsHTMLMediaElement::Play()
   // seek to the effective start.
   // TODO: The playback rate must be set to the default playback rate.
   if (mPaused) {
+    if (mStream) {
+      GetMediaStream()->ChangeExplicitBlockerCount(-1);
+    }
     DispatchAsyncEvent(NS_LITERAL_STRING("play"));
     switch (mReadyState) {
     case nsIDOMHTMLMediaElement::HAVE_NOTHING:
@@ -2110,15 +2220,7 @@ nsresult nsHTMLMediaElement::InitializeDecoderAsClone(nsMediaDecoder* aOriginal)
     return NS_ERROR_FAILURE;
   }
 
-  mNetworkState = nsIDOMHTMLMediaElement::NETWORK_LOADING;
-
-  nsresult rv = decoder->Load(resource, nsnull, aOriginal);
-  if (NS_FAILED(rv)) {
-    LOG(PR_LOG_DEBUG, ("%p Failed to load decoder/stream for decoder %p", this, decoder.get()));
-    return rv;
-  }
-
-  return FinishDecoderSetup(decoder);
+  return FinishDecoderSetup(decoder, resource, nsnull, aOriginal);
 }
 
 nsresult nsHTMLMediaElement::InitializeDecoderForChannel(nsIChannel *aChannel,
@@ -2142,14 +2244,34 @@ nsresult nsHTMLMediaElement::InitializeDecoderForChannel(nsIChannel *aChannel,
 
   LOG(PR_LOG_DEBUG, ("%p Created decoder %p for type %s", this, decoder.get(), mimeType.get()));
 
-  mNetworkState = nsIDOMHTMLMediaElement::NETWORK_LOADING;
-
   MediaResource* resource = MediaResource::Create(decoder, aChannel);
   if (!resource)
     return NS_ERROR_OUT_OF_MEMORY;
 
-  nsresult rv = decoder->Load(resource, aListener, nsnull);
+  // stream successfully created, the stream now owns the channel.
+  mChannel = nsnull;
+
+  return FinishDecoderSetup(decoder, resource, aListener, nsnull);
+}
+
+nsresult nsHTMLMediaElement::FinishDecoderSetup(nsMediaDecoder* aDecoder,
+                                                MediaResource* aStream,
+                                                nsIStreamListener **aListener,
+                                                nsMediaDecoder* aCloneDonor)
+{
+  mNetworkState = nsIDOMHTMLMediaElement::NETWORK_LOADING;
+
+  // Force a same-origin check before allowing events for this media resource.
+  mMediaSecurityVerified = false;
+
+  // The new stream has not been suspended by us.
+  mPausedForInactiveDocument = false;
+
+  aDecoder->SetVolume(mMuted ? 0.0 : mVolume);
+
+  nsresult rv = aDecoder->Load(aStream, aListener, aCloneDonor);
   if (NS_FAILED(rv)) {
+    LOG(PR_LOG_DEBUG, ("%p Failed to load for decoder %p", this, aDecoder));
     return rv;
   }
 
@@ -2157,29 +2279,13 @@ nsresult nsHTMLMediaElement::InitializeDecoderForChannel(nsIChannel *aChannel,
   // which owns the channel.
   mChannel = nsnull;
 
-  return FinishDecoderSetup(decoder);
-}
-
-nsresult nsHTMLMediaElement::FinishDecoderSetup(nsMediaDecoder* aDecoder)
-{
-  NS_ASSERTION(mLoadingSrc, "mLoadingSrc set up");
-
   mDecoder = aDecoder;
   AddMediaElementToURITable();
 
-  // Force a same-origin check before allowing events for this media resource.
-  mMediaSecurityVerified = false;
-
-  // The new resource has not been suspended by us.
-  mPausedForInactiveDocument = false;
-  // But we may want to suspend it now.
+  // We may want to suspend the new stream now.
   // This will also do an AddRemoveSelfReference.
   NotifyOwnerDocumentActivityChanged();
 
-  nsresult rv = NS_OK;
-
-  mDecoder->SetVolume(mMuted ? 0.0 : mVolume);
-
   if (!mPaused) {
     SetPlayedOrSeeked(true);
     if (!mPausedForInactiveDocument) {
@@ -2204,6 +2310,128 @@ nsresult nsHTMLMediaElement::FinishDecoderSetup(nsMediaDecoder* aDecoder)
   return rv;
 }
 
+class nsHTMLMediaElement::StreamListener : public MediaStreamListener {
+public:
+  StreamListener(nsHTMLMediaElement* aElement) :
+    mElement(aElement),
+    mMutex("nsHTMLMediaElement::StreamListener"),
+    mPendingNotifyOutput(false)
+  {}
+  void Forget() { mElement = nsnull; }
+
+  // Main thread
+  void DoNotifyFinished()
+  {
+    if (mElement) {
+      mElement->PlaybackEnded();
+    }
+  }
+  void DoNotifyBlocked()
+  {
+    if (mElement) {
+      mElement->UpdateReadyStateForData(NEXT_FRAME_UNAVAILABLE_BUFFERING);
+    }
+  }
+  void DoNotifyUnblocked()
+  {
+    if (mElement) {
+      mElement->UpdateReadyStateForData(NEXT_FRAME_AVAILABLE);
+    }
+  }
+  void DoNotifyOutput()
+  {
+    {
+      MutexAutoLock lock(mMutex);
+      mPendingNotifyOutput = false;
+    }
+    if (mElement) {
+      mElement->FireTimeUpdate(true);
+    }
+  }
+
+  // These notifications run on the media graph thread so we need to
+  // dispatch events to the main thread.
+  virtual void NotifyBlockingChanged(MediaStreamGraph* aGraph, Blocking aBlocked)
+  {
+    nsCOMPtr<nsIRunnable> event;
+    if (aBlocked == BLOCKED) {
+      event = NS_NewRunnableMethod(this, &StreamListener::DoNotifyBlocked);
+    } else {
+      event = NS_NewRunnableMethod(this, &StreamListener::DoNotifyUnblocked);
+    }
+    aGraph->DispatchToMainThreadAfterStreamStateUpdate(event);
+  }
+  virtual void NotifyFinished(MediaStreamGraph* aGraph)
+  {
+    nsCOMPtr<nsIRunnable> event =
+      NS_NewRunnableMethod(this, &StreamListener::DoNotifyFinished);
+    aGraph->DispatchToMainThreadAfterStreamStateUpdate(event);
+  }
+  virtual void NotifyOutput(MediaStreamGraph* aGraph)
+  {
+    MutexAutoLock lock(mMutex);
+    if (mPendingNotifyOutput)
+      return;
+    mPendingNotifyOutput = true;
+    nsCOMPtr<nsIRunnable> event =
+      NS_NewRunnableMethod(this, &StreamListener::DoNotifyOutput);
+    aGraph->DispatchToMainThreadAfterStreamStateUpdate(event);
+  }
+
+private:
+  nsHTMLMediaElement* mElement;
+
+  Mutex mMutex;
+  bool mPendingNotifyOutput;
+};
+
+void nsHTMLMediaElement::SetupMediaStreamPlayback()
+{
+  NS_ASSERTION(!mStream && !mStreamListener, "Should have been ended already");
+
+  mStream = mSrcAttrStream;
+  mStreamListener = new StreamListener(this);
+  NS_ADDREF(mStreamListener);
+  GetMediaStream()->AddListener(mStreamListener);
+  if (mPaused) {
+    GetMediaStream()->ChangeExplicitBlockerCount(1);
+  }
+  if (mPausedForInactiveDocument) {
+    GetMediaStream()->ChangeExplicitBlockerCount(1);
+  }
+  ChangeDelayLoadStatus(false);
+  GetMediaStream()->AddAudioOutput(this);
+  GetMediaStream()->SetAudioOutputVolume(this, float(mMuted ? 0.0 : mVolume));
+  VideoFrameContainer* container = GetVideoFrameContainer();
+  if (container) {
+    GetMediaStream()->AddVideoOutput(container);
+  }
+  ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_METADATA);
+  DispatchAsyncEvent(NS_LITERAL_STRING("durationchange"));
+  DispatchAsyncEvent(NS_LITERAL_STRING("loadedmetadata"));
+  ResourceLoaded();
+}
+
+void nsHTMLMediaElement::EndMediaStreamPlayback()
+{
+  GetMediaStream()->RemoveListener(mStreamListener);
+  // Kill its reference to this element
+  mStreamListener->Forget();
+  NS_RELEASE(mStreamListener); // sets to null
+  GetMediaStream()->RemoveAudioOutput(this);
+  VideoFrameContainer* container = GetVideoFrameContainer();
+  if (container) {
+    GetMediaStream()->RemoveVideoOutput(container);
+  }
+  if (mPaused) {
+    GetMediaStream()->ChangeExplicitBlockerCount(-1);
+  }
+  if (mPausedForInactiveDocument) {
+    GetMediaStream()->ChangeExplicitBlockerCount(-1);
+  }
+  mStream = nsnull;
+}
+
 nsresult nsHTMLMediaElement::NewURIFromString(const nsAutoString& aURISpec, nsIURI** aURI)
 {
   NS_ENSURE_ARG_POINTER(aURI);
@@ -2362,11 +2590,12 @@ void nsHTMLMediaElement::Error(PRUint16 aErrorCode)
 
 void nsHTMLMediaElement::PlaybackEnded()
 {
-  NS_ASSERTION(mDecoder->IsEnded(), "Decoder fired ended, but not in ended state");
-  // We changed the state of IsPlaybackEnded which can affect AddRemoveSelfReference
+  // We changed state which can affect AddRemoveSelfReference
   AddRemoveSelfReference();
 
-  if (mDecoder && mDecoder->IsInfinite()) {
+  NS_ASSERTION(!mDecoder || mDecoder->IsEnded(),
+               "Decoder fired ended, but not in ended state");
+  if (mStream || (mDecoder && mDecoder->IsInfinite())) {
     LOG(PR_LOG_DEBUG, ("%p, got duration by reaching the end of the resource", this));
     DispatchAsyncEvent(NS_LITERAL_STRING("durationchange"));
   }
@@ -2445,6 +2674,11 @@ void nsHTMLMediaElement::UpdateReadyStateForData(NextFrameStatus aNextFrame)
     return;
   }
 
+  if (mStream) {
+    ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_ENOUGH_DATA);
+    return;
+  }
+
   // Now see if we should set HAVE_ENOUGH_DATA.
   // If it's something we don't know the size of, then we can't
   // make a real estimate, so we go straight to HAVE_ENOUGH_DATA once
@@ -2544,6 +2778,9 @@ void nsHTMLMediaElement::NotifyAutoplayDataReady()
     if (mDecoder) {
       SetPlayedOrSeeked(true);
       mDecoder->Play();
+    } else if (mStream) {
+      SetPlayedOrSeeked(true);
+      GetMediaStream()->ChangeExplicitBlockerCount(-1);
     }
     DispatchAsyncEvent(NS_LITERAL_STRING("play"));
   }
@@ -2664,10 +2901,14 @@ bool nsHTMLMediaElement::IsPlaybackEnded() const
 
 already_AddRefed<nsIPrincipal> nsHTMLMediaElement::GetCurrentPrincipal()
 {
-  if (!mDecoder)
-    return nsnull;
-
-  return mDecoder->GetCurrentPrincipal();
+  if (mDecoder) {
+    return mDecoder->GetCurrentPrincipal();
+  }
+  if (mStream) {
+    nsRefPtr<nsIPrincipal> principal = mStream->GetPrincipal();
+    return principal.forget();
+  }
+  return nsnull;
 }
 
 void nsHTMLMediaElement::UpdateMediaSize(nsIntSize size)
@@ -2683,17 +2924,23 @@ void nsHTMLMediaElement::NotifyOwnerDocumentActivityChanged()
 
   if (pauseForInactiveDocument != mPausedForInactiveDocument) {
     mPausedForInactiveDocument = pauseForInactiveDocument;
-    if (mDecoder) {
-      if (pauseForInactiveDocument) {
+    if (pauseForInactiveDocument) {
+      if (mDecoder) {
         mDecoder->Pause();
         mDecoder->Suspend();
-      } else {
+      } else if (mStream) {
+        GetMediaStream()->ChangeExplicitBlockerCount(1);
+      }
+    } else {
+      if (mDecoder) {
         mDecoder->Resume(false);
-        DispatchPendingMediaEvents();
         if (!mPaused && !mDecoder->IsEnded()) {
           mDecoder->Play();
         }
+      } else if (mStream) {
+        GetMediaStream()->ChangeExplicitBlockerCount(-1);
       }
+      DispatchPendingMediaEvents();
     }
   }
 
@@ -2715,6 +2962,7 @@ void nsHTMLMediaElement::AddRemoveSelfReference()
     ownerDoc->IsActive() &&
     (mDelayingLoadEvent ||
      (!mPaused && mDecoder && !mDecoder->IsEnded()) ||
+     (!mPaused && mStream && !mStream->IsFinished()) ||
      (mDecoder && mDecoder->IsSeeking()) ||
      CanActivateAutoplay() ||
      mNetworkState == nsIDOMHTMLMediaElement::NETWORK_LOADING);
@@ -2948,7 +3196,7 @@ void nsHTMLMediaElement::FireTimeUpdate(bool aPeriodic)
   double time = 0;
   GetCurrentTime(&time);
 
-  // Fire a timupdate event if this is not a periodic update (i.e. it's a
+  // Fire a timeupdate event if this is not a periodic update (i.e. it's a
   // timeupdate event mandated by the spec), or if it's a periodic update
   // and TIMEUPDATE_MS has passed since the last timeupdate event fired and
   // the time has changed.
diff --git a/dom/interfaces/html/nsIDOMHTMLAudioElement.idl b/dom/interfaces/html/nsIDOMHTMLAudioElement.idl
index ead49377877..6869fa3a5f9 100644
--- a/dom/interfaces/html/nsIDOMHTMLAudioElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLAudioElement.idl
@@ -52,7 +52,7 @@
  * @status UNDER_DEVELOPMENT
  */
 
-[scriptable, uuid(D5844B73-30E2-46D5-894C-108967E05C80)]
+[scriptable, uuid(e1a11e83-255b-4350-81cf-f1f3e7d59712)]
 interface nsIDOMHTMLAudioElement : nsIDOMHTMLMediaElement
 {
   // Setup the audio stream for writing
diff --git a/dom/interfaces/html/nsIDOMHTMLMediaElement.idl b/dom/interfaces/html/nsIDOMHTMLMediaElement.idl
index 9c5edf58abb..b3cf00c55b2 100644
--- a/dom/interfaces/html/nsIDOMHTMLMediaElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLMediaElement.idl
@@ -57,14 +57,14 @@
 #endif
 %}
 
-[scriptable, uuid(02FB205D-68B5-4722-982B-1D12238FBF72)]
+[scriptable, uuid(3e672e79-a0ea-45ef-87de-828402f1f6d7)]
 interface nsIDOMHTMLMediaElement : nsIDOMHTMLElement
 {
   // error state
   readonly attribute nsIDOMMediaError error;
 
   // network state
-           attribute DOMString src;
+  [implicit_jscontext] attribute jsval src;
   readonly attribute DOMString currentSrc;
            attribute DOMString crossorigin;
   const unsigned short NETWORK_EMPTY = 0;
diff --git a/dom/interfaces/html/nsIDOMHTMLVideoElement.idl b/dom/interfaces/html/nsIDOMHTMLVideoElement.idl
index a1734b3b523..f93c0735909 100644
--- a/dom/interfaces/html/nsIDOMHTMLVideoElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLVideoElement.idl
@@ -48,7 +48,7 @@
  * @status UNDER_DEVELOPMENT
  */
 
-[scriptable, uuid(0a1c8b44-12a4-4316-b39f-feeee48475f8)]
+[scriptable, uuid(e1a11e83-255b-4350-81cf-f1f3e7d59712)]
 interface nsIDOMHTMLVideoElement : nsIDOMHTMLMediaElement
 {
            attribute long width; 

From 9eef1b9f614ac7db97fe2039df2aa2a9a65f5259 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:12:42 +1200
Subject: [PATCH 014/162] Bug 664918. Part 8: Add
 mozCaptureStream()/mozCaptureStreamUntilEnded() APIs to HTML media elements,
 returning a MediaStream representing the contents of the media element.
 r=cpearce,jesup This is currently not fully functional. The MediaStream
 always ends when the underlying resource ends. You can't use these APIs on a
 media element whose src is a MediaStream. Seeking or pausing the resource
 will cause problems. The media element does not play back in sync with the
 MediaStream.

---
 .../html/content/public/nsHTMLMediaElement.h  |  25 +-
 .../html/content/src/nsHTMLMediaElement.cpp   |  62 +++
 content/media/MediaResource.cpp               |   8 +
 content/media/MediaResource.h                 |   2 +
 .../media/nsAudioAvailableEventManager.cpp    |  20 +-
 content/media/nsBuiltinDecoder.cpp            |  31 ++
 content/media/nsBuiltinDecoder.h              |  56 +++
 content/media/nsBuiltinDecoderReader.cpp      |  25 +-
 content/media/nsBuiltinDecoderReader.h        |  40 +-
 .../media/nsBuiltinDecoderStateMachine.cpp    | 375 ++++++++++++++++--
 content/media/nsBuiltinDecoderStateMachine.h  |  32 ++
 content/media/nsMediaCache.cpp                |  25 +-
 content/media/nsMediaCache.h                  |  22 +-
 content/media/nsMediaDecoder.h                |  17 +-
 .../html/nsIDOMHTMLAudioElement.idl           |   2 +-
 .../html/nsIDOMHTMLMediaElement.idl           |   9 +-
 .../html/nsIDOMHTMLVideoElement.idl           |   2 +-
 17 files changed, 691 insertions(+), 62 deletions(-)

diff --git a/content/html/content/public/nsHTMLMediaElement.h b/content/html/content/public/nsHTMLMediaElement.h
index 8f11d18a318..c9484fd00be 100644
--- a/content/html/content/public/nsHTMLMediaElement.h
+++ b/content/html/content/public/nsHTMLMediaElement.h
@@ -265,6 +265,9 @@ public:
   // Returns null if nothing is playing.
   already_AddRefed<nsIPrincipal> GetCurrentPrincipal();
 
+  // called to notify that the principal of the decoder's media resource has changed.
+  void NotifyDecoderPrincipalChanged();
+
   // Update the visual size of the media. Called from the decoder on the
   // main thread when/if the size changes.
   void UpdateMediaSize(nsIntSize size);
@@ -416,6 +419,15 @@ protected:
    */
   void EndMediaStreamPlayback();
 
+  /**
+   * Returns an nsDOMMediaStream containing the played contents of this
+   * element. When aFinishWhenEnded is true, when this element ends playback
+   * we will finish the stream and not play any more into it.
+   * When aFinishWhenEnded is false, ending playback does not finish the stream.
+   * The stream will never finish.
+   */
+  already_AddRefed<nsDOMMediaStream> CaptureStreamInternal(bool aFinishWhenEnded);
+
   /**
    * Create a decoder for the given aMIMEType. Returns null if we
    * were unable to create the decoder.
@@ -633,6 +645,14 @@ protected:
   // At most one of mDecoder and mStream can be non-null.
   nsRefPtr<nsDOMMediaStream> mStream;
 
+  // Holds references to the DOM wrappers for the MediaStreams that we're
+  // writing to.
+  struct OutputMediaStream {
+    nsRefPtr<nsDOMMediaStream> mStream;
+    bool mFinishWhenEnded;
+  };
+  nsTArray<OutputMediaStream> mOutputStreams;
+
   // Holds a reference to the MediaStreamListener attached to mStream. STRONG!
   StreamListener* mStreamListener;
 
@@ -769,9 +789,12 @@ protected:
   // 'Pause' method, or playback not yet having started.
   bool mPaused;
 
-  // True if the sound is muted
+  // True if the sound is muted.
   bool mMuted;
 
+  // True if the sound is being captured.
+  bool mAudioCaptured;
+
   // If TRUE then the media element was actively playing before the currently
   // in progress seeking. If FALSE then the media element is either not seeking
   // or was not actively playing before the current seek. Used to decide whether
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index b96adc4aea9..8fbb6da2940 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -427,6 +427,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsHTMLMediaElement, nsGenericH
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mSourcePointer)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mLoadBlockedDoc)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mSourceLoadCandidate)
+  for (PRUint32 i = 0; i < tmp->mOutputStreams.Length(); ++i) {
+    NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOutputStreams[i].mStream);
+  }
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsHTMLMediaElement, nsGenericHTMLElement)
@@ -439,6 +442,9 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsHTMLMediaElement, nsGenericHTM
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mSourcePointer)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mLoadBlockedDoc)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mSourceLoadCandidate)
+  for (PRUint32 i = 0; i < tmp->mOutputStreams.Length(); ++i) {
+    NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOutputStreams[i].mStream);
+  }
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsHTMLMediaElement)
@@ -1422,6 +1428,43 @@ NS_IMETHODIMP nsHTMLMediaElement::SetMuted(bool aMuted)
   return NS_OK;
 }
 
+already_AddRefed<nsDOMMediaStream>
+nsHTMLMediaElement::CaptureStreamInternal(bool aFinishWhenEnded)
+{
+  OutputMediaStream* out = mOutputStreams.AppendElement();
+  out->mStream = nsDOMMediaStream::CreateInputStream();
+  nsRefPtr<nsIPrincipal> principal = GetCurrentPrincipal();
+  out->mStream->CombineWithPrincipal(principal);
+  out->mFinishWhenEnded = aFinishWhenEnded;
+
+  mAudioCaptured = true;
+  if (mDecoder) {
+    mDecoder->SetAudioCaptured(true);
+    mDecoder->AddOutputStream(
+        out->mStream->GetStream()->AsSourceStream(), aFinishWhenEnded);
+  }
+  nsRefPtr<nsDOMMediaStream> result = out->mStream;
+  return result.forget();
+}
+
+NS_IMETHODIMP nsHTMLMediaElement::MozCaptureStream(nsIDOMMediaStream** aStream)
+{
+  *aStream = CaptureStreamInternal(false).get();
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLMediaElement::MozCaptureStreamUntilEnded(nsIDOMMediaStream** aStream)
+{
+  *aStream = CaptureStreamInternal(true).get();
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLMediaElement::GetMozAudioCaptured(bool *aCaptured)
+{
+  *aCaptured = mAudioCaptured;
+  return NS_OK;
+}
+
 class MediaElementSetForURI : public nsURIHashKey {
 public:
   MediaElementSetForURI(const nsIURI* aKey) : nsURIHashKey(aKey) {}
@@ -1548,6 +1591,7 @@ nsHTMLMediaElement::nsHTMLMediaElement(already_AddRefed<nsINodeInfo> aNodeInfo)
     mAutoplayEnabled(true),
     mPaused(true),
     mMuted(false),
+    mAudioCaptured(false),
     mPlayingBeforeSeek(false),
     mPausedForInactiveDocument(false),
     mWaitingFired(false),
@@ -2267,7 +2311,13 @@ nsresult nsHTMLMediaElement::FinishDecoderSetup(nsMediaDecoder* aDecoder,
   // The new stream has not been suspended by us.
   mPausedForInactiveDocument = false;
 
+  aDecoder->SetAudioCaptured(mAudioCaptured);
   aDecoder->SetVolume(mMuted ? 0.0 : mVolume);
+  for (PRUint32 i = 0; i < mOutputStreams.Length(); ++i) {
+    OutputMediaStream* ms = &mOutputStreams[i];
+    aDecoder->AddOutputStream(ms->mStream->GetStream()->AsSourceStream(),
+        ms->mFinishWhenEnded);
+  }
 
   nsresult rv = aDecoder->Load(aStream, aListener, aCloneDonor);
   if (NS_FAILED(rv)) {
@@ -2281,6 +2331,7 @@ nsresult nsHTMLMediaElement::FinishDecoderSetup(nsMediaDecoder* aDecoder,
 
   mDecoder = aDecoder;
   AddMediaElementToURITable();
+  NotifyDecoderPrincipalChanged();
 
   // We may want to suspend the new stream now.
   // This will also do an AddRemoveSelfReference.
@@ -2390,6 +2441,8 @@ void nsHTMLMediaElement::SetupMediaStreamPlayback()
   NS_ASSERTION(!mStream && !mStreamListener, "Should have been ended already");
 
   mStream = mSrcAttrStream;
+  // XXX if we ever support capturing the output of a media element which is
+  // playing a stream, we'll need to add a CombineWithPrincipal call here.
   mStreamListener = new StreamListener(this);
   NS_ADDREF(mStreamListener);
   GetMediaStream()->AddListener(mStreamListener);
@@ -2911,6 +2964,15 @@ already_AddRefed<nsIPrincipal> nsHTMLMediaElement::GetCurrentPrincipal()
   return nsnull;
 }
 
+void nsHTMLMediaElement::NotifyDecoderPrincipalChanged()
+{
+  for (PRUint32 i = 0; i < mOutputStreams.Length(); ++i) {
+    OutputMediaStream* ms = &mOutputStreams[i];
+    nsRefPtr<nsIPrincipal> principal = GetCurrentPrincipal();
+    ms->mStream->CombineWithPrincipal(principal);
+  }
+}
+
 void nsHTMLMediaElement::UpdateMediaSize(nsIntSize size)
 {
   mMediaSize = size;
diff --git a/content/media/MediaResource.cpp b/content/media/MediaResource.cpp
index 43ee9e81b11..a7ca48134c2 100644
--- a/content/media/MediaResource.cpp
+++ b/content/media/MediaResource.cpp
@@ -762,6 +762,14 @@ ChannelMediaResource::CacheClientNotifyDataEnded(nsresult aStatus)
   NS_DispatchToMainThread(event, NS_DISPATCH_NORMAL);
 }
 
+void
+ChannelMediaResource::CacheClientNotifyPrincipalChanged()
+{
+  NS_ASSERTION(NS_IsMainThread(), "Don't call on non-main thread");
+
+  mDecoder->NotifyPrincipalChanged();
+}
+
 nsresult
 ChannelMediaResource::CacheClientSeek(PRInt64 aOffset, bool aResume)
 {
diff --git a/content/media/MediaResource.h b/content/media/MediaResource.h
index 832462ef415..72bc6e9ad1f 100644
--- a/content/media/MediaResource.h
+++ b/content/media/MediaResource.h
@@ -375,6 +375,8 @@ public:
   // if this stream didn't read any data, since another stream might have
   // received data for the same resource.
   void CacheClientNotifyDataEnded(nsresult aStatus);
+  // Notify that the principal for the cached resource changed.
+  void CacheClientNotifyPrincipalChanged();
 
   // These are called on the main thread by nsMediaCache. These shouldn't block,
   // but they may grab locks --- the media cache is not holding its lock
diff --git a/content/media/nsAudioAvailableEventManager.cpp b/content/media/nsAudioAvailableEventManager.cpp
index 9fc35b83edc..10e4a7d2543 100644
--- a/content/media/nsAudioAvailableEventManager.cpp
+++ b/content/media/nsAudioAvailableEventManager.cpp
@@ -161,10 +161,16 @@ void nsAudioAvailableEventManager::QueueWrittenAudioData(AudioDataValue* aAudioD
     // Fill the signalBuffer.
     PRUint32 i;
     float *signalBuffer = mSignalBuffer.get() + mSignalBufferPosition;
-    for (i = 0; i < signalBufferTail; ++i) {
-      signalBuffer[i] = MOZ_CONVERT_AUDIO_SAMPLE(audioData[i]);
+    if (audioData) {
+      for (i = 0; i < signalBufferTail; ++i) {
+        signalBuffer[i] = MOZ_CONVERT_AUDIO_SAMPLE(audioData[i]);
+      }
+    } else {
+      memset(signalBuffer, 0, signalBufferTail*sizeof(signalBuffer[0]));
+    }
+    if (audioData) {
+      audioData += signalBufferTail;
     }
-    audioData += signalBufferTail;
 
     NS_ASSERTION(audioDataLength >= signalBufferTail,
                  "audioDataLength about to wrap past zero to +infinity!");
@@ -204,8 +210,12 @@ void nsAudioAvailableEventManager::QueueWrittenAudioData(AudioDataValue* aAudioD
     // Add data to the signalBuffer.
     PRUint32 i;
     float *signalBuffer = mSignalBuffer.get() + mSignalBufferPosition;
-    for (i = 0; i < audioDataLength; ++i) {
-      signalBuffer[i] = MOZ_CONVERT_AUDIO_SAMPLE(audioData[i]);
+    if (audioData) {
+      for (i = 0; i < audioDataLength; ++i) {
+        signalBuffer[i] = MOZ_CONVERT_AUDIO_SAMPLE(audioData[i]);
+      }
+    } else {
+      memset(signalBuffer, 0, audioDataLength*sizeof(signalBuffer[0]));
     }
     mSignalBufferPosition += audioDataLength;
   }
diff --git a/content/media/nsBuiltinDecoder.cpp b/content/media/nsBuiltinDecoder.cpp
index dc0af2eb8d2..a9352e5f5a1 100644
--- a/content/media/nsBuiltinDecoder.cpp
+++ b/content/media/nsBuiltinDecoder.cpp
@@ -82,6 +82,30 @@ void nsBuiltinDecoder::SetVolume(double aVolume)
   }
 }
 
+void nsBuiltinDecoder::SetAudioCaptured(bool aCaptured)
+{
+  NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
+  mInitialAudioCaptured = aCaptured;
+  if (mDecoderStateMachine) {
+    mDecoderStateMachine->SetAudioCaptured(aCaptured);
+  }
+}
+
+void nsBuiltinDecoder::AddOutputStream(SourceMediaStream* aStream, bool aFinishWhenEnded)
+{
+  NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
+
+  {
+    ReentrantMonitorAutoEnter mon(mReentrantMonitor);
+    OutputMediaStream* ms = mOutputStreams.AppendElement();
+    ms->Init(PRInt64(mCurrentTime*USECS_PER_S), aStream, aFinishWhenEnded);
+  }
+
+  // Make sure the state machine thread runs so that any buffered data
+  // is fed into our strema.
+  ScheduleStateMachineThread();
+}
+
 double nsBuiltinDecoder::GetDuration()
 {
   NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
@@ -692,6 +716,13 @@ void nsBuiltinDecoder::NotifyDownloadEnded(nsresult aStatus)
   UpdateReadyStateForData();
 }
 
+void nsBuiltinDecoder::NotifyPrincipalChanged()
+{
+  if (mElement) {
+    mElement->NotifyDecoderPrincipalChanged();
+  }
+}
+
 void nsBuiltinDecoder::NotifyBytesConsumed(PRInt64 aBytes)
 {
   ReentrantMonitorAutoEnter mon(mReentrantMonitor);
diff --git a/content/media/nsBuiltinDecoder.h b/content/media/nsBuiltinDecoder.h
index e1e44f43399..71e6e4d6a3e 100644
--- a/content/media/nsBuiltinDecoder.h
+++ b/content/media/nsBuiltinDecoder.h
@@ -262,6 +262,7 @@ public:
   // Set the audio volume. The decoder monitor must be obtained before
   // calling this.
   virtual void SetVolume(double aVolume) = 0;
+  virtual void SetAudioCaptured(bool aCapture) = 0;
 
   virtual void Shutdown() = 0;
 
@@ -397,6 +398,54 @@ public:
 
   virtual void Pause();
   virtual void SetVolume(double aVolume);
+  virtual void SetAudioCaptured(bool aCaptured);
+
+  virtual void AddOutputStream(SourceMediaStream* aStream, bool aFinishWhenEnded);
+  // Protected by mReentrantMonitor. All decoder output is copied to these streams.
+  struct OutputMediaStream {
+    void Init(PRInt64 aInitialTime, SourceMediaStream* aStream, bool aFinishWhenEnded)
+    {
+      mLastAudioPacketTime = -1;
+      mLastAudioPacketEndTime = -1;
+      mAudioFramesWrittenBaseTime = aInitialTime;
+      mAudioFramesWritten = 0;
+      mNextVideoTime = aInitialTime;
+      mStream = aStream;
+      mStreamInitialized = false;
+      mFinishWhenEnded = aFinishWhenEnded;
+      mHaveSentFinish = false;
+      mHaveSentFinishAudio = false;
+      mHaveSentFinishVideo = false;
+    }
+    PRInt64 mLastAudioPacketTime; // microseconds
+    PRInt64 mLastAudioPacketEndTime; // microseconds
+    // Count of audio frames written to the stream
+    PRInt64 mAudioFramesWritten;
+    // Timestamp of the first audio packet whose frames we wrote.
+    PRInt64 mAudioFramesWrittenBaseTime; // microseconds
+    // mNextVideoTime is the end timestamp for the last packet sent to the stream.
+    // Therefore video packets starting at or after this time need to be copied
+    // to the output stream.
+    PRInt64 mNextVideoTime; // microseconds
+    // The last video image sent to the stream. Useful if we need to replicate
+    // the image.
+    nsRefPtr<Image> mLastVideoImage;
+    nsRefPtr<SourceMediaStream> mStream;
+    gfxIntSize mLastVideoImageDisplaySize;
+    // This is set to true when the stream is initialized (audio and
+    // video tracks added).
+    bool mStreamInitialized;
+    bool mFinishWhenEnded;
+    bool mHaveSentFinish;
+    bool mHaveSentFinishAudio;
+    bool mHaveSentFinishVideo;
+  };
+  nsTArray<OutputMediaStream>& OutputStreams()
+  {
+    GetReentrantMonitor().AssertCurrentThreadIn();
+    return mOutputStreams;
+  }
+
   virtual double GetDuration();
 
   virtual void SetInfinite(bool aInfinite);
@@ -408,6 +457,7 @@ public:
   virtual void NotifySuspendedStatusChanged();
   virtual void NotifyBytesDownloaded();
   virtual void NotifyDownloadEnded(nsresult aStatus);
+  virtual void NotifyPrincipalChanged();
   // Called by the decode thread to keep track of the number of bytes read
   // from the resource.
   void NotifyBytesConsumed(PRInt64 aBytes);
@@ -663,6 +713,9 @@ public:
   // only.
   PRInt64 mDuration;
 
+  // True when playback should start with audio captured (not playing).
+  bool mInitialAudioCaptured;
+
   // True if the media resource is seekable (server supports byte range
   // requests).
   bool mSeekable;
@@ -686,6 +739,9 @@ public:
   // state change.
   ReentrantMonitor mReentrantMonitor;
 
+  // Data about MediaStreams that are being fed by this decoder.
+  nsTArray<OutputMediaStream> mOutputStreams;
+
   // Set to one of the valid play states. It is protected by the
   // monitor mReentrantMonitor. This monitor must be acquired when reading or
   // writing the state. Any change to the state on the main thread
diff --git a/content/media/nsBuiltinDecoderReader.cpp b/content/media/nsBuiltinDecoderReader.cpp
index e370b270e03..782c5a2baf1 100644
--- a/content/media/nsBuiltinDecoderReader.cpp
+++ b/content/media/nsBuiltinDecoderReader.cpp
@@ -71,6 +71,21 @@ extern PRLogModuleInfo* gBuiltinDecoderLog;
 #define SEEK_LOG(type, msg)
 #endif
 
+void
+AudioData::EnsureAudioBuffer()
+{
+  if (mAudioBuffer)
+    return;
+  mAudioBuffer = SharedBuffer::Create(mFrames*mChannels*sizeof(AudioDataValue));
+
+  AudioDataValue* data = static_cast<AudioDataValue*>(mAudioBuffer->Data());
+  for (PRUint32 i = 0; i < mFrames; ++i) {
+    for (PRUint32 j = 0; j < mChannels; ++j) {
+      data[j*mFrames + i] = mAudioData[i*mChannels + j];
+    }
+  }
+}
+
 static bool
 ValidatePlane(const VideoData::YCbCrBuffer::Plane& aPlane)
 {
@@ -115,7 +130,15 @@ VideoData* VideoData::Create(nsVideoInfo& aInfo,
                              nsIntRect aPicture)
 {
   if (!aContainer) {
-    return nsnull;
+    // Create a dummy VideoData with no image. This gives us something to
+    // send to media streams if necessary.
+    nsAutoPtr<VideoData> v(new VideoData(aOffset,
+                                         aTime,
+                                         aEndTime,
+                                         aKeyframe,
+                                         aTimecode,
+                                         aInfo.mDisplay));
+    return v.forget();
   }
 
   // The following situation should never happen unless there is a bug
diff --git a/content/media/nsBuiltinDecoderReader.h b/content/media/nsBuiltinDecoderReader.h
index fe8b498aceb..0fb2d675202 100644
--- a/content/media/nsBuiltinDecoderReader.h
+++ b/content/media/nsBuiltinDecoderReader.h
@@ -43,13 +43,15 @@
 #include "ImageLayers.h"
 #include "nsSize.h"
 #include "mozilla/ReentrantMonitor.h"
+#include "MediaStreamGraph.h"
+#include "SharedBuffer.h"
 
 // Stores info relevant to presenting media frames.
 class nsVideoInfo {
 public:
   nsVideoInfo()
-    : mAudioRate(0),
-      mAudioChannels(0),
+    : mAudioRate(44100),
+      mAudioChannels(2),
       mDisplay(0,0),
       mStereoMode(mozilla::layers::STEREO_MODE_MONO),
       mHasAudio(false),
@@ -113,6 +115,8 @@ typedef float AudioDataValue;
 // Holds chunk a decoded audio frames.
 class AudioData {
 public:
+  typedef mozilla::SharedBuffer SharedBuffer;
+
   AudioData(PRInt64 aOffset,
             PRInt64 aTime,
             PRInt64 aDuration,
@@ -134,6 +138,11 @@ public:
     MOZ_COUNT_DTOR(AudioData);
   }
 
+  // If mAudioBuffer is null, creates it from mAudioData.
+  void EnsureAudioBuffer();
+
+  PRInt64 GetEnd() { return mTime + mDuration; }
+
   // Approximate byte offset of the end of the page on which this chunk
   // ends.
   const PRInt64 mOffset;
@@ -142,6 +151,10 @@ public:
   const PRInt64 mDuration; // In usecs.
   const PRUint32 mFrames;
   const PRUint32 mChannels;
+  // At least one of mAudioBuffer/mAudioData must be non-null.
+  // mChannels channels, each with mFrames frames
+  nsRefPtr<SharedBuffer> mAudioBuffer;
+  // mFrames frames, each with mChannels values
   nsAutoArrayPtr<AudioDataValue> mAudioData;
 };
 
@@ -198,6 +211,8 @@ public:
     MOZ_COUNT_DTOR(VideoData);
   }
 
+  PRInt64 GetEnd() { return mEndTime; }
+
   // Dimensions at which to display the video frame. The picture region
   // will be scaled to this size. This is should be the picture region's
   // dimensions scaled with respect to its aspect ratio.
@@ -370,6 +385,25 @@ template <class T> class MediaQueue : private nsDeque {
     ForEach(aFunctor);
   }
 
+  // Extracts elements from the queue into aResult, in order.
+  // Elements whose start time is before aTime are ignored.
+  void GetElementsAfter(PRInt64 aTime, nsTArray<T*>* aResult) {
+    ReentrantMonitorAutoEnter mon(mReentrantMonitor);
+    if (!GetSize())
+      return;
+    PRInt32 i;
+    for (i = GetSize() - 1; i > 0; --i) {
+      T* v = static_cast<T*>(ObjectAt(i));
+      if (v->GetEnd() < aTime)
+        break;
+    }
+    // Elements less than i have a end time before aTime. It's also possible
+    // that the element at i has a end time before aTime, but that's OK.
+    for (; i < GetSize(); ++i) {
+      aResult->AppendElement(static_cast<T*>(ObjectAt(i)));
+    }
+  }
+
 private:
   mutable ReentrantMonitor mReentrantMonitor;
 
@@ -408,7 +442,7 @@ public:
   // than aTimeThreshold will be decoded (unless they're not keyframes
   // and aKeyframeSkip is true), but will not be added to the queue.
   virtual bool DecodeVideoFrame(bool &aKeyframeSkip,
-                                  PRInt64 aTimeThreshold) = 0;
+                                PRInt64 aTimeThreshold) = 0;
 
   virtual bool HasAudio() = 0;
   virtual bool HasVideo() = 0;
diff --git a/content/media/nsBuiltinDecoderStateMachine.cpp b/content/media/nsBuiltinDecoderStateMachine.cpp
index 2881398d8d3..712bf3fc8e5 100644
--- a/content/media/nsBuiltinDecoderStateMachine.cpp
+++ b/content/media/nsBuiltinDecoderStateMachine.cpp
@@ -46,6 +46,8 @@
 #include "VideoUtils.h"
 #include "nsTimeRanges.h"
 #include "nsDeque.h"
+#include "AudioSegment.h"
+#include "VideoSegment.h"
 
 #include "mozilla/Preferences.h"
 #include "mozilla/StandardInteger.h"
@@ -420,6 +422,7 @@ nsBuiltinDecoderStateMachine::nsBuiltinDecoderStateMachine(nsBuiltinDecoder* aDe
   mAudioEndTime(-1),
   mVideoFrameEndTime(-1),
   mVolume(1.0),
+  mAudioCaptured(false),
   mSeekable(true),
   mPositionChangeQueued(false),
   mAudioCompleted(false),
@@ -434,6 +437,8 @@ nsBuiltinDecoderStateMachine::nsBuiltinDecoderStateMachine(nsBuiltinDecoder* aDe
   mDecodeThreadWaiting(false),
   mRealTime(aRealTime),
   mRequestedNewDecodeThread(false),
+  mDidThrottleAudioDecoding(false),
+  mDidThrottleVideoDecoding(false),
   mEventManager(aDecoder)
 {
   MOZ_COUNT_CTOR(nsBuiltinDecoderStateMachine);
@@ -521,6 +526,276 @@ void nsBuiltinDecoderStateMachine::DecodeThreadRun()
   LOG(PR_LOG_DEBUG, ("%p Decode thread finished", mDecoder.get()));
 }
 
+void nsBuiltinDecoderStateMachine::SendOutputStreamAudio(AudioData* aAudio,
+                                                         OutputMediaStream* aStream,
+                                                         AudioSegment* aOutput)
+{
+  mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
+
+  if (aAudio->mTime <= aStream->mLastAudioPacketTime) {
+    // ignore packet that we've already processed
+    return;
+  }
+  aStream->mLastAudioPacketTime = aAudio->mTime;
+  aStream->mLastAudioPacketEndTime = aAudio->GetEnd();
+
+  NS_ASSERTION(aOutput->GetChannels() == aAudio->mChannels,
+               "Wrong number of channels");
+
+  // This logic has to mimic AudioLoop closely to make sure we write
+  // the exact same silences
+  CheckedInt64 audioWrittenOffset = UsecsToFrames(mInfo.mAudioRate,
+      aStream->mAudioFramesWrittenBaseTime + mStartTime) + aStream->mAudioFramesWritten;
+  CheckedInt64 frameOffset = UsecsToFrames(mInfo.mAudioRate, aAudio->mTime);
+  if (!audioWrittenOffset.valid() || !frameOffset.valid())
+    return;
+  if (audioWrittenOffset.value() < frameOffset.value()) {
+    // Write silence to catch up
+    LOG(PR_LOG_DEBUG, ("%p Decoder writing %d frames of silence to MediaStream",
+                       mDecoder.get(), PRInt32(frameOffset.value() - audioWrittenOffset.value())));
+    AudioSegment silence;
+    silence.InitFrom(*aOutput);
+    silence.InsertNullDataAtStart(frameOffset.value() - audioWrittenOffset.value());
+    aStream->mAudioFramesWritten += silence.GetDuration();
+    aOutput->AppendFrom(&silence);
+  }
+
+  PRInt64 offset;
+  if (aStream->mAudioFramesWritten == 0) {
+    NS_ASSERTION(frameOffset.value() <= audioWrittenOffset.value(),
+                 "Otherwise we'd have taken the write-silence path");
+    // We're starting in the middle of a packet. Split the packet.
+    offset = audioWrittenOffset.value() - frameOffset.value();
+  } else {
+    // Write the entire packet.
+    offset = 0;
+  }
+
+  if (offset >= aAudio->mFrames)
+    return;
+
+  aAudio->EnsureAudioBuffer();
+  nsRefPtr<SharedBuffer> buffer = aAudio->mAudioBuffer;
+  aOutput->AppendFrames(buffer.forget(), aAudio->mFrames, PRInt32(offset), aAudio->mFrames,
+                        MOZ_AUDIO_DATA_FORMAT);
+  LOG(PR_LOG_DEBUG, ("%p Decoder writing %d frames of data to MediaStream for AudioData at %lld",
+                     mDecoder.get(), aAudio->mFrames - PRInt32(offset), aAudio->mTime));
+  aStream->mAudioFramesWritten += aAudio->mFrames - PRInt32(offset);
+}
+
+static void WriteVideoToMediaStream(Image* aImage,
+                                    PRInt64 aDuration, const gfxIntSize& aIntrinsicSize,
+                                    VideoSegment* aOutput)
+{
+  nsRefPtr<Image> image = aImage;
+  aOutput->AppendFrame(image.forget(), aDuration, aIntrinsicSize);
+}
+
+static const TrackID TRACK_AUDIO = 1;
+static const TrackID TRACK_VIDEO = 2;
+static const TrackRate RATE_VIDEO = USECS_PER_S;
+
+void nsBuiltinDecoderStateMachine::SendOutputStreamData()
+{
+  mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
+
+  if (mState == DECODER_STATE_DECODING_METADATA)
+    return;
+
+  nsTArray<OutputMediaStream>& streams = mDecoder->OutputStreams();
+  PRInt64 minLastAudioPacketTime = PR_INT64_MAX;
+
+  bool finished =
+      (!mInfo.mHasAudio || mReader->mAudioQueue.IsFinished()) &&
+      (!mInfo.mHasVideo || mReader->mVideoQueue.IsFinished());
+
+  for (PRUint32 i = 0; i < streams.Length(); ++i) {
+    OutputMediaStream* stream = &streams[i];
+    SourceMediaStream* mediaStream = stream->mStream;
+    StreamTime endPosition = 0;
+
+    if (!stream->mStreamInitialized) {
+      if (mInfo.mHasAudio) {
+        AudioSegment* audio = new AudioSegment();
+        audio->Init(mInfo.mAudioChannels);
+        mediaStream->AddTrack(TRACK_AUDIO, mInfo.mAudioRate, 0, audio);
+      }
+      if (mInfo.mHasVideo) {
+        VideoSegment* video = new VideoSegment();
+        mediaStream->AddTrack(TRACK_VIDEO, RATE_VIDEO, 0, video);
+      }
+      stream->mStreamInitialized = true;
+    }
+
+    if (mInfo.mHasAudio) {
+      nsAutoTArray<AudioData*,10> audio;
+      // It's OK to hold references to the AudioData because while audio
+      // is captured, only the decoder thread pops from the queue (see below).
+      mReader->mAudioQueue.GetElementsAfter(stream->mLastAudioPacketTime, &audio);
+      AudioSegment output;
+      output.Init(mInfo.mAudioChannels);
+      for (PRUint32 i = 0; i < audio.Length(); ++i) {
+        AudioData* a = audio[i];
+        SendOutputStreamAudio(audio[i], stream, &output);
+      }
+      if (output.GetDuration() > 0) {
+        mediaStream->AppendToTrack(TRACK_AUDIO, &output);
+      }
+      if (mReader->mAudioQueue.IsFinished() && !stream->mHaveSentFinishAudio) {
+        mediaStream->EndTrack(TRACK_AUDIO);
+        stream->mHaveSentFinishAudio = true;
+      }
+      minLastAudioPacketTime = NS_MIN(minLastAudioPacketTime, stream->mLastAudioPacketTime);
+      endPosition = NS_MAX(endPosition,
+          TicksToTimeRoundDown(mInfo.mAudioRate, stream->mAudioFramesWritten));
+    }
+
+    if (mInfo.mHasVideo) {
+      nsAutoTArray<VideoData*,10> video;
+      // It's OK to hold references to the VideoData only the decoder thread
+      // pops from the queue.
+      mReader->mVideoQueue.GetElementsAfter(stream->mNextVideoTime + mStartTime, &video);
+      VideoSegment output;
+      for (PRUint32 i = 0; i < video.Length(); ++i) {
+        VideoData* v = video[i];
+        if (stream->mNextVideoTime + mStartTime < v->mTime) {
+          LOG(PR_LOG_DEBUG, ("%p Decoder writing last video to MediaStream for %lld ms",
+                             mDecoder.get(), v->mTime - (stream->mNextVideoTime + mStartTime)));
+          // Write last video frame to catch up. mLastVideoImage can be null here
+          // which is fine, it just means there's no video.
+          WriteVideoToMediaStream(stream->mLastVideoImage,
+              v->mTime - (stream->mNextVideoTime + mStartTime), stream->mLastVideoImageDisplaySize,
+              &output);
+          stream->mNextVideoTime = v->mTime - mStartTime;
+        }
+        if (stream->mNextVideoTime + mStartTime < v->mEndTime) {
+          LOG(PR_LOG_DEBUG, ("%p Decoder writing video frame %lld to MediaStream",
+                             mDecoder.get(), v->mTime));
+          WriteVideoToMediaStream(v->mImage,
+              v->mEndTime - (stream->mNextVideoTime + mStartTime), v->mDisplay,
+              &output);
+          stream->mNextVideoTime = v->mEndTime - mStartTime;
+          stream->mLastVideoImage = v->mImage;
+          stream->mLastVideoImageDisplaySize = v->mDisplay;
+        } else {
+          LOG(PR_LOG_DEBUG, ("%p Decoder skipping writing video frame %lld to MediaStream",
+                             mDecoder.get(), v->mTime));
+        }
+      }
+      if (output.GetDuration() > 0) {
+        mediaStream->AppendToTrack(TRACK_VIDEO, &output);
+      }
+      if (mReader->mVideoQueue.IsFinished() && !stream->mHaveSentFinishVideo) {
+        mediaStream->EndTrack(TRACK_VIDEO);
+        stream->mHaveSentFinishVideo = true;
+      }
+      endPosition = NS_MAX(endPosition,
+          TicksToTimeRoundDown(RATE_VIDEO, stream->mNextVideoTime));
+    }
+
+    if (!stream->mHaveSentFinish) {
+      stream->mStream->AdvanceKnownTracksTime(endPosition);
+    }
+
+    if (finished && !stream->mHaveSentFinish) {
+      stream->mHaveSentFinish = true;
+      stream->mStream->Finish();
+    }
+  }
+
+  if (mAudioCaptured) {
+    // Discard audio packets that are no longer needed.
+    PRInt64 audioPacketTimeToDiscard =
+        NS_MIN(minLastAudioPacketTime, mStartTime + mCurrentFrameTime);
+    while (true) {
+      nsAutoPtr<AudioData> a(mReader->mAudioQueue.PopFront());
+      if (!a)
+        break;
+      // Packet times are not 100% reliable so this may discard packets that
+      // actually contain data for mCurrentFrameTime. This means if someone might
+      // create a new output stream and we actually don't have the audio for the
+      // very start. That's OK, we'll play silence instead for a brief moment.
+      // That's OK. Seeking to this time would have a similar issue for such
+      // badly muxed resources.
+      if (a->GetEnd() >= audioPacketTimeToDiscard) {
+        mReader->mAudioQueue.PushFront(a.forget());
+        break;
+      }
+    }
+
+    if (finished) {
+      mAudioCompleted = true;
+      UpdateReadyState();
+    }
+  }
+}
+
+bool nsBuiltinDecoderStateMachine::HaveEnoughDecodedAudio(PRInt64 aAmpleAudioUSecs)
+{
+  mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
+
+  if (mReader->mAudioQueue.GetSize() == 0 ||
+      GetDecodedAudioDuration() < aAmpleAudioUSecs) {
+    return false;
+  }
+  if (!mAudioCaptured) {
+    return true;
+  }
+
+  nsTArray<OutputMediaStream>& streams = mDecoder->OutputStreams();
+  for (PRUint32 i = 0; i < streams.Length(); ++i) {
+    OutputMediaStream* stream = &streams[i];
+    if (!stream->mHaveSentFinishAudio &&
+        !stream->mStream->HaveEnoughBuffered(TRACK_AUDIO)) {
+      return false;
+    }
+  }
+
+  nsIThread* thread = GetStateMachineThread();
+  nsCOMPtr<nsIRunnable> callback = NS_NewRunnableMethod(this,
+      &nsBuiltinDecoderStateMachine::ScheduleStateMachineWithLockAndWakeDecoder);
+  for (PRUint32 i = 0; i < streams.Length(); ++i) {
+    OutputMediaStream* stream = &streams[i];
+    if (!stream->mHaveSentFinishAudio) {
+      stream->mStream->DispatchWhenNotEnoughBuffered(TRACK_AUDIO, thread, callback);
+    }
+  }
+  return true;
+}
+
+bool nsBuiltinDecoderStateMachine::HaveEnoughDecodedVideo()
+{
+  mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
+
+  if (static_cast<PRUint32>(mReader->mVideoQueue.GetSize()) < AMPLE_VIDEO_FRAMES) {
+    return false;
+  }
+
+  nsTArray<OutputMediaStream>& streams = mDecoder->OutputStreams();
+  if (streams.IsEmpty()) {
+    return true;
+  }
+
+  for (PRUint32 i = 0; i < streams.Length(); ++i) {
+    OutputMediaStream* stream = &streams[i];
+    if (!stream->mHaveSentFinishVideo &&
+        !stream->mStream->HaveEnoughBuffered(TRACK_VIDEO)) {
+      return false;
+    }
+  }
+
+  nsIThread* thread = GetStateMachineThread();
+  nsCOMPtr<nsIRunnable> callback = NS_NewRunnableMethod(this,
+      &nsBuiltinDecoderStateMachine::ScheduleStateMachineWithLockAndWakeDecoder);
+  for (PRUint32 i = 0; i < streams.Length(); ++i) {
+    OutputMediaStream* stream = &streams[i];
+    if (!stream->mHaveSentFinishVideo) {
+      stream->mStream->DispatchWhenNotEnoughBuffered(TRACK_VIDEO, thread, callback);
+    }
+  }
+  return true;
+}
+
 void nsBuiltinDecoderStateMachine::DecodeLoop()
 {
   LOG(PR_LOG_DEBUG, ("%p Start DecodeLoop()", mDecoder.get()));
@@ -558,7 +833,6 @@ void nsBuiltinDecoderStateMachine::DecodeLoop()
   PRInt64 ampleAudioThreshold = AMPLE_AUDIO_USECS;
 
   MediaQueue<VideoData>& videoQueue = mReader->mVideoQueue;
-  MediaQueue<AudioData>& audioQueue = mReader->mAudioQueue;
 
   // Main decode loop.
   bool videoPlaying = HasVideo();
@@ -592,10 +866,9 @@ void nsBuiltinDecoderStateMachine::DecodeLoop()
     if (mState == DECODER_STATE_DECODING &&
         !skipToNextKeyframe &&
         videoPlaying &&
-        ((!audioPump && audioPlaying && GetDecodedAudioDuration() < lowAudioThreshold) ||
-         (!videoPump &&
-           videoPlaying &&
-           static_cast<PRUint32>(videoQueue.GetSize()) < LOW_VIDEO_FRAMES)) &&
+        ((!audioPump && audioPlaying && !mDidThrottleAudioDecoding && GetDecodedAudioDuration() < lowAudioThreshold) ||
+         (!videoPump && videoPlaying && !mDidThrottleVideoDecoding &&
+          static_cast<PRUint32>(videoQueue.GetSize()) < LOW_VIDEO_FRAMES)) &&
         !HasLowUndecodedData())
 
     {
@@ -604,8 +877,12 @@ void nsBuiltinDecoderStateMachine::DecodeLoop()
     }
 
     // Video decode.
-    if (videoPlaying &&
-        static_cast<PRUint32>(videoQueue.GetSize()) < AMPLE_VIDEO_FRAMES)
+    bool throttleVideoDecoding = !videoPlaying || HaveEnoughDecodedVideo();
+    if (mDidThrottleVideoDecoding && !throttleVideoDecoding) {
+      videoPump = true;
+    }
+    mDidThrottleVideoDecoding = throttleVideoDecoding;
+    if (!throttleVideoDecoding)
     {
       // Time the video decode, so that if it's slow, we can increase our low
       // audio threshold to reduce the chance of an audio underrun while we're
@@ -632,13 +909,18 @@ void nsBuiltinDecoderStateMachine::DecodeLoop()
     }
 
     // Audio decode.
-    if (audioPlaying &&
-        (GetDecodedAudioDuration() < ampleAudioThreshold || audioQueue.GetSize() == 0))
-    {
+    bool throttleAudioDecoding = !audioPlaying || HaveEnoughDecodedAudio(ampleAudioThreshold);
+    if (mDidThrottleAudioDecoding && !throttleAudioDecoding) {
+      audioPump = true;
+    }
+    mDidThrottleAudioDecoding = throttleAudioDecoding;
+    if (!mDidThrottleAudioDecoding) {
       ReentrantMonitorAutoExit exitMon(mDecoder->GetReentrantMonitor());
       audioPlaying = mReader->DecodeAudioData();
     }
 
+    SendOutputStreamData();
+
     // Notify to ensure that the AudioLoop() is not waiting, in case it was
     // waiting for more audio to be decoded.
     mDecoder->GetReentrantMonitor().NotifyAll();
@@ -650,11 +932,7 @@ void nsBuiltinDecoderStateMachine::DecodeLoop()
     if ((mState == DECODER_STATE_DECODING || mState == DECODER_STATE_BUFFERING) &&
         !mStopDecodeThread &&
         (videoPlaying || audioPlaying) &&
-        (!audioPlaying || (GetDecodedAudioDuration() >= ampleAudioThreshold &&
-                           audioQueue.GetSize() > 0))
-        &&
-        (!videoPlaying ||
-          static_cast<PRUint32>(videoQueue.GetSize()) >= AMPLE_VIDEO_FRAMES))
+        throttleAudioDecoding && throttleVideoDecoding)
     {
       // All active bitstreams' decode is well ahead of the playback
       // position, we may as well wait for the playback to catch up. Note the
@@ -697,6 +975,15 @@ bool nsBuiltinDecoderStateMachine::IsPlaying()
   return !mPlayStartTime.IsNull();
 }
 
+static void WriteSilence(nsAudioStream* aStream, PRUint32 aFrames)
+{
+  PRUint32 numSamples = aFrames * aStream->GetChannels();
+  nsAutoTArray<AudioDataValue, 1000> buf;
+  buf.SetLength(numSamples);
+  memset(buf.Elements(), 0, numSamples * sizeof(AudioDataValue));
+  aStream->Write(buf.Elements(), aFrames);
+}
+
 void nsBuiltinDecoderStateMachine::AudioLoop()
 {
   NS_ASSERTION(OnAudioThread(), "Should be on audio thread.");
@@ -760,6 +1047,7 @@ void nsBuiltinDecoderStateMachine::AudioLoop()
       }
 
       // If we're shutting down, break out and exit the audio thread.
+      // Also break out if audio is being captured.
       if (mState == DECODER_STATE_SHUTDOWN ||
           mStopAudioThread ||
           mReader->mAudioQueue.AtEndOfStream())
@@ -813,6 +1101,8 @@ void nsBuiltinDecoderStateMachine::AudioLoop()
       // time.
       missingFrames = NS_MIN(static_cast<PRInt64>(PR_UINT32_MAX),
                              missingFrames.value());
+      LOG(PR_LOG_DEBUG, ("%p Decoder playing %d frames of silence",
+                         mDecoder.get(), PRInt32(missingFrames.value())));
       framesWritten = PlaySilence(static_cast<PRUint32>(missingFrames.value()),
                                   channels, playedFrames.value());
     } else {
@@ -850,10 +1140,7 @@ void nsBuiltinDecoderStateMachine::AudioLoop()
         if (framesToWrite < PR_UINT32_MAX / channels) {
           // Write silence manually rather than using PlaySilence(), so that
           // the AudioAPI doesn't get a copy of the audio frames.
-          PRUint32 numSamples = framesToWrite * channels;
-          nsAutoArrayPtr<AudioDataValue> buf(new AudioDataValue[numSamples]);
-          memset(buf.get(), 0, numSamples * sizeof(AudioDataValue));
-          mAudioStream->Write(buf, framesToWrite);
+          WriteSilence(mAudioStream, framesToWrite);
         }
       }
 
@@ -885,10 +1172,12 @@ void nsBuiltinDecoderStateMachine::AudioLoop()
     ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
     mAudioStream = nsnull;
     mEventManager.Clear();
-    mAudioCompleted = true;
-    UpdateReadyState();
-    // Kick the decode thread; it may be sleeping waiting for this to finish.
-    mDecoder->GetReentrantMonitor().NotifyAll();
+    if (!mAudioCaptured) {
+      mAudioCompleted = true;
+      UpdateReadyState();
+      // Kick the decode thread; it may be sleeping waiting for this to finish.
+      mDecoder->GetReentrantMonitor().NotifyAll();
+    }
   }
 
   // Must not hold the decoder monitor while we shutdown the audio stream, as
@@ -908,12 +1197,9 @@ PRUint32 nsBuiltinDecoderStateMachine::PlaySilence(PRUint32 aFrames,
   NS_ASSERTION(!mAudioStream->IsPaused(), "Don't play when paused");
   PRUint32 maxFrames = SILENCE_BYTES_CHUNK / aChannels / sizeof(AudioDataValue);
   PRUint32 frames = NS_MIN(aFrames, maxFrames);
-  PRUint32 numSamples = frames * aChannels;
-  nsAutoArrayPtr<AudioDataValue> buf(new AudioDataValue[numSamples]);
-  memset(buf.get(), 0, numSamples * sizeof(AudioDataValue));
-  mAudioStream->Write(buf, frames);
+  WriteSilence(mAudioStream, frames);
   // Dispatch events to the DOM for the audio just written.
-  mEventManager.QueueWrittenAudioData(buf.get(), frames * aChannels,
+  mEventManager.QueueWrittenAudioData(nsnull, frames * aChannels,
                                       (aFrameOffset + frames) * aChannels);
   return frames;
 }
@@ -927,6 +1213,7 @@ PRUint32 nsBuiltinDecoderStateMachine::PlayFromAudioQueue(PRUint64 aFrameOffset,
   {
     ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
     NS_WARN_IF_FALSE(IsPlaying(), "Should be playing");
+    NS_ASSERTION(!mAudioCaptured, "Audio cannot be captured here!");
     // Awaken the decode loop if it's waiting for space to free up in the
     // audio queue.
     mDecoder->GetReentrantMonitor().NotifyAll();
@@ -941,6 +1228,8 @@ PRUint32 nsBuiltinDecoderStateMachine::PlayFromAudioQueue(PRUint64 aFrameOffset,
   // able to acquire the audio monitor in order to resume or destroy the
   // audio stream.
   if (!mAudioStream->IsPaused()) {
+    LOG(PR_LOG_DEBUG, ("%p Decoder playing %d frames of data to stream for AudioData at %lld",
+                       mDecoder.get(), audio->mFrames, audio->mTime));
     mAudioStream->Write(audio->mAudioData,
                         audio->mFrames);
 
@@ -1077,6 +1366,16 @@ void nsBuiltinDecoderStateMachine::SetVolume(double volume)
   mVolume = volume;
 }
 
+void nsBuiltinDecoderStateMachine::SetAudioCaptured(bool aCaptured)
+{
+  NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
+  ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
+  if (!mAudioCaptured && aCaptured) {
+    StopAudioThread();
+  }
+  mAudioCaptured = aCaptured;
+}
+
 double nsBuiltinDecoderStateMachine::GetCurrentTime() const
 {
   NS_ASSERTION(NS_IsMainThread() ||
@@ -1363,7 +1662,7 @@ nsBuiltinDecoderStateMachine::StartAudioThread()
                "Should be on state machine or decode thread.");
   mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
   mStopAudioThread = false;
-  if (HasAudio() && !mAudioThread) {
+  if (HasAudio() && !mAudioThread && !mAudioCaptured) {
     nsresult rv = NS_NewThread(getter_AddRefs(mAudioThread),
                                nsnull,
                                MEDIA_THREAD_STACK_SIZE);
@@ -1542,6 +1841,9 @@ void nsBuiltinDecoderStateMachine::DecodeSeek()
   NS_ASSERTION(mState == DECODER_STATE_SEEKING,
                "Only call when in seeking state");
 
+  mDidThrottleAudioDecoding = false;
+  mDidThrottleVideoDecoding = false;
+
   // During the seek, don't have a lock on the decoder state,
   // otherwise long seek operations can block the main thread.
   // The events dispatched to the main thread are SYNC calls.
@@ -1596,7 +1898,7 @@ void nsBuiltinDecoderStateMachine::DecodeSeek()
       mAudioStartTime = startTime;
       mPlayDuration = startTime - mStartTime;
       if (HasVideo()) {
-        nsAutoPtr<VideoData> video(mReader->mVideoQueue.PeekFront());
+        VideoData* video = mReader->mVideoQueue.PeekFront();
         if (video) {
           NS_ASSERTION(video->mTime <= seekTime && seekTime <= video->mEndTime,
                         "Seek target should lie inside the first frame after seek");
@@ -1604,7 +1906,6 @@ void nsBuiltinDecoderStateMachine::DecodeSeek()
             ReentrantMonitorAutoExit exitMon(mDecoder->GetReentrantMonitor());
             RenderVideoFrame(video, TimeStamp::Now());
           }
-          mReader->mVideoQueue.PopFront();
           nsCOMPtr<nsIRunnable> event =
             NS_NewRunnableMethod(mDecoder, &nsBuiltinDecoder::Invalidate);
           NS_DispatchToMainThread(event, NS_DISPATCH_NORMAL);
@@ -1882,6 +2183,9 @@ void nsBuiltinDecoderStateMachine::RenderVideoFrame(VideoData* aData,
     return;
   }
 
+  LOG(PR_LOG_DEBUG, ("%p Decoder playing video frame %lld",
+                     mDecoder.get(), aData->mTime));
+
   VideoFrameContainer* container = mDecoder->GetVideoFrameContainer();
   if (container) {
     container->SetCurrentFrame(aData->mDisplay, aData->mImage, aTarget);
@@ -1893,7 +2197,7 @@ nsBuiltinDecoderStateMachine::GetAudioClock()
 {
   NS_ASSERTION(OnStateMachineThread(), "Should be on state machine thread.");
   mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
-  if (!HasAudio())
+  if (!HasAudio() || mAudioCaptured)
     return -1;
   // We must hold the decoder monitor while using the audio stream off the
   // audio thread to ensure that it doesn't get destroyed on the audio thread
@@ -1953,6 +2257,7 @@ void nsBuiltinDecoderStateMachine::AdvanceFrame()
     while (mRealTime || clock_time >= frame->mTime) {
       mVideoFrameEndTime = frame->mEndTime;
       currentFrame = frame;
+      LOG(PR_LOG_DEBUG, ("%p Decoder discarding video frame %lld", mDecoder.get(), frame->mTime));
       mReader->mVideoQueue.PopFront();
       // Notify the decode thread that the video queue's buffers may have
       // free'd up space for more frames.
@@ -2240,6 +2545,12 @@ nsresult nsBuiltinDecoderStateMachine::ScheduleStateMachine() {
   return ScheduleStateMachine(0);
 }
 
+void nsBuiltinDecoderStateMachine::ScheduleStateMachineWithLockAndWakeDecoder() {
+  ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
+  mon.NotifyAll();
+  ScheduleStateMachine(0);
+}
+
 nsresult nsBuiltinDecoderStateMachine::ScheduleStateMachine(PRInt64 aUsecs) {
   mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
   NS_ABORT_IF_FALSE(GetStateMachineThread(),
diff --git a/content/media/nsBuiltinDecoderStateMachine.h b/content/media/nsBuiltinDecoderStateMachine.h
index 6a211ccb6c9..4ea50f246b8 100644
--- a/content/media/nsBuiltinDecoderStateMachine.h
+++ b/content/media/nsBuiltinDecoderStateMachine.h
@@ -117,6 +117,8 @@ hardware (via nsAudioStream and libsydneyaudio).
 #include "nsHTMLMediaElement.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "nsITimer.h"
+#include "AudioSegment.h"
+#include "VideoSegment.h"
 
 /*
   The state machine class. This manages the decoding and seeking in the
@@ -137,6 +139,10 @@ public:
   typedef mozilla::TimeStamp TimeStamp;
   typedef mozilla::TimeDuration TimeDuration;
   typedef mozilla::VideoFrameContainer VideoFrameContainer;
+  typedef nsBuiltinDecoder::OutputMediaStream OutputMediaStream;
+  typedef mozilla::SourceMediaStream SourceMediaStream;
+  typedef mozilla::AudioSegment AudioSegment;
+  typedef mozilla::VideoSegment VideoSegment;
 
   nsBuiltinDecoderStateMachine(nsBuiltinDecoder* aDecoder, nsBuiltinDecoderReader* aReader, bool aRealTime = false);
   ~nsBuiltinDecoderStateMachine();
@@ -149,6 +155,7 @@ public:
     return mState; 
   }
   virtual void SetVolume(double aVolume);
+  virtual void SetAudioCaptured(bool aCapture);
   virtual void Shutdown();
   virtual PRInt64 GetDuration();
   virtual void SetDuration(PRInt64 aDuration);
@@ -249,6 +256,10 @@ public:
   // machine again.
   nsresult ScheduleStateMachine();
 
+  // Calls ScheduleStateMachine() after taking the decoder lock. Also
+  // notifies the decoder thread in case it's waiting on the decoder lock.
+  void ScheduleStateMachineWithLockAndWakeDecoder();
+
   // Schedules the shared state machine thread to run the state machine
   // in aUsecs microseconds from now, if it's not already scheduled to run
   // earlier, in which case the request is discarded.
@@ -273,6 +284,12 @@ public:
    // element. Called on the main thread.
    void NotifyAudioAvailableListener();
 
+  // Copy queued audio/video data in the reader to any output MediaStreams that
+  // need it.
+  void SendOutputStreamData();
+  bool HaveEnoughDecodedAudio(PRInt64 aAmpleAudioUSecs);
+  bool HaveEnoughDecodedVideo();
+
 protected:
 
   // Returns true if we've got less than aAudioUsecs microseconds of decoded
@@ -436,6 +453,11 @@ protected:
   // to call.
   void DecodeThreadRun();
 
+  // Copy audio from an AudioData packet to aOutput. This may require
+  // inserting silence depending on the timing of the audio packet.
+  void SendOutputStreamAudio(AudioData* aAudio, OutputMediaStream* aStream,
+                             AudioSegment* aOutput);
+
   // State machine thread run function. Defers to RunStateMachine().
   nsresult CallRunStateMachine();
 
@@ -569,6 +591,10 @@ protected:
   // Time at which we started decoding. Synchronised via decoder monitor.
   TimeStamp mDecodeStartTime;
 
+  // True if we shouldn't play our audio (but still write it to any capturing
+  // streams).
+  bool mAudioCaptured;
+
   // True if the media resource can be seeked. Accessed from the state
   // machine and main threads. Synchronised via decoder monitor.
   bool mSeekable;
@@ -636,6 +662,12 @@ protected:
   // True is we are decoding a realtime stream, like a camera stream
   bool mRealTime;
 
+  // Record whether audio and video decoding were throttled during the
+  // previous iteration of DecodeLooop. When we transition from
+  // throttled to not-throttled we need to pump decoding.
+  bool mDidThrottleAudioDecoding;
+  bool mDidThrottleVideoDecoding;
+
   // True if we've requested a new decode thread, but it has not yet been
   // created. Synchronized by the decoder monitor.
   bool mRequestedNewDecodeThread;
diff --git a/content/media/nsMediaCache.cpp b/content/media/nsMediaCache.cpp
index 0ee5f98dca8..e12e154a562 100644
--- a/content/media/nsMediaCache.cpp
+++ b/content/media/nsMediaCache.cpp
@@ -239,6 +239,7 @@ public:
   /**
    * An iterator that makes it easy to iterate through all streams that
    * have a given resource ID and are not closed.
+   * Can be used on the main thread or while holding the media cache lock.
    */
   class ResourceStreamIterator {
   public:
@@ -351,13 +352,14 @@ protected:
   // This member is main-thread only. It's used to allocate unique
   // resource IDs to streams.
   PRInt64                       mNextResourceID;
-  // This member is main-thread only. It contains all the streams.
-  nsTArray<nsMediaCacheStream*> mStreams;
 
   // The monitor protects all the data members here. Also, off-main-thread
   // readers that need to block will Wait() on this monitor. When new
   // data becomes available in the cache, we NotifyAll() on this monitor.
   ReentrantMonitor         mReentrantMonitor;
+  // This is only written while on the main thread and the monitor is held.
+  // Thus, it can be safely read from the main thread or while holding the monitor.
+  nsTArray<nsMediaCacheStream*> mStreams;
   // The Blocks describing the cache entries.
   nsTArray<Block> mIndex;
   // Writer which performs IO, asynchronously writing cache blocks.
@@ -1703,10 +1705,10 @@ nsMediaCacheStream::NotifyDataStarted(PRInt64 aOffset)
   }
 }
 
-void
+bool
 nsMediaCacheStream::UpdatePrincipal(nsIPrincipal* aPrincipal)
 {
-  nsContentUtils::CombineResourcePrincipals(&mPrincipal, aPrincipal);
+  return nsContentUtils::CombineResourcePrincipals(&mPrincipal, aPrincipal);
 }
 
 void
@@ -1715,6 +1717,20 @@ nsMediaCacheStream::NotifyDataReceived(PRInt64 aSize, const char* aData,
 {
   NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
 
+  // Update principals before putting the data in the cache. This is important,
+  // we want to make sure all principals are updated before any consumer
+  // can see the new data.
+  // We do this without holding the cache monitor, in case the client wants
+  // to do something that takes a lock.
+  {
+    nsMediaCache::ResourceStreamIterator iter(mResourceID);
+    while (nsMediaCacheStream* stream = iter.Next()) {
+      if (stream->UpdatePrincipal(aPrincipal)) {
+        stream->mClient->CacheClientNotifyPrincipalChanged();
+      }
+    }
+  }
+
   ReentrantMonitorAutoEnter mon(gMediaCache->GetReentrantMonitor());
   PRInt64 size = aSize;
   const char* data = aData;
@@ -1769,7 +1785,6 @@ nsMediaCacheStream::NotifyDataReceived(PRInt64 aSize, const char* aData,
       // The stream is at least as long as what we've read
       stream->mStreamLength = NS_MAX(stream->mStreamLength, mChannelOffset);
     }
-    stream->UpdatePrincipal(aPrincipal);
     stream->mClient->CacheClientNotifyDataReceived();
   }
 
diff --git a/content/media/nsMediaCache.h b/content/media/nsMediaCache.h
index fe0a17b700f..3142ddf585c 100644
--- a/content/media/nsMediaCache.h
+++ b/content/media/nsMediaCache.h
@@ -230,10 +230,10 @@ public:
   // aClient provides the underlying transport that cache will use to read
   // data for this stream.
   nsMediaCacheStream(ChannelMediaResource* aClient)
-    : mClient(aClient), mResourceID(0), mInitialized(false),
+    : mClient(aClient), mInitialized(false),
       mHasHadUpdate(false),
       mClosed(false),
-      mDidNotifyDataEnded(false),
+      mDidNotifyDataEnded(false), mResourceID(0),
       mIsSeekable(false), mCacheSuspended(false),
       mChannelEnded(false),
       mChannelOffset(0), mStreamLength(-1),  
@@ -326,7 +326,8 @@ public:
   // If we've successfully read data beyond the originally reported length,
   // we return the end of the data we've read.
   PRInt64 GetLength();
-  // Returns the unique resource ID
+  // Returns the unique resource ID. Call only on the main thread or while
+  // holding the media cache lock.
   PRInt64 GetResourceID() { return mResourceID; }
   // Returns the end of the bytes starting at the given offset
   // which are in cache.
@@ -459,15 +460,11 @@ private:
   // blocked on reading from this stream.
   void CloseInternal(ReentrantMonitorAutoEnter& aReentrantMonitor);
   // Update mPrincipal given that data has been received from aPrincipal
-  void UpdatePrincipal(nsIPrincipal* aPrincipal);
+  bool UpdatePrincipal(nsIPrincipal* aPrincipal);
 
   // These fields are main-thread-only.
   ChannelMediaResource*  mClient;
   nsCOMPtr<nsIPrincipal> mPrincipal;
-  // This is a unique ID representing the resource we're loading.
-  // All streams with the same mResourceID are loading the same
-  // underlying resource and should share data.
-  PRInt64                mResourceID;
   // Set to true when Init or InitAsClone has been called
   bool                   mInitialized;
   // Set to true when nsMediaCache::Update() has finished while this stream
@@ -479,9 +476,14 @@ private:
   // True if CacheClientNotifyDataEnded has been called for this stream.
   bool                   mDidNotifyDataEnded;
 
-  // The following fields are protected by the cache's monitor but are
-  // only written on the main thread. 
+  // The following fields must be written holding the cache's monitor and
+  // only on the main thread, thus can be read either on the main thread
+  // or while holding the cache's monitor.
 
+  // This is a unique ID representing the resource we're loading.
+  // All streams with the same mResourceID are loading the same
+  // underlying resource and should share data.
+  PRInt64 mResourceID;
   // The last reported seekability state for the underlying channel
   bool mIsSeekable;
   // True if the cache has suspended our channel because the cache is
diff --git a/content/media/nsMediaDecoder.h b/content/media/nsMediaDecoder.h
index 8418d35c7ee..7a2a24f38f3 100644
--- a/content/media/nsMediaDecoder.h
+++ b/content/media/nsMediaDecoder.h
@@ -41,6 +41,7 @@
 #include "ImageLayers.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "VideoFrameContainer.h"
+#include "MediaStreamGraph.h"
 
 class nsHTMLMediaElement;
 class nsIStreamListener;
@@ -69,13 +70,14 @@ static const PRUint32 FRAMEBUFFER_LENGTH_MAX = 16384;
 class nsMediaDecoder : public nsIObserver
 {
 public:
+  typedef mozilla::layers::Image Image;
+  typedef mozilla::layers::ImageContainer ImageContainer;
   typedef mozilla::MediaResource MediaResource;
   typedef mozilla::ReentrantMonitor ReentrantMonitor;
+  typedef mozilla::SourceMediaStream SourceMediaStream;
   typedef mozilla::TimeStamp TimeStamp;
   typedef mozilla::TimeDuration TimeDuration;
   typedef mozilla::VideoFrameContainer VideoFrameContainer;
-  typedef mozilla::layers::Image Image;
-  typedef mozilla::layers::ImageContainer ImageContainer;
 
   nsMediaDecoder();
   virtual ~nsMediaDecoder();
@@ -129,6 +131,13 @@ public:
   // Set the audio volume. It should be a value from 0 to 1.0.
   virtual void SetVolume(double aVolume) = 0;
 
+  // Sets whether audio is being captured. If it is, we won't play any
+  // of our audio.
+  virtual void SetAudioCaptured(bool aCaptured) = 0;
+
+  // Add an output stream. All decoder output will be sent to the stream.
+  virtual void AddOutputStream(SourceMediaStream* aStream, bool aFinishWhenEnded) = 0;
+
   // Start playback of a video. 'Load' must have previously been
   // called.
   virtual nsresult Play() = 0;
@@ -331,6 +340,10 @@ public:
   // the result from OnStopRequest.
   virtual void NotifyDownloadEnded(nsresult aStatus) = 0;
 
+  // Called by MediaResource when the principal of the resource has
+  // changed. Called on main thread only.
+  virtual void NotifyPrincipalChanged() = 0;
+
   // Called as data arrives on the stream and is read into the cache.  Called
   // on the main thread only.
   virtual void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRInt64 aOffset) = 0;
diff --git a/dom/interfaces/html/nsIDOMHTMLAudioElement.idl b/dom/interfaces/html/nsIDOMHTMLAudioElement.idl
index 6869fa3a5f9..a3983a73ee7 100644
--- a/dom/interfaces/html/nsIDOMHTMLAudioElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLAudioElement.idl
@@ -52,7 +52,7 @@
  * @status UNDER_DEVELOPMENT
  */
 
-[scriptable, uuid(e1a11e83-255b-4350-81cf-f1f3e7d59712)]
+[scriptable, uuid(32c54e30-5063-4e35-8fc9-890e50fed147)]
 interface nsIDOMHTMLAudioElement : nsIDOMHTMLMediaElement
 {
   // Setup the audio stream for writing
diff --git a/dom/interfaces/html/nsIDOMHTMLMediaElement.idl b/dom/interfaces/html/nsIDOMHTMLMediaElement.idl
index b3cf00c55b2..979c88a1dfe 100644
--- a/dom/interfaces/html/nsIDOMHTMLMediaElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLMediaElement.idl
@@ -40,6 +40,8 @@
 #include "nsIDOMMediaError.idl"
 #include "nsIDOMTimeRanges.idl"
 
+interface nsIDOMMediaStream;
+
 /**
  * The nsIDOMHTMLMediaElement interface is an interface to be implemented by the HTML
  * <audio> and <video> elements.
@@ -57,7 +59,7 @@
 #endif
 %}
 
-[scriptable, uuid(3e672e79-a0ea-45ef-87de-828402f1f6d7)]
+[scriptable, uuid(6b938133-a8c2-424a-9401-a631f74aeff5)]
 interface nsIDOMHTMLMediaElement : nsIDOMHTMLElement
 {
   // error state
@@ -105,6 +107,11 @@ interface nsIDOMHTMLMediaElement : nsIDOMHTMLElement
            attribute boolean muted;
            attribute boolean defaultMuted;
 
+  // Mozilla extension: stream capture
+  nsIDOMMediaStream mozCaptureStream();
+  nsIDOMMediaStream mozCaptureStreamUntilEnded();
+  readonly attribute boolean mozAudioCaptured;
+
   // Mozilla extension: extra stream metadata information, used as part
   // of MozAudioAvailable events and the mozWriteAudio() method.  The
   // mozFrameBufferLength method allows for the size of the framebuffer
diff --git a/dom/interfaces/html/nsIDOMHTMLVideoElement.idl b/dom/interfaces/html/nsIDOMHTMLVideoElement.idl
index f93c0735909..5d0d28fae0f 100644
--- a/dom/interfaces/html/nsIDOMHTMLVideoElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLVideoElement.idl
@@ -48,7 +48,7 @@
  * @status UNDER_DEVELOPMENT
  */
 
-[scriptable, uuid(e1a11e83-255b-4350-81cf-f1f3e7d59712)]
+[scriptable, uuid(e43f61e3-9c67-4e78-8534-3399d7f192b9)]
 interface nsIDOMHTMLVideoElement : nsIDOMHTMLMediaElement
 {
            attribute long width; 

From 9188df2b5d99abe5dd14543aec5af6f5f14c118d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:12:50 +1200
Subject: [PATCH 015/162] Bug 664918. Part 9: Tentative support for
 MediaStreamListener::NotifyQueuedTrackChanges. r=jesup

---
 content/media/MediaStreamGraph.cpp |  7 +++++++
 content/media/MediaStreamGraph.h   | 20 ++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/content/media/MediaStreamGraph.cpp b/content/media/MediaStreamGraph.cpp
index bc346493326..dae0280010e 100644
--- a/content/media/MediaStreamGraph.cpp
+++ b/content/media/MediaStreamGraph.cpp
@@ -621,6 +621,13 @@ MediaStreamGraphImpl::ExtractPendingInput(SourceMediaStream* aStream)
     finished = aStream->mUpdateFinished;
     for (PRInt32 i = aStream->mUpdateTracks.Length() - 1; i >= 0; --i) {
       SourceMediaStream::TrackData* data = &aStream->mUpdateTracks[i];
+      for (PRUint32 j = 0; j < aStream->mListeners.Length(); ++j) {
+        MediaStreamListener* l = aStream->mListeners[j];
+        TrackTicks offset = (data->mCommands & SourceMediaStream::TRACK_CREATE)
+            ? data->mStart : aStream->mBuffer.FindTrack(data->mID)->GetSegment()->GetDuration();
+        l->NotifyQueuedTrackChanges(this, data->mID, data->mRate,
+                                    offset, data->mCommands, *data->mData);
+      }
       if (data->mCommands & SourceMediaStream::TRACK_CREATE) {
         MediaSegment* segment = data->mData.forget();
         LOG(PR_LOG_DEBUG, ("SourceMediaStream %p creating track %d, rate %d, start %lld, initial end %lld",
diff --git a/content/media/MediaStreamGraph.h b/content/media/MediaStreamGraph.h
index 8d372f9eb5f..23abeafffe0 100644
--- a/content/media/MediaStreamGraph.h
+++ b/content/media/MediaStreamGraph.h
@@ -108,6 +108,22 @@ public:
    * Notify that the stream finished.
    */
   virtual void NotifyFinished(MediaStreamGraph* aGraph) {}
+
+  enum {
+    TRACK_EVENT_CREATED = 0x01,
+    TRACK_EVENT_ENDED = 0x02
+  };
+  /**
+   * Notify that changes to one of the stream tracks have been queued.
+   * aTrackEvents can be any combination of TRACK_EVENT_CREATED and
+   * TRACK_EVENT_ENDED. aQueuedMedia is the data being added to the track
+   * at aTrackOffset (relative to the start of the stream).
+   */
+  virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
+                                        TrackRate aTrackRate,
+                                        TrackTicks aTrackOffset,
+                                        PRUint32 aTrackEvents,
+                                        const MediaSegment& aQueuedMedia) {}
 };
 
 class MediaStreamGraphImpl;
@@ -419,8 +435,8 @@ public:
     nsCOMPtr<nsIRunnable> mRunnable;
   };
   enum TrackCommands {
-    TRACK_CREATE = 0x01,
-    TRACK_END = 0x02
+    TRACK_CREATE = MediaStreamListener::TRACK_EVENT_CREATED,
+    TRACK_END = MediaStreamListener::TRACK_EVENT_ENDED
   };
   /**
    * Data for each track that hasn't ended.

From 1002cf8e775a7410355fa1881e2d664ae74ef770 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:13:01 +1200
Subject: [PATCH 016/162] Bug 664918. Part 10: Add
 test_streams_element_capture.html to test capturing a media element into a
 stream and playing that stream through another media element. The test also
 tests that capturing MediaStream video into a canvas works.

---
 content/media/test/Makefile.in                |  1 +
 .../test/test_streams_element_capture.html    | 62 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 content/media/test/test_streams_element_capture.html

diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in
index fdc058c47e3..0b6dd62ba84 100644
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -150,6 +150,7 @@ _TEST_FILES = \
 		test_source.html \
 		test_source_write.html \
 		test_standalone.html \
+		test_streams_element_capture.html \
 		test_timeupdate_small_files.html \
 		test_too_many_elements.html \
 		test_volume.html \
diff --git a/content/media/test/test_streams_element_capture.html b/content/media/test/test_streams_element_capture.html
new file mode 100644
index 00000000000..c264897ed23
--- /dev/null
+++ b/content/media/test/test_streams_element_capture.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test that a MediaStream captured from one element plays back in another</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="manifest.js"></script>
+</head>
+<body>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+SimpleTest.waitForExplicitFinish();
+
+var manager = new MediaTestManager;
+
+function checkDrawImage(vout) {
+  var canvas = document.createElement("canvas");
+  var ctx = canvas.getContext("2d");
+  ctx.drawImage(vout, 0, 0);
+  var imgData = ctx.getImageData(0, 0, 1, 1);
+  is(imgData.data[3], 255, "Check video frame pixel has been drawn");
+}
+
+function startTest(test, token) {
+  manager.started(token);
+
+  var v = document.createElement('video');
+  var vout = document.createElement('video');
+  vout.token = token;
+
+  v.src = test.name;
+  var stream = v.mozCaptureStreamUntilEnded();
+  is(stream.currentTime, 0, test.name + " stream initial currentTime");
+  vout.src = stream;
+  is(vout.src, stream, test.name + " set output element .src correctly");
+
+  var checkEnded = function(test, vout, stream) { return function() {
+    is(stream.currentTime, vout.currentTime, test.name + " stream final currentTime");
+    if (test.duration) {
+      ok(Math.abs(vout.currentTime - test.duration) < 0.1,
+         test.name + " current time at end: " + vout.currentTime + " should be: " + test.duration);
+    }
+    is(vout.readyState, vout.HAVE_CURRENT_DATA, test.name + " checking readyState");
+    ok(vout.ended, test.name + " checking playback has ended");
+    if (test.type.match(/^video/)) {
+      checkDrawImage(vout);
+    }
+    vout.parentNode.removeChild(vout);
+    manager.finished(vout.token);
+  }}(test, vout, stream);
+  vout.addEventListener("ended", checkEnded, false);
+
+  document.body.appendChild(vout);
+  v.play();
+  vout.play();
+}
+
+manager.runTests(gSmallTests, startTest);
+</script>
+</pre>
+</body>
+</html>

From d89ca4ad7a0d462d44638e847cfbb2f199f5ad12 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:13:09 +1200
Subject: [PATCH 017/162] Bug 664918. Part 11: Refactor code around
 mDecoder->Shutdown() to make following fix easier. r=cpearce

---
 .../html/content/public/nsHTMLMediaElement.h  |  4 ++++
 .../html/content/src/nsHTMLMediaElement.cpp   | 23 ++++++++++---------
 content/media/nsBuiltinDecoder.cpp            | 11 ++++++---
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/content/html/content/public/nsHTMLMediaElement.h b/content/html/content/public/nsHTMLMediaElement.h
index c9484fd00be..8f66992dc44 100644
--- a/content/html/content/public/nsHTMLMediaElement.h
+++ b/content/html/content/public/nsHTMLMediaElement.h
@@ -472,6 +472,10 @@ protected:
    */
   nsHTMLMediaElement* LookupMediaElementURITable(nsIURI* aURI);
 
+  /**
+   * Shutdown and clear mDecoder and maintain associated invariants.
+   */
+  void ShutdownDecoder();
   /**
    * Execute the initial steps of the load algorithm that ensure existing
    * loads are aborted, the element is emptied, and a new load ID is
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index 8fbb6da2940..fa4bc9a1efc 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -575,6 +575,14 @@ nsHTMLMediaElement::OnChannelRedirect(nsIChannel *aChannel,
   return NS_OK;
 }
 
+void nsHTMLMediaElement::ShutdownDecoder()
+{
+  RemoveMediaElementFromURITable();
+  NS_ASSERTION(mDecoder, "Must have decoder to shut down");
+  mDecoder->Shutdown();
+  mDecoder = nsnull;
+}
+
 void nsHTMLMediaElement::AbortExistingLoads()
 {
   // Abort any already-running instance of the resource selection algorithm.
@@ -587,10 +595,8 @@ void nsHTMLMediaElement::AbortExistingLoads()
   bool fireTimeUpdate = false;
 
   if (mDecoder) {
-    RemoveMediaElementFromURITable();
     fireTimeUpdate = mDecoder->GetCurrentTime() != 0.0;
-    mDecoder->Shutdown();
-    mDecoder = nsnull;
+    ShutdownDecoder();
   }
   if (mStream) {
     EndMediaStreamPlayback();
@@ -1633,8 +1639,7 @@ nsHTMLMediaElement::~nsHTMLMediaElement()
   }
   UnregisterFreezableElement();
   if (mDecoder) {
-    RemoveMediaElementFromURITable();
-    mDecoder->Shutdown();
+    ShutdownDecoder();
   }
   if (mStream) {
     EndMediaStreamPlayback();
@@ -2349,9 +2354,7 @@ nsresult nsHTMLMediaElement::FinishDecoderSetup(nsMediaDecoder* aDecoder,
   }
 
   if (NS_FAILED(rv)) {
-    RemoveMediaElementFromURITable();
-    mDecoder->Shutdown();
-    mDecoder = nsnull;
+    ShutdownDecoder();
   }
 
   NS_ASSERTION(NS_SUCCEEDED(rv) == (MediaElementTableCount(this, mLoadingSrc) == 1),
@@ -2599,9 +2602,7 @@ void nsHTMLMediaElement::DecodeError()
   ReportLoadError("MediaLoadDecodeError", params, ArrayLength(params));
 
   if (mDecoder) {
-    RemoveMediaElementFromURITable();
-    mDecoder->Shutdown();
-    mDecoder = nsnull;
+    ShutdownDecoder();
   }
   mLoadingSrc = nsnull;
   if (mIsLoadingFromSourceChildren) {
diff --git a/content/media/nsBuiltinDecoder.cpp b/content/media/nsBuiltinDecoder.cpp
index a9352e5f5a1..3e4d50146e6 100644
--- a/content/media/nsBuiltinDecoder.cpp
+++ b/content/media/nsBuiltinDecoder.cpp
@@ -101,9 +101,14 @@ void nsBuiltinDecoder::AddOutputStream(SourceMediaStream* aStream, bool aFinishW
     ms->Init(PRInt64(mCurrentTime*USECS_PER_S), aStream, aFinishWhenEnded);
   }
 
-  // Make sure the state machine thread runs so that any buffered data
-  // is fed into our strema.
-  ScheduleStateMachineThread();
+  // This can be called before Load(), in which case our mDecoderStateMachine
+  // won't have been created yet and we can rely on Load() to schedule it
+  // once it is created.
+  if (mDecoderStateMachine) {
+    // Make sure the state machine thread runs so that any buffered data
+    // is fed into our stream.
+    ScheduleStateMachineThread();
+  }
 }
 
 double nsBuiltinDecoder::GetDuration()

From 873464954ca716133969150f18778229e8df06e5 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 15:13:42 +1200
Subject: [PATCH 018/162] Bug 664918. Part 12: Finish SourceMediaStreams when
 the media decoder is destroyed, to avoid late low-audio/low-video
 notifications and issues when multiple decoders write to the same stream.
 r=cpearce,rjesup

---
 .../html/content/src/nsHTMLMediaElement.cpp   |  6 ++
 content/media/MediaStreamGraph.cpp            |  7 +-
 .../media/nsBuiltinDecoderStateMachine.cpp    | 31 +++++++++
 content/media/nsBuiltinDecoderStateMachine.h  |  1 +
 content/media/test/Makefile.in                |  1 +
 .../test_streams_element_capture_reset.html   | 66 +++++++++++++++++++
 6 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 content/media/test/test_streams_element_capture_reset.html

diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index fa4bc9a1efc..4bfdd990c76 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -581,6 +581,12 @@ void nsHTMLMediaElement::ShutdownDecoder()
   NS_ASSERTION(mDecoder, "Must have decoder to shut down");
   mDecoder->Shutdown();
   mDecoder = nsnull;
+  // Discard all output streams. mDecoder->Shutdown() will have finished all
+  // its output streams.
+  // XXX For now we ignore mFinishWhenEnded. We'll fix this later. The
+  // immediate goal is to not crash when reloading a media element with
+  // output streams.
+  mOutputStreams.Clear();
 }
 
 void nsHTMLMediaElement::AbortExistingLoads()
diff --git a/content/media/MediaStreamGraph.cpp b/content/media/MediaStreamGraph.cpp
index dae0280010e..3c16391772e 100644
--- a/content/media/MediaStreamGraph.cpp
+++ b/content/media/MediaStreamGraph.cpp
@@ -668,10 +668,15 @@ MediaStreamGraphImpl::UpdateBufferSufficiencyState(SourceMediaStream* aStream)
     MutexAutoLock lock(aStream->mMutex);
     for (PRUint32 i = 0; i < aStream->mUpdateTracks.Length(); ++i) {
       SourceMediaStream::TrackData* data = &aStream->mUpdateTracks[i];
-      if (data->mCommands & SourceMediaStream::TRACK_CREATE) {
+      if (data->mCommands & SourceMediaStream::TRACK_END) {
+        // This track will end, so no point in firing not-enough-data
+        // callbacks.
         continue;
       }
       StreamBuffer::Track* track = aStream->mBuffer.FindTrack(data->mID);
+      // Note that track->IsEnded() must be false, otherwise we would have
+      // removed the track from mUpdateTracks already.
+      NS_ASSERTION(!track->IsEnded(), "What is this track doing here?");
       data->mHaveEnough = track->GetEndTimeRoundDown() >= desiredEnd;
       if (!data->mHaveEnough) {
         runnables.MoveElementsFrom(data->mDispatchWhenNotEnough);
diff --git a/content/media/nsBuiltinDecoderStateMachine.cpp b/content/media/nsBuiltinDecoderStateMachine.cpp
index 712bf3fc8e5..705f643a46b 100644
--- a/content/media/nsBuiltinDecoderStateMachine.cpp
+++ b/content/media/nsBuiltinDecoderStateMachine.cpp
@@ -730,6 +730,33 @@ void nsBuiltinDecoderStateMachine::SendOutputStreamData()
   }
 }
 
+void nsBuiltinDecoderStateMachine::FinishOutputStreams()
+{
+  // Tell all our output streams that all tracks have ended and we've
+  // finished.
+  nsTArray<OutputMediaStream>& streams = mDecoder->OutputStreams();
+  for (PRUint32 i = 0; i < streams.Length(); ++i) {
+    OutputMediaStream* stream = &streams[i];
+    if (!stream->mStreamInitialized) {
+      continue;
+    }
+    SourceMediaStream* mediaStream = stream->mStream;
+    if (mInfo.mHasAudio && !stream->mHaveSentFinishAudio) {
+      mediaStream->EndTrack(TRACK_AUDIO);
+      stream->mHaveSentFinishAudio = true;
+    }
+    if (mInfo.mHasVideo && !stream->mHaveSentFinishVideo) {
+      mediaStream->EndTrack(TRACK_VIDEO);
+      stream->mHaveSentFinishVideo = true;
+    }
+    // XXX ignoring mFinishWhenEnded for now. Immediate goal is to not crash.
+    if (!stream->mHaveSentFinish) {
+      mediaStream->Finish();
+      stream->mHaveSentFinish = true;
+    }
+  }
+}
+
 bool nsBuiltinDecoderStateMachine::HaveEnoughDecodedAudio(PRInt64 aAmpleAudioUSecs)
 {
   mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
@@ -2008,6 +2035,10 @@ nsresult nsBuiltinDecoderStateMachine::RunStateMachine()
       StopDecodeThread();
       NS_ASSERTION(mState == DECODER_STATE_SHUTDOWN,
                    "How did we escape from the shutdown state?");
+      // Need to call this before dispatching nsDispatchDisposeEvent below, to
+      // ensure that any notifications dispatched by the stream graph
+      // will run before nsDispatchDisposeEvent below.
+      FinishOutputStreams();
       // We must daisy-chain these events to destroy the decoder. We must
       // destroy the decoder on the main thread, but we can't destroy the
       // decoder while this thread holds the decoder monitor. We can't
diff --git a/content/media/nsBuiltinDecoderStateMachine.h b/content/media/nsBuiltinDecoderStateMachine.h
index 4ea50f246b8..5f8ed9e27ae 100644
--- a/content/media/nsBuiltinDecoderStateMachine.h
+++ b/content/media/nsBuiltinDecoderStateMachine.h
@@ -287,6 +287,7 @@ public:
   // Copy queued audio/video data in the reader to any output MediaStreams that
   // need it.
   void SendOutputStreamData();
+  void FinishOutputStreams();
   bool HaveEnoughDecodedAudio(PRInt64 aAmpleAudioUSecs);
   bool HaveEnoughDecodedVideo();
 
diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in
index 0b6dd62ba84..c583074de47 100644
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -151,6 +151,7 @@ _TEST_FILES = \
 		test_source_write.html \
 		test_standalone.html \
 		test_streams_element_capture.html \
+		test_streams_element_capture_reset.html \
 		test_timeupdate_small_files.html \
 		test_too_many_elements.html \
 		test_volume.html \
diff --git a/content/media/test/test_streams_element_capture_reset.html b/content/media/test/test_streams_element_capture_reset.html
new file mode 100644
index 00000000000..8cd8236d341
--- /dev/null
+++ b/content/media/test/test_streams_element_capture_reset.html
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test that reloading and seeking in a media element that's being captured doesn't crash</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="manifest.js"></script>
+</head>
+<body>
+<video id="v"></video>
+<video id="vout"></video>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+SimpleTest.waitForExplicitFinish();
+
+var v = document.getElementById('v');
+var vout = document.getElementById('vout');
+var stream = v.mozCaptureStream();
+vout.src = stream;
+
+function startTest(test) {
+  var seekTime = test.duration/2;
+
+  function ended() {
+    ok(true, "Final ended after changing src");
+    SimpleTest.finish();
+  };
+  function timeupdateAfterSeek() {
+    if (v.currentTime < seekTime + 0.001)
+      return;
+    ok(true, "timeupdate after seek");
+    v.removeEventListener("timeupdate", timeupdateAfterSeek, false);
+    v.src = test.name + "?1";
+    v.play();
+    v.addEventListener("ended", ended, false);
+  };
+  function seeked() {
+    ok(true, "Finished seeking");
+    v.removeEventListener("seeked", seeked, false);
+    v.addEventListener("timeupdate", timeupdateAfterSeek, false);
+  };
+  function timeupdate() {
+    if (v.currentTime == 0)
+      return;
+    ok(true, "Initial timeupdate");
+    v.removeEventListener("timeupdate", timeupdate, false);
+    v.currentTime = seekTime;
+    v.addEventListener("seeked", seeked, false);
+  };
+  v.addEventListener("timeupdate", timeupdate, false);
+
+  v.src = test.name;
+  v.play();
+  vout.play();
+}
+
+var testVideo = getPlayableVideo(gSmallTests);
+if (testVideo) {
+  startTest(testVideo);
+} else {
+  todo(false, "No playable video");
+}
+</script>
+</pre>
+</body>
+</html>

From 440f0d3aad819e83093e8f9e3fb58d101cf61342 Mon Sep 17 00:00:00 2001
From: "Timothy B. Terriberry" <tterribe@vt.edu>
Date: Sun, 29 Apr 2012 20:51:44 -0700
Subject: [PATCH 019/162] Bug 730907 - Update libvpx to v1.0.0, r=cpearce,khuey

--HG--
rename : media/libvpx/vp8/decoder/arm/armv6/dequant_idct_v6.asm => media/libvpx/vp8/common/arm/armv6/dequant_idct_v6.asm
rename : media/libvpx/vp8/decoder/arm/armv6/dequantize_v6.asm => media/libvpx/vp8/common/arm/armv6/dequantize_v6.asm
rename : media/libvpx/vp8/decoder/arm/armv6/idct_blk_v6.c => media/libvpx/vp8/common/arm/armv6/idct_blk_v6.c
rename : media/libvpx/vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm => media/libvpx/vp8/common/arm/armv6/vp8_mse16x16_armv6.asm
rename : media/libvpx/vp8/encoder/arm/armv6/vp8_sad16x16_armv6.asm => media/libvpx/vp8/common/arm/armv6/vp8_sad16x16_armv6.asm
rename : media/libvpx/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm => media/libvpx/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm
rename : media/libvpx/vp8/encoder/arm/armv6/vp8_variance8x8_armv6.asm => media/libvpx/vp8/common/arm/armv6/vp8_variance8x8_armv6.asm
rename : media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm => media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
rename : media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm => media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
rename : media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm => media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
rename : media/libvpx/vp8/decoder/arm/dequantize_arm.c => media/libvpx/vp8/common/arm/dequantize_arm.c
rename : media/libvpx/vp8/decoder/arm/dequantize_arm.h => media/libvpx/vp8/common/arm/dequantize_arm.h
rename : media/libvpx/vp8/decoder/arm/neon/dequant_idct_neon.asm => media/libvpx/vp8/common/arm/neon/dequant_idct_neon.asm
rename : media/libvpx/vp8/decoder/arm/neon/dequantizeb_neon.asm => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.asm
rename : media/libvpx/vp8/decoder/arm/neon/idct_blk_neon.c => media/libvpx/vp8/common/arm/neon/idct_blk_neon.c
rename : media/libvpx/vp8/decoder/arm/neon/idct_dequant_0_2x_neon.asm => media/libvpx/vp8/common/arm/neon/idct_dequant_0_2x_neon.asm
rename : media/libvpx/vp8/decoder/arm/neon/idct_dequant_full_2x_neon.asm => media/libvpx/vp8/common/arm/neon/idct_dequant_full_2x_neon.asm
rename : media/libvpx/vp8/encoder/arm/neon/sad16_neon.asm => media/libvpx/vp8/common/arm/neon/sad16_neon.asm
rename : media/libvpx/vp8/encoder/arm/neon/sad8_neon.asm => media/libvpx/vp8/common/arm/neon/sad8_neon.asm
rename : media/libvpx/vp8/encoder/arm/neon/variance_neon.asm => media/libvpx/vp8/common/arm/neon/variance_neon.asm
rename : media/libvpx/vp8/encoder/arm/neon/vp8_mse16x16_neon.asm => media/libvpx/vp8/common/arm/neon/vp8_mse16x16_neon.asm
rename : media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm => media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm
rename : media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm => media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm
rename : media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm => media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm
rename : media/libvpx/vp8/encoder/arm/variance_arm.c => media/libvpx/vp8/common/arm/variance_arm.c
rename : media/libvpx/vp8/encoder/arm/variance_arm.h => media/libvpx/vp8/common/arm/variance_arm.h
rename : media/libvpx/vp8/decoder/dequantize.c => media/libvpx/vp8/common/dequantize.c
rename : media/libvpx/vp8/decoder/dequantize.h => media/libvpx/vp8/common/dequantize.h
rename : media/libvpx/vp8/decoder/idct_blk.c => media/libvpx/vp8/common/idct_blk.c
rename : media/libvpx/vp8/encoder/sad_c.c => media/libvpx/vp8/common/sad_c.c
rename : media/libvpx/vp8/encoder/variance.h => media/libvpx/vp8/common/variance.h
rename : media/libvpx/vp8/encoder/variance_c.c => media/libvpx/vp8/common/variance_c.c
rename : media/libvpx/vp8/decoder/x86/dequantize_mmx.asm => media/libvpx/vp8/common/x86/dequantize_mmx.asm
rename : media/libvpx/vp8/decoder/x86/dequantize_x86.h => media/libvpx/vp8/common/x86/dequantize_x86.h
rename : media/libvpx/vp8/decoder/x86/idct_blk_mmx.c => media/libvpx/vp8/common/x86/idct_blk_mmx.c
rename : media/libvpx/vp8/decoder/x86/idct_blk_sse2.c => media/libvpx/vp8/common/x86/idct_blk_sse2.c
rename : media/libvpx/vp8/encoder/x86/sad_mmx.asm => media/libvpx/vp8/common/x86/sad_mmx.asm
rename : media/libvpx/vp8/encoder/x86/sad_sse2.asm => media/libvpx/vp8/common/x86/sad_sse2.asm
rename : media/libvpx/vp8/encoder/x86/sad_sse3.asm => media/libvpx/vp8/common/x86/sad_sse3.asm
rename : media/libvpx/vp8/encoder/x86/sad_sse4.asm => media/libvpx/vp8/common/x86/sad_sse4.asm
rename : media/libvpx/vp8/encoder/x86/sad_ssse3.asm => media/libvpx/vp8/common/x86/sad_ssse3.asm
rename : media/libvpx/vp8/encoder/x86/variance_impl_mmx.asm => media/libvpx/vp8/common/x86/variance_impl_mmx.asm
rename : media/libvpx/vp8/encoder/x86/variance_impl_sse2.asm => media/libvpx/vp8/common/x86/variance_impl_sse2.asm
rename : media/libvpx/vp8/encoder/x86/variance_impl_ssse3.asm => media/libvpx/vp8/common/x86/variance_impl_ssse3.asm
rename : media/libvpx/vp8/encoder/x86/variance_mmx.c => media/libvpx/vp8/common/x86/variance_mmx.c
rename : media/libvpx/vp8/encoder/x86/variance_sse2.c => media/libvpx/vp8/common/x86/variance_sse2.c
rename : media/libvpx/vp8/encoder/x86/variance_ssse3.c => media/libvpx/vp8/common/x86/variance_ssse3.c
rename : media/libvpx/vp8/encoder/x86/variance_x86.h => media/libvpx/vp8/common/x86/variance_x86.h
rename : media/libvpx/vp8/encoder/arm/armv6/vp8_fast_fdct4x4_armv6.asm => media/libvpx/vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm
rename : media/libvpx/vp8/common/defaultcoefcounts.c => media/libvpx/vp8/encoder/defaultcoefcounts.h
---
 configure.in                                  |    1 +
 media/libvpx/I1bad27ea.patch                  |  624 ++++++
 media/libvpx/I256a37c6.patch                  | 1932 +++++++++++++++++
 media/libvpx/I3915d597.patch                  |   41 +
 media/libvpx/I42ab00e3.patch                  |   33 +
 media/libvpx/I6f2b218d.patch                  |  348 +++
 media/libvpx/I8a35831e.patch                  |   29 +
 media/libvpx/I9713c9f0.patch                  |   33 +
 media/libvpx/LICENSE                          |    9 +-
 media/libvpx/Makefile.in                      |  232 +-
 media/libvpx/build/make/ads2gas.pl            |   16 +-
 media/libvpx/compile_errors.patch             |  105 +-
 media/libvpx/solaris.patch                    |   24 +-
 media/libvpx/textrels.patch                   |  164 ++
 media/libvpx/update.sh                        |  189 +-
 media/libvpx/variance-invoke.patch            |  101 +
 media/libvpx/vp8/common/alloccommon.c         |    8 +-
 .../vp8/common/arm/arm_systemdependent.c      |   78 +-
 .../common/arm/armv6/dc_only_idct_add_v6.asm  |   33 +-
 .../arm/armv6/dequant_idct_v6.asm             |   26 +-
 .../arm/armv6/dequantize_v6.asm               |    0
 .../libvpx/vp8/common/arm/armv6/idct_blk_v6.c |  116 +
 media/libvpx/vp8/common/arm/armv6/idct_v6.asm |  491 ++---
 .../common/arm/armv6/intra4x4_predict_v6.asm  |  606 ++++++
 .../libvpx/vp8/common/arm/armv6/iwalsh_v6.asm |  118 +-
 .../libvpx/vp8/common/arm/armv6/recon_v6.asm  |  281 ---
 .../arm/armv6/vp8_mse16x16_armv6.asm          |    0
 .../arm/armv6/vp8_sad16x16_armv6.asm          |    0
 .../arm/armv6/vp8_variance16x16_armv6.asm     |    2 +-
 .../arm/armv6/vp8_variance8x8_armv6.asm       |    0
 .../vp8_variance_halfpixvar16x16_h_armv6.asm  |    2 +-
 .../vp8_variance_halfpixvar16x16_hv_armv6.asm |    2 +-
 .../vp8_variance_halfpixvar16x16_v_armv6.asm  |    2 +-
 .../{decoder => common}/arm/dequantize_arm.c  |   11 +-
 .../{decoder => common}/arm/dequantize_arm.h  |   32 +-
 media/libvpx/vp8/common/arm/filter_arm.c      |    2 +-
 media/libvpx/vp8/common/arm/idct_arm.h        |   14 -
 .../common/arm/neon/dc_only_idct_add_neon.asm |   33 +-
 .../arm/neon/dequant_idct_neon.asm            |   34 +-
 .../arm/neon/dequantizeb_neon.asm             |    0
 .../vp8/common/arm/neon/idct_blk_neon.c       |   97 +
 .../arm/neon/idct_dequant_0_2x_neon.asm       |   48 +-
 .../arm/neon/idct_dequant_full_2x_neon.asm    |   51 +-
 .../vp8/common/arm/neon/iwalsh_neon.asm       |   39 +-
 .../vp8/common/arm/neon/recon16x16mb_neon.asm |  131 --
 .../vp8/common/arm/neon/recon2b_neon.asm      |   54 -
 .../vp8/common/arm/neon/recon4b_neon.asm      |   69 -
 media/libvpx/vp8/common/arm/neon/recon_neon.c |   29 -
 .../vp8/common/arm/neon/reconb_neon.asm       |   61 -
 .../arm/neon/sad16_neon.asm                   |    0
 .../arm/neon/sad8_neon.asm                    |    0
 .../arm/neon/shortidct4x4llm_1_neon.asm       |   67 -
 .../common/arm/neon/shortidct4x4llm_neon.asm  |   53 +-
 .../arm/neon/variance_neon.asm                |   22 +-
 .../arm/neon/vp8_mse16x16_neon.asm            |    0
 .../neon/vp8_subpixelvariance16x16_neon.asm   |   18 +-
 .../neon/vp8_subpixelvariance16x16s_neon.asm  |   16 +-
 .../arm/neon/vp8_subpixelvariance8x8_neon.asm |    8 +-
 media/libvpx/vp8/common/arm/recon_arm.h       |   33 +-
 media/libvpx/vp8/common/arm/reconintra_arm.c  |    2 +-
 .../{encoder => common}/arm/variance_arm.c    |    4 +-
 .../{encoder => common}/arm/variance_arm.h    |    0
 media/libvpx/vp8/common/asm_com_offsets.c     |   15 +
 media/libvpx/vp8/common/blockd.h              |   45 +-
 media/libvpx/vp8/common/common.h              |    2 -
 media/libvpx/vp8/common/default_coef_probs.h  |  188 ++
 media/libvpx/vp8/common/defaultcoefcounts.h   |   21 -
 media/libvpx/vp8/common/dequantize.c          |   43 +
 .../vp8/{decoder => common}/dequantize.h      |   37 +-
 media/libvpx/vp8/common/entropy.c             |   33 +-
 media/libvpx/vp8/common/entropymode.c         |    8 -
 media/libvpx/vp8/common/entropymode.h         |    9 +
 media/libvpx/vp8/common/extend.c              |   54 +
 media/libvpx/vp8/common/extend.h              |    4 +
 media/libvpx/vp8/common/findnearmv.c          |   48 +-
 media/libvpx/vp8/common/findnearmv.h          |   33 +-
 media/libvpx/vp8/common/g_common.h            |   21 -
 .../vp8/common/generic/systemdependent.c      |   72 +-
 media/libvpx/vp8/common/idct.h                |   18 +-
 media/libvpx/vp8/common/idct_blk.c            |   90 +
 media/libvpx/vp8/common/idctllm.c             |   87 +-
 media/libvpx/vp8/common/invtrans.c            |   88 -
 media/libvpx/vp8/common/invtrans.h            |   50 +-
 media/libvpx/vp8/common/loopfilter.c          |   20 +-
 media/libvpx/vp8/common/loopfilter.h          |    5 +-
 media/libvpx/vp8/common/loopfilter_filters.c  |   39 +-
 media/libvpx/vp8/common/mbpitch.c             |    6 +-
 media/libvpx/vp8/common/onyx.h                |   77 +-
 media/libvpx/vp8/common/onyxc_int.h           |   12 +-
 media/libvpx/vp8/common/onyxd.h               |   22 +-
 media/libvpx/vp8/common/postproc.c            |  303 ++-
 media/libvpx/vp8/common/postproc.h            |    1 +
 media/libvpx/vp8/common/ppflags.h             |    3 +-
 media/libvpx/vp8/common/recon.c               |  181 --
 media/libvpx/vp8/common/recon.h               |   41 +-
 media/libvpx/vp8/common/reconinter.c          |  440 ++--
 media/libvpx/vp8/common/reconinter.h          |   12 +-
 media/libvpx/vp8/common/reconintra.c          |   12 +-
 media/libvpx/vp8/common/reconintra4x4.c       |  234 +-
 media/libvpx/vp8/{encoder => common}/sad_c.c  |    4 +-
 media/libvpx/vp8/common/systemdependent.h     |    2 +-
 media/libvpx/vp8/common/textblit.c            |  130 --
 media/libvpx/vp8/common/threading.h           |    1 -
 media/libvpx/vp8/common/type_aliases.h        |  117 -
 .../libvpx/vp8/{encoder => common}/variance.h |   22 +-
 .../vp8/{encoder => common}/variance_c.c      |   38 +-
 .../x86/dequantize_mmx.asm                    |  229 +-
 .../{decoder => common}/x86/dequantize_x86.h  |   12 -
 media/libvpx/vp8/common/x86/filter_x86.c      |   35 +
 media/libvpx/vp8/common/x86/filter_x86.h      |   19 +
 media/libvpx/vp8/common/x86/idct_blk_mmx.c    |  127 ++
 media/libvpx/vp8/common/x86/idct_blk_sse2.c   |   90 +
 media/libvpx/vp8/common/x86/idct_x86.h        |    8 -
 media/libvpx/vp8/common/x86/idctllm_mmx.asm   |  445 ++--
 media/libvpx/vp8/common/x86/idctllm_sse2.asm  |  150 +-
 media/libvpx/vp8/common/x86/iwalsh_mmx.asm    |  211 +-
 media/libvpx/vp8/common/x86/iwalsh_sse2.asm   |  144 +-
 .../vp8/common/x86/loopfilter_block_sse2.asm  |  813 +++++++
 .../libvpx/vp8/common/x86/loopfilter_mmx.asm  |   24 +-
 .../libvpx/vp8/common/x86/loopfilter_sse2.asm |  233 +-
 media/libvpx/vp8/common/x86/loopfilter_x86.c  |   13 +
 media/libvpx/vp8/common/x86/postproc_mmx.asm  |   77 +-
 media/libvpx/vp8/common/x86/postproc_sse2.asm |  110 +-
 .../{common_types.h => x86/postproc_x86.c}    |   17 +-
 media/libvpx/vp8/common/x86/recon_mmx.asm     |   47 -
 media/libvpx/vp8/common/x86/recon_sse2.asm    |  605 +++++-
 .../vp8/common/x86/recon_wrapper_sse2.c       |   68 +-
 media/libvpx/vp8/common/x86/recon_x86.h       |   28 +-
 .../vp8/{encoder => common}/x86/sad_mmx.asm   |   16 +-
 .../vp8/{encoder => common}/x86/sad_sse2.asm  |   40 +-
 .../vp8/{encoder => common}/x86/sad_sse3.asm  |   12 +-
 .../vp8/{encoder => common}/x86/sad_sse4.asm  |    0
 .../vp8/{encoder => common}/x86/sad_ssse3.asm |  156 +-
 media/libvpx/vp8/common/x86/subpixel_mmx.asm  |   65 +-
 media/libvpx/vp8/common/x86/subpixel_sse2.asm |   78 +-
 .../libvpx/vp8/common/x86/subpixel_ssse3.asm  |  100 +-
 media/libvpx/vp8/common/x86/subpixel_x86.h    |    2 +
 .../x86/variance_impl_mmx.asm                 |   12 +-
 .../x86/variance_impl_sse2.asm                |    8 +-
 .../x86/variance_impl_ssse3.asm               |   38 +-
 .../{encoder => common}/x86/variance_mmx.c    |   49 +-
 .../{encoder => common}/x86/variance_sse2.c   |   23 +-
 .../{encoder => common}/x86/variance_ssse3.c  |    6 +-
 .../{encoder => common}/x86/variance_x86.h    |   10 +
 media/libvpx/vp8/common/x86/vp8_asm_stubs.c   |    4 +-
 .../vp8/common/x86/x86_systemdependent.c      |  124 +-
 .../vp8/decoder/arm/arm_dsystemdependent.c    |   18 +-
 .../decoder/arm/armv6/dequant_dc_idct_v6.asm  |  218 --
 .../vp8/decoder/arm/armv6/idct_blk_v6.c       |  151 --
 .../vp8/decoder/arm/neon/idct_blk_neon.c      |  115 -
 .../arm/neon/idct_dequant_dc_0_2x_neon.asm    |   69 -
 .../arm/neon/idct_dequant_dc_full_2x_neon.asm |  205 --
 media/libvpx/vp8/decoder/asm_dec_offsets.c    |   26 +
 media/libvpx/vp8/decoder/dboolhuff.h          |    2 +-
 media/libvpx/vp8/decoder/decodemv.c           |  697 +++---
 media/libvpx/vp8/decoder/decodframe.c         |  637 +++---
 media/libvpx/vp8/decoder/dequantize.c         |  113 -
 media/libvpx/vp8/decoder/detokenize.c         |   49 +-
 media/libvpx/vp8/decoder/error_concealment.c  |  118 +-
 .../vp8/decoder/generic/dsystemdependent.c    |   12 +-
 media/libvpx/vp8/decoder/idct_blk.c           |  124 --
 media/libvpx/vp8/decoder/onyxd_if.c           |  208 +-
 media/libvpx/vp8/decoder/onyxd_int.h          |   43 +-
 media/libvpx/vp8/decoder/reconintra_mt.c      |  203 +-
 media/libvpx/vp8/decoder/reconintra_mt.h      |    2 +-
 media/libvpx/vp8/decoder/threading.c          |  146 +-
 media/libvpx/vp8/decoder/x86/idct_blk_mmx.c   |  151 --
 media/libvpx/vp8/decoder/x86/idct_blk_sse2.c  |  114 -
 .../vp8/decoder/x86/x86_dsystemdependent.c    |   45 +-
 .../vp8/encoder/arm/arm_csystemdependent.c    |   79 +-
 .../encoder/arm/armv5te/boolhuff_armv5te.asm  |  311 +++
 .../arm/armv5te/vp8_packtokens_armv5.asm      |   50 +-
 .../armv5te/vp8_packtokens_mbrow_armv5.asm    |   43 +-
 .../vp8_packtokens_partitions_armv5.asm       |  117 +-
 .../arm/armv6/vp8_fast_quantize_b_armv6.asm   |    5 +-
 ..._armv6.asm => vp8_short_fdct4x4_armv6.asm} |    4 +-
 .../encoder/arm/armv6/vp8_subtract_armv6.asm  |   63 +-
 .../libvpx/vp8/encoder/arm/armv6/walsh_v6.asm |  265 ++-
 media/libvpx/vp8/encoder/arm/boolhuff_arm.c   |   41 +
 media/libvpx/vp8/encoder/arm/dct_arm.c        |    8 +-
 media/libvpx/vp8/encoder/arm/dct_arm.h        |   18 +-
 .../vp8/encoder/arm/neon/fastfdct4x4_neon.asm |  124 --
 .../vp8/encoder/arm/neon/fastfdct8x4_neon.asm |  177 --
 .../encoder/arm/neon/fastquantizeb_neon.asm   |   23 +-
 .../libvpx/vp8/encoder/arm/neon/picklpf_arm.c |   48 +
 .../vp8/encoder/arm/neon/shortfdct_neon.asm   |  269 ++-
 .../vp8/encoder/arm/neon/subtract_neon.asm    |  154 +-
 .../vp8/encoder/arm/neon/vp8_memcpy_neon.asm  |    8 +-
 .../arm/neon/vp8_shortwalsh4x4_neon.asm       |  101 +-
 media/libvpx/vp8/encoder/arm/picklpf_arm.c    |   50 -
 media/libvpx/vp8/encoder/arm/quantize_arm.c   |   62 +
 media/libvpx/vp8/encoder/asm_enc_offsets.c    |    5 +-
 media/libvpx/vp8/encoder/bitstream.c          |  293 ++-
 media/libvpx/vp8/encoder/bitstream.h          |   14 +-
 media/libvpx/vp8/encoder/block.h              |    6 +-
 media/libvpx/vp8/encoder/boolhuff.c           |   15 +-
 media/libvpx/vp8/encoder/boolhuff.h           |   19 +-
 .../defaultcoefcounts.h}                      |   10 +-
 media/libvpx/vp8/encoder/encodeframe.c        |  143 +-
 media/libvpx/vp8/encoder/encodeintra.c        |   52 +-
 media/libvpx/vp8/encoder/encodemb.c           |  109 +-
 media/libvpx/vp8/encoder/encodemb.h           |   11 +-
 media/libvpx/vp8/encoder/encodemv.c           |    4 +-
 media/libvpx/vp8/encoder/ethreading.c         |   44 +-
 media/libvpx/vp8/encoder/firstpass.c          |  623 +++---
 .../vp8/encoder/generic/csystemdependent.c    |   60 +-
 media/libvpx/vp8/encoder/lookahead.c          |   63 +-
 media/libvpx/vp8/encoder/lookahead.h          |   19 +-
 media/libvpx/vp8/encoder/mcomp.c              |  110 +-
 media/libvpx/vp8/encoder/mcomp.h              |    2 +-
 media/libvpx/vp8/encoder/mr_dissim.c          |  201 ++
 .../config.h => vp8/encoder/mr_dissim.h}      |    9 +
 media/libvpx/vp8/encoder/onyx_if.c            | 1756 ++++++++-------
 media/libvpx/vp8/encoder/onyx_int.h           |  148 +-
 media/libvpx/vp8/encoder/pickinter.c          |  615 ++++--
 media/libvpx/vp8/encoder/pickinter.h          |    8 +-
 media/libvpx/vp8/encoder/picklpf.c            |  216 +-
 media/libvpx/vp8/encoder/quantize.c           |  288 ++-
 media/libvpx/vp8/encoder/quantize.h           |    2 +-
 media/libvpx/vp8/encoder/ratectrl.c           |   81 +-
 media/libvpx/vp8/encoder/rdopt.c              |  365 ++--
 media/libvpx/vp8/encoder/rdopt.h              |   99 +
 media/libvpx/vp8/encoder/temporal_filter.c    |    5 +-
 media/libvpx/vp8/encoder/tokenize.c           |  147 +-
 media/libvpx/vp8/encoder/treewriter.h         |   10 +-
 media/libvpx/vp8/encoder/x86/encodeopt.asm    |   16 +-
 .../libvpx/vp8/encoder/x86/quantize_sse2.asm  |   16 +-
 .../libvpx/vp8/encoder/x86/quantize_sse4.asm  |   10 +-
 .../libvpx/vp8/encoder/x86/quantize_ssse3.asm |   44 +-
 media/libvpx/vp8/encoder/x86/subtract_mmx.asm |  445 +---
 .../libvpx/vp8/encoder/x86/subtract_sse2.asm  |  353 ++-
 .../x86/temporal_filter_apply_sse2.asm        |   18 +-
 .../vp8/encoder/x86/x86_csystemdependent.c    |  133 +-
 media/libvpx/vp8/vp8_cx_iface.c               |  226 +-
 media/libvpx/vp8/vp8_dx_iface.c               |   40 +-
 .../libvpx/vpx/internal/vpx_codec_internal.h  |   25 +-
 media/libvpx/vpx/src/vpx_decoder.c            |    6 +-
 media/libvpx/vpx/src/vpx_encoder.c            |  115 +-
 media/libvpx/vpx/src/vpx_image.c              |   53 +-
 media/libvpx/vpx/vp8.h                        |    3 +-
 media/libvpx/vpx/vp8cx.h                      |    4 +-
 media/libvpx/vpx/vp8dx.h                      |    7 +-
 media/libvpx/vpx/vpx_decoder.h                |   20 +-
 media/libvpx/vpx/vpx_encoder.h                |   87 +-
 media/libvpx/vpx/vpx_image.h                  |    3 +-
 media/libvpx/vpx/vpx_integer.h                |   10 +-
 media/libvpx/vpx_config.h                     |    2 +
 media/libvpx/vpx_config_arm-linux-gcc.c       |    7 +
 media/libvpx/vpx_config_arm-linux-gcc.h       |   11 +-
 media/libvpx/vpx_config_generic-gnu.c         |    7 +
 media/libvpx/vpx_config_generic-gnu.h         |   11 +-
 media/libvpx/vpx_config_x86-darwin9-gcc.asm   |    4 +-
 media/libvpx/vpx_config_x86-darwin9-gcc.c     |    7 +
 media/libvpx/vpx_config_x86-darwin9-gcc.h     |   11 +-
 media/libvpx/vpx_config_x86-linux-gcc.asm     |    4 +-
 media/libvpx/vpx_config_x86-linux-gcc.c       |    7 +
 media/libvpx/vpx_config_x86-linux-gcc.h       |   11 +-
 media/libvpx/vpx_config_x86-win32-vs8.asm     |    4 +-
 media/libvpx/vpx_config_x86-win32-vs8.c       |    7 +
 media/libvpx/vpx_config_x86-win32-vs8.h       |   11 +-
 .../libvpx/vpx_config_x86_64-darwin9-gcc.asm  |    4 +-
 media/libvpx/vpx_config_x86_64-darwin9-gcc.c  |    7 +
 media/libvpx/vpx_config_x86_64-darwin9-gcc.h  |   11 +-
 media/libvpx/vpx_config_x86_64-linux-gcc.asm  |    4 +-
 media/libvpx/vpx_config_x86_64-linux-gcc.c    |    7 +
 media/libvpx/vpx_config_x86_64-linux-gcc.h    |   11 +-
 media/libvpx/vpx_config_x86_64-win64-vs8.asm  |    4 +-
 media/libvpx/vpx_config_x86_64-win64-vs8.c    |    7 +
 media/libvpx/vpx_config_x86_64-win64-vs8.h    |   11 +-
 media/libvpx/vpx_mem/include/vpx_mem_intrnl.h |    2 +-
 media/libvpx/vpx_ports/arm.h                  |    2 +-
 media/libvpx/vpx_ports/arm_cpudetect.c        |   30 +-
 media/libvpx/vpx_ports/x86.h                  |    2 +-
 .../vpx_scale/arm/arm_scalesystemdependent.c  |   30 +
 .../arm/neon/vp8_vpxyv12_copy_y_neon.asm      |  122 ++
 .../neon/vp8_vpxyv12_copyframe_func_neon.asm  |  233 ++
 .../neon/vp8_vpxyv12_copyframeyonly_neon.asm  |  500 -----
 .../vp8_vpxyv12_extendframeborders_neon.asm   |  308 +++
 .../vpx_scale/arm/neon/yv12extend_arm.c       |   25 +
 media/libvpx/vpx_scale/arm/yv12extend_arm.h   |   28 +
 .../vpx_scale/generic/scalesystemdependent.c  |   24 +-
 media/libvpx/vpx_scale/generic/vpxscale.c     |    4 -
 media/libvpx/vpx_scale/generic/yv12extend.c   |    5 +-
 .../vpx_scale/generic/yv12extend_generic.h    |   25 +
 media/libvpx/vpx_scale/vpxscale.h             |   26 +-
 media/libvpx/vpx_scale/yv12extend.h           |   13 +-
 media/libvpx/vpx_version.h                    |   10 +-
 287 files changed, 16717 insertions(+), 11024 deletions(-)
 create mode 100644 media/libvpx/I1bad27ea.patch
 create mode 100644 media/libvpx/I256a37c6.patch
 create mode 100644 media/libvpx/I3915d597.patch
 create mode 100644 media/libvpx/I42ab00e3.patch
 create mode 100644 media/libvpx/I6f2b218d.patch
 create mode 100644 media/libvpx/I8a35831e.patch
 create mode 100644 media/libvpx/I9713c9f0.patch
 mode change 100644 => 100755 media/libvpx/build/make/ads2gas.pl
 create mode 100644 media/libvpx/textrels.patch
 create mode 100644 media/libvpx/variance-invoke.patch
 rename media/libvpx/vp8/{decoder => common}/arm/armv6/dequant_idct_v6.asm (90%)
 rename media/libvpx/vp8/{decoder => common}/arm/armv6/dequantize_v6.asm (100%)
 create mode 100644 media/libvpx/vp8/common/arm/armv6/idct_blk_v6.c
 create mode 100644 media/libvpx/vp8/common/arm/armv6/intra4x4_predict_v6.asm
 delete mode 100644 media/libvpx/vp8/common/arm/armv6/recon_v6.asm
 rename media/libvpx/vp8/{encoder => common}/arm/armv6/vp8_mse16x16_armv6.asm (100%)
 rename media/libvpx/vp8/{encoder => common}/arm/armv6/vp8_sad16x16_armv6.asm (100%)
 rename media/libvpx/vp8/{encoder => common}/arm/armv6/vp8_variance16x16_armv6.asm (98%)
 rename media/libvpx/vp8/{encoder => common}/arm/armv6/vp8_variance8x8_armv6.asm (100%)
 rename media/libvpx/vp8/{encoder => common}/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm (99%)
 rename media/libvpx/vp8/{encoder => common}/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm (99%)
 rename media/libvpx/vp8/{encoder => common}/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm (99%)
 rename media/libvpx/vp8/{decoder => common}/arm/dequantize_arm.c (79%)
 rename media/libvpx/vp8/{decoder => common}/arm/dequantize_arm.h (64%)
 rename media/libvpx/vp8/{decoder => common}/arm/neon/dequant_idct_neon.asm (81%)
 rename media/libvpx/vp8/{decoder => common}/arm/neon/dequantizeb_neon.asm (100%)
 create mode 100644 media/libvpx/vp8/common/arm/neon/idct_blk_neon.c
 rename media/libvpx/vp8/{decoder => common}/arm/neon/idct_dequant_0_2x_neon.asm (72%)
 rename media/libvpx/vp8/{decoder => common}/arm/neon/idct_dequant_full_2x_neon.asm (82%)
 delete mode 100644 media/libvpx/vp8/common/arm/neon/recon16x16mb_neon.asm
 delete mode 100644 media/libvpx/vp8/common/arm/neon/recon2b_neon.asm
 delete mode 100644 media/libvpx/vp8/common/arm/neon/recon4b_neon.asm
 delete mode 100644 media/libvpx/vp8/common/arm/neon/recon_neon.c
 delete mode 100644 media/libvpx/vp8/common/arm/neon/reconb_neon.asm
 rename media/libvpx/vp8/{encoder => common}/arm/neon/sad16_neon.asm (100%)
 rename media/libvpx/vp8/{encoder => common}/arm/neon/sad8_neon.asm (100%)
 delete mode 100644 media/libvpx/vp8/common/arm/neon/shortidct4x4llm_1_neon.asm
 rename media/libvpx/vp8/{encoder => common}/arm/neon/variance_neon.asm (94%)
 rename media/libvpx/vp8/{encoder => common}/arm/neon/vp8_mse16x16_neon.asm (100%)
 rename media/libvpx/vp8/{encoder => common}/arm/neon/vp8_subpixelvariance16x16_neon.asm (98%)
 rename media/libvpx/vp8/{encoder => common}/arm/neon/vp8_subpixelvariance16x16s_neon.asm (98%)
 rename media/libvpx/vp8/{encoder => common}/arm/neon/vp8_subpixelvariance8x8_neon.asm (97%)
 rename media/libvpx/vp8/{encoder => common}/arm/variance_arm.c (99%)
 rename media/libvpx/vp8/{encoder => common}/arm/variance_arm.h (100%)
 create mode 100644 media/libvpx/vp8/common/default_coef_probs.h
 delete mode 100644 media/libvpx/vp8/common/defaultcoefcounts.h
 create mode 100644 media/libvpx/vp8/common/dequantize.c
 rename media/libvpx/vp8/{decoder => common}/dequantize.h (65%)
 delete mode 100644 media/libvpx/vp8/common/g_common.h
 create mode 100644 media/libvpx/vp8/common/idct_blk.c
 delete mode 100644 media/libvpx/vp8/common/invtrans.c
 delete mode 100644 media/libvpx/vp8/common/recon.c
 rename media/libvpx/vp8/{encoder => common}/sad_c.c (99%)
 delete mode 100644 media/libvpx/vp8/common/textblit.c
 delete mode 100644 media/libvpx/vp8/common/type_aliases.h
 rename media/libvpx/vp8/{encoder => common}/variance.h (97%)
 rename media/libvpx/vp8/{encoder => common}/variance_c.c (94%)
 rename media/libvpx/vp8/{decoder => common}/x86/dequantize_mmx.asm (50%)
 rename media/libvpx/vp8/{decoder => common}/x86/dequantize_x86.h (76%)
 create mode 100644 media/libvpx/vp8/common/x86/filter_x86.c
 create mode 100644 media/libvpx/vp8/common/x86/filter_x86.h
 create mode 100644 media/libvpx/vp8/common/x86/idct_blk_mmx.c
 create mode 100644 media/libvpx/vp8/common/x86/idct_blk_sse2.c
 create mode 100644 media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm
 rename media/libvpx/vp8/common/{common_types.h => x86/postproc_x86.c} (57%)
 rename media/libvpx/vp8/{encoder => common}/x86/sad_mmx.asm (97%)
 rename media/libvpx/vp8/{encoder => common}/x86/sad_sse2.asm (94%)
 rename media/libvpx/vp8/{encoder => common}/x86/sad_sse3.asm (99%)
 rename media/libvpx/vp8/{encoder => common}/x86/sad_sse4.asm (100%)
 rename media/libvpx/vp8/{encoder => common}/x86/sad_ssse3.asm (64%)
 rename media/libvpx/vp8/{encoder => common}/x86/variance_impl_mmx.asm (99%)
 rename media/libvpx/vp8/{encoder => common}/x86/variance_impl_sse2.asm (99%)
 rename media/libvpx/vp8/{encoder => common}/x86/variance_impl_ssse3.asm (93%)
 rename media/libvpx/vp8/{encoder => common}/x86/variance_mmx.c (85%)
 rename media/libvpx/vp8/{encoder => common}/x86/variance_sse2.c (96%)
 rename media/libvpx/vp8/{encoder => common}/x86/variance_ssse3.c (96%)
 rename media/libvpx/vp8/{encoder => common}/x86/variance_x86.h (97%)
 delete mode 100644 media/libvpx/vp8/decoder/arm/armv6/dequant_dc_idct_v6.asm
 delete mode 100644 media/libvpx/vp8/decoder/arm/armv6/idct_blk_v6.c
 delete mode 100644 media/libvpx/vp8/decoder/arm/neon/idct_blk_neon.c
 delete mode 100644 media/libvpx/vp8/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm
 delete mode 100644 media/libvpx/vp8/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm
 create mode 100644 media/libvpx/vp8/decoder/asm_dec_offsets.c
 delete mode 100644 media/libvpx/vp8/decoder/dequantize.c
 delete mode 100644 media/libvpx/vp8/decoder/idct_blk.c
 delete mode 100644 media/libvpx/vp8/decoder/x86/idct_blk_mmx.c
 delete mode 100644 media/libvpx/vp8/decoder/x86/idct_blk_sse2.c
 create mode 100644 media/libvpx/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm
 rename media/libvpx/vp8/encoder/arm/armv6/{vp8_fast_fdct4x4_armv6.asm => vp8_short_fdct4x4_armv6.asm} (99%)
 create mode 100644 media/libvpx/vp8/encoder/arm/boolhuff_arm.c
 delete mode 100644 media/libvpx/vp8/encoder/arm/neon/fastfdct4x4_neon.asm
 delete mode 100644 media/libvpx/vp8/encoder/arm/neon/fastfdct8x4_neon.asm
 create mode 100644 media/libvpx/vp8/encoder/arm/neon/picklpf_arm.c
 delete mode 100644 media/libvpx/vp8/encoder/arm/picklpf_arm.c
 create mode 100644 media/libvpx/vp8/encoder/arm/quantize_arm.c
 rename media/libvpx/vp8/{common/defaultcoefcounts.c => encoder/defaultcoefcounts.h} (97%)
 create mode 100644 media/libvpx/vp8/encoder/mr_dissim.c
 rename media/libvpx/{vpx_ports/config.h => vp8/encoder/mr_dissim.h} (72%)
 create mode 100644 media/libvpx/vpx_scale/arm/arm_scalesystemdependent.c
 create mode 100644 media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm
 create mode 100644 media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm
 delete mode 100644 media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm
 create mode 100644 media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm
 create mode 100644 media/libvpx/vpx_scale/arm/neon/yv12extend_arm.c
 create mode 100644 media/libvpx/vpx_scale/arm/yv12extend_arm.h
 create mode 100644 media/libvpx/vpx_scale/generic/yv12extend_generic.h

diff --git a/configure.in b/configure.in
index 09cd5023da6..f82bff0ca14 100644
--- a/configure.in
+++ b/configure.in
@@ -310,6 +310,7 @@ if test -n "$gonkdir" ; then
     kernel_name=`uname -s | tr "[[:upper:]]" "[[:lower:]]"`
     android_source="$gonkdir"
     ANDROID_SOURCE="$android_source"
+    ANDROID_NDK="${ANDROID_SOURCE}/ndk"
 
     dnl set up compilers
     AS="$gonk_toolchain_prefix"as
diff --git a/media/libvpx/I1bad27ea.patch b/media/libvpx/I1bad27ea.patch
new file mode 100644
index 00000000000..ad526bd81e1
--- /dev/null
+++ b/media/libvpx/I1bad27ea.patch
@@ -0,0 +1,624 @@
+# HG changeset patch
+# Parent 5a1a0398f8503451582602525c3e7b35def5d0b9
+# User Timothy B. Terriberry <tterribe@vt.edu>
+Fix variance overflow
+
+Upstream Change-Id: I1bad27ea0720067def6d71a6da5f789508cec265
+
+diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm b/media/libvpx/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm
+--- a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm
++++ b/media/libvpx/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm
+@@ -139,16 +139,16 @@ loop
+     subs    r12, r12, #1
+ 
+     bne     loop
+ 
+     ; return stuff
+     ldr     r6, [sp, #40]       ; get address of sse
+     mul     r0, r8, r8          ; sum * sum
+     str     r11, [r6]           ; store sse
+-    sub     r0, r11, r0, asr #8 ; return (sse - ((sum * sum) >> 8))
++    sub     r0, r11, r0, lsr #8 ; return (sse - ((sum * sum) >> 8))
+ 
+     ldmfd   sp!, {r4-r12, pc}
+ 
+     ENDP
+ 
+     END
+ 
+diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm b/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
+--- a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
++++ b/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
+@@ -164,17 +164,17 @@ loop
+     subs    r12, r12, #1
+ 
+     bne     loop
+ 
+     ; return stuff
+     ldr     r6, [sp, #40]       ; get address of sse
+     mul     r0, r8, r8          ; sum * sum
+     str     r11, [r6]           ; store sse
+-    sub     r0, r11, r0, asr #8 ; return (sse - ((sum * sum) >> 8))
++    sub     r0, r11, r0, lsr #8 ; return (sse - ((sum * sum) >> 8))
+ 
+     ldmfd   sp!, {r4-r12, pc}
+ 
+     ENDP
+ 
+ c80808080
+     DCD     0x80808080
+ 
+diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm b/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
+--- a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
++++ b/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
+@@ -205,17 +205,17 @@ loop
+     smlad   r11, r7, r7, r11    ; dual signed multiply, add and accumulate (2)
+ 
+     bne     loop
+ 
+     ; return stuff
+     ldr     r6, [sp, #40]       ; get address of sse
+     mul     r0, r8, r8          ; sum * sum
+     str     r11, [r6]           ; store sse
+-    sub     r0, r11, r0, asr #8 ; return (sse - ((sum * sum) >> 8))
++    sub     r0, r11, r0, lsr #8 ; return (sse - ((sum * sum) >> 8))
+ 
+     ldmfd   sp!, {r4-r12, pc}
+ 
+     ENDP
+ 
+ c80808080
+     DCD     0x80808080
+ 
+diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm b/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
+--- a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
++++ b/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
+@@ -166,17 +166,17 @@ loop
+     subs    r12, r12, #1
+ 
+     bne     loop
+ 
+     ; return stuff
+     ldr     r6, [sp, #40]       ; get address of sse
+     mul     r0, r8, r8          ; sum * sum
+     str     r11, [r6]           ; store sse
+-    sub     r0, r11, r0, asr #8 ; return (sse - ((sum * sum) >> 8))
++    sub     r0, r11, r0, lsr #8 ; return (sse - ((sum * sum) >> 8))
+ 
+     ldmfd   sp!, {r4-r12, pc}
+ 
+     ENDP
+ 
+ c80808080
+     DCD     0x80808080
+ 
+diff --git a/media/libvpx/vp8/encoder/arm/neon/variance_neon.asm b/media/libvpx/vp8/encoder/arm/neon/variance_neon.asm
+--- a/media/libvpx/vp8/encoder/arm/neon/variance_neon.asm
++++ b/media/libvpx/vp8/encoder/arm/neon/variance_neon.asm
+@@ -72,24 +72,24 @@ variance16x16_neon_loop
+     vpaddl.u32      q1, q10
+     vadd.s64        d0, d0, d1
+     vadd.u64        d1, d2, d3
+ 
+     ;vmov.32        r0, d0[0]                   ;this instruction costs a lot
+     ;vmov.32        r1, d1[0]
+     ;mul            r0, r0, r0
+     ;str            r1, [r12]
+-    ;sub            r0, r1, r0, asr #8
++    ;sub            r0, r1, r0, lsr #8
+ 
+-    ;sum is in [-255x256, 255x256]. sumxsum is 32-bit. Shift to right should
+-    ;have sign-bit exension, which is vshr.s. Have to use s32 to make it right.
++    ; while sum is signed, sum * sum is always positive and must be treated as
++    ; unsigned to avoid propagating the sign bit.
+     vmull.s32       q5, d0, d0
+     vst1.32         {d1[0]}, [r12]              ;store sse
+-    vshr.s32        d10, d10, #8
+-    vsub.s32        d0, d1, d10
++    vshr.u32        d10, d10, #8
++    vsub.u32        d0, d1, d10
+ 
+     vmov.32         r0, d0[0]                   ;return
+     bx              lr
+ 
+     ENDP
+ 
+ ;================================
+ ;unsigned int vp8_variance16x8_c(
+@@ -140,18 +140,18 @@ variance16x8_neon_loop
+     ldr             r12, [sp]                   ;load *sse from stack
+ 
+     vpaddl.u32      q1, q10
+     vadd.s64        d0, d0, d1
+     vadd.u64        d1, d2, d3
+ 
+     vmull.s32       q5, d0, d0
+     vst1.32         {d1[0]}, [r12]              ;store sse
+-    vshr.s32        d10, d10, #7
+-    vsub.s32        d0, d1, d10
++    vshr.u32        d10, d10, #7
++    vsub.u32        d0, d1, d10
+ 
+     vmov.32         r0, d0[0]                   ;return
+     bx              lr
+ 
+     ENDP
+ 
+ ;=================================
+ ;unsigned int vp8_variance8x16_c(
+@@ -195,18 +195,18 @@ variance8x16_neon_loop
+     ldr             r12, [sp]                   ;load *sse from stack
+ 
+     vpaddl.u32      q1, q10
+     vadd.s64        d0, d0, d1
+     vadd.u64        d1, d2, d3
+ 
+     vmull.s32       q5, d0, d0
+     vst1.32         {d1[0]}, [r12]              ;store sse
+-    vshr.s32        d10, d10, #7
+-    vsub.s32        d0, d1, d10
++    vshr.u32        d10, d10, #7
++    vsub.u32        d0, d1, d10
+ 
+     vmov.32         r0, d0[0]                   ;return
+     bx              lr
+ 
+     ENDP
+ 
+ ;==================================
+ ; r0    unsigned char *src_ptr
+@@ -260,17 +260,17 @@ variance8x8_neon_loop
+     ldr             r12, [sp]                   ;load *sse from stack
+ 
+     vpaddl.u32      q1, q10
+     vadd.s64        d0, d0, d1
+     vadd.u64        d1, d2, d3
+ 
+     vmull.s32       q5, d0, d0
+     vst1.32         {d1[0]}, [r12]              ;store sse
+-    vshr.s32        d10, d10, #6
+-    vsub.s32        d0, d1, d10
++    vshr.u32        d10, d10, #6
++    vsub.u32        d0, d1, d10
+ 
+     vmov.32         r0, d0[0]                   ;return
+     bx              lr
+ 
+     ENDP
+ 
+     END
+diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm b/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm
+--- a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm
++++ b/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm
+@@ -400,18 +400,18 @@ sub_pixel_variance16x16_neon_loop
+     vpaddl.s32      q0, q8                      ;accumulate sum
+ 
+     vpaddl.u32      q1, q10
+     vadd.s64        d0, d0, d1
+     vadd.u64        d1, d2, d3
+ 
+     vmull.s32       q5, d0, d0
+     vst1.32         {d1[0]}, [r6]               ;store sse
+-    vshr.s32        d10, d10, #8
+-    vsub.s32        d0, d1, d10
++    vshr.u32        d10, d10, #8
++    vsub.u32        d0, d1, d10
+ 
+     add             sp, sp, #528
+     vmov.32         r0, d0[0]                   ;return
+ 
+     pop             {r4-r6,pc}
+ 
+     ENDP
+ 
+diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm b/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm
+--- a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm
++++ b/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm
+@@ -107,18 +107,18 @@ vp8_filt_fpo16x16s_4_0_loop_neon
+     vpaddl.s32      q0, q8                      ;accumulate sum
+ 
+     vpaddl.u32      q1, q10
+     vadd.s64        d0, d0, d1
+     vadd.u64        d1, d2, d3
+ 
+     vmull.s32       q5, d0, d0
+     vst1.32         {d1[0]}, [lr]               ;store sse
+-    vshr.s32        d10, d10, #8
+-    vsub.s32        d0, d1, d10
++    vshr.u32        d10, d10, #8
++    vsub.u32        d0, d1, d10
+ 
+     vmov.32         r0, d0[0]                   ;return
+     pop             {pc}
+     ENDP
+ 
+ ;================================================
+ ;unsigned int vp8_variance_halfpixvar16x16_v_neon
+ ;(
+@@ -203,18 +203,18 @@ vp8_filt_spo16x16s_0_4_loop_neon
+     vpaddl.s32      q0, q8                      ;accumulate sum
+ 
+     vpaddl.u32      q1, q10
+     vadd.s64        d0, d0, d1
+     vadd.u64        d1, d2, d3
+ 
+     vmull.s32       q5, d0, d0
+     vst1.32         {d1[0]}, [lr]               ;store sse
+-    vshr.s32        d10, d10, #8
+-    vsub.s32        d0, d1, d10
++    vshr.u32        d10, d10, #8
++    vsub.u32        d0, d1, d10
+ 
+     vmov.32         r0, d0[0]                   ;return
+     pop             {pc}
+     ENDP
+ 
+ ;================================================
+ ;unsigned int vp8_variance_halfpixvar16x16_hv_neon
+ ;(
+@@ -322,18 +322,18 @@ vp8_filt16x16s_4_4_loop_neon
+     vpaddl.s32      q0, q13                      ;accumulate sum
+ 
+     vpaddl.u32      q1, q15
+     vadd.s64        d0, d0, d1
+     vadd.u64        d1, d2, d3
+ 
+     vmull.s32       q5, d0, d0
+     vst1.32         {d1[0]}, [lr]               ;store sse
+-    vshr.s32        d10, d10, #8
+-    vsub.s32        d0, d1, d10
++    vshr.u32        d10, d10, #8
++    vsub.u32        d0, d1, d10
+ 
+     vmov.32         r0, d0[0]                   ;return
+     pop             {pc}
+     ENDP
+ 
+ ;==============================
+ ; r0    unsigned char  *src_ptr,
+ ; r1    int  src_pixels_per_line,
+@@ -555,18 +555,18 @@ sub_pixel_variance16x16s_neon_loop
+     vpaddl.s32      q0, q8                      ;accumulate sum
+ 
+     vpaddl.u32      q1, q10
+     vadd.s64        d0, d0, d1
+     vadd.u64        d1, d2, d3
+ 
+     vmull.s32       q5, d0, d0
+     vst1.32         {d1[0]}, [lr]               ;store sse
+-    vshr.s32        d10, d10, #8
+-    vsub.s32        d0, d1, d10
++    vshr.u32        d10, d10, #8
++    vsub.u32        d0, d1, d10
+ 
+     add             sp, sp, #256
+     vmov.32         r0, d0[0]                   ;return
+ 
+     pop             {r4, pc}
+     ENDP
+ 
+     END
+diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm b/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm
+--- a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm
++++ b/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm
+@@ -201,18 +201,18 @@ sub_pixel_variance8x8_neon_loop
+     vpaddl.s32      q0, q8                      ;accumulate sum
+ 
+     vpaddl.u32      q1, q10
+     vadd.s64        d0, d0, d1
+     vadd.u64        d1, d2, d3
+ 
+     vmull.s32       q5, d0, d0
+     vst1.32         {d1[0]}, [lr]               ;store sse
+-    vshr.s32        d10, d10, #6
+-    vsub.s32        d0, d1, d10
++    vshr.u32        d10, d10, #6
++    vsub.u32        d0, d1, d10
+ 
+     vmov.32         r0, d0[0]                   ;return
+     pop             {r4-r5, pc}
+ 
+     ENDP
+ 
+ ;-----------------
+ 
+diff --git a/media/libvpx/vp8/encoder/variance_c.c b/media/libvpx/vp8/encoder/variance_c.c
+--- a/media/libvpx/vp8/encoder/variance_c.c
++++ b/media/libvpx/vp8/encoder/variance_c.c
+@@ -70,82 +70,82 @@ unsigned int vp8_variance16x16_c(
+     unsigned int *sse)
+ {
+     unsigned int var;
+     int avg;
+ 
+ 
+     variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 16, &var, &avg);
+     *sse = var;
+-    return (var - ((avg * avg) >> 8));
++    return (var - ((unsigned int)(avg * avg) >> 8));
+ }
+ 
+ unsigned int vp8_variance8x16_c(
+     const unsigned char *src_ptr,
+     int  source_stride,
+     const unsigned char *ref_ptr,
+     int  recon_stride,
+     unsigned int *sse)
+ {
+     unsigned int var;
+     int avg;
+ 
+ 
+     variance(src_ptr, source_stride, ref_ptr, recon_stride, 8, 16, &var, &avg);
+     *sse = var;
+-    return (var - ((avg * avg) >> 7));
++    return (var - ((unsigned int)(avg * avg) >> 7));
+ }
+ 
+ unsigned int vp8_variance16x8_c(
+     const unsigned char *src_ptr,
+     int  source_stride,
+     const unsigned char *ref_ptr,
+     int  recon_stride,
+     unsigned int *sse)
+ {
+     unsigned int var;
+     int avg;
+ 
+ 
+     variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 8, &var, &avg);
+     *sse = var;
+-    return (var - ((avg * avg) >> 7));
++    return (var - ((unsigned int)(avg * avg) >> 7));
+ }
+ 
+ 
+ unsigned int vp8_variance8x8_c(
+     const unsigned char *src_ptr,
+     int  source_stride,
+     const unsigned char *ref_ptr,
+     int  recon_stride,
+     unsigned int *sse)
+ {
+     unsigned int var;
+     int avg;
+ 
+ 
+     variance(src_ptr, source_stride, ref_ptr, recon_stride, 8, 8, &var, &avg);
+     *sse = var;
+-    return (var - ((avg * avg) >> 6));
++    return (var - ((unsigned int)(avg * avg) >> 6));
+ }
+ 
+ unsigned int vp8_variance4x4_c(
+     const unsigned char *src_ptr,
+     int  source_stride,
+     const unsigned char *ref_ptr,
+     int  recon_stride,
+     unsigned int *sse)
+ {
+     unsigned int var;
+     int avg;
+ 
+ 
+     variance(src_ptr, source_stride, ref_ptr, recon_stride, 4, 4, &var, &avg);
+     *sse = var;
+-    return (var - ((avg * avg) >> 4));
++    return (var - ((unsigned int)(avg * avg) >> 4));
+ }
+ 
+ 
+ unsigned int vp8_mse16x16_c(
+     const unsigned char *src_ptr,
+     int  source_stride,
+     const unsigned char *ref_ptr,
+     int  recon_stride,
+diff --git a/media/libvpx/vp8/encoder/x86/variance_mmx.c b/media/libvpx/vp8/encoder/x86/variance_mmx.c
+--- a/media/libvpx/vp8/encoder/x86/variance_mmx.c
++++ b/media/libvpx/vp8/encoder/x86/variance_mmx.c
+@@ -86,34 +86,34 @@ unsigned int vp8_variance4x4_mmx(
+     int  recon_stride,
+     unsigned int *sse)
+ {
+     unsigned int var;
+     int avg;
+ 
+     vp8_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
+     *sse = var;
+-    return (var - ((avg * avg) >> 4));
++    return (var - ((unsigned int)(avg * avg) >> 4));
+ 
+ }
+ 
+ unsigned int vp8_variance8x8_mmx(
+     const unsigned char *src_ptr,
+     int  source_stride,
+     const unsigned char *ref_ptr,
+     int  recon_stride,
+     unsigned int *sse)
+ {
+     unsigned int var;
+     int avg;
+ 
+     vp8_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
+     *sse = var;
+ 
+-    return (var - ((avg * avg) >> 6));
++    return (var - ((unsigned int)(avg * avg) >> 6));
+ 
+ }
+ 
+ unsigned int vp8_mse16x16_mmx(
+     const unsigned char *src_ptr,
+     int  source_stride,
+     const unsigned char *ref_ptr,
+     int  recon_stride,
+@@ -148,17 +148,17 @@ unsigned int vp8_variance16x16_mmx(
+     vp8_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0) ;
+     vp8_get8x8var_mmx(src_ptr + 8, source_stride, ref_ptr + 8, recon_stride, &sse1, &sum1);
+     vp8_get8x8var_mmx(src_ptr + 8 * source_stride, source_stride, ref_ptr + 8 * recon_stride, recon_stride, &sse2, &sum2) ;
+     vp8_get8x8var_mmx(src_ptr + 8 * source_stride + 8, source_stride, ref_ptr + 8 * recon_stride + 8, recon_stride, &sse3, &sum3);
+ 
+     var = sse0 + sse1 + sse2 + sse3;
+     avg = sum0 + sum1 + sum2 + sum3;
+     *sse = var;
+-    return (var - ((avg * avg) >> 8));
++    return (var - ((unsigned int)(avg * avg) >> 8));
+ }
+ 
+ unsigned int vp8_variance16x8_mmx(
+     const unsigned char *src_ptr,
+     int  source_stride,
+     const unsigned char *ref_ptr,
+     int  recon_stride,
+     unsigned int *sse)
+@@ -167,17 +167,17 @@ unsigned int vp8_variance16x8_mmx(
+     int sum0, sum1, avg;
+ 
+     vp8_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0) ;
+     vp8_get8x8var_mmx(src_ptr + 8, source_stride, ref_ptr + 8, recon_stride, &sse1, &sum1);
+ 
+     var = sse0 + sse1;
+     avg = sum0 + sum1;
+     *sse = var;
+-    return (var - ((avg * avg) >> 7));
++    return (var - ((unsigned int)(avg * avg) >> 7));
+ 
+ }
+ 
+ 
+ unsigned int vp8_variance8x16_mmx(
+     const unsigned char *src_ptr,
+     int  source_stride,
+     const unsigned char *ref_ptr,
+@@ -189,17 +189,17 @@ unsigned int vp8_variance8x16_mmx(
+ 
+     vp8_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0) ;
+     vp8_get8x8var_mmx(src_ptr + 8 * source_stride, source_stride, ref_ptr + 8 * recon_stride, recon_stride, &sse1, &sum1) ;
+ 
+     var = sse0 + sse1;
+     avg = sum0 + sum1;
+     *sse = var;
+ 
+-    return (var - ((avg * avg) >> 7));
++    return (var - ((unsigned int)(avg * avg) >> 7));
+ 
+ }
+ 
+ 
+ unsigned int vp8_sub_pixel_variance4x4_mmx
+ (
+     const unsigned char  *src_ptr,
+     int  src_pixels_per_line,
+diff --git a/media/libvpx/vp8/encoder/x86/variance_sse2.c b/media/libvpx/vp8/encoder/x86/variance_sse2.c
+--- a/media/libvpx/vp8/encoder/x86/variance_sse2.c
++++ b/media/libvpx/vp8/encoder/x86/variance_sse2.c
+@@ -143,34 +143,34 @@ unsigned int vp8_variance4x4_wmt(
+     int  recon_stride,
+     unsigned int *sse)
+ {
+     unsigned int var;
+     int avg;
+ 
+     vp8_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
+     *sse = var;
+-    return (var - ((avg * avg) >> 4));
++    return (var - ((unsigned int)(avg * avg) >> 4));
+ 
+ }
+ 
+ unsigned int vp8_variance8x8_wmt
+ (
+     const unsigned char *src_ptr,
+     int  source_stride,
+     const unsigned char *ref_ptr,
+     int  recon_stride,
+     unsigned int *sse)
+ {
+     unsigned int var;
+     int avg;
+ 
+     vp8_get8x8var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
+     *sse = var;
+-    return (var - ((avg * avg) >> 6));
++    return (var - ((unsigned int)(avg * avg) >> 6));
+ 
+ }
+ 
+ 
+ unsigned int vp8_variance16x16_wmt
+ (
+     const unsigned char *src_ptr,
+     int  source_stride,
+@@ -215,17 +215,17 @@ unsigned int vp8_variance16x8_wmt
+     int sum0, sum1, avg;
+ 
+     vp8_get8x8var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0) ;
+     vp8_get8x8var_sse2(src_ptr + 8, source_stride, ref_ptr + 8, recon_stride, &sse1, &sum1);
+ 
+     var = sse0 + sse1;
+     avg = sum0 + sum1;
+     *sse = var;
+-    return (var - ((avg * avg) >> 7));
++    return (var - ((unsigned int)(avg * avg) >> 7));
+ 
+ }
+ 
+ unsigned int vp8_variance8x16_wmt
+ (
+     const unsigned char *src_ptr,
+     int  source_stride,
+     const unsigned char *ref_ptr,
+@@ -236,17 +236,17 @@ unsigned int vp8_variance8x16_wmt
+     int sum0, sum1, avg;
+ 
+     vp8_get8x8var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0) ;
+     vp8_get8x8var_sse2(src_ptr + 8 * source_stride, source_stride, ref_ptr + 8 * recon_stride, recon_stride, &sse1, &sum1) ;
+ 
+     var = sse0 + sse1;
+     avg = sum0 + sum1;
+     *sse = var;
+-    return (var - ((avg * avg) >> 7));
++    return (var - ((unsigned int)(avg * avg) >> 7));
+ 
+ }
+ 
+ unsigned int vp8_sub_pixel_variance4x4_wmt
+ (
+     const unsigned char  *src_ptr,
+     int  src_pixels_per_line,
+     int  xoffset,
+diff --git a/media/libvpx/vp8/encoder/x86/variance_ssse3.c b/media/libvpx/vp8/encoder/x86/variance_ssse3.c
+--- a/media/libvpx/vp8/encoder/x86/variance_ssse3.c
++++ b/media/libvpx/vp8/encoder/x86/variance_ssse3.c
+@@ -107,17 +107,17 @@ unsigned int vp8_sub_pixel_variance16x16
+         vp8_filter_block2d_bil_var_ssse3(
+             src_ptr, src_pixels_per_line,
+             dst_ptr, dst_pixels_per_line, 16,
+             xoffset, yoffset,
+             &xsum0, &xxsum0);
+     }
+ 
+     *sse = xxsum0;
+-    return (xxsum0 - ((xsum0 * xsum0) >> 8));
++    return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8));
+ }
+ 
+ unsigned int vp8_sub_pixel_variance16x8_ssse3
+ (
+     const unsigned char  *src_ptr,
+     int  src_pixels_per_line,
+     int  xoffset,
+     int  yoffset,
+@@ -156,10 +156,10 @@ unsigned int vp8_sub_pixel_variance16x8_
+         vp8_filter_block2d_bil_var_ssse3(
+             src_ptr, src_pixels_per_line,
+             dst_ptr, dst_pixels_per_line, 8,
+             xoffset, yoffset,
+             &xsum0, &xxsum0);
+     }
+ 
+     *sse = xxsum0;
+-    return (xxsum0 - ((xsum0 * xsum0) >> 7));
++    return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 7));
+ }
diff --git a/media/libvpx/I256a37c6.patch b/media/libvpx/I256a37c6.patch
new file mode 100644
index 00000000000..797cbf8b798
--- /dev/null
+++ b/media/libvpx/I256a37c6.patch
@@ -0,0 +1,1932 @@
+# HG changeset patch
+# Parent 677ab41568f1a8427e3e43a6ce9b0d7c822b1f7e
+# User Timothy B. Terriberry <tterribe@vt.edu>
+Move SAD and variance functions to common
+
+Upstream Change-Id: I256a37c6de079fe92ce744b1f11e16526d06b50a
+
+This patch contains substantial differences compared to the upstream
+one, as it still uses the old RTCD framework and does not include
+the extra short-circuiting work done in upstream change
+I05ce5b2d34e6d45fb3ec2a450aa99c4f3343bf3a.
+
+diff --git a/media/libvpx/vp8/common/arm/arm_systemdependent.c b/media/libvpx/vp8/common/arm/arm_systemdependent.c
+--- a/media/libvpx/vp8/common/arm/arm_systemdependent.c
++++ b/media/libvpx/vp8/common/arm/arm_systemdependent.c
+@@ -11,16 +11,17 @@
+ 
+ #include "vpx_config.h"
+ #include "vpx_ports/arm.h"
+ #include "vp8/common/pragmas.h"
+ #include "vp8/common/subpixel.h"
+ #include "vp8/common/loopfilter.h"
+ #include "vp8/common/recon.h"
+ #include "vp8/common/idct.h"
++#include "vp8/common/variance.h"
+ #include "vp8/common/onyxc_int.h"
+ 
+ void vp8_arch_arm_common_init(VP8_COMMON *ctx)
+ {
+ #if CONFIG_RUNTIME_CPU_DETECT
+     VP8_COMMON_RTCD *rtcd = &ctx->rtcd;
+     int flags = arm_cpu_caps();
+     rtcd->flags = flags;
+@@ -63,16 +64,41 @@ void vp8_arch_arm_common_init(VP8_COMMON
+         rtcd->recon.copy8x4     = vp8_copy_mem8x4_v6;
+         rtcd->recon.intra4x4_predict = vp8_intra4x4_predict_armv6;
+ 
+         rtcd->dequant.block               = vp8_dequantize_b_v6;
+         rtcd->dequant.idct_add            = vp8_dequant_idct_add_v6;
+         rtcd->dequant.idct_add_y_block    = vp8_dequant_idct_add_y_block_v6;
+         rtcd->dequant.idct_add_uv_block   = vp8_dequant_idct_add_uv_block_v6;
+ 
++        rtcd->variance.sad16x16              = vp8_sad16x16_armv6;
++        /*rtcd->variance.sad16x8               = vp8_sad16x8_c;
++        rtcd->variance.sad8x16               = vp8_sad8x16_c;
++        rtcd->variance.sad8x8                = vp8_sad8x8_c;
++        rtcd->variance.sad4x4                = vp8_sad4x4_c;*/
++
++        /*rtcd->variance.var4x4                = vp8_variance4x4_c;*/
++        rtcd->variance.var8x8                = vp8_variance8x8_armv6;
++        /*rtcd->variance.var8x16               = vp8_variance8x16_c;
++        rtcd->variance.var16x8               = vp8_variance16x8_c;*/
++        rtcd->variance.var16x16              = vp8_variance16x16_armv6;
++
++        /*rtcd->variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;*/
++        rtcd->variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_armv6;
++        /*rtcd->variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
++        rtcd->variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;*/
++        rtcd->variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_armv6;
++        rtcd->variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_armv6;
++        rtcd->variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_armv6;
++        rtcd->variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_armv6;
++
++        rtcd->variance.mse16x16              = vp8_mse16x16_armv6;
++        /*rtcd->variance.getmbss               = vp8_get_mb_ss_c;*/
++
++        /*rtcd->variance.get4x4sse_cs          = vp8_get4x4sse_cs_c;*/
+     }
+ #endif
+ 
+ #if HAVE_ARMV7
+     if (flags & HAS_NEON)
+     {
+         rtcd->subpix.sixtap16x16   = vp8_sixtap_predict16x16_neon;
+         rtcd->subpix.sixtap8x8     = vp8_sixtap_predict8x8_neon;
+@@ -103,13 +129,38 @@ void vp8_arch_arm_common_init(VP8_COMMON
+         rtcd->recon.build_intra_predictors_mby_s =
+             vp8_build_intra_predictors_mby_s_neon;
+ 
+         rtcd->dequant.block               = vp8_dequantize_b_neon;
+         rtcd->dequant.idct_add            = vp8_dequant_idct_add_neon;
+         rtcd->dequant.idct_add_y_block    = vp8_dequant_idct_add_y_block_neon;
+         rtcd->dequant.idct_add_uv_block   = vp8_dequant_idct_add_uv_block_neon;
+ 
++        rtcd->variance.sad16x16              = vp8_sad16x16_neon;
++        rtcd->variance.sad16x8               = vp8_sad16x8_neon;
++        rtcd->variance.sad8x16               = vp8_sad8x16_neon;
++        rtcd->variance.sad8x8                = vp8_sad8x8_neon;
++        rtcd->variance.sad4x4                = vp8_sad4x4_neon;
++
++        /*rtcd->variance.var4x4                = vp8_variance4x4_c;*/
++        rtcd->variance.var8x8                = vp8_variance8x8_neon;
++        rtcd->variance.var8x16               = vp8_variance8x16_neon;
++        rtcd->variance.var16x8               = vp8_variance16x8_neon;
++        rtcd->variance.var16x16              = vp8_variance16x16_neon;
++
++        /*rtcd->variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;*/
++        rtcd->variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_neon;
++        /*rtcd->variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
++        rtcd->variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;*/
++        rtcd->variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_neon;
++        rtcd->variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_neon;
++        rtcd->variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_neon;
++        rtcd->variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_neon;
++
++        rtcd->variance.mse16x16              = vp8_mse16x16_neon;
++        /*rtcd->variance.getmbss               = vp8_get_mb_ss_c;*/
++
++        rtcd->variance.get4x4sse_cs          = vp8_get4x4sse_cs_neon;
+     }
+ #endif
+ 
+ #endif
+ }
+diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_mse16x16_armv6.asm
+rename from media/libvpx/vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm
+rename to media/libvpx/vp8/common/arm/armv6/vp8_mse16x16_armv6.asm
+diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_sad16x16_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_sad16x16_armv6.asm
+rename from media/libvpx/vp8/encoder/arm/armv6/vp8_sad16x16_armv6.asm
+rename to media/libvpx/vp8/common/arm/armv6/vp8_sad16x16_armv6.asm
+diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm
+rename from media/libvpx/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm
+rename to media/libvpx/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm
+diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance8x8_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_variance8x8_armv6.asm
+rename from media/libvpx/vp8/encoder/arm/armv6/vp8_variance8x8_armv6.asm
+rename to media/libvpx/vp8/common/arm/armv6/vp8_variance8x8_armv6.asm
+diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
+rename from media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
+rename to media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
+diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
+rename from media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
+rename to media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
+diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
+rename from media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
+rename to media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
+diff --git a/media/libvpx/vp8/encoder/arm/neon/sad16_neon.asm b/media/libvpx/vp8/common/arm/neon/sad16_neon.asm
+rename from media/libvpx/vp8/encoder/arm/neon/sad16_neon.asm
+rename to media/libvpx/vp8/common/arm/neon/sad16_neon.asm
+diff --git a/media/libvpx/vp8/encoder/arm/neon/sad8_neon.asm b/media/libvpx/vp8/common/arm/neon/sad8_neon.asm
+rename from media/libvpx/vp8/encoder/arm/neon/sad8_neon.asm
+rename to media/libvpx/vp8/common/arm/neon/sad8_neon.asm
+diff --git a/media/libvpx/vp8/encoder/arm/neon/variance_neon.asm b/media/libvpx/vp8/common/arm/neon/variance_neon.asm
+rename from media/libvpx/vp8/encoder/arm/neon/variance_neon.asm
+rename to media/libvpx/vp8/common/arm/neon/variance_neon.asm
+diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_mse16x16_neon.asm b/media/libvpx/vp8/common/arm/neon/vp8_mse16x16_neon.asm
+rename from media/libvpx/vp8/encoder/arm/neon/vp8_mse16x16_neon.asm
+rename to media/libvpx/vp8/common/arm/neon/vp8_mse16x16_neon.asm
+diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm
+rename from media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm
+rename to media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm
+diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm
+rename from media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm
+rename to media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm
+diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm
+rename from media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm
+rename to media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm
+diff --git a/media/libvpx/vp8/encoder/arm/variance_arm.c b/media/libvpx/vp8/common/arm/variance_arm.c
+rename from media/libvpx/vp8/encoder/arm/variance_arm.c
+rename to media/libvpx/vp8/common/arm/variance_arm.c
+--- a/media/libvpx/vp8/encoder/arm/variance_arm.c
++++ b/media/libvpx/vp8/common/arm/variance_arm.c
+@@ -4,17 +4,17 @@
+  *  Use of this source code is governed by a BSD-style license
+  *  that can be found in the LICENSE file in the root of the source
+  *  tree. An additional intellectual property rights grant can be found
+  *  in the file PATENTS.  All contributing project authors may
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+ #include "vpx_config.h"
+-#include "vp8/encoder/variance.h"
++#include "vp8/common/variance.h"
+ #include "vp8/common/filter.h"
+ 
+ #if HAVE_ARMV6
+ #include "vp8/common/arm/bilinearfilter_arm.h"
+ 
+ unsigned int vp8_sub_pixel_variance8x8_armv6
+ (
+     const unsigned char  *src_ptr,
+diff --git a/media/libvpx/vp8/encoder/arm/variance_arm.h b/media/libvpx/vp8/common/arm/variance_arm.h
+rename from media/libvpx/vp8/encoder/arm/variance_arm.h
+rename to media/libvpx/vp8/common/arm/variance_arm.h
+diff --git a/media/libvpx/vp8/common/generic/systemdependent.c b/media/libvpx/vp8/common/generic/systemdependent.c
+--- a/media/libvpx/vp8/common/generic/systemdependent.c
++++ b/media/libvpx/vp8/common/generic/systemdependent.c
+@@ -9,16 +9,17 @@
+  */
+ 
+ 
+ #include "vpx_config.h"
+ #include "vp8/common/subpixel.h"
+ #include "vp8/common/loopfilter.h"
+ #include "vp8/common/recon.h"
+ #include "vp8/common/idct.h"
++#include "vp8/common/variance.h"
+ #include "vp8/common/onyxc_int.h"
+ 
+ #if CONFIG_MULTITHREAD
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #elif defined(_WIN32)
+ #include <windows.h>
+ typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
+@@ -110,16 +111,67 @@ void vp8_machine_specific_config(VP8_COM
+     rtcd->loopfilter.normal_b_v  = vp8_loop_filter_bv_c;
+     rtcd->loopfilter.normal_mb_h = vp8_loop_filter_mbh_c;
+     rtcd->loopfilter.normal_b_h  = vp8_loop_filter_bh_c;
+     rtcd->loopfilter.simple_mb_v = vp8_loop_filter_simple_vertical_edge_c;
+     rtcd->loopfilter.simple_b_v  = vp8_loop_filter_bvs_c;
+     rtcd->loopfilter.simple_mb_h = vp8_loop_filter_simple_horizontal_edge_c;
+     rtcd->loopfilter.simple_b_h  = vp8_loop_filter_bhs_c;
+ 
++    rtcd->variance.sad16x16              = vp8_sad16x16_c;
++    rtcd->variance.sad16x8               = vp8_sad16x8_c;
++    rtcd->variance.sad8x16               = vp8_sad8x16_c;
++    rtcd->variance.sad8x8                = vp8_sad8x8_c;
++    rtcd->variance.sad4x4                = vp8_sad4x4_c;
++
++    rtcd->variance.sad16x16x3            = vp8_sad16x16x3_c;
++    rtcd->variance.sad16x8x3             = vp8_sad16x8x3_c;
++    rtcd->variance.sad8x16x3             = vp8_sad8x16x3_c;
++    rtcd->variance.sad8x8x3              = vp8_sad8x8x3_c;
++    rtcd->variance.sad4x4x3              = vp8_sad4x4x3_c;
++
++    rtcd->variance.sad16x16x8            = vp8_sad16x16x8_c;
++    rtcd->variance.sad16x8x8             = vp8_sad16x8x8_c;
++    rtcd->variance.sad8x16x8             = vp8_sad8x16x8_c;
++    rtcd->variance.sad8x8x8              = vp8_sad8x8x8_c;
++    rtcd->variance.sad4x4x8              = vp8_sad4x4x8_c;
++
++    rtcd->variance.sad16x16x4d           = vp8_sad16x16x4d_c;
++    rtcd->variance.sad16x8x4d            = vp8_sad16x8x4d_c;
++    rtcd->variance.sad8x16x4d            = vp8_sad8x16x4d_c;
++    rtcd->variance.sad8x8x4d             = vp8_sad8x8x4d_c;
++    rtcd->variance.sad4x4x4d             = vp8_sad4x4x4d_c;
++#if ARCH_X86 || ARCH_X86_64
++    rtcd->variance.copy32xn              = vp8_copy32xn_c;
++#endif
++    rtcd->variance.var4x4                = vp8_variance4x4_c;
++    rtcd->variance.var8x8                = vp8_variance8x8_c;
++    rtcd->variance.var8x16               = vp8_variance8x16_c;
++    rtcd->variance.var16x8               = vp8_variance16x8_c;
++    rtcd->variance.var16x16              = vp8_variance16x16_c;
++
++    rtcd->variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;
++    rtcd->variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_c;
++    rtcd->variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
++    rtcd->variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;
++    rtcd->variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_c;
++    rtcd->variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_c;
++    rtcd->variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_c;
++    rtcd->variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_c;
++    rtcd->variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_c;
++
++    rtcd->variance.mse16x16              = vp8_mse16x16_c;
++    rtcd->variance.getmbss               = vp8_get_mb_ss_c;
++
++    rtcd->variance.get4x4sse_cs          = vp8_get4x4sse_cs_c;
++#if CONFIG_INTERNAL_STATS
++    rtcd->variance.ssimpf_8x8            = vp8_ssim_parms_8x8_c;
++    rtcd->variance.ssimpf_16x16          = vp8_ssim_parms_16x16_c;
++#endif
++
+ #if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_INTERNAL_STATS)
+     rtcd->postproc.down             = vp8_mbpost_proc_down_c;
+     rtcd->postproc.across           = vp8_mbpost_proc_across_ip_c;
+     rtcd->postproc.downacross       = vp8_post_proc_down_and_across_c;
+     rtcd->postproc.addnoise         = vp8_plane_add_noise_c;
+     rtcd->postproc.blend_mb_inner   = vp8_blend_mb_inner_c;
+     rtcd->postproc.blend_mb_outer   = vp8_blend_mb_outer_c;
+     rtcd->postproc.blend_b          = vp8_blend_b_c;
+diff --git a/media/libvpx/vp8/common/onyxc_int.h b/media/libvpx/vp8/common/onyxc_int.h
+--- a/media/libvpx/vp8/common/onyxc_int.h
++++ b/media/libvpx/vp8/common/onyxc_int.h
+@@ -14,16 +14,17 @@
+ 
+ #include "vpx_config.h"
+ #include "vpx/internal/vpx_codec_internal.h"
+ #include "loopfilter.h"
+ #include "entropymv.h"
+ #include "entropy.h"
+ #include "idct.h"
+ #include "recon.h"
++#include "variance.h"
+ #if CONFIG_POSTPROC
+ #include "postproc.h"
+ #endif
+ #include "dequantize.h"
+ 
+ /*#ifdef PACKET_TESTING*/
+ #include "header.h"
+ /*#endif*/
+@@ -74,16 +75,17 @@ typedef enum
+ typedef struct VP8_COMMON_RTCD
+ {
+ #if CONFIG_RUNTIME_CPU_DETECT
+     vp8_dequant_rtcd_vtable_t        dequant;
+     vp8_idct_rtcd_vtable_t        idct;
+     vp8_recon_rtcd_vtable_t       recon;
+     vp8_subpix_rtcd_vtable_t      subpix;
+     vp8_loopfilter_rtcd_vtable_t  loopfilter;
++    vp8_variance_rtcd_vtable_t    variance;
+ #if CONFIG_POSTPROC
+     vp8_postproc_rtcd_vtable_t    postproc;
+ #endif
+     int                           flags;
+ #else
+     int unused;
+ #endif
+ } VP8_COMMON_RTCD;
+diff --git a/media/libvpx/vp8/common/postproc.c b/media/libvpx/vp8/common/postproc.c
+--- a/media/libvpx/vp8/common/postproc.c
++++ b/media/libvpx/vp8/common/postproc.c
+@@ -12,17 +12,17 @@
+ #include "vpx_config.h"
+ #include "vpx_scale/yv12config.h"
+ #include "postproc.h"
+ #include "common.h"
+ #include "recon.h"
+ #include "vpx_scale/yv12extend.h"
+ #include "vpx_scale/vpxscale.h"
+ #include "systemdependent.h"
+-#include "../encoder/variance.h"
++#include "variance.h"
+ 
+ #include <math.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
+ #define RGB_TO_YUV(t)                                                                       \
+     ( (0.257*(float)(t>>16)) + (0.504*(float)(t>>8&0xff)) + (0.098*(float)(t&0xff)) + 16),  \
+     (-(0.148*(float)(t>>16)) - (0.291*(float)(t>>8&0xff)) + (0.439*(float)(t&0xff)) + 128), \
+diff --git a/media/libvpx/vp8/encoder/sad_c.c b/media/libvpx/vp8/common/sad_c.c
+rename from media/libvpx/vp8/encoder/sad_c.c
+rename to media/libvpx/vp8/common/sad_c.c
+diff --git a/media/libvpx/vp8/encoder/variance.h b/media/libvpx/vp8/common/variance.h
+rename from media/libvpx/vp8/encoder/variance.h
+rename to media/libvpx/vp8/common/variance.h
+--- a/media/libvpx/vp8/encoder/variance.h
++++ b/media/libvpx/vp8/common/variance.h
+@@ -78,31 +78,31 @@
+     ( \
+       const unsigned char  *src_ptr, \
+       int  source_stride, \
+       int  xoffset, \
+       int  yoffset, \
+       const unsigned char *ref_ptr, \
+       int Refstride, \
+       unsigned int *sse \
+-    );
++    )
+ 
+ #define prototype_ssimpf(sym) \
+     void (sym) \
+       ( \
+         unsigned char *s, \
+         int sp, \
+         unsigned char *r, \
+         int rp, \
+         unsigned long *sum_s, \
+         unsigned long *sum_r, \
+         unsigned long *sum_sq_s, \
+         unsigned long *sum_sq_r, \
+         unsigned long *sum_sxr \
+-      );
++      )
+ 
+ #define prototype_getmbss(sym) unsigned int (sym)(const short *)
+ 
+ #define prototype_get16x16prederror(sym)\
+     unsigned int (sym)\
+     (\
+      const unsigned char *src_ptr, \
+      int source_stride, \
+@@ -318,22 +318,22 @@ extern prototype_variance(vp8_variance_m
+ #ifndef vp8_variance_get4x4sse_cs
+ #define vp8_variance_get4x4sse_cs vp8_get4x4sse_cs_c
+ #endif
+ extern prototype_get16x16prederror(vp8_variance_get4x4sse_cs);
+ 
+ #ifndef vp8_ssimpf_8x8
+ #define vp8_ssimpf_8x8 vp8_ssim_parms_8x8_c
+ #endif
+-extern prototype_ssimpf(vp8_ssimpf_8x8)
++extern prototype_ssimpf(vp8_ssimpf_8x8);
+ 
+ #ifndef vp8_ssimpf_16x16
+ #define vp8_ssimpf_16x16 vp8_ssim_parms_16x16_c
+ #endif
+-extern prototype_ssimpf(vp8_ssimpf_16x16)
++extern prototype_ssimpf(vp8_ssimpf_16x16);
+ 
+ typedef prototype_sad(*vp8_sad_fn_t);
+ typedef prototype_sad_multi_same_address(*vp8_sad_multi_fn_t);
+ typedef prototype_sad_multi_same_address_1(*vp8_sad_multi1_fn_t);
+ typedef prototype_sad_multi_dif_address(*vp8_sad_multi_d_fn_t);
+ typedef prototype_variance(*vp8_variance_fn_t);
+ typedef prototype_variance2(*vp8_variance2_fn_t);
+ typedef prototype_subpixvariance(*vp8_subpixvariance_fn_t);
+diff --git a/media/libvpx/vp8/encoder/variance_c.c b/media/libvpx/vp8/common/variance_c.c
+rename from media/libvpx/vp8/encoder/variance_c.c
+rename to media/libvpx/vp8/common/variance_c.c
+--- a/media/libvpx/vp8/encoder/variance_c.c
++++ b/media/libvpx/vp8/common/variance_c.c
+@@ -5,17 +5,17 @@
+  *  that can be found in the LICENSE file in the root of the source
+  *  tree. An additional intellectual property rights grant can be found
+  *  in the file PATENTS.  All contributing project authors may
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+ 
+ #include "variance.h"
+-#include "vp8/common/filter.h"
++#include "filter.h"
+ 
+ 
+ unsigned int vp8_get_mb_ss_c
+ (
+     const short *src_ptr
+ )
+ {
+     unsigned int i = 0, sum = 0;
+@@ -451,8 +451,34 @@ unsigned int vp8_sub_pixel_variance8x16_
+     VFilter = vp8_bilinear_filters[yoffset];
+ 
+ 
+     var_filter_block2d_bil_first_pass(src_ptr, FData3, src_pixels_per_line, 1, 17, 8, HFilter);
+     var_filter_block2d_bil_second_pass(FData3, temp2, 8, 8, 16, 8, VFilter);
+ 
+     return vp8_variance8x16_c(temp2, 8, dst_ptr, dst_pixels_per_line, sse);
+ }
++
++unsigned int vp8_get4x4sse_cs_c
++(
++    const unsigned char *src_ptr,
++    int  source_stride,
++    const unsigned char *ref_ptr,
++    int  recon_stride
++)
++{
++    int distortion = 0;
++    int r, c;
++
++    for (r = 0; r < 4; r++)
++    {
++        for (c = 0; c < 4; c++)
++        {
++            int diff = src_ptr[c] - ref_ptr[c];
++            distortion += diff * diff;
++        }
++
++        src_ptr += source_stride;
++        ref_ptr += recon_stride;
++    }
++
++    return distortion;
++}
+diff --git a/media/libvpx/vp8/encoder/x86/sad_mmx.asm b/media/libvpx/vp8/common/x86/sad_mmx.asm
+rename from media/libvpx/vp8/encoder/x86/sad_mmx.asm
+rename to media/libvpx/vp8/common/x86/sad_mmx.asm
+diff --git a/media/libvpx/vp8/encoder/x86/sad_sse2.asm b/media/libvpx/vp8/common/x86/sad_sse2.asm
+rename from media/libvpx/vp8/encoder/x86/sad_sse2.asm
+rename to media/libvpx/vp8/common/x86/sad_sse2.asm
+diff --git a/media/libvpx/vp8/encoder/x86/sad_sse3.asm b/media/libvpx/vp8/common/x86/sad_sse3.asm
+rename from media/libvpx/vp8/encoder/x86/sad_sse3.asm
+rename to media/libvpx/vp8/common/x86/sad_sse3.asm
+diff --git a/media/libvpx/vp8/encoder/x86/sad_sse4.asm b/media/libvpx/vp8/common/x86/sad_sse4.asm
+rename from media/libvpx/vp8/encoder/x86/sad_sse4.asm
+rename to media/libvpx/vp8/common/x86/sad_sse4.asm
+diff --git a/media/libvpx/vp8/encoder/x86/sad_ssse3.asm b/media/libvpx/vp8/common/x86/sad_ssse3.asm
+rename from media/libvpx/vp8/encoder/x86/sad_ssse3.asm
+rename to media/libvpx/vp8/common/x86/sad_ssse3.asm
+diff --git a/media/libvpx/vp8/encoder/x86/variance_impl_mmx.asm b/media/libvpx/vp8/common/x86/variance_impl_mmx.asm
+rename from media/libvpx/vp8/encoder/x86/variance_impl_mmx.asm
+rename to media/libvpx/vp8/common/x86/variance_impl_mmx.asm
+diff --git a/media/libvpx/vp8/encoder/x86/variance_impl_sse2.asm b/media/libvpx/vp8/common/x86/variance_impl_sse2.asm
+rename from media/libvpx/vp8/encoder/x86/variance_impl_sse2.asm
+rename to media/libvpx/vp8/common/x86/variance_impl_sse2.asm
+diff --git a/media/libvpx/vp8/encoder/x86/variance_impl_ssse3.asm b/media/libvpx/vp8/common/x86/variance_impl_ssse3.asm
+rename from media/libvpx/vp8/encoder/x86/variance_impl_ssse3.asm
+rename to media/libvpx/vp8/common/x86/variance_impl_ssse3.asm
+diff --git a/media/libvpx/vp8/encoder/x86/variance_mmx.c b/media/libvpx/vp8/common/x86/variance_mmx.c
+rename from media/libvpx/vp8/encoder/x86/variance_mmx.c
+rename to media/libvpx/vp8/common/x86/variance_mmx.c
+--- a/media/libvpx/vp8/encoder/x86/variance_mmx.c
++++ b/media/libvpx/vp8/common/x86/variance_mmx.c
+@@ -4,17 +4,17 @@
+  *  Use of this source code is governed by a BSD-style license
+  *  that can be found in the LICENSE file in the root of the source
+  *  tree. An additional intellectual property rights grant can be found
+  *  in the file PATENTS.  All contributing project authors may
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+ #include "vpx_config.h"
+-#include "vp8/encoder/variance.h"
++#include "vp8/common/variance.h"
+ #include "vp8/common/pragmas.h"
+ #include "vpx_ports/mem.h"
+ #include "vp8/common/x86/filter_x86.h"
+ 
+ extern void filter_block1d_h6_mmx
+ (
+     const unsigned char *src_ptr,
+     unsigned short *output_ptr,
+diff --git a/media/libvpx/vp8/encoder/x86/variance_sse2.c b/media/libvpx/vp8/common/x86/variance_sse2.c
+rename from media/libvpx/vp8/encoder/x86/variance_sse2.c
+rename to media/libvpx/vp8/common/x86/variance_sse2.c
+--- a/media/libvpx/vp8/encoder/x86/variance_sse2.c
++++ b/media/libvpx/vp8/common/x86/variance_sse2.c
+@@ -4,17 +4,17 @@
+  *  Use of this source code is governed by a BSD-style license
+  *  that can be found in the LICENSE file in the root of the source
+  *  tree. An additional intellectual property rights grant can be found
+  *  in the file PATENTS.  All contributing project authors may
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+ #include "vpx_config.h"
+-#include "vp8/encoder/variance.h"
++#include "vp8/common/variance.h"
+ #include "vp8/common/pragmas.h"
+ #include "vpx_ports/mem.h"
+ #include "vp8/common/x86/filter_x86.h"
+ 
+ extern void filter_block1d_h6_mmx(const unsigned char *src_ptr, unsigned short *output_ptr, unsigned int src_pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *filter);
+ extern void filter_block1d_v6_mmx(const short *src_ptr, unsigned char *output_ptr, unsigned int pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *filter);
+ extern void filter_block1d8_h6_sse2(const unsigned char *src_ptr, unsigned short *output_ptr, unsigned int src_pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *filter);
+ extern void filter_block1d8_v6_sse2(const short *src_ptr, unsigned char *output_ptr, unsigned int pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *filter);
+diff --git a/media/libvpx/vp8/encoder/x86/variance_ssse3.c b/media/libvpx/vp8/common/x86/variance_ssse3.c
+rename from media/libvpx/vp8/encoder/x86/variance_ssse3.c
+rename to media/libvpx/vp8/common/x86/variance_ssse3.c
+--- a/media/libvpx/vp8/encoder/x86/variance_ssse3.c
++++ b/media/libvpx/vp8/common/x86/variance_ssse3.c
+@@ -4,17 +4,17 @@
+  *  Use of this source code is governed by a BSD-style license
+  *  that can be found in the LICENSE file in the root of the source
+  *  tree. An additional intellectual property rights grant can be found
+  *  in the file PATENTS.  All contributing project authors may
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+ #include "vpx_config.h"
+-#include "vp8/encoder/variance.h"
++#include "vp8/common/variance.h"
+ #include "vp8/common/pragmas.h"
+ #include "vpx_ports/mem.h"
+ 
+ extern unsigned int vp8_get16x16var_sse2
+ (
+     const unsigned char *src_ptr,
+     int source_stride,
+     const unsigned char *ref_ptr,
+diff --git a/media/libvpx/vp8/encoder/x86/variance_x86.h b/media/libvpx/vp8/common/x86/variance_x86.h
+rename from media/libvpx/vp8/encoder/x86/variance_x86.h
+rename to media/libvpx/vp8/common/x86/variance_x86.h
+--- a/media/libvpx/vp8/encoder/x86/variance_x86.h
++++ b/media/libvpx/vp8/common/x86/variance_x86.h
+@@ -135,18 +135,18 @@ extern prototype_subpixvariance(vp8_sub_
+ extern prototype_variance(vp8_variance_halfpixvar16x16_h_wmt);
+ extern prototype_variance(vp8_variance_halfpixvar16x16_v_wmt);
+ extern prototype_variance(vp8_variance_halfpixvar16x16_hv_wmt);
+ extern prototype_subpixvariance(vp8_sub_pixel_mse16x16_wmt);
+ extern prototype_getmbss(vp8_get_mb_ss_sse2);
+ extern prototype_variance(vp8_mse16x16_wmt);
+ extern prototype_variance2(vp8_get8x8var_sse2);
+ extern prototype_variance2(vp8_get16x16var_sse2);
+-extern prototype_ssimpf(vp8_ssim_parms_8x8_sse2)
+-extern prototype_ssimpf(vp8_ssim_parms_16x16_sse2)
++extern prototype_ssimpf(vp8_ssim_parms_8x8_sse2);
++extern prototype_ssimpf(vp8_ssim_parms_16x16_sse2);
+ 
+ #if !CONFIG_RUNTIME_CPU_DETECT
+ #undef  vp8_variance_sad4x4
+ #define vp8_variance_sad4x4 vp8_sad4x4_wmt
+ 
+ #undef  vp8_variance_sad8x8
+ #define vp8_variance_sad8x8 vp8_sad8x8_wmt
+ 
+diff --git a/media/libvpx/vp8/common/x86/x86_systemdependent.c b/media/libvpx/vp8/common/x86/x86_systemdependent.c
+--- a/media/libvpx/vp8/common/x86/x86_systemdependent.c
++++ b/media/libvpx/vp8/common/x86/x86_systemdependent.c
+@@ -10,16 +10,17 @@
+ 
+ 
+ #include "vpx_config.h"
+ #include "vpx_ports/x86.h"
+ #include "vp8/common/subpixel.h"
+ #include "vp8/common/loopfilter.h"
+ #include "vp8/common/recon.h"
+ #include "vp8/common/idct.h"
++#include "vp8/common/variance.h"
+ #include "vp8/common/pragmas.h"
+ #include "vp8/common/onyxc_int.h"
+ 
+ void vp8_arch_x86_common_init(VP8_COMMON *ctx)
+ {
+ #if CONFIG_RUNTIME_CPU_DETECT
+     VP8_COMMON_RTCD *rtcd = &ctx->rtcd;
+     int flags = x86_simd_caps();
+@@ -62,16 +63,43 @@ void vp8_arch_x86_common_init(VP8_COMMON
+         rtcd->loopfilter.normal_b_v  = vp8_loop_filter_bv_mmx;
+         rtcd->loopfilter.normal_mb_h = vp8_loop_filter_mbh_mmx;
+         rtcd->loopfilter.normal_b_h  = vp8_loop_filter_bh_mmx;
+         rtcd->loopfilter.simple_mb_v = vp8_loop_filter_simple_vertical_edge_mmx;
+         rtcd->loopfilter.simple_b_v  = vp8_loop_filter_bvs_mmx;
+         rtcd->loopfilter.simple_mb_h = vp8_loop_filter_simple_horizontal_edge_mmx;
+         rtcd->loopfilter.simple_b_h  = vp8_loop_filter_bhs_mmx;
+ 
++        rtcd->variance.sad16x16              = vp8_sad16x16_mmx;
++        rtcd->variance.sad16x8               = vp8_sad16x8_mmx;
++        rtcd->variance.sad8x16               = vp8_sad8x16_mmx;
++        rtcd->variance.sad8x8                = vp8_sad8x8_mmx;
++        rtcd->variance.sad4x4                = vp8_sad4x4_mmx;
++
++        rtcd->variance.var4x4                = vp8_variance4x4_mmx;
++        rtcd->variance.var8x8                = vp8_variance8x8_mmx;
++        rtcd->variance.var8x16               = vp8_variance8x16_mmx;
++        rtcd->variance.var16x8               = vp8_variance16x8_mmx;
++        rtcd->variance.var16x16              = vp8_variance16x16_mmx;
++
++        rtcd->variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_mmx;
++        rtcd->variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_mmx;
++        rtcd->variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_mmx;
++        rtcd->variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_mmx;
++        rtcd->variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_mmx;
++        rtcd->variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_mmx;
++        rtcd->variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_mmx;
++        rtcd->variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_mmx;
++        rtcd->variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_mmx;
++
++        rtcd->variance.mse16x16              = vp8_mse16x16_mmx;
++        rtcd->variance.getmbss               = vp8_get_mb_ss_mmx;
++
++        rtcd->variance.get4x4sse_cs          = vp8_get4x4sse_cs_mmx;
++
+ #if CONFIG_POSTPROC
+         rtcd->postproc.down        = vp8_mbpost_proc_down_mmx;
+         /*rtcd->postproc.across      = vp8_mbpost_proc_across_ip_c;*/
+         rtcd->postproc.downacross  = vp8_post_proc_down_and_across_mmx;
+         rtcd->postproc.addnoise    = vp8_plane_add_noise_mmx;
+ #endif
+     }
+ 
+@@ -105,26 +133,81 @@ void vp8_arch_x86_common_init(VP8_COMMON
+         rtcd->loopfilter.normal_b_v  = vp8_loop_filter_bv_sse2;
+         rtcd->loopfilter.normal_mb_h = vp8_loop_filter_mbh_sse2;
+         rtcd->loopfilter.normal_b_h  = vp8_loop_filter_bh_sse2;
+         rtcd->loopfilter.simple_mb_v = vp8_loop_filter_simple_vertical_edge_sse2;
+         rtcd->loopfilter.simple_b_v  = vp8_loop_filter_bvs_sse2;
+         rtcd->loopfilter.simple_mb_h = vp8_loop_filter_simple_horizontal_edge_sse2;
+         rtcd->loopfilter.simple_b_h  = vp8_loop_filter_bhs_sse2;
+ 
++        rtcd->variance.sad16x16              = vp8_sad16x16_wmt;
++        rtcd->variance.sad16x8               = vp8_sad16x8_wmt;
++        rtcd->variance.sad8x16               = vp8_sad8x16_wmt;
++        rtcd->variance.sad8x8                = vp8_sad8x8_wmt;
++        rtcd->variance.sad4x4                = vp8_sad4x4_wmt;
++        rtcd->variance.copy32xn              = vp8_copy32xn_sse2;
++
++        rtcd->variance.var4x4                = vp8_variance4x4_wmt;
++        rtcd->variance.var8x8                = vp8_variance8x8_wmt;
++        rtcd->variance.var8x16               = vp8_variance8x16_wmt;
++        rtcd->variance.var16x8               = vp8_variance16x8_wmt;
++        rtcd->variance.var16x16              = vp8_variance16x16_wmt;
++
++        rtcd->variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_wmt;
++        rtcd->variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_wmt;
++        rtcd->variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_wmt;
++        rtcd->variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_wmt;
++        rtcd->variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_wmt;
++        rtcd->variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_wmt;
++        rtcd->variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_wmt;
++        rtcd->variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_wmt;
++        rtcd->variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_wmt;
++
++        rtcd->variance.mse16x16              = vp8_mse16x16_wmt;
++        rtcd->variance.getmbss               = vp8_get_mb_ss_sse2;
++
++        /* rtcd->variance.get4x4sse_cs  not implemented for wmt */;
++
++#if CONFIG_INTERNAL_STATS
++#if ARCH_X86_64
++        rtcd->variance.ssimpf_8x8            = vp8_ssim_parms_8x8_sse2;
++        rtcd->variance.ssimpf_16x16          = vp8_ssim_parms_16x16_sse2;
++#endif
++#endif
++
+ #if CONFIG_POSTPROC
+         rtcd->postproc.down        = vp8_mbpost_proc_down_xmm;
+         rtcd->postproc.across      = vp8_mbpost_proc_across_ip_xmm;
+         rtcd->postproc.downacross  = vp8_post_proc_down_and_across_xmm;
+         rtcd->postproc.addnoise    = vp8_plane_add_noise_wmt;
+ #endif
+     }
+ 
+ #endif
+ 
++#if HAVE_SSE3
++
++    if (flags & HAS_SSE3)
++    {
++        rtcd->variance.sad16x16              = vp8_sad16x16_sse3;
++        rtcd->variance.sad16x16x3            = vp8_sad16x16x3_sse3;
++        rtcd->variance.sad16x8x3             = vp8_sad16x8x3_sse3;
++        rtcd->variance.sad8x16x3             = vp8_sad8x16x3_sse3;
++        rtcd->variance.sad8x8x3              = vp8_sad8x8x3_sse3;
++        rtcd->variance.sad4x4x3              = vp8_sad4x4x3_sse3;
++        rtcd->variance.sad16x16x4d           = vp8_sad16x16x4d_sse3;
++        rtcd->variance.sad16x8x4d            = vp8_sad16x8x4d_sse3;
++        rtcd->variance.sad8x16x4d            = vp8_sad8x16x4d_sse3;
++        rtcd->variance.sad8x8x4d             = vp8_sad8x8x4d_sse3;
++        rtcd->variance.sad4x4x4d             = vp8_sad4x4x4d_sse3;
++        rtcd->variance.copy32xn              = vp8_copy32xn_sse3;
++
++    }
++#endif
++
+ #if HAVE_SSSE3
+ 
+     if (flags & HAS_SSSE3)
+     {
+         rtcd->subpix.sixtap16x16   = vp8_sixtap_predict16x16_ssse3;
+         rtcd->subpix.sixtap8x8     = vp8_sixtap_predict8x8_ssse3;
+         rtcd->subpix.sixtap8x4     = vp8_sixtap_predict8x4_ssse3;
+         rtcd->subpix.sixtap4x4     = vp8_sixtap_predict4x4_ssse3;
+@@ -134,13 +217,30 @@ void vp8_arch_x86_common_init(VP8_COMMON
+         rtcd->recon.build_intra_predictors_mbuv =
+             vp8_build_intra_predictors_mbuv_ssse3;
+         rtcd->recon.build_intra_predictors_mbuv_s =
+             vp8_build_intra_predictors_mbuv_s_ssse3;
+         rtcd->recon.build_intra_predictors_mby =
+             vp8_build_intra_predictors_mby_ssse3;
+         rtcd->recon.build_intra_predictors_mby_s =
+             vp8_build_intra_predictors_mby_s_ssse3;
++
++        rtcd->variance.sad16x16x3            = vp8_sad16x16x3_ssse3;
++        rtcd->variance.sad16x8x3             = vp8_sad16x8x3_ssse3;
++
++        rtcd->variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_ssse3;
++        rtcd->variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_ssse3;
++    }
++#endif
++
++#if HAVE_SSE4_1
++    if (flags & HAS_SSE4_1)
++    {
++        rtcd->variance.sad16x16x8            = vp8_sad16x16x8_sse4;
++        rtcd->variance.sad16x8x8             = vp8_sad16x8x8_sse4;
++        rtcd->variance.sad8x16x8             = vp8_sad8x16x8_sse4;
++        rtcd->variance.sad8x8x8              = vp8_sad8x8x8_sse4;
++        rtcd->variance.sad4x4x8              = vp8_sad4x4x8_sse4;
+     }
+ #endif
+ 
+ #endif
+ }
+diff --git a/media/libvpx/vp8/encoder/arm/arm_csystemdependent.c b/media/libvpx/vp8/encoder/arm/arm_csystemdependent.c
+--- a/media/libvpx/vp8/encoder/arm/arm_csystemdependent.c
++++ b/media/libvpx/vp8/encoder/arm/arm_csystemdependent.c
+@@ -6,17 +6,16 @@
+  *  tree. An additional intellectual property rights grant can be found
+  *  in the file PATENTS.  All contributing project authors may
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+ 
+ #include "vpx_config.h"
+ #include "vpx_ports/arm.h"
+-#include "vp8/encoder/variance.h"
+ #include "vp8/encoder/onyx_int.h"
+ 
+ extern void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
+ extern void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
+ extern void vp8_yv12_copy_partial_frame_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
+ 
+ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
+ {
+@@ -27,42 +26,16 @@ void vp8_arch_arm_encoder_init(VP8_COMP 
+     if (flags & HAS_EDSP)
+     {
+     }
+ #endif
+ 
+ #if HAVE_ARMV6
+     if (flags & HAS_MEDIA)
+     {
+-        cpi->rtcd.variance.sad16x16              = vp8_sad16x16_armv6;
+-        /*cpi->rtcd.variance.sad16x8               = vp8_sad16x8_c;
+-        cpi->rtcd.variance.sad8x16               = vp8_sad8x16_c;
+-        cpi->rtcd.variance.sad8x8                = vp8_sad8x8_c;
+-        cpi->rtcd.variance.sad4x4                = vp8_sad4x4_c;*/
+-
+-        /*cpi->rtcd.variance.var4x4                = vp8_variance4x4_c;*/
+-        cpi->rtcd.variance.var8x8                = vp8_variance8x8_armv6;
+-        /*cpi->rtcd.variance.var8x16               = vp8_variance8x16_c;
+-        cpi->rtcd.variance.var16x8               = vp8_variance16x8_c;*/
+-        cpi->rtcd.variance.var16x16              = vp8_variance16x16_armv6;
+-
+-        /*cpi->rtcd.variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;*/
+-        cpi->rtcd.variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_armv6;
+-        /*cpi->rtcd.variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
+-        cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;*/
+-        cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_armv6;
+-        cpi->rtcd.variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_armv6;
+-        cpi->rtcd.variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_armv6;
+-        cpi->rtcd.variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_armv6;
+-
+-        cpi->rtcd.variance.mse16x16              = vp8_mse16x16_armv6;
+-        /*cpi->rtcd.variance.getmbss               = vp8_get_mb_ss_c;*/
+-
+-        /*cpi->rtcd.variance.get4x4sse_cs          = vp8_get4x4sse_cs_c;*/
+-
+         cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_armv6;
+         cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_armv6;
+         cpi->rtcd.fdct.fast4x4                   = vp8_short_fdct4x4_armv6;
+         cpi->rtcd.fdct.fast8x4                   = vp8_short_fdct8x4_armv6;
+         cpi->rtcd.fdct.walsh_short4x4            = vp8_short_walsh4x4_armv6;
+ 
+         /*cpi->rtcd.encodemb.berr                  = vp8_block_error_c;
+         cpi->rtcd.encodemb.mberr                 = vp8_mbblock_error_c;
+@@ -74,42 +47,16 @@ void vp8_arch_arm_encoder_init(VP8_COMP 
+         /*cpi->rtcd.quantize.quantb                = vp8_regular_quantize_b;*/
+         cpi->rtcd.quantize.fastquantb            = vp8_fast_quantize_b_armv6;
+     }
+ #endif
+ 
+ #if HAVE_ARMV7
+     if (flags & HAS_NEON)
+     {
+-        cpi->rtcd.variance.sad16x16              = vp8_sad16x16_neon;
+-        cpi->rtcd.variance.sad16x8               = vp8_sad16x8_neon;
+-        cpi->rtcd.variance.sad8x16               = vp8_sad8x16_neon;
+-        cpi->rtcd.variance.sad8x8                = vp8_sad8x8_neon;
+-        cpi->rtcd.variance.sad4x4                = vp8_sad4x4_neon;
+-
+-        /*cpi->rtcd.variance.var4x4                = vp8_variance4x4_c;*/
+-        cpi->rtcd.variance.var8x8                = vp8_variance8x8_neon;
+-        cpi->rtcd.variance.var8x16               = vp8_variance8x16_neon;
+-        cpi->rtcd.variance.var16x8               = vp8_variance16x8_neon;
+-        cpi->rtcd.variance.var16x16              = vp8_variance16x16_neon;
+-
+-        /*cpi->rtcd.variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;*/
+-        cpi->rtcd.variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_neon;
+-        /*cpi->rtcd.variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
+-        cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;*/
+-        cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_neon;
+-        cpi->rtcd.variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_neon;
+-        cpi->rtcd.variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_neon;
+-        cpi->rtcd.variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_neon;
+-
+-        cpi->rtcd.variance.mse16x16              = vp8_mse16x16_neon;
+-        /*cpi->rtcd.variance.getmbss               = vp8_get_mb_ss_c;*/
+-
+-        cpi->rtcd.variance.get4x4sse_cs          = vp8_get4x4sse_cs_neon;
+-
+         cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_neon;
+         cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_neon;
+         cpi->rtcd.fdct.fast4x4                   = vp8_short_fdct4x4_neon;
+         cpi->rtcd.fdct.fast8x4                   = vp8_short_fdct8x4_neon;
+         cpi->rtcd.fdct.walsh_short4x4            = vp8_short_walsh4x4_neon;
+ 
+         /*cpi->rtcd.encodemb.berr                  = vp8_block_error_c;
+         cpi->rtcd.encodemb.mberr                 = vp8_mbblock_error_c;
+diff --git a/media/libvpx/vp8/encoder/encodeframe.c b/media/libvpx/vp8/encoder/encodeframe.c
+--- a/media/libvpx/vp8/encoder/encodeframe.c
++++ b/media/libvpx/vp8/encoder/encodeframe.c
+@@ -93,17 +93,17 @@ static unsigned int tt_activity_measure(
+     unsigned int sse;
+     /* TODO: This could also be done over smaller areas (8x8), but that would
+      *  require extensive changes elsewhere, as lambda is assumed to be fixed
+      *  over an entire MB in most of the code.
+      * Another option is to compute four 8x8 variances, and pick a single
+      *  lambda using a non-linear combination (e.g., the smallest, or second
+      *  smallest, etc.).
+      */
+-    act =     VARIANCE_INVOKE(&cpi->rtcd.variance, var16x16)(x->src.y_buffer,
++    act =     VARIANCE_INVOKE(&cpi->common.rtcd.variance, var16x16)(x->src.y_buffer,
+                     x->src.y_stride, VP8_VAR_OFFS, 0, &sse);
+     act = act<<4;
+ 
+     /* If the region is flat, lower the activity some more. */
+     if (act < 8<<12)
+         act = act < 5<<12 ? act : 5<<12;
+ 
+     return act;
+diff --git a/media/libvpx/vp8/encoder/encodeintra.c b/media/libvpx/vp8/encoder/encodeintra.c
+--- a/media/libvpx/vp8/encoder/encodeintra.c
++++ b/media/libvpx/vp8/encoder/encodeintra.c
+@@ -50,17 +50,17 @@ int vp8_encode_intra(VP8_COMP *cpi, MACR
+     {
+         for (i = 0; i < 16; i++)
+         {
+             x->e_mbd.block[i].bmi.as_mode = B_DC_PRED;
+             vp8_encode_intra4x4block(IF_RTCD(&cpi->rtcd), x, i);
+         }
+     }
+ 
+-    intra_pred_var = VARIANCE_INVOKE(&cpi->rtcd.variance, getmbss)(x->src_diff);
++    intra_pred_var = VARIANCE_INVOKE(&cpi->common.rtcd.variance, getmbss)(x->src_diff);
+ 
+     return intra_pred_var;
+ }
+ 
+ void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd,
+                               MACROBLOCK *x, int ib)
+ {
+     BLOCKD *b = &x->e_mbd.block[ib];
+diff --git a/media/libvpx/vp8/encoder/firstpass.c b/media/libvpx/vp8/encoder/firstpass.c
+--- a/media/libvpx/vp8/encoder/firstpass.c
++++ b/media/libvpx/vp8/encoder/firstpass.c
+@@ -7,17 +7,17 @@
+  *  in the file PATENTS.  All contributing project authors may
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+ #include "math.h"
+ #include "limits.h"
+ #include "block.h"
+ #include "onyx_int.h"
+-#include "variance.h"
++#include "vp8/common/variance.h"
+ #include "encodeintra.h"
+ #include "vp8/common/setupintrarecon.h"
+ #include "mcomp.h"
+ #include "firstpass.h"
+ #include "vpx_scale/vpxscale.h"
+ #include "encodemb.h"
+ #include "vp8/common/extend.h"
+ #include "vp8/common/systemdependent.h"
+@@ -404,17 +404,17 @@ static void zz_motion_search( VP8_COMP *
+     unsigned char *ref_ptr;
+     int ref_stride=d->pre_stride;
+ 
+     // Set up pointers for this macro block recon buffer
+     xd->pre.y_buffer = recon_buffer->y_buffer + recon_yoffset;
+ 
+     ref_ptr = (unsigned char *)(*(d->base_pre) + d->pre );
+ 
+-    VARIANCE_INVOKE(IF_RTCD(&cpi->rtcd.variance), mse16x16) ( src_ptr, src_stride, ref_ptr, ref_stride, (unsigned int *)(best_motion_err));
++    VARIANCE_INVOKE(IF_RTCD(&cpi->common.rtcd.variance), mse16x16) ( src_ptr, src_stride, ref_ptr, ref_stride, (unsigned int *)(best_motion_err));
+ }
+ 
+ static void first_pass_motion_search(VP8_COMP *cpi, MACROBLOCK *x,
+                                      int_mv *ref_mv, MV *best_mv,
+                                      YV12_BUFFER_CONFIG *recon_buffer,
+                                      int *best_motion_err, int recon_yoffset )
+ {
+     MACROBLOCKD *const xd = & x->e_mbd;
+@@ -428,17 +428,17 @@ static void first_pass_motion_search(VP8
+     int tmp_err;
+     int step_param = 3;                                       //3;          // Dont search over full range for first pass
+     int further_steps = (MAX_MVSEARCH_STEPS - 1) - step_param; //3;
+     int n;
+     vp8_variance_fn_ptr_t v_fn_ptr = cpi->fn_ptr[BLOCK_16X16];
+     int new_mv_mode_penalty = 256;
+ 
+     // override the default variance function to use MSE
+-    v_fn_ptr.vf    = VARIANCE_INVOKE(IF_RTCD(&cpi->rtcd.variance), mse16x16);
++    v_fn_ptr.vf    = VARIANCE_INVOKE(IF_RTCD(&cpi->common.rtcd.variance), mse16x16);
+ 
+     // Set up pointers for this macro block recon buffer
+     xd->pre.y_buffer = recon_buffer->y_buffer + recon_yoffset;
+ 
+     // Initial step/diamond search centred on best mv
+     tmp_mv.as_int = 0;
+     ref_mv_full.as_mv.col = ref_mv->as_mv.col>>3;
+     ref_mv_full.as_mv.row = ref_mv->as_mv.row>>3;
+diff --git a/media/libvpx/vp8/encoder/generic/csystemdependent.c b/media/libvpx/vp8/encoder/generic/csystemdependent.c
+--- a/media/libvpx/vp8/encoder/generic/csystemdependent.c
++++ b/media/libvpx/vp8/encoder/generic/csystemdependent.c
+@@ -5,78 +5,31 @@
+  *  that can be found in the LICENSE file in the root of the source
+  *  tree. An additional intellectual property rights grant can be found
+  *  in the file PATENTS.  All contributing project authors may
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+ 
+ #include "vpx_config.h"
+-#include "vp8/encoder/variance.h"
+ #include "vp8/encoder/onyx_int.h"
+ 
+ 
+ void vp8_arch_x86_encoder_init(VP8_COMP *cpi);
+ void vp8_arch_arm_encoder_init(VP8_COMP *cpi);
+ 
+ void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc,
+                                         YV12_BUFFER_CONFIG *dst_ybc);
+ extern void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc,
+                                         YV12_BUFFER_CONFIG *dst_ybc);
+ 
+ void vp8_cmachine_specific_config(VP8_COMP *cpi)
+ {
+ #if CONFIG_RUNTIME_CPU_DETECT
+     cpi->rtcd.common                    = &cpi->common.rtcd;
+-    cpi->rtcd.variance.sad16x16              = vp8_sad16x16_c;
+-    cpi->rtcd.variance.sad16x8               = vp8_sad16x8_c;
+-    cpi->rtcd.variance.sad8x16               = vp8_sad8x16_c;
+-    cpi->rtcd.variance.sad8x8                = vp8_sad8x8_c;
+-    cpi->rtcd.variance.sad4x4                = vp8_sad4x4_c;
+-
+-    cpi->rtcd.variance.sad16x16x3            = vp8_sad16x16x3_c;
+-    cpi->rtcd.variance.sad16x8x3             = vp8_sad16x8x3_c;
+-    cpi->rtcd.variance.sad8x16x3             = vp8_sad8x16x3_c;
+-    cpi->rtcd.variance.sad8x8x3              = vp8_sad8x8x3_c;
+-    cpi->rtcd.variance.sad4x4x3              = vp8_sad4x4x3_c;
+-
+-    cpi->rtcd.variance.sad16x16x8            = vp8_sad16x16x8_c;
+-    cpi->rtcd.variance.sad16x8x8             = vp8_sad16x8x8_c;
+-    cpi->rtcd.variance.sad8x16x8             = vp8_sad8x16x8_c;
+-    cpi->rtcd.variance.sad8x8x8              = vp8_sad8x8x8_c;
+-    cpi->rtcd.variance.sad4x4x8              = vp8_sad4x4x8_c;
+-
+-    cpi->rtcd.variance.sad16x16x4d           = vp8_sad16x16x4d_c;
+-    cpi->rtcd.variance.sad16x8x4d            = vp8_sad16x8x4d_c;
+-    cpi->rtcd.variance.sad8x16x4d            = vp8_sad8x16x4d_c;
+-    cpi->rtcd.variance.sad8x8x4d             = vp8_sad8x8x4d_c;
+-    cpi->rtcd.variance.sad4x4x4d             = vp8_sad4x4x4d_c;
+-#if ARCH_X86 || ARCH_X86_64
+-    cpi->rtcd.variance.copy32xn              = vp8_copy32xn_c;
+-#endif
+-    cpi->rtcd.variance.var4x4                = vp8_variance4x4_c;
+-    cpi->rtcd.variance.var8x8                = vp8_variance8x8_c;
+-    cpi->rtcd.variance.var8x16               = vp8_variance8x16_c;
+-    cpi->rtcd.variance.var16x8               = vp8_variance16x8_c;
+-    cpi->rtcd.variance.var16x16              = vp8_variance16x16_c;
+-
+-    cpi->rtcd.variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;
+-    cpi->rtcd.variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_c;
+-    cpi->rtcd.variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
+-    cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;
+-    cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_c;
+-    cpi->rtcd.variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_c;
+-    cpi->rtcd.variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_c;
+-    cpi->rtcd.variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_c;
+-    cpi->rtcd.variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_c;
+-
+-    cpi->rtcd.variance.mse16x16              = vp8_mse16x16_c;
+-    cpi->rtcd.variance.getmbss               = vp8_get_mb_ss_c;
+-
+-    cpi->rtcd.variance.get4x4sse_cs          = vp8_get4x4sse_cs_c;
+ 
+     cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_c;
+     cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_c;
+     cpi->rtcd.fdct.fast4x4                   = vp8_short_fdct4x4_c;
+     cpi->rtcd.fdct.fast8x4                   = vp8_short_fdct8x4_c;
+     cpi->rtcd.fdct.walsh_short4x4            = vp8_short_walsh4x4_c;
+ 
+     cpi->rtcd.encodemb.berr                  = vp8_block_error_c;
+@@ -91,20 +44,16 @@ void vp8_cmachine_specific_config(VP8_CO
+     cpi->rtcd.quantize.fastquantb            = vp8_fast_quantize_b_c;
+     cpi->rtcd.quantize.fastquantb_pair       = vp8_fast_quantize_b_pair_c;
+     cpi->rtcd.search.full_search             = vp8_full_search_sad;
+     cpi->rtcd.search.refining_search         = vp8_refining_search_sad;
+     cpi->rtcd.search.diamond_search          = vp8_diamond_search_sad;
+ #if !(CONFIG_REALTIME_ONLY)
+     cpi->rtcd.temporal.apply                 = vp8_temporal_filter_apply_c;
+ #endif
+-#if CONFIG_INTERNAL_STATS
+-    cpi->rtcd.variance.ssimpf_8x8            = vp8_ssim_parms_8x8_c;
+-    cpi->rtcd.variance.ssimpf_16x16          = vp8_ssim_parms_16x16_c;
+-#endif
+ #endif
+ 
+     // Pure C:
+     vp8_yv12_copy_partial_frame_ptr = vp8_yv12_copy_partial_frame;
+ 
+ #if ARCH_X86 || ARCH_X86_64
+     vp8_arch_x86_encoder_init(cpi);
+ #endif
+diff --git a/media/libvpx/vp8/encoder/mcomp.h b/media/libvpx/vp8/encoder/mcomp.h
+--- a/media/libvpx/vp8/encoder/mcomp.h
++++ b/media/libvpx/vp8/encoder/mcomp.h
+@@ -8,17 +8,17 @@
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+ 
+ #ifndef __INC_MCOMP_H
+ #define __INC_MCOMP_H
+ 
+ #include "block.h"
+-#include "variance.h"
++#include "vp8/common/variance.h"
+ 
+ #ifdef ENTROPY_STATS
+ extern void init_mv_ref_counts();
+ extern void accum_mv_refs(MB_PREDICTION_MODE, const int near_mv_ref_cts[4]);
+ #endif
+ 
+ 
+ #define MAX_MVSEARCH_STEPS 8                                    // The maximum number of steps in a step search given the largest allowed initial step
+diff --git a/media/libvpx/vp8/encoder/onyx_if.c b/media/libvpx/vp8/encoder/onyx_if.c
+--- a/media/libvpx/vp8/encoder/onyx_if.c
++++ b/media/libvpx/vp8/encoder/onyx_if.c
+@@ -1948,72 +1948,72 @@ struct VP8_COMP* vp8_create_compressor(V
+ #ifdef ENTROPY_STATS
+     init_mv_ref_counts();
+ #endif
+ 
+ #if CONFIG_MULTITHREAD
+     vp8cx_create_encoder_threads(cpi);
+ #endif
+ 
+-    cpi->fn_ptr[BLOCK_16X16].sdf            = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x16);
+-    cpi->fn_ptr[BLOCK_16X16].vf             = VARIANCE_INVOKE(&cpi->rtcd.variance, var16x16);
+-    cpi->fn_ptr[BLOCK_16X16].svf            = VARIANCE_INVOKE(&cpi->rtcd.variance, subpixvar16x16);
+-    cpi->fn_ptr[BLOCK_16X16].svf_halfpix_h  = VARIANCE_INVOKE(&cpi->rtcd.variance, halfpixvar16x16_h);
+-    cpi->fn_ptr[BLOCK_16X16].svf_halfpix_v  = VARIANCE_INVOKE(&cpi->rtcd.variance, halfpixvar16x16_v);
+-    cpi->fn_ptr[BLOCK_16X16].svf_halfpix_hv = VARIANCE_INVOKE(&cpi->rtcd.variance, halfpixvar16x16_hv);
+-    cpi->fn_ptr[BLOCK_16X16].sdx3f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x16x3);
+-    cpi->fn_ptr[BLOCK_16X16].sdx8f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x16x8);
+-    cpi->fn_ptr[BLOCK_16X16].sdx4df         = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x16x4d);
+-
+-    cpi->fn_ptr[BLOCK_16X8].sdf            = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x8);
+-    cpi->fn_ptr[BLOCK_16X8].vf             = VARIANCE_INVOKE(&cpi->rtcd.variance, var16x8);
+-    cpi->fn_ptr[BLOCK_16X8].svf            = VARIANCE_INVOKE(&cpi->rtcd.variance, subpixvar16x8);
++    cpi->fn_ptr[BLOCK_16X16].sdf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x16);
++    cpi->fn_ptr[BLOCK_16X16].vf             = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var16x16);
++    cpi->fn_ptr[BLOCK_16X16].svf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, subpixvar16x16);
++    cpi->fn_ptr[BLOCK_16X16].svf_halfpix_h  = VARIANCE_INVOKE(&cpi->common.rtcd.variance, halfpixvar16x16_h);
++    cpi->fn_ptr[BLOCK_16X16].svf_halfpix_v  = VARIANCE_INVOKE(&cpi->common.rtcd.variance, halfpixvar16x16_v);
++    cpi->fn_ptr[BLOCK_16X16].svf_halfpix_hv = VARIANCE_INVOKE(&cpi->common.rtcd.variance, halfpixvar16x16_hv);
++    cpi->fn_ptr[BLOCK_16X16].sdx3f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x16x3);
++    cpi->fn_ptr[BLOCK_16X16].sdx8f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x16x8);
++    cpi->fn_ptr[BLOCK_16X16].sdx4df         = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x16x4d);
++
++    cpi->fn_ptr[BLOCK_16X8].sdf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x8);
++    cpi->fn_ptr[BLOCK_16X8].vf             = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var16x8);
++    cpi->fn_ptr[BLOCK_16X8].svf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, subpixvar16x8);
+     cpi->fn_ptr[BLOCK_16X8].svf_halfpix_h  = NULL;
+     cpi->fn_ptr[BLOCK_16X8].svf_halfpix_v  = NULL;
+     cpi->fn_ptr[BLOCK_16X8].svf_halfpix_hv = NULL;
+-    cpi->fn_ptr[BLOCK_16X8].sdx3f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x8x3);
+-    cpi->fn_ptr[BLOCK_16X8].sdx8f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x8x8);
+-    cpi->fn_ptr[BLOCK_16X8].sdx4df         = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x8x4d);
+-
+-    cpi->fn_ptr[BLOCK_8X16].sdf            = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x16);
+-    cpi->fn_ptr[BLOCK_8X16].vf             = VARIANCE_INVOKE(&cpi->rtcd.variance, var8x16);
+-    cpi->fn_ptr[BLOCK_8X16].svf            = VARIANCE_INVOKE(&cpi->rtcd.variance, subpixvar8x16);
++    cpi->fn_ptr[BLOCK_16X8].sdx3f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x8x3);
++    cpi->fn_ptr[BLOCK_16X8].sdx8f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x8x8);
++    cpi->fn_ptr[BLOCK_16X8].sdx4df         = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x8x4d);
++
++    cpi->fn_ptr[BLOCK_8X16].sdf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x16);
++    cpi->fn_ptr[BLOCK_8X16].vf             = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var8x16);
++    cpi->fn_ptr[BLOCK_8X16].svf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, subpixvar8x16);
+     cpi->fn_ptr[BLOCK_8X16].svf_halfpix_h  = NULL;
+     cpi->fn_ptr[BLOCK_8X16].svf_halfpix_v  = NULL;
+     cpi->fn_ptr[BLOCK_8X16].svf_halfpix_hv = NULL;
+-    cpi->fn_ptr[BLOCK_8X16].sdx3f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x16x3);
+-    cpi->fn_ptr[BLOCK_8X16].sdx8f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x16x8);
+-    cpi->fn_ptr[BLOCK_8X16].sdx4df         = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x16x4d);
+-
+-    cpi->fn_ptr[BLOCK_8X8].sdf            = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x8);
+-    cpi->fn_ptr[BLOCK_8X8].vf             = VARIANCE_INVOKE(&cpi->rtcd.variance, var8x8);
+-    cpi->fn_ptr[BLOCK_8X8].svf            = VARIANCE_INVOKE(&cpi->rtcd.variance, subpixvar8x8);
++    cpi->fn_ptr[BLOCK_8X16].sdx3f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x16x3);
++    cpi->fn_ptr[BLOCK_8X16].sdx8f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x16x8);
++    cpi->fn_ptr[BLOCK_8X16].sdx4df         = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x16x4d);
++
++    cpi->fn_ptr[BLOCK_8X8].sdf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x8);
++    cpi->fn_ptr[BLOCK_8X8].vf             = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var8x8);
++    cpi->fn_ptr[BLOCK_8X8].svf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, subpixvar8x8);
+     cpi->fn_ptr[BLOCK_8X8].svf_halfpix_h  = NULL;
+     cpi->fn_ptr[BLOCK_8X8].svf_halfpix_v  = NULL;
+     cpi->fn_ptr[BLOCK_8X8].svf_halfpix_hv = NULL;
+-    cpi->fn_ptr[BLOCK_8X8].sdx3f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x8x3);
+-    cpi->fn_ptr[BLOCK_8X8].sdx8f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x8x8);
+-    cpi->fn_ptr[BLOCK_8X8].sdx4df         = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x8x4d);
+-
+-    cpi->fn_ptr[BLOCK_4X4].sdf            = VARIANCE_INVOKE(&cpi->rtcd.variance, sad4x4);
+-    cpi->fn_ptr[BLOCK_4X4].vf             = VARIANCE_INVOKE(&cpi->rtcd.variance, var4x4);
+-    cpi->fn_ptr[BLOCK_4X4].svf            = VARIANCE_INVOKE(&cpi->rtcd.variance, subpixvar4x4);
++    cpi->fn_ptr[BLOCK_8X8].sdx3f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x8x3);
++    cpi->fn_ptr[BLOCK_8X8].sdx8f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x8x8);
++    cpi->fn_ptr[BLOCK_8X8].sdx4df         = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x8x4d);
++
++    cpi->fn_ptr[BLOCK_4X4].sdf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad4x4);
++    cpi->fn_ptr[BLOCK_4X4].vf             = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var4x4);
++    cpi->fn_ptr[BLOCK_4X4].svf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, subpixvar4x4);
+     cpi->fn_ptr[BLOCK_4X4].svf_halfpix_h  = NULL;
+     cpi->fn_ptr[BLOCK_4X4].svf_halfpix_v  = NULL;
+     cpi->fn_ptr[BLOCK_4X4].svf_halfpix_hv = NULL;
+-    cpi->fn_ptr[BLOCK_4X4].sdx3f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad4x4x3);
+-    cpi->fn_ptr[BLOCK_4X4].sdx8f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad4x4x8);
+-    cpi->fn_ptr[BLOCK_4X4].sdx4df         = VARIANCE_INVOKE(&cpi->rtcd.variance, sad4x4x4d);
++    cpi->fn_ptr[BLOCK_4X4].sdx3f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad4x4x3);
++    cpi->fn_ptr[BLOCK_4X4].sdx8f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad4x4x8);
++    cpi->fn_ptr[BLOCK_4X4].sdx4df         = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad4x4x4d);
+ 
+ #if ARCH_X86 || ARCH_X86_64
+-    cpi->fn_ptr[BLOCK_16X16].copymem        = VARIANCE_INVOKE(&cpi->rtcd.variance, copy32xn);
+-    cpi->fn_ptr[BLOCK_16X8].copymem        = VARIANCE_INVOKE(&cpi->rtcd.variance, copy32xn);
+-    cpi->fn_ptr[BLOCK_8X16].copymem        = VARIANCE_INVOKE(&cpi->rtcd.variance, copy32xn);
+-    cpi->fn_ptr[BLOCK_8X8].copymem        = VARIANCE_INVOKE(&cpi->rtcd.variance, copy32xn);
+-    cpi->fn_ptr[BLOCK_4X4].copymem        = VARIANCE_INVOKE(&cpi->rtcd.variance, copy32xn);
++    cpi->fn_ptr[BLOCK_16X16].copymem        = VARIANCE_INVOKE(&cpi->common.rtcd.variance, copy32xn);
++    cpi->fn_ptr[BLOCK_16X8].copymem        = VARIANCE_INVOKE(&cpi->common.rtcd.variance, copy32xn);
++    cpi->fn_ptr[BLOCK_8X16].copymem        = VARIANCE_INVOKE(&cpi->common.rtcd.variance, copy32xn);
++    cpi->fn_ptr[BLOCK_8X8].copymem        = VARIANCE_INVOKE(&cpi->common.rtcd.variance, copy32xn);
++    cpi->fn_ptr[BLOCK_4X4].copymem        = VARIANCE_INVOKE(&cpi->common.rtcd.variance, copy32xn);
+ #endif
+ 
+     cpi->full_search_sad = SEARCH_INVOKE(&cpi->rtcd.search, full_search);
+     cpi->diamond_search_sad = SEARCH_INVOKE(&cpi->rtcd.search, diamond_search);
+     cpi->refining_search_sad = SEARCH_INVOKE(&cpi->rtcd.search, refining_search);
+ 
+     // make sure frame 1 is okay
+     cpi->error_bins[0] = cpi->common.MBs;
+@@ -2410,38 +2410,38 @@ static void generate_psnr_packet(VP8_COM
+     int                      i;
+     unsigned int             width = cpi->common.Width;
+     unsigned int             height = cpi->common.Height;
+ 
+     pkt.kind = VPX_CODEC_PSNR_PKT;
+     sse = calc_plane_error(orig->y_buffer, orig->y_stride,
+                            recon->y_buffer, recon->y_stride,
+                            width, height,
+-                           IF_RTCD(&cpi->rtcd.variance));
++                           IF_RTCD(&cpi->common.rtcd.variance));
+     pkt.data.psnr.sse[0] = sse;
+     pkt.data.psnr.sse[1] = sse;
+     pkt.data.psnr.samples[0] = width * height;
+     pkt.data.psnr.samples[1] = width * height;
+ 
+     width = (width + 1) / 2;
+     height = (height + 1) / 2;
+ 
+     sse = calc_plane_error(orig->u_buffer, orig->uv_stride,
+                            recon->u_buffer, recon->uv_stride,
+                            width, height,
+-                           IF_RTCD(&cpi->rtcd.variance));
++                           IF_RTCD(&cpi->common.rtcd.variance));
+     pkt.data.psnr.sse[0] += sse;
+     pkt.data.psnr.sse[2] = sse;
+     pkt.data.psnr.samples[0] += width * height;
+     pkt.data.psnr.samples[2] = width * height;
+ 
+     sse = calc_plane_error(orig->v_buffer, orig->uv_stride,
+                            recon->v_buffer, recon->uv_stride,
+                            width, height,
+-                           IF_RTCD(&cpi->rtcd.variance));
++                           IF_RTCD(&cpi->common.rtcd.variance));
+     pkt.data.psnr.sse[0] += sse;
+     pkt.data.psnr.sse[3] = sse;
+     pkt.data.psnr.samples[0] += width * height;
+     pkt.data.psnr.samples[3] = width * height;
+ 
+     for (i = 0; i < 4; i++)
+         pkt.data.psnr.psnr[i] = vp8_mse2psnr(pkt.data.psnr.samples[i], 255.0,
+                                              pkt.data.psnr.sse[i]);
+@@ -3821,17 +3821,17 @@ static void encode_frame_to_data_rate
+ 
+ #if !(CONFIG_REALTIME_ONLY)
+         // Special case handling for forced key frames
+         if ( (cm->frame_type == KEY_FRAME) && cpi->this_key_frame_forced )
+         {
+             int last_q = Q;
+             int kf_err = vp8_calc_ss_err(cpi->Source,
+                                          &cm->yv12_fb[cm->new_fb_idx],
+-                                         IF_RTCD(&cpi->rtcd.variance));
++                                         IF_RTCD(&cpi->common.rtcd.variance));
+ 
+             // The key frame is not good enough
+             if ( kf_err > ((cpi->ambient_err * 7) >> 3) )
+             {
+                 // Lower q_high
+                 q_high = (Q > q_low) ? (Q - 1) : q_low;
+ 
+                 // Adjust Q
+@@ -4018,17 +4018,17 @@ static void encode_frame_to_data_rate
+ 
+     // Special case code to reduce pulsing when key frames are forced at a
+     // fixed interval. Note the reconstruction error if it is the frame before
+     // the force key frame
+     if ( cpi->next_key_frame_forced && (cpi->twopass.frames_to_key == 0) )
+     {
+         cpi->ambient_err = vp8_calc_ss_err(cpi->Source,
+                                            &cm->yv12_fb[cm->new_fb_idx],
+-                                           IF_RTCD(&cpi->rtcd.variance));
++                                           IF_RTCD(&cpi->common.rtcd.variance));
+     }
+ 
+     /* This frame's MVs are saved and will be used in next frame's MV predictor.
+      * Last frame has one more line(add to bottom) and one more column(add to
+      * right) than cm->mip. The edge elements are initialized to 0.
+      */
+ #if CONFIG_MULTI_RES_ENCODING
+     if(!cpi->oxcf.mr_encoder_id && cm->show_frame)
+@@ -4963,25 +4963,25 @@ int vp8_get_compressed_data(VP8_COMP *cp
+                 YV12_BUFFER_CONFIG      *pp = &cm->post_proc_buffer;
+                 int y_samples = orig->y_height * orig->y_width ;
+                 int uv_samples = orig->uv_height * orig->uv_width ;
+                 int t_samples = y_samples + 2 * uv_samples;
+                 int64_t sq_error, sq_error2;
+ 
+                 ye = calc_plane_error(orig->y_buffer, orig->y_stride,
+                   recon->y_buffer, recon->y_stride, orig->y_width, orig->y_height,
+-                  IF_RTCD(&cpi->rtcd.variance));
++                  IF_RTCD(&cpi->common.rtcd.variance));
+ 
+                 ue = calc_plane_error(orig->u_buffer, orig->uv_stride,
+                   recon->u_buffer, recon->uv_stride, orig->uv_width, orig->uv_height,
+-                  IF_RTCD(&cpi->rtcd.variance));
++                  IF_RTCD(&cpi->common.rtcd.variance));
+ 
+                 ve = calc_plane_error(orig->v_buffer, orig->uv_stride,
+                   recon->v_buffer, recon->uv_stride, orig->uv_width, orig->uv_height,
+-                  IF_RTCD(&cpi->rtcd.variance));
++                  IF_RTCD(&cpi->common.rtcd.variance));
+ 
+                 sq_error = ye + ue + ve;
+ 
+                 frame_psnr = vp8_mse2psnr(t_samples, 255.0, sq_error);
+ 
+                 cpi->total_y += vp8_mse2psnr(y_samples, 255.0, ye);
+                 cpi->total_u += vp8_mse2psnr(uv_samples, 255.0, ue);
+                 cpi->total_v += vp8_mse2psnr(uv_samples, 255.0, ve);
+@@ -4991,39 +4991,39 @@ int vp8_get_compressed_data(VP8_COMP *cp
+                     double frame_psnr2, frame_ssim2 = 0;
+                     double weight = 0;
+ 
+                     vp8_deblock(cm->frame_to_show, &cm->post_proc_buffer, cm->filter_level * 10 / 6, 1, 0, IF_RTCD(&cm->rtcd.postproc));
+                     vp8_clear_system_state();
+ 
+                     ye = calc_plane_error(orig->y_buffer, orig->y_stride,
+                       pp->y_buffer, pp->y_stride, orig->y_width, orig->y_height,
+-                      IF_RTCD(&cpi->rtcd.variance));
++                      IF_RTCD(&cpi->common.rtcd.variance));
+ 
+                     ue = calc_plane_error(orig->u_buffer, orig->uv_stride,
+                       pp->u_buffer, pp->uv_stride, orig->uv_width, orig->uv_height,
+-                      IF_RTCD(&cpi->rtcd.variance));
++                      IF_RTCD(&cpi->common.rtcd.variance));
+ 
+                     ve = calc_plane_error(orig->v_buffer, orig->uv_stride,
+                       pp->v_buffer, pp->uv_stride, orig->uv_width, orig->uv_height,
+-                      IF_RTCD(&cpi->rtcd.variance));
++                      IF_RTCD(&cpi->common.rtcd.variance));
+ 
+                     sq_error2 = ye + ue + ve;
+ 
+                     frame_psnr2 = vp8_mse2psnr(t_samples, 255.0, sq_error2);
+ 
+                     cpi->totalp_y += vp8_mse2psnr(y_samples, 255.0, ye);
+                     cpi->totalp_u += vp8_mse2psnr(uv_samples, 255.0, ue);
+                     cpi->totalp_v += vp8_mse2psnr(uv_samples, 255.0, ve);
+                     cpi->total_sq_error2 += sq_error2;
+                     cpi->totalp  += frame_psnr2;
+ 
+                     frame_ssim2 = vp8_calc_ssim(cpi->Source,
+                       &cm->post_proc_buffer, 1, &weight,
+-                      IF_RTCD(&cpi->rtcd.variance));
++                      IF_RTCD(&cpi->common.rtcd.variance));
+ 
+                     cpi->summed_quality += frame_ssim2 * weight;
+                     cpi->summed_weights += weight;
+ 
+                     if (cpi->oxcf.number_of_layers > 1)
+                     {
+                          int i;
+ 
+@@ -5043,17 +5043,17 @@ int vp8_get_compressed_data(VP8_COMP *cp
+                     }
+                 }
+             }
+ 
+             if (cpi->b_calculate_ssimg)
+             {
+                 double y, u, v, frame_all;
+                 frame_all =  vp8_calc_ssimg(cpi->Source, cm->frame_to_show,
+-                    &y, &u, &v, IF_RTCD(&cpi->rtcd.variance));
++                    &y, &u, &v, IF_RTCD(&cpi->common.rtcd.variance));
+ 
+                 if (cpi->oxcf.number_of_layers > 1)
+                 {
+                     int i;
+ 
+                     for (i=cpi->current_layer;
+                          i<cpi->oxcf.number_of_layers; i++)
+                     {
+diff --git a/media/libvpx/vp8/encoder/onyx_int.h b/media/libvpx/vp8/encoder/onyx_int.h
+--- a/media/libvpx/vp8/encoder/onyx_int.h
++++ b/media/libvpx/vp8/encoder/onyx_int.h
+@@ -13,17 +13,17 @@
+ #define __INC_VP8_INT_H
+ 
+ #include <stdio.h>
+ #include "vpx_config.h"
+ #include "vp8/common/onyx.h"
+ #include "treewriter.h"
+ #include "tokenize.h"
+ #include "vp8/common/onyxc_int.h"
+-#include "variance.h"
++#include "vp8/common/variance.h"
+ #include "dct.h"
+ #include "encodemb.h"
+ #include "quantize.h"
+ #include "vp8/common/entropy.h"
+ #include "vp8/common/threading.h"
+ #include "vpx_ports/mem.h"
+ #include "vpx/internal/vpx_codec_internal.h"
+ #include "mcomp.h"
+@@ -220,17 +220,16 @@ typedef struct
+     int ithread;
+     void *ptr1;
+ } LPFTHREAD_DATA;
+ 
+ 
+ typedef struct VP8_ENCODER_RTCD
+ {
+     VP8_COMMON_RTCD            *common;
+-    vp8_variance_rtcd_vtable_t  variance;
+     vp8_fdct_rtcd_vtable_t      fdct;
+     vp8_encodemb_rtcd_vtable_t  encodemb;
+     vp8_quantize_rtcd_vtable_t  quantize;
+     vp8_search_rtcd_vtable_t    search;
+     vp8_temporal_rtcd_vtable_t  temporal;
+ } VP8_ENCODER_RTCD;
+ 
+ enum
+diff --git a/media/libvpx/vp8/encoder/pickinter.c b/media/libvpx/vp8/encoder/pickinter.c
+--- a/media/libvpx/vp8/encoder/pickinter.c
++++ b/media/libvpx/vp8/encoder/pickinter.c
+@@ -16,17 +16,17 @@
+ #include "encodeintra.h"
+ #include "vp8/common/entropymode.h"
+ #include "pickinter.h"
+ #include "vp8/common/findnearmv.h"
+ #include "encodemb.h"
+ #include "vp8/common/reconinter.h"
+ #include "vp8/common/reconintra.h"
+ #include "vp8/common/reconintra4x4.h"
+-#include "variance.h"
++#include "vp8/common/variance.h"
+ #include "mcomp.h"
+ #include "rdopt.h"
+ #include "vpx_mem/vpx_mem.h"
+ 
+ #if CONFIG_RUNTIME_CPU_DETECT
+ #define IF_RTCD(x) (x)
+ #else
+ #define IF_RTCD(x)  NULL
+@@ -90,42 +90,16 @@ static int get_inter_mbpred_error(MACROB
+     else
+     {
+         return vfp->vf(what, what_stride, in_what, in_what_stride, sse);
+     }
+ 
+ }
+ 
+ 
+-unsigned int vp8_get4x4sse_cs_c
+-(
+-    const unsigned char *src_ptr,
+-    int  source_stride,
+-    const unsigned char *ref_ptr,
+-    int  recon_stride
+-)
+-{
+-    int distortion = 0;
+-    int r, c;
+-
+-    for (r = 0; r < 4; r++)
+-    {
+-        for (c = 0; c < 4; c++)
+-        {
+-            int diff = src_ptr[c] - ref_ptr[c];
+-            distortion += diff * diff;
+-        }
+-
+-        src_ptr += source_stride;
+-        ref_ptr += recon_stride;
+-    }
+-
+-    return distortion;
+-}
+-
+ static int get_prediction_error(BLOCK *be, BLOCKD *b, const vp8_variance_rtcd_vtable_t *rtcd)
+ {
+     unsigned char *sptr;
+     unsigned char *dptr;
+     sptr = (*(be->base_src) + be->src);
+     dptr = b->predictor;
+ 
+     return VARIANCE_INVOKE(rtcd, get4x4sse_cs)(sptr, be->src_stride, dptr, 16);
+@@ -153,17 +127,17 @@ static int pick_intra4x4block(
+     for (mode = B_DC_PRED; mode <= B_HE_PRED /*B_HU_PRED*/; mode++)
+     {
+         int this_rd;
+ 
+         rate = mode_costs[mode];
+         RECON_INVOKE(&rtcd->common->recon, intra4x4_predict)
+                      (*(b->base_dst) + b->dst, b->dst_stride,
+                       mode, b->predictor, 16);
+-        distortion = get_prediction_error(be, b, &rtcd->variance);
++        distortion = get_prediction_error(be, b, &rtcd->common->variance);
+         this_rd = RDCOST(x->rdmult, x->rddiv, rate, distortion);
+ 
+         if (this_rd < best_rd)
+         {
+             *bestrate = rate;
+             *bestdistortion = distortion;
+             best_rd = this_rd;
+             *best_mode = mode;
+@@ -671,17 +645,17 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, 
+             if (distortion2 == INT_MAX)
+             {
+                 this_rd = INT_MAX;
+             }
+             else
+             {
+                 rate2 += rate;
+                 distortion2 = VARIANCE_INVOKE
+-                                (&cpi->rtcd.variance, var16x16)(
++                                (&cpi->common.rtcd.variance, var16x16)(
+                                     *(b->base_src), b->src_stride,
+                                     x->e_mbd.predictor, 16, &sse);
+                 this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2);
+ 
+                 if (this_rd < best_intra_rd)
+                 {
+                     best_intra_rd = this_rd;
+                     *returnintra = distortion2;
+@@ -696,17 +670,17 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, 
+             break;
+ 
+         case DC_PRED:
+         case V_PRED:
+         case H_PRED:
+         case TM_PRED:
+             RECON_INVOKE(&cpi->common.rtcd.recon, build_intra_predictors_mby)
+                 (&x->e_mbd);
+-            distortion2 = VARIANCE_INVOKE(&cpi->rtcd.variance, var16x16)
++            distortion2 = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var16x16)
+                                           (*(b->base_src), b->src_stride,
+                                           x->e_mbd.predictor, 16, &sse);
+             rate2 += x->mbmode_cost[x->e_mbd.frame_type][x->e_mbd.mode_info_context->mbmi.mode];
+             this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2);
+ 
+             if (this_rd < best_intra_rd)
+             {
+                 best_intra_rd = this_rd;
+@@ -933,17 +907,17 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, 
+ 
+             this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2);
+ 
+             if (sse < x->encode_breakout)
+             {
+                 // Check u and v to make sure skip is ok
+                 int sse2 = 0;
+ 
+-                sse2 = VP8_UVSSE(x, IF_RTCD(&cpi->rtcd.variance));
++                sse2 = VP8_UVSSE(x, IF_RTCD(&cpi->common.rtcd.variance));
+ 
+                 if (sse2 * 2 < x->encode_breakout)
+                     x->skip = 1;
+                 else
+                     x->skip = 0;
+             }
+ 
+             break;
+@@ -1067,17 +1041,17 @@ void vp8_pick_intra_mode(VP8_COMP *cpi, 
+ 
+     pick_intra_mbuv_mode(x);
+ 
+     for (mode = DC_PRED; mode <= TM_PRED; mode ++)
+     {
+         x->e_mbd.mode_info_context->mbmi.mode = mode;
+         RECON_INVOKE(&cpi->common.rtcd.recon, build_intra_predictors_mby)
+             (&x->e_mbd);
+-        distortion = VARIANCE_INVOKE(&cpi->rtcd.variance, var16x16)
++        distortion = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var16x16)
+             (*(b->base_src), b->src_stride, x->e_mbd.predictor, 16, &sse);
+         rate = x->mbmode_cost[x->e_mbd.frame_type][mode];
+         this_rd = RDCOST(x->rdmult, x->rddiv, rate, distortion);
+ 
+         if (error16x16 > this_rd)
+         {
+             error16x16 = this_rd;
+             best_mode = mode;
+diff --git a/media/libvpx/vp8/encoder/picklpf.c b/media/libvpx/vp8/encoder/picklpf.c
+--- a/media/libvpx/vp8/encoder/picklpf.c
++++ b/media/libvpx/vp8/encoder/picklpf.c
+@@ -179,30 +179,30 @@ void vp8cx_pick_filter_level_fast(YV12_B
+ 
+     // Get the err using the previous frame's filter value.
+ 
+     /* Copy the unfiltered / processed recon buffer to the new buffer */
+     vp8_yv12_copy_partial_frame_ptr(saved_frame, cm->frame_to_show);
+     vp8_loop_filter_partial_frame(cm, &cpi->mb.e_mbd, filt_val);
+ 
+     best_err = calc_partial_ssl_err(sd, cm->frame_to_show,
+-                                    IF_RTCD(&cpi->rtcd.variance));
++                                    IF_RTCD(&cpi->common.rtcd.variance));
+ 
+     filt_val -= 1 + (filt_val > 10);
+ 
+     // Search lower filter levels
+     while (filt_val >= min_filter_level)
+     {
+         // Apply the loop filter
+         vp8_yv12_copy_partial_frame_ptr(saved_frame, cm->frame_to_show);
+         vp8_loop_filter_partial_frame(cm, &cpi->mb.e_mbd, filt_val);
+ 
+         // Get the err for filtered frame
+         filt_err = calc_partial_ssl_err(sd, cm->frame_to_show,
+-                                        IF_RTCD(&cpi->rtcd.variance));
++                                        IF_RTCD(&cpi->common.rtcd.variance));
+ 
+         // Update the best case record or exit loop.
+         if (filt_err < best_err)
+         {
+             best_err = filt_err;
+             best_filt_val = filt_val;
+         }
+         else
+@@ -224,17 +224,17 @@ void vp8cx_pick_filter_level_fast(YV12_B
+         {
+             // Apply the loop filter
+             vp8_yv12_copy_partial_frame_ptr(saved_frame, cm->frame_to_show);
+ 
+             vp8_loop_filter_partial_frame(cm, &cpi->mb.e_mbd, filt_val);
+ 
+             // Get the err for filtered frame
+             filt_err = calc_partial_ssl_err(sd, cm->frame_to_show,
+-                                            IF_RTCD(&cpi->rtcd.variance));
++                                            IF_RTCD(&cpi->common.rtcd.variance));
+ 
+             // Update the best case record or exit loop.
+             if (filt_err < best_err)
+             {
+                 // Do not raise filter level if improvement is < 1 part in 4096
+                 best_err = filt_err - (filt_err >> 10);
+ 
+                 best_filt_val = filt_val;
+@@ -318,17 +318,17 @@ void vp8cx_pick_filter_level(YV12_BUFFER
+ 
+     /* Copy the unfiltered / processed recon buffer to the new buffer */
+     vp8_yv12_copy_y_ptr(saved_frame, cm->frame_to_show);
+ 
+     vp8cx_set_alt_lf_level(cpi, filt_mid);
+     vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_mid);
+ 
+     best_err = vp8_calc_ss_err(sd, cm->frame_to_show,
+-                               IF_RTCD(&cpi->rtcd.variance));
++                               IF_RTCD(&cpi->common.rtcd.variance));
+ 
+     ss_err[filt_mid] = best_err;
+ 
+     filt_best = filt_mid;
+ 
+     while (filter_step > 0)
+     {
+         Bias = (best_err >> (15 - (filt_mid / 8))) * filter_step; //PGW change 12/12/06 for small images
+@@ -345,17 +345,17 @@ void vp8cx_pick_filter_level(YV12_BUFFER
+             if(ss_err[filt_low] == 0)
+             {
+                 // Get Low filter error score
+                 vp8_yv12_copy_y_ptr(saved_frame, cm->frame_to_show);
+                 vp8cx_set_alt_lf_level(cpi, filt_low);
+                 vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_low);
+ 
+                 filt_err = vp8_calc_ss_err(sd, cm->frame_to_show,
+-                                           IF_RTCD(&cpi->rtcd.variance));
++                                           IF_RTCD(&cpi->common.rtcd.variance));
+                 ss_err[filt_low] = filt_err;
+             }
+             else
+                 filt_err = ss_err[filt_low];
+ 
+             // If value is close to the best so far then bias towards a lower loop filter value.
+             if ((filt_err - Bias) < best_err)
+             {
+@@ -372,17 +372,17 @@ void vp8cx_pick_filter_level(YV12_BUFFER
+         {
+             if(ss_err[filt_high] == 0)
+             {
+                 vp8_yv12_copy_y_ptr(saved_frame, cm->frame_to_show);
+                 vp8cx_set_alt_lf_level(cpi, filt_high);
+                 vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_high);
+ 
+                 filt_err = vp8_calc_ss_err(sd, cm->frame_to_show,
+-                                           IF_RTCD(&cpi->rtcd.variance));
++                                           IF_RTCD(&cpi->common.rtcd.variance));
+                 ss_err[filt_high] = filt_err;
+             }
+             else
+                 filt_err = ss_err[filt_high];
+ 
+             // Was it better than the previous best?
+             if (filt_err < (best_err - Bias))
+             {
+diff --git a/media/libvpx/vp8/encoder/rdopt.c b/media/libvpx/vp8/encoder/rdopt.c
+--- a/media/libvpx/vp8/encoder/rdopt.c
++++ b/media/libvpx/vp8/encoder/rdopt.c
+@@ -23,17 +23,17 @@
+ #include "vp8/common/entropymode.h"
+ #include "vp8/common/reconinter.h"
+ #include "vp8/common/reconintra.h"
+ #include "vp8/common/reconintra4x4.h"
+ #include "vp8/common/findnearmv.h"
+ #include "encodemb.h"
+ #include "quantize.h"
+ #include "vp8/common/idct.h"
+-#include "variance.h"
++#include "vp8/common/variance.h"
+ #include "mcomp.h"
+ #include "rdopt.h"
+ #include "vpx_mem/vpx_mem.h"
+ #include "dct.h"
+ #include "vp8/common/systemdependent.h"
+ 
+ #if CONFIG_RUNTIME_CPU_DETECT
+ #define IF_RTCD(x)  (x)
+@@ -2132,30 +2132,30 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cp
+                 unsigned int sse;
+                 unsigned int var;
+                 int threshold = (xd->block[0].dequant[1]
+                             * xd->block[0].dequant[1] >>4);
+ 
+                 if(threshold < x->encode_breakout)
+                     threshold = x->encode_breakout;
+ 
+-                var = VARIANCE_INVOKE(&cpi->rtcd.variance, var16x16)
++                var = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var16x16)
+                         (*(b->base_src), b->src_stride,
+                         x->e_mbd.predictor, 16, &sse);
+ 
+                 if (sse < threshold)
+                 {
+                      unsigned int q2dc = xd->block[24].dequant[0];
+                     /* If theres is no codeable 2nd order dc
+                        or a very small uniform pixel change change */
+                     if ((sse - var < q2dc * q2dc >>4) ||
+                         (sse /2 > var && sse-var < 64))
+                     {
+                         // Check u and v to make sure skip is ok
+-                        int sse2=  VP8_UVSSE(x, IF_RTCD(&cpi->rtcd.variance));
++                        int sse2=  VP8_UVSSE(x, IF_RTCD(&cpi->common.rtcd.variance));
+                         if (sse2 * 2 < threshold)
+                         {
+                             x->skip = 1;
+                             distortion2 = sse + sse2;
+                             rate2 = 500;
+ 
+                             /* for best_yrd calculation */
+                             rate_uv = 0;
+diff --git a/media/libvpx/vp8/encoder/x86/x86_csystemdependent.c b/media/libvpx/vp8/encoder/x86/x86_csystemdependent.c
+--- a/media/libvpx/vp8/encoder/x86/x86_csystemdependent.c
++++ b/media/libvpx/vp8/encoder/x86/x86_csystemdependent.c
+@@ -6,17 +6,16 @@
+  *  tree. An additional intellectual property rights grant can be found
+  *  in the file PATENTS.  All contributing project authors may
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+ 
+ #include "vpx_config.h"
+ #include "vpx_ports/x86.h"
+-#include "vp8/encoder/variance.h"
+ #include "vp8/encoder/onyx_int.h"
+ 
+ 
+ #if HAVE_MMX
+ void vp8_short_fdct8x4_mmx(short *input, short *output, int pitch)
+ {
+     vp8_short_fdct4x4_mmx(input,   output,    pitch);
+     vp8_short_fdct4x4_mmx(input + 4, output + 16, pitch);
+@@ -122,43 +121,16 @@ void vp8_arch_x86_encoder_init(VP8_COMP 
+      * you modify any of the function mappings present in this file, be sure
+      * to also update them in static mapings (<arch>/filename_<arch>.h)
+      */
+ 
+     /* Override default functions with fastest ones for this CPU. */
+ #if HAVE_MMX
+     if (flags & HAS_MMX)
+     {
+-        cpi->rtcd.variance.sad16x16              = vp8_sad16x16_mmx;
+-        cpi->rtcd.variance.sad16x8               = vp8_sad16x8_mmx;
+-        cpi->rtcd.variance.sad8x16               = vp8_sad8x16_mmx;
+-        cpi->rtcd.variance.sad8x8                = vp8_sad8x8_mmx;
+-        cpi->rtcd.variance.sad4x4                = vp8_sad4x4_mmx;
+-
+-        cpi->rtcd.variance.var4x4                = vp8_variance4x4_mmx;
+-        cpi->rtcd.variance.var8x8                = vp8_variance8x8_mmx;
+-        cpi->rtcd.variance.var8x16               = vp8_variance8x16_mmx;
+-        cpi->rtcd.variance.var16x8               = vp8_variance16x8_mmx;
+-        cpi->rtcd.variance.var16x16              = vp8_variance16x16_mmx;
+-
+-        cpi->rtcd.variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_mmx;
+-        cpi->rtcd.variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_mmx;
+-        cpi->rtcd.variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_mmx;
+-        cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_mmx;
+-        cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_mmx;
+-        cpi->rtcd.variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_mmx;
+-        cpi->rtcd.variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_mmx;
+-        cpi->rtcd.variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_mmx;
+-        cpi->rtcd.variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_mmx;
+-
+-        cpi->rtcd.variance.mse16x16              = vp8_mse16x16_mmx;
+-        cpi->rtcd.variance.getmbss               = vp8_get_mb_ss_mmx;
+-
+-        cpi->rtcd.variance.get4x4sse_cs          = vp8_get4x4sse_cs_mmx;
+-
+         cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_mmx;
+         cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_mmx;
+         cpi->rtcd.fdct.fast4x4                   = vp8_short_fdct4x4_mmx;
+         cpi->rtcd.fdct.fast8x4                   = vp8_short_fdct8x4_mmx;
+ 
+         cpi->rtcd.fdct.walsh_short4x4            = vp8_short_walsh4x4_c;
+ 
+         cpi->rtcd.encodemb.berr                  = vp8_block_error_mmx;
+@@ -170,44 +142,16 @@ void vp8_arch_x86_encoder_init(VP8_COMP 
+ 
+         /*cpi->rtcd.quantize.fastquantb            = vp8_fast_quantize_b_mmx;*/
+     }
+ #endif
+ 
+ #if HAVE_SSE2
+     if (flags & HAS_SSE2)
+     {
+-        cpi->rtcd.variance.sad16x16              = vp8_sad16x16_wmt;
+-        cpi->rtcd.variance.sad16x8               = vp8_sad16x8_wmt;
+-        cpi->rtcd.variance.sad8x16               = vp8_sad8x16_wmt;
+-        cpi->rtcd.variance.sad8x8                = vp8_sad8x8_wmt;
+-        cpi->rtcd.variance.sad4x4                = vp8_sad4x4_wmt;
+-        cpi->rtcd.variance.copy32xn              = vp8_copy32xn_sse2;
+-
+-        cpi->rtcd.variance.var4x4                = vp8_variance4x4_wmt;
+-        cpi->rtcd.variance.var8x8                = vp8_variance8x8_wmt;
+-        cpi->rtcd.variance.var8x16               = vp8_variance8x16_wmt;
+-        cpi->rtcd.variance.var16x8               = vp8_variance16x8_wmt;
+-        cpi->rtcd.variance.var16x16              = vp8_variance16x16_wmt;
+-
+-        cpi->rtcd.variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_wmt;
+-        cpi->rtcd.variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_wmt;
+-        cpi->rtcd.variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_wmt;
+-        cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_wmt;
+-        cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_wmt;
+-        cpi->rtcd.variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_wmt;
+-        cpi->rtcd.variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_wmt;
+-        cpi->rtcd.variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_wmt;
+-        cpi->rtcd.variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_wmt;
+-
+-        cpi->rtcd.variance.mse16x16              = vp8_mse16x16_wmt;
+-        cpi->rtcd.variance.getmbss               = vp8_get_mb_ss_sse2;
+-
+-        /* cpi->rtcd.variance.get4x4sse_cs  not implemented for wmt */;
+-
+         cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_sse2;
+         cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_sse2;
+         cpi->rtcd.fdct.fast4x4                   = vp8_short_fdct4x4_sse2;
+         cpi->rtcd.fdct.fast8x4                   = vp8_short_fdct8x4_sse2;
+ 
+         cpi->rtcd.fdct.walsh_short4x4            = vp8_short_walsh4x4_sse2 ;
+ 
+         cpi->rtcd.encodemb.berr                  = vp8_block_error_xmm;
+@@ -219,69 +163,40 @@ void vp8_arch_x86_encoder_init(VP8_COMP 
+ 
+         cpi->rtcd.quantize.quantb                = vp8_regular_quantize_b_sse2;
+         cpi->rtcd.quantize.fastquantb            = vp8_fast_quantize_b_sse2;
+ 
+ #if !(CONFIG_REALTIME_ONLY)
+         cpi->rtcd.temporal.apply                 = vp8_temporal_filter_apply_sse2;
+ #endif
+ 
+-#if CONFIG_INTERNAL_STATS
+-#if ARCH_X86_64
+-        cpi->rtcd.variance.ssimpf_8x8            = vp8_ssim_parms_8x8_sse2;
+-        cpi->rtcd.variance.ssimpf_16x16          = vp8_ssim_parms_16x16_sse2;
+-#endif
+-#endif
+     }
+ #endif
+ 
+ #if HAVE_SSE3
+     if (flags & HAS_SSE3)
+     {
+-        cpi->rtcd.variance.sad16x16              = vp8_sad16x16_sse3;
+-        cpi->rtcd.variance.sad16x16x3            = vp8_sad16x16x3_sse3;
+-        cpi->rtcd.variance.sad16x8x3             = vp8_sad16x8x3_sse3;
+-        cpi->rtcd.variance.sad8x16x3             = vp8_sad8x16x3_sse3;
+-        cpi->rtcd.variance.sad8x8x3              = vp8_sad8x8x3_sse3;
+-        cpi->rtcd.variance.sad4x4x3              = vp8_sad4x4x3_sse3;
+         cpi->rtcd.search.full_search             = vp8_full_search_sadx3;
+-        cpi->rtcd.variance.sad16x16x4d           = vp8_sad16x16x4d_sse3;
+-        cpi->rtcd.variance.sad16x8x4d            = vp8_sad16x8x4d_sse3;
+-        cpi->rtcd.variance.sad8x16x4d            = vp8_sad8x16x4d_sse3;
+-        cpi->rtcd.variance.sad8x8x4d             = vp8_sad8x8x4d_sse3;
+-        cpi->rtcd.variance.sad4x4x4d             = vp8_sad4x4x4d_sse3;
+-        cpi->rtcd.variance.copy32xn              = vp8_copy32xn_sse3;
+         cpi->rtcd.search.diamond_search          = vp8_diamond_search_sadx4;
+         cpi->rtcd.search.refining_search         = vp8_refining_search_sadx4;
+     }
+ #endif
+ 
+ #if HAVE_SSSE3
+     if (flags & HAS_SSSE3)
+     {
+-        cpi->rtcd.variance.sad16x16x3            = vp8_sad16x16x3_ssse3;
+-        cpi->rtcd.variance.sad16x8x3             = vp8_sad16x8x3_ssse3;
+-
+-        cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_ssse3;
+-        cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_ssse3;
+-
+         cpi->rtcd.quantize.fastquantb            = vp8_fast_quantize_b_ssse3;
+     }
+ #endif
+ 
+ 
+ 
+ #if HAVE_SSE4_1
+     if (flags & HAS_SSE4_1)
+     {
+-        cpi->rtcd.variance.sad16x16x8            = vp8_sad16x16x8_sse4;
+-        cpi->rtcd.variance.sad16x8x8             = vp8_sad16x8x8_sse4;
+-        cpi->rtcd.variance.sad8x16x8             = vp8_sad8x16x8_sse4;
+-        cpi->rtcd.variance.sad8x8x8              = vp8_sad8x8x8_sse4;
+-        cpi->rtcd.variance.sad4x4x8              = vp8_sad4x4x8_sse4;
+         cpi->rtcd.search.full_search             = vp8_full_search_sadx8;
+ 
+         cpi->rtcd.quantize.quantb                = vp8_regular_quantize_b_sse4;
+     }
+ #endif
+ 
+ #endif
+ }
diff --git a/media/libvpx/I3915d597.patch b/media/libvpx/I3915d597.patch
new file mode 100644
index 00000000000..0831829317c
--- /dev/null
+++ b/media/libvpx/I3915d597.patch
@@ -0,0 +1,41 @@
+# HG changeset patch
+# Parent 0d104ba08fe98d5024014fbf45af06100ef7b6f9
+# User Timothy B. Terriberry <tterribe@vt.edu>
+Align internal mfqe framebuffer dimensions
+
+Upstream Change-Id: I3915d597cd66886a24f4ef39752751ebe6425066
+
+diff --git a/media/libvpx/vp8/common/postproc.c b/media/libvpx/vp8/common/postproc.c
+--- a/media/libvpx/vp8/common/postproc.c
++++ b/media/libvpx/vp8/common/postproc.c
+@@ -938,20 +938,26 @@ int vp8_post_proc_frame(VP8_COMMON *oci,
+         return 0;
+     }
+ 
+     /* Allocate post_proc_buffer_int if needed */
+     if ((flags & VP8D_MFQE) && !oci->post_proc_buffer_int_used)
+     {
+         if ((flags & VP8D_DEBLOCK) || (flags & VP8D_DEMACROBLOCK))
+         {
+-            if (vp8_yv12_alloc_frame_buffer(&oci->post_proc_buffer_int, oci->Width, oci->Height, VP8BORDERINPIXELS) >= 0)
+-            {
+-                oci->post_proc_buffer_int_used = 1;
+-            }
++            int width = (oci->Width + 15) & ~15;
++            int height = (oci->Height + 15) & ~15;
++
++            if (vp8_yv12_alloc_frame_buffer(&oci->post_proc_buffer_int,
++                                            width, height, VP8BORDERINPIXELS))
++                vpx_internal_error(&oci->error, VPX_CODEC_MEM_ERROR,
++                                   "Failed to allocate MFQE framebuffer");
++
++            oci->post_proc_buffer_int_used = 1;
++
+             // insure that postproc is set to all 0's so that post proc
+             // doesn't pull random data in from edge
+             vpx_memset((&oci->post_proc_buffer_int)->buffer_alloc,126,(&oci->post_proc_buffer)->frame_size);
+ 
+         }
+     }
+ 
+ #if ARCH_X86||ARCH_X86_64
diff --git a/media/libvpx/I42ab00e3.patch b/media/libvpx/I42ab00e3.patch
new file mode 100644
index 00000000000..68e867a9966
--- /dev/null
+++ b/media/libvpx/I42ab00e3.patch
@@ -0,0 +1,33 @@
+# HG changeset patch
+# Parent 5668c50552abba043eff64ffc5d8abde43d7964a
+# User Timothy B. Terriberry <tterribe@vt.edu>
+Support Android x86 NDK build
+
+Upstream Change-Id: I42ab00e3255208ba95d7f9b9a8a3605ff58da8e1
+
+diff --git a/media/libvpx/vp8/common/x86/postproc_x86.c b/media/libvpx/vp8/common/x86/postproc_x86.c
+new file mode 100644
+--- /dev/null
++++ b/media/libvpx/vp8/common/x86/postproc_x86.c
+@@ -0,0 +1,21 @@
++/*
++ *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
++ *
++ *  Use of this source code is governed by a BSD-style license
++ *  that can be found in the LICENSE file in the root of the source
++ *  tree. An additional intellectual property rights grant can be found
++ *  in the file PATENTS.  All contributing project authors may
++ *  be found in the AUTHORS file in the root of the source tree.
++ */
++
++/* On Android NDK, rand is inlined function, but postproc needs rand symbol */
++#if defined(__ANDROID__)
++#define rand __rand
++#include <stdlib.h>
++#undef rand
++
++extern int rand(void)
++{
++  return __rand();
++}
++#endif
diff --git a/media/libvpx/I6f2b218d.patch b/media/libvpx/I6f2b218d.patch
new file mode 100644
index 00000000000..2e4a367eb2a
--- /dev/null
+++ b/media/libvpx/I6f2b218d.patch
@@ -0,0 +1,348 @@
+# HG changeset patch
+# Parent d02aa133060bcdfd44634038c8c28654c718c2ff
+# User Timothy B. Terriberry <tterribe@vt.edu>
+remove __inline for compiler compatibility
+
+Upstream Change-Id: I6f2b218dfc808b73212bbb90c69e2b6cc1fa90ce
+
+diff --git a/media/libvpx/vp8/common/loopfilter_filters.c b/media/libvpx/vp8/common/loopfilter_filters.c
+--- a/media/libvpx/vp8/common/loopfilter_filters.c
++++ b/media/libvpx/vp8/common/loopfilter_filters.c
+@@ -10,50 +10,50 @@
+ 
+ 
+ #include <stdlib.h>
+ #include "loopfilter.h"
+ #include "onyxc_int.h"
+ 
+ typedef unsigned char uc;
+ 
+-static __inline signed char vp8_signed_char_clamp(int t)
++static signed char vp8_signed_char_clamp(int t)
+ {
+     t = (t < -128 ? -128 : t);
+     t = (t > 127 ? 127 : t);
+     return (signed char) t;
+ }
+ 
+ 
+ /* should we apply any filter at all ( 11111111 yes, 00000000 no) */
+-static __inline signed char vp8_filter_mask(uc limit, uc blimit,
+-                                     uc p3, uc p2, uc p1, uc p0,
+-                                     uc q0, uc q1, uc q2, uc q3)
++static signed char vp8_filter_mask(uc limit, uc blimit,
++                            uc p3, uc p2, uc p1, uc p0,
++                            uc q0, uc q1, uc q2, uc q3)
+ {
+     signed char mask = 0;
+     mask |= (abs(p3 - p2) > limit);
+     mask |= (abs(p2 - p1) > limit);
+     mask |= (abs(p1 - p0) > limit);
+     mask |= (abs(q1 - q0) > limit);
+     mask |= (abs(q2 - q1) > limit);
+     mask |= (abs(q3 - q2) > limit);
+     mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2  > blimit);
+     return mask - 1;
+ }
+ 
+ /* is there high variance internal edge ( 11111111 yes, 00000000 no) */
+-static __inline signed char vp8_hevmask(uc thresh, uc p1, uc p0, uc q0, uc q1)
++static signed char vp8_hevmask(uc thresh, uc p1, uc p0, uc q0, uc q1)
+ {
+     signed char hev = 0;
+     hev  |= (abs(p1 - p0) > thresh) * -1;
+     hev  |= (abs(q1 - q0) > thresh) * -1;
+     return hev;
+ }
+ 
+-static __inline void vp8_filter(signed char mask, uc hev, uc *op1,
++static void vp8_filter(signed char mask, uc hev, uc *op1,
+         uc *op0, uc *oq0, uc *oq1)
+ 
+ {
+     signed char ps0, qs0;
+     signed char ps1, qs1;
+     signed char vp8_filter, Filter1, Filter2;
+     signed char u;
+ 
+@@ -153,17 +153,17 @@ void vp8_loop_filter_vertical_edge_c
+ 
+         vp8_filter(mask, hev, s - 2, s - 1, s, s + 1);
+ 
+         s += p;
+     }
+     while (++i < count * 8);
+ }
+ 
+-static __inline void vp8_mbfilter(signed char mask, uc hev,
++static void vp8_mbfilter(signed char mask, uc hev,
+                            uc *op2, uc *op1, uc *op0, uc *oq0, uc *oq1, uc *oq2)
+ {
+     signed char s, u;
+     signed char vp8_filter, Filter1, Filter2;
+     signed char ps2 = (signed char) * op2 ^ 0x80;
+     signed char ps1 = (signed char) * op1 ^ 0x80;
+     signed char ps0 = (signed char) * op0 ^ 0x80;
+     signed char qs0 = (signed char) * oq0 ^ 0x80;
+@@ -274,27 +274,27 @@ void vp8_mbloop_filter_vertical_edge_c
+ 
+         s += p;
+     }
+     while (++i < count * 8);
+ 
+ }
+ 
+ /* should we apply any filter at all ( 11111111 yes, 00000000 no) */
+-static __inline signed char vp8_simple_filter_mask(uc blimit, uc p1, uc p0, uc q0, uc q1)
++static signed char vp8_simple_filter_mask(uc blimit, uc p1, uc p0, uc q0, uc q1)
+ {
+ /* Why does this cause problems for win32?
+  * error C2143: syntax error : missing ';' before 'type'
+  *  (void) limit;
+  */
+     signed char mask = (abs(p0 - q0) * 2 + abs(p1 - q1) / 2  <= blimit) * -1;
+     return mask;
+ }
+ 
+-static __inline void vp8_simple_filter(signed char mask, uc *op1, uc *op0, uc *oq0, uc *oq1)
++static void vp8_simple_filter(signed char mask, uc *op1, uc *op0, uc *oq0, uc *oq1)
+ {
+     signed char vp8_filter, Filter1, Filter2;
+     signed char p1 = (signed char) * op1 ^ 0x80;
+     signed char p0 = (signed char) * op0 ^ 0x80;
+     signed char q0 = (signed char) * oq0 ^ 0x80;
+     signed char q1 = (signed char) * oq1 ^ 0x80;
+     signed char u;
+ 
+diff --git a/media/libvpx/vp8/common/onyx.h b/media/libvpx/vp8/common/onyx.h
+--- a/media/libvpx/vp8/common/onyx.h
++++ b/media/libvpx/vp8/common/onyx.h
+@@ -67,17 +67,17 @@ extern "C"
+     {
+         FRAMEFLAGS_KEY    = 1,
+         FRAMEFLAGS_GOLDEN = 2,
+         FRAMEFLAGS_ALTREF = 4,
+     } FRAMETYPE_FLAGS;
+ 
+ 
+ #include <assert.h>
+-    static __inline void Scale2Ratio(int mode, int *hr, int *hs)
++    static void Scale2Ratio(int mode, int *hr, int *hs)
+     {
+         switch (mode)
+         {
+         case    NORMAL:
+             *hr = 1;
+             *hs = 1;
+             break;
+         case    FOURFIVE:
+diff --git a/media/libvpx/vp8/encoder/encodemv.c b/media/libvpx/vp8/encoder/encodemv.c
+--- a/media/libvpx/vp8/encoder/encodemv.c
++++ b/media/libvpx/vp8/encoder/encodemv.c
+@@ -181,17 +181,17 @@ void vp8_build_component_cost_table(int 
+ 
+ // Motion vector probability table update depends on benefit.
+ // Small correction allows for the fact that an update to an MV probability
+ // may have benefit in subsequent frames as well as the current one.
+ 
+ #define MV_PROB_UPDATE_CORRECTION   -1
+ 
+ 
+-__inline static void calc_prob(vp8_prob *p, const unsigned int ct[2])
++static void calc_prob(vp8_prob *p, const unsigned int ct[2])
+ {
+     const unsigned int tot = ct[0] + ct[1];
+ 
+     if (tot)
+     {
+         const vp8_prob x = ((ct[0] * 255) / tot) & -2;
+         *p = x ? x : 1;
+     }
+diff --git a/media/libvpx/vp8/encoder/rdopt.c b/media/libvpx/vp8/encoder/rdopt.c
+--- a/media/libvpx/vp8/encoder/rdopt.c
++++ b/media/libvpx/vp8/encoder/rdopt.c
+@@ -1326,17 +1326,17 @@ static void rd_check_segment(VP8_COMP *c
+         {
+             bsi->mvs[i].as_mv = x->partition_info->bmi[i].mv.as_mv;
+             bsi->modes[i] = x->partition_info->bmi[i].mode;
+             bsi->eobs[i] = x->e_mbd.eobs[i];
+         }
+     }
+ }
+ 
+-static __inline
++static
+ void vp8_cal_step_param(int sr, int *sp)
+ {
+     int step = 0;
+ 
+     if (sr > MAX_FIRST_STEP) sr = MAX_FIRST_STEP;
+     else if (sr < 1) sr = 1;
+ 
+     while (sr>>=1)
+diff --git a/media/libvpx/vp8/encoder/sad_c.c b/media/libvpx/vp8/encoder/sad_c.c
+--- a/media/libvpx/vp8/encoder/sad_c.c
++++ b/media/libvpx/vp8/encoder/sad_c.c
+@@ -34,17 +34,17 @@ unsigned int vp8_sad16x16_c(
+         src_ptr += src_stride;
+         ref_ptr += ref_stride;
+     }
+ 
+     return sad;
+ }
+ 
+ 
+-static __inline
++static
+ unsigned int sad_mx_n_c(
+     const unsigned char *src_ptr,
+     int  src_stride,
+     const unsigned char *ref_ptr,
+     int  ref_stride,
+     int m,
+     int n)
+ {
+diff --git a/media/libvpx/vp8/encoder/tokenize.c b/media/libvpx/vp8/encoder/tokenize.c
+--- a/media/libvpx/vp8/encoder/tokenize.c
++++ b/media/libvpx/vp8/encoder/tokenize.c
+@@ -480,17 +480,17 @@ void print_context_counters()
+ 
+ 
+ void vp8_tokenize_initialize()
+ {
+     fill_value_tokens();
+ }
+ 
+ 
+-static __inline void stuff2nd_order_b
++static void stuff2nd_order_b
+ (
+     TOKENEXTRA **tp,
+     ENTROPY_CONTEXT *a,
+     ENTROPY_CONTEXT *l,
+     VP8_COMP *cpi
+ )
+ {
+     int pt; /* near block/prev token context index */
+@@ -504,17 +504,17 @@ static __inline void stuff2nd_order_b
+     ++t;
+ 
+     *tp = t;
+     pt = 0;
+     *a = *l = pt;
+ 
+ }
+ 
+-static __inline void stuff1st_order_b
++static void stuff1st_order_b
+ (
+     TOKENEXTRA **tp,
+     ENTROPY_CONTEXT *a,
+     ENTROPY_CONTEXT *l,
+     int type,
+     VP8_COMP *cpi
+ )
+ {
+@@ -528,17 +528,17 @@ static __inline void stuff1st_order_b
+     t->skip_eob_node = 0;
+     ++cpi->coef_counts       [type] [band] [pt] [DCT_EOB_TOKEN];
+     ++t;
+     *tp = t;
+     pt = 0; /* 0 <-> all coeff data is zero */
+     *a = *l = pt;
+ 
+ }
+-static __inline
++static
+ void stuff1st_order_buv
+ (
+     TOKENEXTRA **tp,
+     ENTROPY_CONTEXT *a,
+     ENTROPY_CONTEXT *l,
+     VP8_COMP *cpi
+ )
+ {
+diff --git a/media/libvpx/vp8/encoder/treewriter.h b/media/libvpx/vp8/encoder/treewriter.h
+--- a/media/libvpx/vp8/encoder/treewriter.h
++++ b/media/libvpx/vp8/encoder/treewriter.h
+@@ -37,28 +37,28 @@ typedef BOOL_CODER vp8_writer;
+ 
+ #define vp8_cost_bit( x, b) vp8_cost_zero( (b)?  vp8_complement(x) : (x) )
+ 
+ /* VP8BC version is scaled by 2^20 rather than 2^8; see bool_coder.h */
+ 
+ 
+ /* Both of these return bits, not scaled bits. */
+ 
+-static __inline unsigned int vp8_cost_branch(const unsigned int ct[2], vp8_prob p)
++static unsigned int vp8_cost_branch(const unsigned int ct[2], vp8_prob p)
+ {
+     /* Imitate existing calculation */
+ 
+     return ((ct[0] * vp8_cost_zero(p))
+             + (ct[1] * vp8_cost_one(p))) >> 8;
+ }
+ 
+ /* Small functions to write explicit values and tokens, as well as
+    estimate their lengths. */
+ 
+-static __inline void vp8_treed_write
++static void vp8_treed_write
+ (
+     vp8_writer *const w,
+     vp8_tree t,
+     const vp8_prob *const p,
+     int v,
+     int n               /* number of bits in v, assumed nonzero */
+ )
+ {
+@@ -67,28 +67,28 @@ static __inline void vp8_treed_write
+     do
+     {
+         const int b = (v >> --n) & 1;
+         vp8_write(w, b, p[i>>1]);
+         i = t[i+b];
+     }
+     while (n);
+ }
+-static __inline void vp8_write_token
++static void vp8_write_token
+ (
+     vp8_writer *const w,
+     vp8_tree t,
+     const vp8_prob *const p,
+     vp8_token *const x
+ )
+ {
+     vp8_treed_write(w, t, p, x->value, x->Len);
+ }
+ 
+-static __inline int vp8_treed_cost(
++static int vp8_treed_cost(
+     vp8_tree t,
+     const vp8_prob *const p,
+     int v,
+     int n               /* number of bits in v, assumed nonzero */
+ )
+ {
+     int c = 0;
+     vp8_tree_index i = 0;
+@@ -98,17 +98,17 @@ static __inline int vp8_treed_cost(
+         const int b = (v >> --n) & 1;
+         c += vp8_cost_bit(p[i>>1], b);
+         i = t[i+b];
+     }
+     while (n);
+ 
+     return c;
+ }
+-static __inline int vp8_cost_token
++static int vp8_cost_token
+ (
+     vp8_tree t,
+     const vp8_prob *const p,
+     vp8_token *const x
+ )
+ {
+     return vp8_treed_cost(t, p, x->value, x->Len);
+ }
diff --git a/media/libvpx/I8a35831e.patch b/media/libvpx/I8a35831e.patch
new file mode 100644
index 00000000000..d93fa39b905
--- /dev/null
+++ b/media/libvpx/I8a35831e.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# Parent 919fe109d4a2e1768470d78c59d5b8ecc1a34a53
+# User Timothy B. Terriberry <tterribe@vt.edu>
+fix potential use of uninitialized rate_y
+
+Upstream Change-Id: I8a35831e8f08b549806d0c2c6900d42af883f78f
+
+diff --git a/media/libvpx/vp8/encoder/rdopt.c b/media/libvpx/vp8/encoder/rdopt.c
+--- a/media/libvpx/vp8/encoder/rdopt.c
++++ b/media/libvpx/vp8/encoder/rdopt.c
+@@ -742,17 +742,17 @@ static int rd_pick_intra4x4mby_modes(VP8
+         if(total_rd >= (int64_t)best_rd)
+             break;
+     }
+ 
+     if(total_rd >= (int64_t)best_rd)
+         return INT_MAX;
+ 
+     *Rate = cost;
+-    *rate_y += tot_rate_y;
++    *rate_y = tot_rate_y;
+     *Distortion = distortion;
+ 
+     return RDCOST(mb->rdmult, mb->rddiv, cost, distortion);
+ }
+ 
+ 
+ static int rd_pick_intra16x16mby_mode(VP8_COMP *cpi,
+                                       MACROBLOCK *x,
diff --git a/media/libvpx/I9713c9f0.patch b/media/libvpx/I9713c9f0.patch
new file mode 100644
index 00000000000..fe2132b7678
--- /dev/null
+++ b/media/libvpx/I9713c9f0.patch
@@ -0,0 +1,33 @@
+# HG changeset patch
+# Parent d0bb669a2e26f138d416333b21f55151503dcdf9
+# User Timothy B. Terriberry <tterribe@vt.edu>
+decoder: reset segmentation map on keyframes
+
+Upstream Change-Id: I9713c9f070eb37b31b3b029d9ef96be9b6ea2def
+
+diff --git a/media/libvpx/vp8/decoder/decodframe.c b/media/libvpx/vp8/decoder/decodframe.c
+--- a/media/libvpx/vp8/decoder/decodframe.c
++++ b/media/libvpx/vp8/decoder/decodframe.c
+@@ -830,16 +830,22 @@ int vp8_decode_frame(VP8D_COMP *pbi)
+             for (i = 0; i < MB_FEATURE_TREE_PROBS; i++)
+             {
+                 /* If not explicitly set value is defaulted to 255 by memset above */
+                 if (vp8_read_bit(bc))
+                     xd->mb_segment_tree_probs[i] = (vp8_prob)vp8_read_literal(bc, 8);
+             }
+         }
+     }
++    else
++    {
++        /* No segmentation updates on this frame */
++        xd->update_mb_segmentation_map = 0;
++        xd->update_mb_segmentation_data = 0;
++    }
+ 
+     /* Read the loop filter level and type */
+     pc->filter_type = (LOOPFILTERTYPE) vp8_read_bit(bc);
+     pc->filter_level = vp8_read_literal(bc, 6);
+     pc->sharpness_level = vp8_read_literal(bc, 3);
+ 
+     /* Read in loop filter deltas applied at the MB level based on mode or ref frame. */
+     xd->mode_ref_lf_delta_update = 0;
diff --git a/media/libvpx/LICENSE b/media/libvpx/LICENSE
index 7a6f99547d4..1ce44343c4a 100644
--- a/media/libvpx/LICENSE
+++ b/media/libvpx/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010, Google Inc. All rights reserved.
+Copyright (c) 2010, The WebM Project authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -12,9 +12,10 @@ met:
     the documentation and/or other materials provided with the
     distribution.
 
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
+  * Neither the name of Google, nor the WebM Project, nor the names
+    of its contributors may be used to endorse or promote products
+    derived from this software without specific prior written
+    permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in
index 13bd7f24d2e..ae9682238fe 100644
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -77,6 +77,7 @@ VPATH += \
   $(srcdir)/vpx_ports \
   $(srcdir)/vpx_scale \
   $(srcdir)/vpx_scale/arm \
+  $(srcdir)/vpx_scale/arm/neon \
   $(srcdir)/vpx_scale/generic \
   $(srcdir)/vp8 \
   $(srcdir)/vp8/common \
@@ -115,7 +116,6 @@ EXPORTS_vpx = \
   vpx_image.h \
   vpx_mem_intrnl.h \
   vpx_mem.h \
-  config.h \
   mem.h \
   vpx_integer.h \
   vpx_timer.h \
@@ -129,20 +129,19 @@ EXPORTS_vpx = \
 
 CSRCS += \
   vpx_config_c.c \
-  systemdependent.c \
+  vp8_dx_iface.c \
   alloccommon.c \
   blockd.c \
   debugmodes.c \
-  defaultcoefcounts.c \
-  dsystemdependent.c \
+  dequantize.c \
   entropy.c \
   entropymode.c \
   entropymv.c \
   extend.c \
   filter.c \
   findnearmv.c \
+  idct_blk.c \
   idctllm.c \
-  invtrans.c \
   loopfilter.c \
   loopfilter_filters.c \
   mbpitch.c \
@@ -150,24 +149,23 @@ CSRCS += \
   modecontext.c \
   postproc.c \
   quant_common.c \
-  recon.c \
   reconinter.c \
   reconintra.c \
   reconintra4x4.c \
+  sad_c.c \
   setupintrarecon.c \
   swapyv12buffer.c \
-  textblit.c \
   treecoder.c \
+  variance_c.c \
+  systemdependent.c \
   dboolhuff.c \
   decodemv.c \
   decodframe.c \
-  dequantize.c \
   detokenize.c \
   reconintra_mt.c \
-  idct_blk.c \
   onyxd_if.c \
   threading.c \
-  vp8_dx_iface.c \
+  dsystemdependent.c \
   vpx_codec.c \
   vpx_decoder.c \
   vpx_decoder_compat.c \
@@ -203,7 +201,6 @@ VPATH += \
 CSRCS += \
   vp8_cx_iface.c \
   bitstream.c \
-  boolhuff.c \
   dct.c \
   encodeframe.c \
   encodeintra.c \
@@ -214,19 +211,18 @@ CSRCS += \
   lookahead.c \
   mcomp.c \
   modecosts.c \
+  mr_dissim.c \
   onyx_if.c \
-  picklpf.c \
   pickinter.c \
+  picklpf.c \
   psnr.c \
   quantize.c \
   ratectrl.c \
   rdopt.c \
-  sad_c.c \
   segmentation.c \
   temporal_filter.c \
   tokenize.c \
   treewriter.c \
-  variance_c.c \
   csystemdependent.c \
   $(NULL)
 endif
@@ -236,16 +232,22 @@ ifdef VPX_X86_ASM
 # the optimized assembly in the build.
 
 CSRCS += \
+  filter_x86.c \
   idct_blk_mmx.c \
   idct_blk_sse2.c \
   loopfilter_x86.c \
+  postproc_x86.c \
   recon_wrapper_sse2.c \
+  variance_mmx.c \
+  variance_sse2.c \
+  variance_ssse3.c \
   vp8_asm_stubs.c \
   x86_systemdependent.c \
   x86_dsystemdependent.c \
   $(NULL)
 
 ASFILES += \
+  dequantize_mmx.asm \
   idctllm_mmx.asm \
   idctllm_sse2.asm \
   iwalsh_mmx.asm \
@@ -256,49 +258,47 @@ ASFILES += \
   postproc_sse2.asm \
   recon_mmx.asm \
   recon_sse2.asm \
+  sad_mmx.asm \
+  sad_sse2.asm \
+  sad_sse3.asm \
+  sad_sse4.asm \
+  sad_ssse3.asm \
   subpixel_mmx.asm \
   subpixel_sse2.asm \
   subpixel_ssse3.asm \
-  dequantize_mmx.asm \
+  variance_impl_mmx.asm \
+  variance_impl_sse2.asm \
+  variance_impl_ssse3.asm \
   emms.asm \
   $(NULL)
 
+ifeq (64,$(findstring 64,$(OS_TEST)))
+ASFILES += loopfilter_block_sse2.asm
+endif
+
 ifdef MOZ_VP8_ENCODER
 
 CSRCS += \
-  variance_mmx.c \
-  variance_sse2.c \
-  variance_ssse3.c \
   x86_csystemdependent.c \
   $(NULL)
 
+# Files which depend on asm_enc_offsets.asm
+VPX_ASM_ENC_OFFSETS_SRCS = \
+  quantize_sse2.asm \
+  quantize_sse4.asm \
+  quantize_ssse3.asm \
+  $(NULL)
+
 ASFILES += \
   dct_mmx.asm \
   dct_sse2.asm \
   encodeopt.asm \
   fwalsh_sse2.asm \
   quantize_mmx.asm \
-  quantize_sse2.asm \
-  quantize_ssse3.asm \
-  quantize_sse4.asm \
-  sad_mmx.asm \
-  sad_sse2.asm \
-  sad_sse3.asm \
-  sad_ssse3.asm \
-  sad_sse4.asm \
   subtract_mmx.asm \
   subtract_sse2.asm \
   temporal_filter_apply_sse2.asm \
-  variance_impl_mmx.asm \
-  variance_impl_sse2.asm \
-  variance_impl_ssse3.asm \
-  $(NULL)
-
-# Files which depend on asm_enc_offsets.asm
-VPX_ASM_ENC_OFFSETS_SRCS = \
-  quantize_sse2.asm \
-  quantize_ssse3.asm \
-  quantize_sse4.asm \
+  $(VPX_ASM_ENC_OFFSETS_SRCS) \
   $(NULL)
 
 endif
@@ -309,122 +309,111 @@ ifdef VPX_ARM_ASM
 # Building on an ARM platform with a supported assembler, include
 # the optimized assembly in the build.
 
-# The Android NDK doesn't pre-define anything to indicate the OS it's on, so
-# do it for them.
 ifeq ($(OS_TARGET),Android)
+
+# Older versions of the Android NDK don't pre-define anything to indicate the
+# OS they're on, so do it for them.
 DEFINES += -D__linux__
+
+# For cpu-features.h
+LOCAL_INCLUDES += -I$(ANDROID_NDK)/sources/android/cpufeatures
+# For cpu-features.c
+VPATH += $(ANDROID_NDK)/sources/android/cpufeatures
+
+CSRCS += cpu-features.c
+
 endif
 
 CSRCS += \
   arm_cpudetect.c \
   arm_systemdependent.c \
   bilinearfilter_arm.c \
+  dequantize_arm.c \
   filter_arm.c \
   loopfilter_arm.c \
   reconintra_arm.c \
-  arm_dsystemdependent.c \
-  dequantize_arm.c \
+  variance_arm.c \
   idct_blk_v6.c \
   idct_blk_neon.c \
-  recon_neon.c \
+  arm_dsystemdependent.c \
+  arm_scalesystemdependent.c \
+  yv12extend_arm.c \
+  $(NULL)
+
+# Files which depend on asm_com_offsets.asm
+VPX_ASM_COM_OFFSETS_SRCS = \
+  vp8_vpxyv12_copy_y_neon.asm \
+  vp8_vpxyv12_copyframe_func_neon.asm \
+  vp8_vpxyv12_extendframeborders_neon.asm \
   $(NULL)
 
 VPX_ASFILES = \
   bilinearfilter_v6.asm \
+  copymem16x16_v6.asm \
   copymem8x4_v6.asm \
   copymem8x8_v6.asm \
-  copymem16x16_v6.asm \
   dc_only_idct_add_v6.asm \
-  iwalsh_v6.asm \
+  dequant_idct_v6.asm \
+  dequantize_v6.asm \
   filter_v6.asm \
   idct_v6.asm \
+  intra4x4_predict_v6.asm \
+  iwalsh_v6.asm \
   loopfilter_v6.asm \
-  recon_v6.asm \
   simpleloopfilter_v6.asm \
   sixtappredict8x4_v6.asm \
+  bilinearpredict16x16_neon.asm \
   bilinearpredict4x4_neon.asm \
   bilinearpredict8x4_neon.asm \
   bilinearpredict8x8_neon.asm \
-  bilinearpredict16x16_neon.asm \
+  buildintrapredictorsmby_neon.asm \
+  copymem16x16_neon.asm \
   copymem8x4_neon.asm \
   copymem8x8_neon.asm \
-  copymem16x16_neon.asm \
   dc_only_idct_add_neon.asm \
+  dequant_idct_neon.asm \
+  dequantizeb_neon.asm \
+  idct_dequant_0_2x_neon.asm \
+  idct_dequant_full_2x_neon.asm \
   iwalsh_neon.asm \
   loopfilter_neon.asm \
   loopfiltersimplehorizontaledge_neon.asm \
   loopfiltersimpleverticaledge_neon.asm \
   mbloopfilter_neon.asm \
-  recon2b_neon.asm \
-  recon4b_neon.asm \
-  reconb_neon.asm \
-  shortidct4x4llm_1_neon.asm \
-  shortidct4x4llm_neon.asm \
-  sixtappredict4x4_neon.asm \
-  sixtappredict8x4_neon.asm \
-  sixtappredict8x8_neon.asm \
-  sixtappredict16x16_neon.asm \
-  recon16x16mb_neon.asm \
-  buildintrapredictorsmby_neon.asm \
   save_neon_reg.asm \
-  dequant_dc_idct_v6.asm \
-  dequant_idct_v6.asm \
-  dequantize_v6.asm \
-  idct_dequant_dc_full_2x_neon.asm \
-  idct_dequant_dc_0_2x_neon.asm \
-  dequant_idct_neon.asm \
-  idct_dequant_full_2x_neon.asm \
-  idct_dequant_0_2x_neon.asm \
-  dequantizeb_neon.asm \
-  $(NULL)
-
-ifdef MOZ_VP8_ENCODER
-CSRCS += \
-  arm_csystemdependent.c \
-  dct_arm.c \
-  picklpf_arm.c \
-  variance_arm.c \
-  $(NULL)
-
-VPX_ASFILES += \
-  vp8_packtokens_armv5.asm \
-  vp8_packtokens_mbrow_armv5.asm \
-  vp8_packtokens_partitions_armv5.asm \
-  vp8_fast_fdct4x4_armv6.asm \
-  vp8_fast_quantize_b_armv6.asm \
   vp8_mse16x16_armv6.asm \
   vp8_sad16x16_armv6.asm \
-  vp8_subtract_armv6.asm \
   vp8_variance16x16_armv6.asm \
   vp8_variance8x8_armv6.asm \
   vp8_variance_halfpixvar16x16_h_armv6.asm \
   vp8_variance_halfpixvar16x16_hv_armv6.asm \
   vp8_variance_halfpixvar16x16_v_armv6.asm \
-  walsh_v6.asm \
-  fastfdct4x4_neon.asm \
-  fastfdct8x4_neon.asm \
-  fastquantizeb_neon.asm \
+  shortidct4x4llm_neon.asm \
   sad16_neon.asm \
   sad8_neon.asm \
-  shortfdct_neon.asm \
-  subtract_neon.asm \
+  sixtappredict16x16_neon.asm \
+  sixtappredict4x4_neon.asm \
+  sixtappredict8x4_neon.asm \
+  sixtappredict8x8_neon.asm \
   variance_neon.asm \
-  vp8_memcpy_neon.asm \
   vp8_mse16x16_neon.asm \
-  vp8_shortwalsh4x4_neon.asm \
   vp8_subpixelvariance8x8_neon.asm \
   vp8_subpixelvariance16x16_neon.asm \
   vp8_subpixelvariance16x16s_neon.asm \
-  vp8_vpxyv12_copyframeyonly_neon.asm \
+  $(VPX_ASM_COM_OFFSETS_SRCS) \
   $(NULL)
 
-# Files which depend on asm_com_offsets.asm
-VPX_ASM_COM_OFFSETS_SRCS = \
-  vp8_vpxyv12_copyframeyonly_neon.asm \
+ifdef MOZ_VP8_ENCODER
+CSRCS += \
+  arm_csystemdependent.c \
+  boolhuff_arm.c \
+  dct_arm.c \
+  picklpf_arm.c \
   $(NULL)
 
 # Files which depend on asm_enc_offsets.asm
 VPX_ASM_ENC_OFFSETS_SRCS = \
+  boolhuff_armv5te.asm \
   vp8_packtokens_armv5.asm \
   vp8_packtokens_mbrow_armv5.asm \
   vp8_packtokens_partitions_armv5.asm \
@@ -434,6 +423,15 @@ VPX_ASM_ENC_OFFSETS_SRCS = \
   subtract_neon.asm \
   $(NULL)
 
+VPX_ASFILES += \
+  vp8_short_fdct4x4_armv6.asm \
+  walsh_v6.asm \
+  shortfdct_neon.asm \
+  vp8_memcpy_neon.asm \
+  vp8_shortwalsh4x4_neon.asm \
+  $(VPX_ASM_ENC_OFFSETS_SRCS) \
+  $(NULL)
+
 endif
 
 ifdef VPX_AS_CONVERSION
@@ -450,9 +448,14 @@ else
 ASFILES += $(VPX_ASFILES)
 endif
 
+else
+ifdef MOZ_VP8_ENCODER
+# boolhuff_armv5te.asm defines the same functions as boolhuff.c instead of
+# using RTCD, so we have to make sure we only add one of the two.
+CSRCS += boolhuff.c
+endif
 endif
 
-ifdef MOZ_VP8_ENCODER
 ifdef VPX_NEED_OBJ_INT_EXTRACT
 
 # We don't have a compiler that supports a compatible inline asm syntax, so we
@@ -469,10 +472,11 @@ endif
 HOST_CSRCS = obj_int_extract.c
 HOST_PROGRAM = host_obj_int_extract$(HOST_BIN_SUFFIX)
 
-GARBAGE += \
-  asm_com_offsets.$(OBJ_SUFFIX) asm_com_offsets.asm \
-  asm_enc_offsets.$(OBJ_SUFFIX) asm_enc_offsets.asm \
-  $(NULL)
+GARBAGE += asm_com_offsets.$(OBJ_SUFFIX) asm_com_offsets.asm
+
+ifdef MOZ_VP8_ENCODER
+GARBAGE += asm_enc_offsets.$(OBJ_SUFFIX) asm_enc_offsets.asm
+endif
 
 else
 
@@ -480,51 +484,59 @@ else
 # asm. This is the preferred method.
 
 asm_com_offsets.s: CFLAGS += -DINLINE_ASM
-asm_enc_offsets.s: CFLAGS += -DINLINE_ASM
+
+OFFSET_PATTERN := '^[a-zA-Z0-9_]* EQU'
 
 asm_com_offsets.asm: asm_com_offsets.s
-	grep \\\<EQU\\\> $< | sed -e 's/[$$\#]//g' \
+	grep $(OFFSET_PATTERN) $< | sed -e 's/[$$\#]//g' \
 	    $(if $(VPX_AS_CONVERSION),| $(VPX_AS_CONVERSION)) > $@
 
+GARBAGE += asm_com_offsets.s asm_com_offsets.asm
+
+ifdef MOZ_VP8_ENCODER
+
+asm_enc_offsets.s: CFLAGS += -DINLINE_ASM
+
 asm_enc_offsets.asm: asm_enc_offsets.s
-	grep \\\<EQU\\\> $< | sed -e 's/[$$\#]//g' \
+	grep $(OFFSET_PATTERN) $< | sed -e 's/[$$\#]//g' \
 	    $(if $(VPX_AS_CONVERSION),| $(VPX_AS_CONVERSION)) > $@
 
-GARBAGE += \
-  asm_com_offsets.s asm_com_offsets.asm \
-  asm_enc_offsets.s asm_enc_offsets.asm \
-  $(NULL)
+GARBAGE += asm_enc_offsets.s asm_enc_offsets.asm
 
 endif
+
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 # This must be after rules.mk in order to use $(OBJ_SUFFIX) outside a
 # recursively-expanded variable.
-ifdef MOZ_VP8_ENCODER
-
 ifdef VPX_NEED_OBJ_INT_EXTRACT
 
 asm_com_offsets.asm: asm_com_offsets.$(OBJ_SUFFIX) $(HOST_PROGRAM)
 	./$(HOST_PROGRAM) $(VPX_OIE_FORMAT) $< \
 	    $(if $(VPX_AS_CONVERSION),| $(VPX_AS_CONVERSION)) > $@
 
+ifdef MOZ_VP8_ENCODER
+
 asm_enc_offsets.asm: asm_enc_offsets.$(OBJ_SUFFIX) $(HOST_PROGRAM)
 	./$(HOST_PROGRAM) $(VPX_OIE_FORMAT) $< \
 	    $(if $(VPX_AS_CONVERSION),| $(VPX_AS_CONVERSION)) > $@
 
 endif
+endif
 
 # These dependencies are not generated automatically, so do it manually.
 ifdef VPX_AS_CONVERSION
 $(addsuffix .$(OBJ_SUFFIX), $(VPX_ASM_COM_OFFSETS_SRCS)): asm_com_offsets.asm
+ifdef MOZ_VP8_ENCODER
 $(addsuffix .$(OBJ_SUFFIX), $(VPX_ASM_ENC_OFFSETS_SRCS)): asm_enc_offsets.asm
+endif
 else
 $(patsubst %.$(ASM_SUFFIX),%.$(OBJ_SUFFIX), $(VPX_ASM_COM_OFFSETS_SRCS)): asm_com_offsets.asm
+ifdef MOZ_VP8_ENCODER
 $(patsubst %.$(ASM_SUFFIX),%.$(OBJ_SUFFIX), $(VPX_ASM_ENC_OFFSETS_SRCS)): asm_enc_offsets.asm
 endif
-
 endif
 
 # Workaround a bug of Sun Studio (CR 6963410)
diff --git a/media/libvpx/build/make/ads2gas.pl b/media/libvpx/build/make/ads2gas.pl
old mode 100644
new mode 100755
index 388133aa290..c55ed0fe42a
--- a/media/libvpx/build/make/ads2gas.pl
+++ b/media/libvpx/build/make/ads2gas.pl
@@ -126,15 +126,17 @@ while (<STDIN>)
     # ALIGN directive
     s/ALIGN/.balign/g;
 
-    # Strip ARM
-    s/\sARM/@ ARM/g;
+    # ARM code
+    s/\sARM/.arm/g;
 
-    # Strip REQUIRE8
-    #s/\sREQUIRE8/@ REQUIRE8/g;
-    s/\sREQUIRE8/@ /g;      #EQU cause problem
+    # eabi_attributes numerical equivalents can be found in the
+    # "ARM IHI 0045C" document.
 
-    # Strip PRESERVE8
-    s/\sPRESERVE8/@ PRESERVE8/g;
+    # REQUIRE8 Stack is required to be 8-byte aligned
+    s/\sREQUIRE8/.eabi_attribute 24, 1 \@Tag_ABI_align_needed/g;
+
+    # PRESERVE8 Stack 8-byte align is preserved
+    s/\sPRESERVE8/.eabi_attribute 25, 1 \@Tag_ABI_align_preserved/g;
 
     # Use PROC and ENDP to give the symbols a .size directive.
     # This makes them show up properly in debugging tools like gdb and valgrind.
diff --git a/media/libvpx/compile_errors.patch b/media/libvpx/compile_errors.patch
index b490ab34fe3..c9931078b52 100644
--- a/media/libvpx/compile_errors.patch
+++ b/media/libvpx/compile_errors.patch
@@ -1,7 +1,64 @@
+# HG changeset patch
+# Parent f73b7e96c0735448035ec4786f37dcf7d7644e00
+# User Timothy B. Terriberry <tterribe@vt.edu>
+Patch to fix errors including C headers in C++
+
+diff --git a/media/libvpx/vp8/common/onyx.h b/media/libvpx/vp8/common/onyx.h
+--- a/media/libvpx/vp8/common/onyx.h
++++ b/media/libvpx/vp8/common/onyx.h
+@@ -55,24 +55,24 @@ extern "C"
+ 
+     typedef enum
+     {
+         MODE_REALTIME       = 0x0,
+         MODE_GOODQUALITY    = 0x1,
+         MODE_BESTQUALITY    = 0x2,
+         MODE_FIRSTPASS      = 0x3,
+         MODE_SECONDPASS     = 0x4,
+-        MODE_SECONDPASS_BEST = 0x5,
++        MODE_SECONDPASS_BEST = 0x5
+     } MODE;
+ 
+     typedef enum
+     {
+         FRAMEFLAGS_KEY    = 1,
+         FRAMEFLAGS_GOLDEN = 2,
+-        FRAMEFLAGS_ALTREF = 4,
++        FRAMEFLAGS_ALTREF = 4
+     } FRAMETYPE_FLAGS;
+ 
+ 
+ #include <assert.h>
+     static void Scale2Ratio(int mode, int *hr, int *hs)
+     {
+         switch (mode)
+         {
+diff --git a/media/libvpx/vp8/encoder/onyx_int.h b/media/libvpx/vp8/encoder/onyx_int.h
+--- a/media/libvpx/vp8/encoder/onyx_int.h
++++ b/media/libvpx/vp8/encoder/onyx_int.h
+@@ -158,17 +158,17 @@ typedef enum
+     THR_NEW1           = 13,
+     THR_NEW2           = 14,
+     THR_NEW3           = 15,
+ 
+     THR_SPLIT1         = 16,
+     THR_SPLIT2         = 17,
+     THR_SPLIT3         = 18,
+ 
+-    THR_B_PRED         = 19,
++    THR_B_PRED         = 19
+ }
+ THR_MODES;
+ 
+ typedef enum
+ {
+     DIAMOND = 0,
+     NSTEP = 1,
+     HEX = 2
 diff --git a/media/libvpx/vpx/vp8.h b/media/libvpx/vpx/vp8.h
 --- a/media/libvpx/vpx/vp8.h
 +++ b/media/libvpx/vpx/vp8.h
-@@ -41,33 +41,33 @@ enum vp8_com_control_id
+@@ -41,34 +41,34 @@ enum vp8_com_control_id
      VP8_SET_REFERENCE           = 1,    /**< pass in an external frame into decoder to be used as reference frame */
      VP8_COPY_REFERENCE          = 2,    /**< get a copy of reference frame from the decoder */
      VP8_SET_POSTPROC            = 3,    /**< set the decoder's post processing settings  */
@@ -27,8 +84,9 @@ diff --git a/media/libvpx/vpx/vp8.h b/media/libvpx/vpx/vp8.h
      VP8_DEBUG_TXT_FRAME_INFO    = 1<<3, /**< print frame information */
      VP8_DEBUG_TXT_MBLK_MODES    = 1<<4, /**< print macro block modes over each macro block */
      VP8_DEBUG_TXT_DC_DIFF       = 1<<5, /**< print dc diff for each macro block */
--    VP8_DEBUG_TXT_RATE_INFO     = 1<<6, /**< print video rate info (encoder only) */
-+    VP8_DEBUG_TXT_RATE_INFO     = 1<<6  /**< print video rate info (encoder only) */
+     VP8_DEBUG_TXT_RATE_INFO     = 1<<6, /**< print video rate info (encoder only) */
+-    VP8_MFQE                    = 1<<10,
++    VP8_MFQE                    = 1<<10
  };
  
  /*!\brief post process flags
@@ -37,3 +95,44 @@ diff --git a/media/libvpx/vpx/vp8.h b/media/libvpx/vpx/vp8.h
   * the best objective measure (using the PSNR metric) set post_proc_flag
   * to VP8_DEBLOCK and deblocking_level to 1.
   */
+diff --git a/media/libvpx/vpx/vp8cx.h b/media/libvpx/vpx/vp8cx.h
+--- a/media/libvpx/vpx/vp8cx.h
++++ b/media/libvpx/vpx/vp8cx.h
+@@ -172,17 +172,17 @@ enum vp8e_enc_control_id
+      * per-frame bitrate, with the special (and default) value 0 meaning
+      * unlimited, or no additional clamping beyond the codec's built-in
+      * algorithm.
+      *
+      * For example, to allocate no more than 4.5 frames worth of bitrate
+      * to a keyframe, set this to 450.
+      *
+      */
+-    VP8E_SET_MAX_INTRA_BITRATE_PCT,
++    VP8E_SET_MAX_INTRA_BITRATE_PCT
+ };
+ 
+ /*!\brief vpx 1-D scaling mode
+  *
+  * This set of constants define 1-D vpx scaling modes
+  */
+ typedef enum vpx_scaling_mode_1d
+ {
+@@ -253,17 +253,17 @@ typedef enum
+  *
+  */
+ 
+ typedef enum
+ {
+     VP8_ONE_TOKENPARTITION   = 0,
+     VP8_TWO_TOKENPARTITION   = 1,
+     VP8_FOUR_TOKENPARTITION  = 2,
+-    VP8_EIGHT_TOKENPARTITION = 3,
++    VP8_EIGHT_TOKENPARTITION = 3
+ } vp8e_token_partitions;
+ 
+ 
+ /*!\brief VP8 model tuning parameters
+  *
+  * Changes the encoder to tune for certain types of input material.
+  *
+  */
diff --git a/media/libvpx/solaris.patch b/media/libvpx/solaris.patch
index 4be026324e1..3dba0fea7d6 100644
--- a/media/libvpx/solaris.patch
+++ b/media/libvpx/solaris.patch
@@ -1,21 +1,3 @@
-diff --git a/media/libvpx/vp8/common/loopfilter_filters.c b/media/libvpx/vp8/common/loopfilter_filters.c
---- a/media/libvpx/vp8/common/loopfilter_filters.c
-+++ b/media/libvpx/vp8/common/loopfilter_filters.c
-@@ -11,10 +11,14 @@
- 
- #include <stdlib.h>
- #include "loopfilter.h"
- #include "onyxc_int.h"
- 
-+#ifdef __SUNPRO_C
-+#define __inline inline
-+#endif
-+
- typedef unsigned char uc;
- 
- static __inline signed char vp8_signed_char_clamp(int t)
- {
-     t = (t < -128 ? -128 : t);
 diff --git a/media/libvpx/vpx_ports/mem.h b/media/libvpx/vpx_ports/mem.h
 --- a/media/libvpx/vpx_ports/mem.h
 +++ b/media/libvpx/vpx_ports/mem.h
@@ -41,7 +23,7 @@ diff --git a/media/libvpx/vpx_ports/mem.h b/media/libvpx/vpx_ports/mem.h
 diff --git a/media/libvpx/vpx_ports/x86.h b/media/libvpx/vpx_ports/x86.h
 --- a/media/libvpx/vpx_ports/x86.h
 +++ b/media/libvpx/vpx_ports/x86.h
-@@ -45,16 +45,36 @@
+@@ -45,16 +45,36 @@ typedef enum
  #define cpuid(func,ax,bx,cx,dx)\
      __asm__ __volatile__ (\
                            "mov %%ebx, %%edi   \n\t" \
@@ -78,7 +60,7 @@ diff --git a/media/libvpx/vpx_ports/x86.h b/media/libvpx/vpx_ports/x86.h
          int regs[4];\
          __cpuid(regs,func); a=regs[0];  b=regs[1];  c=regs[2];  d=regs[3];\
      } while(0)
-@@ -108,29 +128,36 @@ unsigned __int64 __rdtsc(void);
+@@ -131,29 +151,36 @@ unsigned __int64 __rdtsc(void);
  #endif
  static unsigned int
  x86_readtsc(void)
@@ -115,7 +97,7 @@ diff --git a/media/libvpx/vpx_ports/x86.h b/media/libvpx/vpx_ports/x86.h
  #define x86_pause_hint()\
      __asm pause
  #endif
-@@ -144,16 +171,29 @@ x87_set_control_word(unsigned short mode
+@@ -167,16 +194,29 @@ x87_set_control_word(unsigned short mode
  }
  static unsigned short
  x87_get_control_word(void)
diff --git a/media/libvpx/textrels.patch b/media/libvpx/textrels.patch
new file mode 100644
index 00000000000..0a255a741cc
--- /dev/null
+++ b/media/libvpx/textrels.patch
@@ -0,0 +1,164 @@
+# HG changeset patch
+# Parent f7a8c8a419870421138438970a0514e79353ae34
+# User Timothy B. Terriberry <tterribe@vt.edu>
+Bug 730903 - Fix text relocations in libvpx variance functions.
+
+diff --git a/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm
+--- a/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm
++++ b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm
+@@ -4,16 +4,21 @@
+ ;  Use of this source code is governed by a BSD-style license
+ ;  that can be found in the LICENSE file in the root of the source
+ ;  tree. An additional intellectual property rights grant can be found
+ ;  in the file PATENTS.  All contributing project authors may
+ ;  be found in the AUTHORS file in the root of the source tree.
+ ;
+ 
+ 
++bilinear_taps_coeff
++    DCD     128, 0, 112, 16, 96, 32, 80, 48, 64, 64, 48, 80, 32, 96, 16, 112
++
++;-----------------
++
+     EXPORT  |vp8_sub_pixel_variance16x16_neon_func|
+     ARM
+     REQUIRE8
+     PRESERVE8
+ 
+     AREA ||.text||, CODE, READONLY, ALIGN=2
+ ; r0    unsigned char  *src_ptr,
+ ; r1    int  src_pixels_per_line,
+@@ -22,17 +27,17 @@
+ ; stack(r4) unsigned char *dst_ptr,
+ ; stack(r5) int dst_pixels_per_line,
+ ; stack(r6) unsigned int *sse
+ ;note: most of the code is copied from bilinear_predict16x16_neon and vp8_variance16x16_neon.
+ 
+ |vp8_sub_pixel_variance16x16_neon_func| PROC
+     push            {r4-r6, lr}
+ 
+-    ldr             r12, _BilinearTaps_coeff_
++    adr             r12, bilinear_taps_coeff
+     ldr             r4, [sp, #16]           ;load *dst_ptr from stack
+     ldr             r5, [sp, #20]           ;load dst_pixels_per_line from stack
+     ldr             r6, [sp, #24]           ;load *sse from stack
+ 
+     cmp             r2, #0                  ;skip first_pass filter if xoffset=0
+     beq             secondpass_bfilter16x16_only
+ 
+     add             r2, r12, r2, lsl #3     ;calculate filter location
+@@ -410,16 +415,9 @@ sub_pixel_variance16x16_neon_loop
+ 
+     add             sp, sp, #528
+     vmov.32         r0, d0[0]                   ;return
+ 
+     pop             {r4-r6,pc}
+ 
+     ENDP
+ 
+-;-----------------
+-
+-_BilinearTaps_coeff_
+-    DCD     bilinear_taps_coeff
+-bilinear_taps_coeff
+-    DCD     128, 0, 112, 16, 96, 32, 80, 48, 64, 64, 48, 80, 32, 96, 16, 112
+-
+     END
+diff --git a/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm
+--- a/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm
++++ b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm
+@@ -22,17 +22,17 @@
+ ; stack(r4) unsigned char *dst_ptr,
+ ; stack(r5) int dst_pixels_per_line,
+ ; stack(r6) unsigned int *sse
+ ;note: most of the code is copied from bilinear_predict8x8_neon and vp8_variance8x8_neon.
+ 
+ |vp8_sub_pixel_variance8x8_neon| PROC
+     push            {r4-r5, lr}
+ 
+-    ldr             r12, _BilinearTaps_coeff_
++    adr             r12, bilinear_taps_coeff
+     ldr             r4, [sp, #12]           ;load *dst_ptr from stack
+     ldr             r5, [sp, #16]           ;load dst_pixels_per_line from stack
+     ldr             lr, [sp, #20]           ;load *sse from stack
+ 
+     cmp             r2, #0                  ;skip first_pass filter if xoffset=0
+     beq             skip_firstpass_filter
+ 
+ ;First pass: output_height lines x output_width columns (9x8)
+@@ -211,14 +211,12 @@ sub_pixel_variance8x8_neon_loop
+ 
+     vmov.32         r0, d0[0]                   ;return
+     pop             {r4-r5, pc}
+ 
+     ENDP
+ 
+ ;-----------------
+ 
+-_BilinearTaps_coeff_
+-    DCD     bilinear_taps_coeff
+ bilinear_taps_coeff
+     DCD     128, 0, 112, 16, 96, 32, 80, 48, 64, 64, 48, 80, 32, 96, 16, 112
+ 
+     END
+diff --git a/media/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.asm b/media/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.asm
+--- a/media/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.asm
++++ b/media/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.asm
+@@ -93,17 +93,17 @@
+     vsub.s16        q10, q12            ; x2=(y^sz)-sz = (y^sz)-(-1) (2's complement)
+     vsub.s16        q11, q13
+ 
+     ldr             r6, [r3, #vp8_blockd_qcoeff]
+ 
+     vmul.s16        q2, q6, q4          ; x * Dequant
+     vmul.s16        q3, q7, q5
+ 
+-    ldr             r0, _inv_zig_zag_   ; load ptr of inverse zigzag table
++    adr             r0, inv_zig_zag     ; load ptr of inverse zigzag table
+ 
+     vceq.s16        q8, q8              ; set q8 to all 1
+ 
+     vst1.s16        {q10, q11}, [r6]    ; store: qcoeff = x2
+ 
+     vmul.s16        q12, q6, q10        ; x2 * Dequant
+     vmul.s16        q13, q7, q11
+ 
+@@ -176,17 +176,17 @@
+     vshr.s16        q3, q1, #15
+ 
+     vld1.s16        {q14, q15}, [r5@128]; load round_ptr [0-15]
+     vld1.s16        {q8, q9}, [r4@128]  ; load quant_ptr [0-15]
+ 
+     vadd.s16        q12, q14            ; x + Round
+     vadd.s16        q13, q15
+ 
+-    ldr             r0, _inv_zig_zag_   ; load ptr of inverse zigzag table
++    adr             r0, inv_zig_zag     ; load ptr of inverse zigzag table
+ 
+     vqdmulh.s16     q12, q8             ; y = ((Round+abs(z)) * Quant) >> 16
+     vqdmulh.s16     q13, q9
+ 
+     vld1.16         {q10, q11}, [r0@128]; load inverse scan order
+ 
+     vceq.s16        q8, q8              ; set q8 to all 1
+ 
+@@ -242,19 +242,16 @@ zero_output
+     vst1.s16        {q0, q1}, [r7@128]  ; dqcoeff = 0
+ 
+     ldmfd           sp!, {r4-r7}
+     bx              lr
+ 
+     ENDP
+ 
+ ; default inverse zigzag table is defined in vp8/common/entropy.c
+-_inv_zig_zag_
+-    DCD inv_zig_zag
+-
+     ALIGN 16    ; enable use of @128 bit aligned loads
+ inv_zig_zag
+     DCW 0x0001, 0x0002, 0x0006, 0x0007
+     DCW 0x0003, 0x0005, 0x0008, 0x000d
+     DCW 0x0004, 0x0009, 0x000c, 0x000e
+     DCW 0x000a, 0x000b, 0x000f, 0x0010
+ 
+     END
diff --git a/media/libvpx/update.sh b/media/libvpx/update.sh
index 75c7af4cf9b..95035699f89 100755
--- a/media/libvpx/update.sh
+++ b/media/libvpx/update.sh
@@ -43,8 +43,9 @@ if [ $# -lt 1 ]; then
   echo   * objdir/generic-gnu
   echo   * objdir/x86-darwin9-gcc
   echo   * objdir/x86_64-darwin9-gcc
+  echo   * objdir/armv7-linux-gcc
   echo You can configure these from objdir/$target with the following command:
-  echo $ ..configure --target=$target --disable-vp8-encoder --disable-examples --disable-install-docs
+  echo $ ../../configure --target=$target --disable-vp8-encoder --disable-examples --disable-install-docs
   echo On Mac, you also need --enable-pic
   exit -1
 fi
@@ -57,15 +58,15 @@ commonFiles=(
   vp8/common/asm_com_offsets.c
   vp8/common/blockd.c
   vp8/common/debugmodes.c
-  vp8/common/defaultcoefcounts.c
+  vp8/common/dequantize.c
   vp8/common/entropy.c
   vp8/common/entropymode.c
   vp8/common/entropymv.c
   vp8/common/extend.c
   vp8/common/filter.c
   vp8/common/findnearmv.c
+  vp8/common/idct_blk.c
   vp8/common/idctllm.c
-  vp8/common/invtrans.c
   vp8/common/loopfilter.c
   vp8/common/loopfilter_filters.c
   vp8/common/mbpitch.c
@@ -73,42 +74,39 @@ commonFiles=(
   vp8/common/modecontext.c
   vp8/common/postproc.c
   vp8/common/quant_common.c
-  vp8/common/recon.c
   vp8/common/reconinter.c
-  vp8/common/reconintra4x4.c
   vp8/common/reconintra.c
+  vp8/common/reconintra4x4.c
   vp8/common/setupintrarecon.c
   vp8/common/swapyv12buffer.c
-  vp8/common/textblit.c
   vp8/common/treecoder.c
   vp8/common/arm/arm_systemdependent.c
   vp8/common/arm/bilinearfilter_arm.c
+  vp8/common/arm/dequantize_arm.c
   vp8/common/arm/filter_arm.c
   vp8/common/arm/loopfilter_arm.c
   vp8/common/arm/reconintra_arm.c
-  vp8/common/arm/neon/recon_neon.c
+  vp8/common/arm/armv6/idct_blk_v6.c
+  vp8/common/arm/neon/idct_blk_neon.c
   vp8/common/generic/systemdependent.c
+  vp8/common/x86/filter_x86.c
+  vp8/common/x86/idct_blk_mmx.c
+  vp8/common/x86/idct_blk_sse2.c
   vp8/common/x86/loopfilter_x86.c
   vp8/common/x86/recon_wrapper_sse2.c
   vp8/common/x86/vp8_asm_stubs.c
   vp8/common/x86/x86_systemdependent.c
+  vp8/decoder/asm_dec_offsets.c
   vp8/decoder/dboolhuff.c
   vp8/decoder/decodemv.c
   vp8/decoder/decodframe.c
-  vp8/decoder/dequantize.c
   vp8/decoder/detokenize.c
   vp8/decoder/error_concealment.c
-  vp8/decoder/idct_blk.c
   vp8/decoder/onyxd_if.c
   vp8/decoder/reconintra_mt.c
   vp8/decoder/threading.c
   vp8/decoder/arm/arm_dsystemdependent.c
-  vp8/decoder/arm/dequantize_arm.c
-  vp8/decoder/arm/armv6/idct_blk_v6.c
-  vp8/decoder/arm/neon/idct_blk_neon.c
   vp8/decoder/generic/dsystemdependent.c
-  vp8/decoder/x86/idct_blk_mmx.c
-  vp8/decoder/x86/idct_blk_sse2.c
   vp8/decoder/x86/x86_dsystemdependent.c
   vp8/encoder/asm_enc_offsets.c
   vp8/encoder/bitstream.c
@@ -123,9 +121,10 @@ commonFiles=(
   vp8/encoder/lookahead.c
   vp8/encoder/mcomp.c
   vp8/encoder/modecosts.c
+  vp8/encoder/mr_dissim.c
   vp8/encoder/onyx_if.c
-  vp8/encoder/picklpf.c
   vp8/encoder/pickinter.c
+  vp8/encoder/picklpf.c
   vp8/encoder/psnr.c
   vp8/encoder/quantize.c
   vp8/encoder/ratectrl.c
@@ -137,9 +136,11 @@ commonFiles=(
   vp8/encoder/treewriter.c
   vp8/encoder/variance_c.c
   vp8/encoder/arm/arm_csystemdependent.c
+  vp8/encoder/arm/boolhuff_arm.c
   vp8/encoder/arm/dct_arm.c
-  vp8/encoder/arm/picklpf_arm.c
+  vp8/encoder/arm/quantize_arm.c
   vp8/encoder/arm/variance_arm.c
+  vp8/encoder/arm/neon/picklpf_arm.c
   vp8/encoder/generic/csystemdependent.c
   vp8/encoder/x86/variance_mmx.c
   vp8/encoder/x86/variance_sse2.c
@@ -151,6 +152,8 @@ commonFiles=(
   vpx/src/vpx_encoder.c
   vpx/src/vpx_image.c
   vpx_mem/vpx_mem.c
+  vpx_ports/arm_cpudetect.c
+  vpx_scale/arm/neon/yv12extend_arm.c
   vpx_scale/generic/gen_scalers.c
   vpx_scale/generic/scalesystemdependent.c
   vpx_scale/generic/vpxscale.c
@@ -160,44 +163,45 @@ commonFiles=(
   vp8/common/blockd.h
   vp8/common/coefupdateprobs.h
   vp8/common/common.h
-  vp8/common/common_types.h
-  vp8/common/defaultcoefcounts.h
+  vp8/common/default_coef_probs.h
+  vp8/common/dequantize.h
   vp8/common/entropy.h
   vp8/common/entropymode.h
   vp8/common/entropymv.h
   vp8/common/extend.h
   vp8/common/filter.h
   vp8/common/findnearmv.h
-  vp8/common/g_common.h
   vp8/common/header.h
   vp8/common/idct.h
   vp8/common/invtrans.h
   vp8/common/loopfilter.h
   vp8/common/modecont.h
   vp8/common/mv.h
+  vp8/common/onyx.h
   vp8/common/onyxc_int.h
   vp8/common/onyxd.h
-  vp8/common/onyx.h
   vp8/common/postproc.h
   vp8/common/ppflags.h
   vp8/common/pragmas.h
   vp8/common/quant_common.h
   vp8/common/recon.h
   vp8/common/reconinter.h
-  vp8/common/reconintra4x4.h
   vp8/common/reconintra.h
+  vp8/common/reconintra4x4.h
   vp8/common/setupintrarecon.h
   vp8/common/subpixel.h
   vp8/common/swapyv12buffer.h
   vp8/common/systemdependent.h
   vp8/common/threading.h
   vp8/common/treecoder.h
-  vp8/common/type_aliases.h
   vp8/common/arm/bilinearfilter_arm.h
+  vp8/common/arm/dequantize_arm.h
   vp8/common/arm/idct_arm.h
   vp8/common/arm/loopfilter_arm.h
   vp8/common/arm/recon_arm.h
   vp8/common/arm/subpixel_arm.h
+  vp8/common/x86/dequantize_x86.h
+  vp8/common/x86/filter_x86.h
   vp8/common/x86/idct_x86.h
   vp8/common/x86/loopfilter_x86.h
   vp8/common/x86/postproc_x86.h
@@ -206,20 +210,17 @@ commonFiles=(
   vp8/decoder/dboolhuff.h
   vp8/decoder/decodemv.h
   vp8/decoder/decoderthreading.h
-  vp8/decoder/dequantize.h
   vp8/decoder/detokenize.h
   vp8/decoder/ec_types.h
   vp8/decoder/error_concealment.h
   vp8/decoder/onyxd_int.h
   vp8/decoder/reconintra_mt.h
   vp8/decoder/treereader.h
-  vp8/decoder/arm/dequantize_arm.h
-  vp8/decoder/x86/dequantize_x86.h
-  vp8/encoder/asm_enc_offsets.h
   vp8/encoder/bitstream.h
-  vp8/encoder/boolhuff.h
   vp8/encoder/block.h
+  vp8/encoder/boolhuff.h
   vp8/encoder/dct.h
+  vp8/encoder/defaultcoefcounts.h
   vp8/encoder/encodeintra.h
   vp8/encoder/encodemb.h
   vp8/encoder/encodemv.h
@@ -227,6 +228,7 @@ commonFiles=(
   vp8/encoder/lookahead.h
   vp8/encoder/mcomp.h
   vp8/encoder/modecosts.h
+  vp8/encoder/mr_dissim.h
   vp8/encoder/onyx_int.h
   vp8/encoder/pickinter.h
   vp8/encoder/psnr.h
@@ -263,67 +265,62 @@ commonFiles=(
   vpx/vpx_integer.h
   vpx_mem/include/vpx_mem_intrnl.h
   vpx_mem/vpx_mem.h
-  vpx_ports/arm_cpudetect.c
+  vpx_ports/arm.h
   vpx_ports/asm_offsets.h
-  vpx_ports/config.h
   vpx_ports/mem.h
   vpx_ports/vpx_timer.h
-  vpx_ports/arm.h
   vpx_ports/x86.h
   vpx_scale/scale_mode.h
   vpx_scale/vpxscale.h
   vpx_scale/yv12config.h
   vpx_scale/yv12extend.h
+  vpx_scale/arm/yv12extend_arm.h
+  vpx_scale/generic/yv12extend_generic.h
   vp8/common/arm/armv6/bilinearfilter_v6.asm
+  vp8/common/arm/armv6/copymem16x16_v6.asm
   vp8/common/arm/armv6/copymem8x4_v6.asm
   vp8/common/arm/armv6/copymem8x8_v6.asm
-  vp8/common/arm/armv6/copymem16x16_v6.asm
   vp8/common/arm/armv6/dc_only_idct_add_v6.asm
+  vp8/common/arm/armv6/dequant_idct_v6.asm
+  vp8/common/arm/armv6/dequantize_v6.asm
   vp8/common/arm/armv6/iwalsh_v6.asm
   vp8/common/arm/armv6/filter_v6.asm
   vp8/common/arm/armv6/idct_v6.asm
+  vp8/common/arm/armv6/intra4x4_predict_v6.asm
+  vp8/common/arm/armv6/iwalsh_v6.asm
   vp8/common/arm/armv6/loopfilter_v6.asm
-  vp8/common/arm/armv6/recon_v6.asm
   vp8/common/arm/armv6/simpleloopfilter_v6.asm
   vp8/common/arm/armv6/sixtappredict8x4_v6.asm
+  vp8/common/arm/neon/bilinearpredict16x16_neon.asm
   vp8/common/arm/neon/bilinearpredict4x4_neon.asm
   vp8/common/arm/neon/bilinearpredict8x4_neon.asm
   vp8/common/arm/neon/bilinearpredict8x8_neon.asm
-  vp8/common/arm/neon/bilinearpredict16x16_neon.asm
+  vp8/common/arm/neon/buildintrapredictorsmby_neon.asm
+  vp8/common/arm/neon/copymem16x16_neon.asm
   vp8/common/arm/neon/copymem8x4_neon.asm
   vp8/common/arm/neon/copymem8x8_neon.asm
-  vp8/common/arm/neon/copymem16x16_neon.asm
   vp8/common/arm/neon/dc_only_idct_add_neon.asm
+  vp8/common/arm/neon/dequant_idct_neon.asm
+  vp8/common/arm/neon/dequantizeb_neon.asm
+  vp8/common/arm/neon/idct_dequant_0_2x_neon.asm
+  vp8/common/arm/neon/idct_dequant_full_2x_neon.asm
   vp8/common/arm/neon/iwalsh_neon.asm
   vp8/common/arm/neon/loopfilter_neon.asm
   vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm
   vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.asm
   vp8/common/arm/neon/mbloopfilter_neon.asm
-  vp8/common/arm/neon/recon2b_neon.asm
-  vp8/common/arm/neon/recon4b_neon.asm
-  vp8/common/arm/neon/reconb_neon.asm
-  vp8/common/arm/neon/shortidct4x4llm_1_neon.asm
+  vp8/common/arm/neon/save_neon_reg.asm
   vp8/common/arm/neon/shortidct4x4llm_neon.asm
+  vp8/common/arm/neon/sixtappredict16x16_neon.asm
   vp8/common/arm/neon/sixtappredict4x4_neon.asm
   vp8/common/arm/neon/sixtappredict8x4_neon.asm
   vp8/common/arm/neon/sixtappredict8x8_neon.asm
-  vp8/common/arm/neon/sixtappredict16x16_neon.asm
-  vp8/common/arm/neon/recon16x16mb_neon.asm
-  vp8/common/arm/neon/buildintrapredictorsmby_neon.asm
-  vp8/common/arm/neon/save_neon_reg.asm
-  vp8/decoder/arm/armv6/dequant_dc_idct_v6.asm
-  vp8/decoder/arm/armv6/dequant_idct_v6.asm
-  vp8/decoder/arm/armv6/dequantize_v6.asm
-  vp8/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm
-  vp8/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm
-  vp8/decoder/arm/neon/dequant_idct_neon.asm
-  vp8/decoder/arm/neon/idct_dequant_full_2x_neon.asm
-  vp8/decoder/arm/neon/idct_dequant_0_2x_neon.asm
-  vp8/decoder/arm/neon/dequantizeb_neon.asm
+  vp8/common/x86/dequantize_mmx.asm
   vp8/common/x86/idctllm_mmx.asm
   vp8/common/x86/idctllm_sse2.asm
   vp8/common/x86/iwalsh_mmx.asm
   vp8/common/x86/iwalsh_sse2.asm
+  vp8/common/x86/loopfilter_block_sse2.asm
   vp8/common/x86/loopfilter_mmx.asm
   vp8/common/x86/loopfilter_sse2.asm
   vp8/common/x86/postproc_mmx.asm
@@ -333,14 +330,14 @@ commonFiles=(
   vp8/common/x86/subpixel_mmx.asm
   vp8/common/x86/subpixel_sse2.asm
   vp8/common/x86/subpixel_ssse3.asm
-  vp8/decoder/x86/dequantize_mmx.asm
+  vp8/encoder/arm/armv5te/boolhuff_armv5te.asm
   vp8/encoder/arm/armv5te/vp8_packtokens_armv5.asm
   vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm
   vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
-  vp8/encoder/arm/armv6/vp8_fast_fdct4x4_armv6.asm
   vp8/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm
   vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm
   vp8/encoder/arm/armv6/vp8_sad16x16_armv6.asm
+  vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm
   vp8/encoder/arm/armv6/vp8_subtract_armv6.asm
   vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm
   vp8/encoder/arm/armv6/vp8_variance8x8_armv6.asm
@@ -348,8 +345,6 @@ commonFiles=(
   vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
   vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
   vp8/encoder/arm/armv6/walsh_v6.asm
-  vp8/encoder/arm/neon/fastfdct4x4_neon.asm
-  vp8/encoder/arm/neon/fastfdct8x4_neon.asm
   vp8/encoder/arm/neon/fastquantizeb_neon.asm
   vp8/encoder/arm/neon/sad16_neon.asm
   vp8/encoder/arm/neon/sad8_neon.asm
@@ -359,9 +354,9 @@ commonFiles=(
   vp8/encoder/arm/neon/vp8_memcpy_neon.asm
   vp8/encoder/arm/neon/vp8_mse16x16_neon.asm
   vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm
-  vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm
   vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm
   vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm
+  vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm
   vp8/encoder/x86/dct_mmx.asm
   vp8/encoder/x86/dct_sse2.asm
   vp8/encoder/x86/encodeopt.asm
@@ -383,7 +378,9 @@ commonFiles=(
   vp8/encoder/x86/variance_impl_ssse3.asm
   vpx_ports/emms.asm
   vpx_ports/x86_abi_support.asm
-  vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm
+  vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm
+  vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm
+  vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm
   build/make/ads2gas.pl
   build/make/obj_int_extract.c
   LICENSE
@@ -433,14 +430,86 @@ do
   cp -v $1/$f $f
 done
 
+# This has to be renamed because there's already a scalesystemdependent.c in
+# vpx_scale/generic/
+cp -v $1/vpx_scale/arm/scalesystemdependent.c \
+         vpx_scale/arm/arm_scalesystemdependent.c
+
+# Upstream patch to fix variance overflow.
+patch -p3 < I1bad27ea.patch
+
+# Upstream patch to remove __inline for compiler compatibility.
+patch -p3 < I6f2b218d.patch
+
+# Patch to move SAD and variance functions to common (based on an upstream
+# patch).
+patch -p3 < I256a37c6.patch
+
+# These get moved by I256a37c6.patch above, but patch won't do the actual move
+# for us.
+encoderMovedFiles=(
+  vp8/encoder/sad_c.c
+  vp8/encoder/variance_c.c
+  vp8/encoder/arm/variance_arm.c
+  vp8/encoder/x86/variance_mmx.c
+  vp8/encoder/x86/variance_sse2.c
+  vp8/encoder/x86/variance_ssse3.c
+  vp8/encoder/variance.h
+  vp8/encoder/arm/variance_arm.h
+  vp8/encoder/x86/variance_x86.h
+  vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm
+  vp8/encoder/arm/armv6/vp8_sad16x16_armv6.asm
+  vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm
+  vp8/encoder/arm/armv6/vp8_variance8x8_armv6.asm
+  vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
+  vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
+  vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
+  vp8/encoder/arm/neon/sad16_neon.asm
+  vp8/encoder/arm/neon/sad8_neon.asm
+  vp8/encoder/arm/neon/variance_neon.asm
+  vp8/encoder/arm/neon/vp8_mse16x16_neon.asm
+  vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm
+  vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm
+  vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm
+  vp8/encoder/x86/sad_mmx.asm
+  vp8/encoder/x86/sad_sse2.asm
+  vp8/encoder/x86/sad_sse3.asm
+  vp8/encoder/x86/sad_ssse3.asm
+  vp8/encoder/x86/sad_sse4.asm
+  vp8/encoder/x86/variance_impl_mmx.asm
+  vp8/encoder/x86/variance_impl_sse2.asm
+  vp8/encoder/x86/variance_impl_ssse3.asm
+)
+
+# Move encoder source files into the common tree.
+for f in ${encoderMovedFiles[@]}
+do
+  mv -v $f ${f/encoder/common}
+done
+
+# Patch to fix text relocations in the variance functions.
+patch -p3 < textrels.patch
+
+# Patch to use VARIANCE_INVOKE in multiframe_quality_enhance_block().
+patch -p3 < variance-invoke.patch
+
+# Upstream patch to fix potential use of uninitialized rate_y.
+patch -p3 < I8a35831e.patch
+
+# Upstream patch to reset segmentation map on keyframes.
+patch -p3 < I9713c9f0.patch
+
+# Upstream patch to support Android x86 NDK build.
+patch -p3 < I42ab00e3.patch
+
+# Upstream patch to align internal mfqe framebuffer dimensions.
+patch -p3 < I3915d597.patch
+
 # Patch to compile with Sun Studio on Solaris
 patch -p3 < solaris.patch
 
 # Patch to fix errors including C headers in C++
 patch -p3 < compile_errors.patch
 
-# Patch to fix MV clamping in the v0.9.7-p1 release.
-patch -p3 < bug696390.patch
-
 # Patch to permit vpx users to specify their own <stdint.h> types.
 patch -p3 < stdint.patch
diff --git a/media/libvpx/variance-invoke.patch b/media/libvpx/variance-invoke.patch
new file mode 100644
index 00000000000..0be8939791e
--- /dev/null
+++ b/media/libvpx/variance-invoke.patch
@@ -0,0 +1,101 @@
+# HG changeset patch
+# Parent f294d64ffb01bf6d8190377708405bf5f4fe30fa
+# User Timothy B. Terriberry <tterribe@vt.edu>
+Bug 730907 - Use VARIANCE_INVOKE in multiframe_quality_enhance_block()
+
+diff --git a/media/libvpx/vp8/common/postproc.c b/media/libvpx/vp8/common/postproc.c
+--- a/media/libvpx/vp8/common/postproc.c
++++ b/media/libvpx/vp8/common/postproc.c
+@@ -706,17 +706,18 @@ static void multiframe_quality_enhance_b
+     unsigned char *u,
+     unsigned char *v,
+     int y_stride,
+     int uv_stride,
+     unsigned char *yd,
+     unsigned char *ud,
+     unsigned char *vd,
+     int yd_stride,
+-    int uvd_stride
++    int uvd_stride,
++    vp8_variance_rtcd_vtable_t *rtcd
+ )
+ {
+     static const unsigned char VP8_ZEROS[16]=
+     {
+          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+     };
+     int blksizeby2 = blksize >> 1;
+     int qdiff = qcurr - qprev;
+@@ -727,28 +728,28 @@ static void multiframe_quality_enhance_b
+     unsigned char *up;
+     unsigned char *udp;
+     unsigned char *vp;
+     unsigned char *vdp;
+ 
+     unsigned int act, sse, sad, thr;
+     if (blksize == 16)
+     {
+-        act = (vp8_variance_var16x16(yd, yd_stride, VP8_ZEROS, 0, &sse)+128)>>8;
+-        sad = (vp8_variance_sad16x16(y, y_stride, yd, yd_stride, 0)+128)>>8;
++        act = (VARIANCE_INVOKE(rtcd, var16x16)(yd, yd_stride, VP8_ZEROS, 0, &sse)+128)>>8;
++        sad = (VARIANCE_INVOKE(rtcd, sad16x16)(y, y_stride, yd, yd_stride, 0)+128)>>8;
+     }
+     else if (blksize == 8)
+     {
+-        act = (vp8_variance_var8x8(yd, yd_stride, VP8_ZEROS, 0, &sse)+32)>>6;
+-        sad = (vp8_variance_sad8x8(y, y_stride, yd, yd_stride, 0)+32)>>6;
++        act = (VARIANCE_INVOKE(rtcd, var8x8)(yd, yd_stride, VP8_ZEROS, 0, &sse)+32)>>6;
++        sad = (VARIANCE_INVOKE(rtcd, sad8x8)(y, y_stride, yd, yd_stride, 0)+32)>>6;
+     }
+     else
+     {
+-        act = (vp8_variance_var4x4(yd, yd_stride, VP8_ZEROS, 0, &sse)+8)>>4;
+-        sad = (vp8_variance_sad4x4(y, y_stride, yd, yd_stride, 0)+8)>>4;
++        act = (VARIANCE_INVOKE(rtcd, var4x4)(yd, yd_stride, VP8_ZEROS, 0, &sse)+8)>>4;
++        sad = (VARIANCE_INVOKE(rtcd, sad4x4)(y, y_stride, yd, yd_stride, 0)+8)>>4;
+     }
+     /* thr = qdiff/8 + log2(act) + log4(qprev) */
+     thr = (qdiff>>3);
+     while (act>>=1) thr++;
+     while (qprev>>=2) thr++;
+     if (sad < thr)
+     {
+         static const int roundoff = (1 << (MFQE_PRECISION - 1));
+@@ -859,33 +860,35 @@ void vp8_multiframe_quality_enhance
+                                                              u_ptr + 4*(i*show->uv_stride+j),
+                                                              v_ptr + 4*(i*show->uv_stride+j),
+                                                              show->y_stride,
+                                                              show->uv_stride,
+                                                              yd_ptr + 8*(i*dest->y_stride+j),
+                                                              ud_ptr + 4*(i*dest->uv_stride+j),
+                                                              vd_ptr + 4*(i*dest->uv_stride+j),
+                                                              dest->y_stride,
+-                                                             dest->uv_stride);
++                                                             dest->uv_stride,
++                                                             &cm->rtcd.variance);
+                 }
+                 else
+                 {
+                     multiframe_quality_enhance_block(16,
+                                                      qcurr,
+                                                      qprev,
+                                                      y_ptr,
+                                                      u_ptr,
+                                                      v_ptr,
+                                                      show->y_stride,
+                                                      show->uv_stride,
+                                                      yd_ptr,
+                                                      ud_ptr,
+                                                      vd_ptr,
+                                                      dest->y_stride,
+-                                                     dest->uv_stride);
++                                                     dest->uv_stride,
++                                                     &cm->rtcd.variance);
+ 
+                 }
+             }
+             else
+             {
+                 vp8_recon_copy16x16(y_ptr, show->y_stride, yd_ptr, dest->y_stride);
+                 vp8_recon_copy8x8(u_ptr, show->uv_stride, ud_ptr, dest->uv_stride);
+                 vp8_recon_copy8x8(v_ptr, show->uv_stride, vd_ptr, dest->uv_stride);
diff --git a/media/libvpx/vp8/common/alloccommon.c b/media/libvpx/vp8/common/alloccommon.c
index 376707ec64c..b606aaca0b6 100644
--- a/media/libvpx/vp8/common/alloccommon.c
+++ b/media/libvpx/vp8/common/alloccommon.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "blockd.h"
 #include "vpx_mem/vpx_mem.h"
 #include "onyxc_int.h"
@@ -43,6 +43,8 @@ void vp8_de_alloc_frame_buffers(VP8_COMMON *oci)
 
     vp8_yv12_de_alloc_frame_buffer(&oci->temp_scale_frame);
     vp8_yv12_de_alloc_frame_buffer(&oci->post_proc_buffer);
+    if (oci->post_proc_buffer_int_used)
+        vp8_yv12_de_alloc_frame_buffer(&oci->post_proc_buffer_int);
 
     vpx_free(oci->above_context);
     vpx_free(oci->mip);
@@ -101,6 +103,8 @@ int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height)
         return 1;
     }
 
+    oci->post_proc_buffer_int_used = 0;
+
     oci->mb_rows = height >> 4;
     oci->mb_cols = width >> 4;
     oci->MBs = oci->mb_rows * oci->mb_cols;
@@ -186,7 +190,7 @@ void vp8_setup_version(VP8_COMMON *cm)
 void vp8_create_common(VP8_COMMON *oci)
 {
     vp8_machine_specific_config(oci);
-    vp8_default_coef_probs(oci);
+
     vp8_init_mbmode_probs(oci);
     vp8_default_bmode_probs(oci->fc.bmode_prob);
 
diff --git a/media/libvpx/vp8/common/arm/arm_systemdependent.c b/media/libvpx/vp8/common/arm/arm_systemdependent.c
index c0467cd843d..6dfa8d998af 100644
--- a/media/libvpx/vp8/common/arm/arm_systemdependent.c
+++ b/media/libvpx/vp8/common/arm/arm_systemdependent.c
@@ -9,14 +9,14 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/arm.h"
-#include "vp8/common/g_common.h"
 #include "vp8/common/pragmas.h"
 #include "vp8/common/subpixel.h"
 #include "vp8/common/loopfilter.h"
 #include "vp8/common/recon.h"
 #include "vp8/common/idct.h"
+#include "vp8/common/variance.h"
 #include "vp8/common/onyxc_int.h"
 
 void vp8_arch_arm_common_init(VP8_COMMON *ctx)
@@ -45,9 +45,7 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx)
         rtcd->subpix.bilinear8x4   = vp8_bilinear_predict8x4_armv6;
         rtcd->subpix.bilinear4x4   = vp8_bilinear_predict4x4_armv6;
 
-        rtcd->idct.idct1        = vp8_short_idct4x4llm_1_v6;
         rtcd->idct.idct16       = vp8_short_idct4x4llm_v6_dual;
-        rtcd->idct.iwalsh1      = vp8_short_inv_walsh4x4_1_v6;
         rtcd->idct.iwalsh16     = vp8_short_inv_walsh4x4_v6;
 
         rtcd->loopfilter.normal_mb_v = vp8_loop_filter_mbv_armv6;
@@ -64,9 +62,38 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx)
         rtcd->recon.copy16x16   = vp8_copy_mem16x16_v6;
         rtcd->recon.copy8x8     = vp8_copy_mem8x8_v6;
         rtcd->recon.copy8x4     = vp8_copy_mem8x4_v6;
-        rtcd->recon.recon       = vp8_recon_b_armv6;
-        rtcd->recon.recon2      = vp8_recon2b_armv6;
-        rtcd->recon.recon4      = vp8_recon4b_armv6;
+        rtcd->recon.intra4x4_predict = vp8_intra4x4_predict_armv6;
+
+        rtcd->dequant.block               = vp8_dequantize_b_v6;
+        rtcd->dequant.idct_add            = vp8_dequant_idct_add_v6;
+        rtcd->dequant.idct_add_y_block    = vp8_dequant_idct_add_y_block_v6;
+        rtcd->dequant.idct_add_uv_block   = vp8_dequant_idct_add_uv_block_v6;
+
+        rtcd->variance.sad16x16              = vp8_sad16x16_armv6;
+        /*rtcd->variance.sad16x8               = vp8_sad16x8_c;
+        rtcd->variance.sad8x16               = vp8_sad8x16_c;
+        rtcd->variance.sad8x8                = vp8_sad8x8_c;
+        rtcd->variance.sad4x4                = vp8_sad4x4_c;*/
+
+        /*rtcd->variance.var4x4                = vp8_variance4x4_c;*/
+        rtcd->variance.var8x8                = vp8_variance8x8_armv6;
+        /*rtcd->variance.var8x16               = vp8_variance8x16_c;
+        rtcd->variance.var16x8               = vp8_variance16x8_c;*/
+        rtcd->variance.var16x16              = vp8_variance16x16_armv6;
+
+        /*rtcd->variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;*/
+        rtcd->variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_armv6;
+        /*rtcd->variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
+        rtcd->variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;*/
+        rtcd->variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_armv6;
+        rtcd->variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_armv6;
+        rtcd->variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_armv6;
+        rtcd->variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_armv6;
+
+        rtcd->variance.mse16x16              = vp8_mse16x16_armv6;
+        /*rtcd->variance.getmbss               = vp8_get_mb_ss_c;*/
+
+        /*rtcd->variance.get4x4sse_cs          = vp8_get4x4sse_cs_c;*/
     }
 #endif
 
@@ -82,9 +109,7 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx)
         rtcd->subpix.bilinear8x4   = vp8_bilinear_predict8x4_neon;
         rtcd->subpix.bilinear4x4   = vp8_bilinear_predict4x4_neon;
 
-        rtcd->idct.idct1        = vp8_short_idct4x4llm_1_neon;
         rtcd->idct.idct16       = vp8_short_idct4x4llm_neon;
-        rtcd->idct.iwalsh1      = vp8_short_inv_walsh4x4_1_neon;
         rtcd->idct.iwalsh16     = vp8_short_inv_walsh4x4_neon;
 
         rtcd->loopfilter.normal_mb_v = vp8_loop_filter_mbv_neon;
@@ -99,14 +124,41 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx)
         rtcd->recon.copy16x16   = vp8_copy_mem16x16_neon;
         rtcd->recon.copy8x8     = vp8_copy_mem8x8_neon;
         rtcd->recon.copy8x4     = vp8_copy_mem8x4_neon;
-        rtcd->recon.recon       = vp8_recon_b_neon;
-        rtcd->recon.recon2      = vp8_recon2b_neon;
-        rtcd->recon.recon4      = vp8_recon4b_neon;
-        rtcd->recon.recon_mb    = vp8_recon_mb_neon;
         rtcd->recon.build_intra_predictors_mby =
             vp8_build_intra_predictors_mby_neon;
         rtcd->recon.build_intra_predictors_mby_s =
             vp8_build_intra_predictors_mby_s_neon;
+
+        rtcd->dequant.block               = vp8_dequantize_b_neon;
+        rtcd->dequant.idct_add            = vp8_dequant_idct_add_neon;
+        rtcd->dequant.idct_add_y_block    = vp8_dequant_idct_add_y_block_neon;
+        rtcd->dequant.idct_add_uv_block   = vp8_dequant_idct_add_uv_block_neon;
+
+        rtcd->variance.sad16x16              = vp8_sad16x16_neon;
+        rtcd->variance.sad16x8               = vp8_sad16x8_neon;
+        rtcd->variance.sad8x16               = vp8_sad8x16_neon;
+        rtcd->variance.sad8x8                = vp8_sad8x8_neon;
+        rtcd->variance.sad4x4                = vp8_sad4x4_neon;
+
+        /*rtcd->variance.var4x4                = vp8_variance4x4_c;*/
+        rtcd->variance.var8x8                = vp8_variance8x8_neon;
+        rtcd->variance.var8x16               = vp8_variance8x16_neon;
+        rtcd->variance.var16x8               = vp8_variance16x8_neon;
+        rtcd->variance.var16x16              = vp8_variance16x16_neon;
+
+        /*rtcd->variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;*/
+        rtcd->variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_neon;
+        /*rtcd->variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
+        rtcd->variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;*/
+        rtcd->variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_neon;
+        rtcd->variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_neon;
+        rtcd->variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_neon;
+        rtcd->variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_neon;
+
+        rtcd->variance.mse16x16              = vp8_mse16x16_neon;
+        /*rtcd->variance.getmbss               = vp8_get_mb_ss_c;*/
+
+        rtcd->variance.get4x4sse_cs          = vp8_get4x4sse_cs_neon;
     }
 #endif
 
diff --git a/media/libvpx/vp8/common/arm/armv6/dc_only_idct_add_v6.asm b/media/libvpx/vp8/common/arm/armv6/dc_only_idct_add_v6.asm
index e0660e9fd03..9aa659fa70a 100644
--- a/media/libvpx/vp8/common/arm/armv6/dc_only_idct_add_v6.asm
+++ b/media/libvpx/vp8/common/arm/armv6/dc_only_idct_add_v6.asm
@@ -11,25 +11,27 @@
 
     AREA    |.text|, CODE, READONLY
 
-;void vp8_dc_only_idct_add_v6(short input_dc, unsigned char *pred_ptr,
-;                             unsigned char *dst_ptr, int pitch, int stride)
+;void vp8_dc_only_idct_add_c(short input_dc, unsigned char *pred_ptr,
+;                            int pred_stride, unsigned char *dst_ptr,
+;                            int dst_stride)
 ; r0  input_dc
 ; r1  pred_ptr
-; r2  dest_ptr
-; r3  pitch
-; sp  stride
+; r2  pred_stride
+; r3  dst_ptr
+; sp  dst_stride
 
 |vp8_dc_only_idct_add_v6| PROC
-    stmdb       sp!, {r4 - r7, lr}
+    stmdb       sp!, {r4 - r7}
 
     add         r0, r0, #4                ; input_dc += 4
     ldr         r12, c0x0000FFFF
-    ldr         r4, [r1], r3
-    ldr         r6, [r1], r3
+    ldr         r4, [r1], r2
     and         r0, r12, r0, asr #3       ; input_dc >> 3 + mask
-    ldr         lr, [sp, #20]
+    ldr         r6, [r1], r2
     orr         r0, r0, r0, lsl #16       ; a1 | a1
 
+    ldr         r12, [sp, #16]            ; dst stride
+
     uxtab16     r5, r0, r4                ; a1+2 | a1+0
     uxtab16     r4, r0, r4, ror #8        ; a1+3 | a1+1
     uxtab16     r7, r0, r6
@@ -40,10 +42,10 @@
     usat16      r6, #8, r6
     orr         r5, r5, r4, lsl #8
     orr         r7, r7, r6, lsl #8
-    ldr         r4, [r1], r3
+    ldr         r4, [r1], r2
+    str         r5, [r3], r12
     ldr         r6, [r1]
-    str         r5, [r2], lr
-    str         r7, [r2], lr
+    str         r7, [r3], r12
 
     uxtab16     r5, r0, r4
     uxtab16     r4, r0, r4, ror #8
@@ -55,10 +57,11 @@
     usat16      r6, #8, r6
     orr         r5, r5, r4, lsl #8
     orr         r7, r7, r6, lsl #8
-    str         r5, [r2], lr
-    str         r7, [r2]
+    str         r5, [r3], r12
+    str         r7, [r3]
 
-    ldmia       sp!, {r4 - r7, pc}
+    ldmia       sp!, {r4 - r7}
+    bx          lr
 
     ENDP  ; |vp8_dc_only_idct_add_v6|
 
diff --git a/media/libvpx/vp8/decoder/arm/armv6/dequant_idct_v6.asm b/media/libvpx/vp8/common/arm/armv6/dequant_idct_v6.asm
similarity index 90%
rename from media/libvpx/vp8/decoder/arm/armv6/dequant_idct_v6.asm
rename to media/libvpx/vp8/common/arm/armv6/dequant_idct_v6.asm
index 47b671ca6fa..2510ad83835 100644
--- a/media/libvpx/vp8/decoder/arm/armv6/dequant_idct_v6.asm
+++ b/media/libvpx/vp8/common/arm/armv6/dequant_idct_v6.asm
@@ -10,15 +10,12 @@
     EXPORT |vp8_dequant_idct_add_v6|
 
     AREA |.text|, CODE, READONLY
-;void vp8_dequant_idct_v6(short *input, short *dq, unsigned char *pred,
-; unsigned char *dest, int pitch, int stride)
-; r0 = input
+;void vp8_dequant_idct_v6(short *input, short *dq,
+;                         unsigned char *dest, int stride)
+; r0 = q
 ; r1 = dq
-; r2 = pred
-; r3 = dest
-; sp + 36 = pitch  ; +4 = 40
-; sp + 40 = stride  ; +4 = 44
-
+; r2 = dst
+; r3 = stride
 
 |vp8_dequant_idct_add_v6| PROC
     stmdb   sp!, {r4-r11, lr}
@@ -127,7 +124,7 @@ vp8_dequant_idct_loop2_v6
     usub16  r1, r12, r8
     uadd16  r8, r11, r6
     ldr     r9, c0x00040004
-    ldr     r12, [sp, #40]
+    ldr     r12, [sp]               ; get stride from stack
     uadd16  r6, r10, r8
     usub16  r7, r10, r8
     uadd16  r7, r7, r9
@@ -136,7 +133,7 @@ vp8_dequant_idct_loop2_v6
     usub16  r1, r14, r1
     uadd16  r10, r10, r9
     uadd16  r1, r1, r9
-    ldr     r11, [r2], r12
+    ldr     r11, [r2]               ; load input from dst
     mov     r8, r7, asr #3
     pkhtb   r9, r8, r10, asr #19
     mov     r8, r1, asr #3
@@ -148,9 +145,7 @@ vp8_dequant_idct_loop2_v6
     usat16  r9, #8, r9
     usat16  r8, #8, r8
     orr     r9, r8, r9, lsl #8
-    ldr     r11, [r2], r12
-    ldr     lr, [sp]
-    ldr     r12, [sp, #44]
+    ldr     r11, [r2, r12]          ; load input from dst
     mov     r7, r7, lsl #16
     mov     r1, r1, lsl #16
     mov     r10, r10, lsl #16
@@ -166,9 +161,8 @@ vp8_dequant_idct_loop2_v6
     usat16  r7, #8, r7
     usat16  r1, #8, r1
     orr     r1, r1, r7, lsl #8
-    str     r9, [lr], r12
-    str     r1, [lr], r12
-    str     lr, [sp]
+    str     r9, [r2], r12           ; store output to dst
+    str     r1, [r2], r12           ; store output to dst
     bne     vp8_dequant_idct_loop2_v6
 
 ; vpx_memset
diff --git a/media/libvpx/vp8/decoder/arm/armv6/dequantize_v6.asm b/media/libvpx/vp8/common/arm/armv6/dequantize_v6.asm
similarity index 100%
rename from media/libvpx/vp8/decoder/arm/armv6/dequantize_v6.asm
rename to media/libvpx/vp8/common/arm/armv6/dequantize_v6.asm
diff --git a/media/libvpx/vp8/common/arm/armv6/idct_blk_v6.c b/media/libvpx/vp8/common/arm/armv6/idct_blk_v6.c
new file mode 100644
index 00000000000..9108929f5ec
--- /dev/null
+++ b/media/libvpx/vp8/common/arm/armv6/idct_blk_v6.c
@@ -0,0 +1,116 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "vpx_config.h"
+#include "vp8/common/idct.h"
+#include "vp8/common/dequantize.h"
+
+
+void vp8_dequant_idct_add_y_block_v6(short *q, short *dq,
+                                     unsigned char *dst,
+                                     int stride, char *eobs)
+{
+    int i;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (eobs[0] > 1)
+            vp8_dequant_idct_add_v6 (q, dq, dst, stride);
+        else if (eobs[0] == 1)
+        {
+            vp8_dc_only_idct_add_v6 (q[0]*dq[0], dst, stride, dst, stride);
+            ((int *)q)[0] = 0;
+        }
+
+        if (eobs[1] > 1)
+            vp8_dequant_idct_add_v6 (q+16, dq, dst+4, stride);
+        else if (eobs[1] == 1)
+        {
+            vp8_dc_only_idct_add_v6 (q[16]*dq[0], dst+4, stride, dst+4, stride);
+            ((int *)(q+16))[0] = 0;
+        }
+
+        if (eobs[2] > 1)
+            vp8_dequant_idct_add_v6 (q+32, dq, dst+8, stride);
+        else if (eobs[2] == 1)
+        {
+            vp8_dc_only_idct_add_v6 (q[32]*dq[0], dst+8, stride, dst+8, stride);
+            ((int *)(q+32))[0] = 0;
+        }
+
+        if (eobs[3] > 1)
+            vp8_dequant_idct_add_v6 (q+48, dq, dst+12, stride);
+        else if (eobs[3] == 1)
+        {
+            vp8_dc_only_idct_add_v6 (q[48]*dq[0], dst+12, stride,dst+12,stride);
+            ((int *)(q+48))[0] = 0;
+        }
+
+        q    += 64;
+        dst  += 4*stride;
+        eobs += 4;
+    }
+}
+
+void vp8_dequant_idct_add_uv_block_v6(short *q, short *dq,
+                                      unsigned char *dstu,
+                                      unsigned char *dstv,
+                                      int stride, char *eobs)
+{
+    int i;
+
+    for (i = 0; i < 2; i++)
+    {
+        if (eobs[0] > 1)
+            vp8_dequant_idct_add_v6 (q, dq, dstu, stride);
+        else if (eobs[0] == 1)
+        {
+            vp8_dc_only_idct_add_v6 (q[0]*dq[0], dstu, stride, dstu, stride);
+            ((int *)q)[0] = 0;
+        }
+
+        if (eobs[1] > 1)
+            vp8_dequant_idct_add_v6 (q+16, dq, dstu+4, stride);
+        else if (eobs[1] == 1)
+        {
+            vp8_dc_only_idct_add_v6 (q[16]*dq[0], dstu+4, stride,
+                                                  dstu+4, stride);
+            ((int *)(q+16))[0] = 0;
+        }
+
+        q    += 32;
+        dstu += 4*stride;
+        eobs += 2;
+    }
+
+    for (i = 0; i < 2; i++)
+    {
+        if (eobs[0] > 1)
+            vp8_dequant_idct_add_v6 (q, dq, dstv, stride);
+        else if (eobs[0] == 1)
+        {
+            vp8_dc_only_idct_add_v6 (q[0]*dq[0], dstv, stride, dstv, stride);
+            ((int *)q)[0] = 0;
+        }
+
+        if (eobs[1] > 1)
+            vp8_dequant_idct_add_v6 (q+16, dq, dstv+4, stride);
+        else if (eobs[1] == 1)
+        {
+            vp8_dc_only_idct_add_v6 (q[16]*dq[0], dstv+4, stride,
+                                                  dstv+4, stride);
+            ((int *)(q+16))[0] = 0;
+        }
+
+        q    += 32;
+        dstv += 4*stride;
+        eobs += 2;
+    }
+}
diff --git a/media/libvpx/vp8/common/arm/armv6/idct_v6.asm b/media/libvpx/vp8/common/arm/armv6/idct_v6.asm
index 27215afcd93..b4d44cbeba4 100644
--- a/media/libvpx/vp8/common/arm/armv6/idct_v6.asm
+++ b/media/libvpx/vp8/common/arm/armv6/idct_v6.asm
@@ -9,337 +9,194 @@
 ;
 
 
-;                   r0  r1  r2  r3  r4  r5  r6  r7  r8  r9  r10 r11 r12     r14
-    EXPORT  |vp8_short_idct4x4llm_1_v6|
-    EXPORT  |vp8_short_idct4x4llm_v6|
-    EXPORT  |vp8_short_idct4x4llm_v6_scott|
     EXPORT  |vp8_short_idct4x4llm_v6_dual|
 
     AREA    |.text|, CODE, READONLY
 
-;********************************************************************************
-;*  void short_idct4x4llm_1_v6(INT16 * input, INT16 * output, INT32 pitch)
-;*      r0  INT16 * input
-;*      r1  INT16 * output
-;*      r2  INT32 pitch
-;*  bench:  3/5
-;********************************************************************************
 
-|vp8_short_idct4x4llm_1_v6| PROC         ;   cycles  in  out pit
-            ;
-    ldrsh   r0, [r0]    ; load input[0] 1, r0 un 2
-    add r0, r0, #4  ;   1   +4
-    stmdb   sp!, {r4, r5, lr}   ; make room for wide writes 1                   backup
-    mov r0, r0, asr #3  ; (input[0] + 4) >> 3   1, r0 req`d ^1  >> 3
-    pkhbt   r4, r0, r0, lsl #16 ; pack r0 into r4   1, r0 req`d ^1                  pack
-    mov r5, r4  ; expand                        expand
+; void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch,
+;                             unsigned char *dst, int stride)
+; r0    short* input
+; r1    unsigned char* pred
+; r2    int pitch
+; r3    unsigned char* dst
+; sp    int stride
 
-    strd    r4, [r1], r2    ; *output = r0, post inc    1
-    strd    r4, [r1], r2    ;   1
-    strd    r4, [r1], r2    ;   1
-    strd    r4, [r1]    ;   1
-            ;
-    ldmia   sp!, {r4, r5, pc}   ; replace vars, return                      restore
-    ENDP        ; |vp8_short_idct4x4llm_1_v6|
-;********************************************************************************
-;********************************************************************************
-;********************************************************************************
+|vp8_short_idct4x4llm_v6_dual| PROC
+    stmdb   sp!, {r4-r11, lr}
 
-;********************************************************************************
-;*  void short_idct4x4llm_v6(INT16 * input, INT16 * output, INT32 pitch)
-;*      r0  INT16 * input
-;*      r1  INT16 * output
-;*      r2  INT32 pitch
-;*  bench:
-;********************************************************************************
+    sub     sp, sp, #4
 
-|vp8_short_idct4x4llm_v6| PROC           ;   cycles  in  out pit
-            ;
-    stmdb   sp!, {r4-r11, lr}   ; backup registers  1                   backup
-            ;
-    mov r4, #0x00004E00 ;   1                   cst
-    orr r4, r4, #0x0000007B ; cospi8sqrt2minus1
-    mov r5, #0x00008A00 ;   1                       cst
-    orr r5, r5, #0x0000008C ; sinpi8sqrt2
-            ;
-    mov r6, #4  ; i=4   1                           i
-loop1           ;
-    ldrsh   r12, [r0, #8]   ; input[4]  1, r12 unavail 2                                                    [4]
-    ldrsh   r3, [r0, #24]   ; input[12] 1, r3 unavail 2             [12]
-    ldrsh   r8, [r0, #16]   ; input[8]  1, r8 unavail 2                                 [8]
-    ldrsh   r7, [r0], #0x2  ; input[0]  1, r7 unavail 2 ++                          [0]
-    smulwb  r10, r5, r12    ; ([4] * sinpi8sqrt2) >> 16 1, r10 un 2, r12/r5 ^1                                          t1
-    smulwb  r11, r4, r3 ; ([12] * cospi8sqrt2minus1) >> 16  1, r11 un 2, r3/r4 ^1                                               t2
-    add r9, r7, r8  ; a1 = [0] + [8]    1                                       a1
-    sub r7, r7, r8  ; b1 = [0] - [8]    1                               b1
-    add r11, r3, r11    ; temp2 1
-    rsb r11, r11, r10   ; c1 = temp1 - temp2    1                                               c1
-    smulwb  r3, r5, r3  ; ([12] * sinpi8sqrt2) >> 16    1, r3 un 2, r3/r5 ^ 1               t2
-    smulwb  r10, r4, r12    ; ([4] * cospi8sqrt2minus1) >> 16   1, r10 un 2, r12/r4 ^1                                          t1
-    add r8, r7, r11 ; b1 + c1   1                                   b+c
-    strh    r8, [r1, r2]    ; out[pitch] = b1+c1    1
-    sub r7, r7, r11 ; b1 - c1   1                               b-c
-    add r10, r12, r10   ; temp1 1
-    add r3, r10, r3 ; d1 = temp1 + temp2    1               d1
-    add r10, r9, r3 ; a1 + d1   1                                           a+d
-    sub r3, r9, r3  ; a1 - d1   1               a-d
-    add r8, r2, r2  ; pitch * 2 1                                   p*2
-    strh    r7, [r1, r8]    ; out[pitch*2] = b1-c1  1
-    add r7, r2, r2, lsl #1  ; pitch * 3 1                               p*3
-    strh    r3, [r1, r7]    ; out[pitch*3] = a1-d1  1
-    subs    r6, r6, #1  ; i--   1                           --
-    strh    r10, [r1], #0x2 ; out[0] = a1+d1    1       ++
-    bne loop1   ; if i>0, continue
-            ;
-    sub r1, r1, #8  ; set up out for next loop  1       -4
-            ; for this iteration, input=prev output
-    mov r6, #4  ; i=4   1                           i
-;   b   returnfull
-loop2           ;
-    ldrsh   r11, [r1, #2]   ; input[1]  1, r11 un 2                                             [1]
-    ldrsh   r8, [r1, #6]    ; input[3]  1, r8 un 2                                  [3]
-    ldrsh   r3, [r1, #4]    ; input[2]  1, r3 un 2              [2]
-    ldrsh   r0, [r1]    ; input[0]  1, r0 un 2  [0]
-    smulwb  r9, r5, r11 ; ([1] * sinpi8sqrt2) >> 16 1, r9 un 2, r5/r11 ^1                                       t1
-    smulwb  r10, r4, r8 ; ([3] * cospi8sqrt2minus1) >> 16   1, r10 un 2, r4/r8 ^1                                           t2
-    add r7, r0, r3  ; a1 = [0] + [2]    1                               a1
-    sub r0, r0, r3  ; b1 = [0] - [2]    1   b1
-    add r10, r8, r10    ; temp2 1
-    rsb r9, r10, r9 ; c1 = temp1 - temp2    1                                       c1
-    smulwb  r8, r5, r8  ; ([3] * sinpi8sqrt2) >> 16 1, r8 un 2, r5/r8 ^1                                    t2
-    smulwb  r10, r4, r11    ; ([1] * cospi8sqrt2minus1) >> 16   1, r10 un 2, r4/r11 ^1                                          t1
-    add r3, r0, r9  ; b1+c1 1               b+c
-    add r3, r3, #4  ; b1+c1+4   1               +4
-    add r10, r11, r10   ; temp1 1
-    mov r3, r3, asr #3  ; b1+c1+4 >> 3  1, r3 ^1                >>3
-    strh    r3, [r1, #2]    ; out[1] = b1+c1    1
-    add r10, r10, r8    ; d1 = temp1 + temp2    1                                           d1
-    add r3, r7, r10 ; a1+d1 1               a+d
-    add r3, r3, #4  ; a1+d1+4   1               +4
-    sub r7, r7, r10 ; a1-d1 1                               a-d
-    add r7, r7, #4  ; a1-d1+4   1                               +4
-    mov r3, r3, asr #3  ; a1+d1+4 >> 3  1, r3 ^1                >>3
-    mov r7, r7, asr #3  ; a1-d1+4 >> 3  1, r7 ^1                                >>3
-    strh    r7, [r1, #6]    ; out[3] = a1-d1    1
-    sub r0, r0, r9  ; b1-c1 1   b-c
-    add r0, r0, #4  ; b1-c1+4   1   +4
-    subs    r6, r6, #1  ; i--   1                           --
-    mov r0, r0, asr #3  ; b1-c1+4 >> 3  1, r0 ^1    >>3
-    strh    r0, [r1, #4]    ; out[2] = b1-c1    1
-    strh    r3, [r1], r2    ; out[0] = a1+d1    1
-;   add r1, r1, r2  ; out += pitch  1       ++
-    bne loop2   ; if i>0, continue
-returnfull          ;
-    ldmia   sp!, {r4 - r11, pc} ; replace vars, return                      restore
-    ENDP
+    mov     r4, #0x00008A00         ; sin
+    orr     r4, r4, #0x0000008C     ; sinpi8sqrt2
 
-;********************************************************************************
-;********************************************************************************
-;********************************************************************************
+    mov     r5, #0x00004E00         ; cos
+    orr     r5, r5, #0x0000007B     ; cospi8sqrt2minus1
+    orr     r5, r5, #1<<31          ; loop counter on top bit
 
-;********************************************************************************
-;*  void short_idct4x4llm_v6_scott(INT16 * input, INT16 * output, INT32 pitch)
-;*      r0  INT16 * input
-;*      r1  INT16 * output
-;*      r2  INT32 pitch
-;*  bench:
-;********************************************************************************
-
-|vp8_short_idct4x4llm_v6_scott| PROC         ;   cycles  in  out pit
-;   mov r0, #0  ;
-;   ldr r0, [r0]    ;
-    stmdb   sp!, {r4 - r11, lr} ; backup registers  1                   backup
-            ;
-    mov r3, #0x00004E00 ;                   cos
-    orr r3, r3, #0x0000007B ; cospi8sqrt2minus1
-    mov r4, #0x00008A00 ;                       sin
-    orr r4, r4, #0x0000008C ; sinpi8sqrt2
-            ;
-    mov r5, #0x2    ; i                         i
-            ;
-short_idct4x4llm_v6_scott_loop1          ;
-    ldr r10, [r0, #(4*2)]   ; i5 | i4                                               5,4
-    ldr r11, [r0, #(12*2)]  ; i13 | i12                                                 13,12
-            ;
-    smulwb  r6, r4, r10 ; ((ip[4] * sinpi8sqrt2) >> 16)                             lt1
-    smulwb  r7, r3, r11 ; ((ip[12] * cospi8sqrt2minus1) >> 16)                                  lt2
-            ;
-    smulwb  r12, r3, r10    ; ((ip[4] * cospi8sqrt2misu1) >> 16)                                                        l2t2
-    smulwb  r14, r4, r11    ; ((ip[12] * sinpi8sqrt2) >> 16)                                                                l2t1
-            ;
-    add r6, r6, r7  ; partial c1                                lt1-lt2
-    add r12, r12, r14   ; partial d1                                                        l2t2+l2t1
-            ;
-    smulwt  r14, r4, r10    ; ((ip[5] * sinpi8sqrt2) >> 16)                                                             ht1
-    smulwt  r7, r3, r11 ; ((ip[13] * cospi8sqrt2minus1) >> 16)                                  ht2
-            ;
-    smulwt  r8, r3, r10 ; ((ip[5] * cospi8sqrt2minus1) >> 16)                                       h2t1
-    smulwt  r9, r4, r11 ; ((ip[13] * sinpi8sqrt2) >> 16)                                            h2t2
-            ;
-    add r7, r14, r7 ; partial c1_2                                  ht1+ht2
-    sub r8, r8, r9  ; partial d1_2                                      h2t1-h2t2
-            ;
-    pkhbt   r6, r6, r7, lsl #16 ; partial c1_2 | partial c1_1                               pack
-    pkhbt   r12, r12, r8, lsl #16   ; partial d1_2 | partial d1_1                                                       pack
-            ;
-    usub16  r6, r6, r10 ; c1_2 | c1_1                               c
-    uadd16  r12, r12, r11   ; d1_2 | d1_1                                                       d
-            ;
-    ldr r10, [r0, #0]   ; i1 | i0                                               1,0
-    ldr r11, [r0, #(8*2)]   ; i9 | i10                                                  9,10
-            ;
-;;;;;;  add r0, r0, #0x4    ;       +4
-;;;;;;  add r1, r1, #0x4    ;           +4
-            ;
-    uadd16  r8, r10, r11    ; i1 + i9 | i0 + i8 aka a1                                      a
-    usub16  r9, r10, r11    ; i1 - i9 | i0 - i8 aka b1                                          b
-            ;
-    uadd16  r7, r8, r12 ; a1 + d1 pair                                  a+d
-    usub16  r14, r8, r12    ; a1 - d1 pair                                                              a-d
-            ;
-    str r7, [r1]    ; op[0] = a1 + d1
-    str r14, [r1, r2]   ; op[pitch*3] = a1 - d1
-            ;
-    add r0, r0, #0x4    ; op[pitch] = b1 + c1       ++
-    add r1, r1, #0x4    ; op[pitch*2] = b1 - c1         ++
-            ;
-    subs    r5, r5, #0x1    ;                           --
-    bne short_idct4x4llm_v6_scott_loop1  ;
-            ;
-    sub r1, r1, #16 ; reset output ptr
-    mov r5, #0x4    ;
-    mov r0, r1  ; input = output
-            ;
-short_idct4x4llm_v6_scott_loop2          ;
-            ;
-    subs    r5, r5, #0x1    ;
-    bne short_idct4x4llm_v6_scott_loop2  ;
-            ;
-    ldmia   sp!, {r4 - r11, pc} ;
-    ENDP        ;
-            ;
-;********************************************************************************
-;********************************************************************************
-;********************************************************************************
-
-;********************************************************************************
-;*  void short_idct4x4llm_v6_dual(INT16 * input, INT16 * output, INT32 pitch)
-;*      r0  INT16 * input
-;*      r1  INT16 * output
-;*      r2  INT32 pitch
-;*  bench:
-;********************************************************************************
-
-|vp8_short_idct4x4llm_v6_dual| PROC          ;   cycles  in  out pit
-            ;
-    stmdb   sp!, {r4-r11, lr}   ; backup registers  1                   backup
-    mov r3, #0x00004E00 ;                   cos
-    orr r3, r3, #0x0000007B ; cospi8sqrt2minus1
-    mov r4, #0x00008A00 ;                       sin
-    orr r4, r4, #0x0000008C ; sinpi8sqrt2
-    mov r5, #0x2    ; i=2                           i
 loop1_dual
-    ldr r6, [r0, #(4*2)]    ; i5 | i4                               5|4
-    ldr r12, [r0, #(12*2)]  ; i13 | i12                                                     13|12
-    ldr r14, [r0, #(8*2)]   ; i9 | i8                                                               9|8
+    ldr     r6, [r0, #(4*2)]        ; i5 | i4
+    ldr     r12, [r0, #(12*2)]      ; i13|i12
+    ldr     r14, [r0, #(8*2)]       ; i9 | i8
 
-    smulwt  r9, r3, r6  ; (ip[5] * cospi8sqrt2minus1) >> 16                                         5c
-    smulwb  r7, r3, r6  ; (ip[4] * cospi8sqrt2minus1) >> 16                                 4c
-    smulwt  r10, r4, r6 ; (ip[5] * sinpi8sqrt2) >> 16                                               5s
-    smulwb  r8, r4, r6  ; (ip[4] * sinpi8sqrt2) >> 16                                       4s
-    pkhbt   r7, r7, r9, lsl #16 ; 5c | 4c
-    smulwt  r11, r3, r12    ; (ip[13] * cospi8sqrt2minus1) >> 16                                                    13c
+    smulbt  r9, r5, r6              ; (ip[5] * cospi8sqrt2minus1) >> 16
+    smulbb  r7, r5, r6              ; (ip[4] * cospi8sqrt2minus1) >> 16
+    smulwt  r10, r4, r6             ; (ip[5] * sinpi8sqrt2) >> 16
+    smulwb  r8, r4, r6              ; (ip[4] * sinpi8sqrt2) >> 16
+
+    smulbt  r11, r5, r12            ; (ip[13] * cospi8sqrt2minus1) >> 16
+    pkhtb   r7, r9, r7, asr #16     ; 5c | 4c
     pkhbt   r8, r8, r10, lsl #16    ; 5s | 4s
-    uadd16  r6, r6, r7  ; 5c+5 | 4c+4
-    smulwt  r7, r4, r12 ; (ip[13] * sinpi8sqrt2) >> 16                                  13s
-    smulwb  r9, r3, r12 ; (ip[12] * cospi8sqrt2minus1) >> 16                                            12c
-    smulwb  r10, r4, r12    ; (ip[12] * sinpi8sqrt2) >> 16                                              12s
-    subs    r5, r5, #0x1    ; i--                           --
-    pkhbt   r9, r9, r11, lsl #16    ; 13c | 12c
-    ldr r11, [r0], #0x4 ; i1 | i0       ++                                          1|0
-    pkhbt   r10, r10, r7, lsl #16   ; 13s | 12s
-    uadd16  r7, r12, r9 ; 13c+13 | 12c+12
-    usub16  r7, r8, r7  ; c                                 c
-    uadd16  r6, r6, r10 ; d                             d
-    uadd16  r10, r11, r14   ; a                                             a
-    usub16  r8, r11, r14    ; b                                     b
-    uadd16  r9, r10, r6 ; a+d                                           a+d
-    usub16  r10, r10, r6    ; a-d                                               a-d
-    uadd16  r6, r8, r7  ; b+c                               b+c
-    usub16  r7, r8, r7  ; b-c                                   b-c
-    str r6, [r1, r2]    ; o5 | o4
-    add r6, r2, r2  ; pitch * 2                             p2
-    str r7, [r1, r6]    ; o9 | o8
-    add r6,  r6, r2 ; pitch * 3                             p3
-    str r10, [r1, r6]   ; o13 | o12
-    str r9, [r1], #0x4  ; o1 | o0           ++
-    bne loop1_dual  ;
-    mov r5, #0x2    ; i=2                           i
-    sub r0, r1, #8  ; reset input/output        i/o
-loop2_dual
-    ldr r6, [r0, r2]    ; i5 | i4                               5|4
-    ldr r1, [r0]    ; i1 | i0           1|0
-    ldr r12, [r0, #0x4] ; i3 | i2                                                       3|2
-    add r14, r2, #0x4   ; pitch + 2                                                             p+2
-    ldr r14, [r0, r14]  ; i7 | i6                                                               7|6
-    smulwt  r9, r3, r6  ; (ip[5] * cospi8sqrt2minus1) >> 16                                         5c
-    smulwt  r7, r3, r1  ; (ip[1] * cospi8sqrt2minus1) >> 16                                 1c
-    smulwt  r10, r4, r6 ; (ip[5] * sinpi8sqrt2) >> 16                                               5s
-    smulwt  r8, r4, r1  ; (ip[1] * sinpi8sqrt2) >> 16                                       1s
-    pkhbt   r11, r6, r1, lsl #16    ; i0 | i4                                                   0|4
-    pkhbt   r7, r9, r7, lsl #16 ; 1c | 5c
-    pkhbt   r8, r10, r8, lsl #16    ; 1s | 5s = temp1 ©                                     tc1
-    pkhtb   r1, r1, r6, asr #16 ; i1 | i5           1|5
-    uadd16  r1, r7, r1  ; 1c+1 | 5c+5 = temp2 (d)           td2
-    pkhbt   r9, r14, r12, lsl #16   ; i2 | i6                                           2|6
-    uadd16  r10, r11, r9    ; a                                             a
-    usub16  r9, r11, r9 ; b                                         b
-    pkhtb   r6, r12, r14, asr #16   ; i3 | i7                               3|7
-    subs    r5, r5, #0x1    ; i--                           --
-    smulwt  r7, r3, r6  ; (ip[3] * cospi8sqrt2minus1) >> 16                                 3c
-    smulwt  r11, r4, r6 ; (ip[3] * sinpi8sqrt2) >> 16                                                   3s
-    smulwb  r12, r3, r6 ; (ip[7] * cospi8sqrt2minus1) >> 16                                                     7c
-    smulwb  r14, r4, r6 ; (ip[7] * sinpi8sqrt2) >> 16                                                               7s
+    uadd16  r6, r6, r7              ; 5c+5 | 4c+4
+
+    smulwt  r7, r4, r12             ; (ip[13] * sinpi8sqrt2) >> 16
+    smulbb  r9, r5, r12             ; (ip[12] * cospi8sqrt2minus1) >> 16
+    smulwb  r10, r4, r12            ; (ip[12] * sinpi8sqrt2) >> 16
+
+    subs    r5, r5, #1<<31          ; i--
+
+    pkhtb   r9, r11, r9, asr #16    ; 13c | 12c
+    ldr     r11, [r0]               ; i1 | i0
+    pkhbt   r10, r10, r7, lsl #16   ; 13s | 12s
+    uadd16  r7, r12, r9             ; 13c+13 | 12c+12
+
+    usub16  r7, r8, r7              ; c
+    uadd16  r6, r6, r10             ; d
+    uadd16  r10, r11, r14           ; a
+    usub16  r8, r11, r14            ; b
+
+    uadd16  r9, r10, r6             ; a+d
+    usub16  r10, r10, r6            ; a-d
+    uadd16  r6, r8, r7              ; b+c
+    usub16  r7, r8, r7              ; b-c
+
+    ; use input buffer to store intermediate results
+    str      r6, [r0, #(4*2)]       ; o5 | o4
+    str      r7, [r0, #(8*2)]       ; o9 | o8
+    str      r10,[r0, #(12*2)]      ; o13|o12
+    str      r9, [r0], #4           ; o1 | o0
+
+    bcs loop1_dual
+
+    sub     r0, r0, #8              ; reset input/output
+    str     r0, [sp]
+
+loop2_dual
+
+    ldr     r6, [r0, #(4*2)]        ; i5 | i4
+    ldr     r12,[r0, #(2*2)]        ; i3 | i2
+    ldr     r14,[r0, #(6*2)]        ; i7 | i6
+    ldr     r0, [r0, #(0*2)]        ; i1 | i0
+
+    smulbt  r9, r5, r6              ; (ip[5] * cospi8sqrt2minus1) >> 16
+    smulbt  r7, r5, r0              ; (ip[1] * cospi8sqrt2minus1) >> 16
+    smulwt  r10, r4, r6             ; (ip[5] * sinpi8sqrt2) >> 16
+    smulwt  r8, r4, r0              ; (ip[1] * sinpi8sqrt2) >> 16
+
+    pkhbt   r11, r6, r0, lsl #16    ; i0 | i4
+    pkhtb   r7, r7, r9, asr #16     ; 1c | 5c
+    pkhtb   r0, r0, r6, asr #16     ; i1 | i5
+    pkhbt   r8, r10, r8, lsl #16    ; 1s | 5s = temp1
+
+    uadd16  r0, r7, r0              ; 1c+1 | 5c+5 = temp2
+    pkhbt   r9, r14, r12, lsl #16   ; i2 | i6
+    uadd16  r10, r11, r9            ; a
+    usub16  r9, r11, r9             ; b
+    pkhtb   r6, r12, r14, asr #16   ; i3 | i7
+
+    subs    r5, r5, #1<<31          ; i--
+
+    smulbt  r7, r5, r6              ; (ip[3] * cospi8sqrt2minus1) >> 16
+    smulwt  r11, r4, r6             ; (ip[3] * sinpi8sqrt2) >> 16
+    smulbb  r12, r5, r6             ; (ip[7] * cospi8sqrt2minus1) >> 16
+    smulwb  r14, r4, r6             ; (ip[7] * sinpi8sqrt2) >> 16
+
+    pkhtb   r7, r7, r12, asr #16    ; 3c | 7c
+    pkhbt   r11, r14, r11, lsl #16  ; 3s | 7s = temp1
+
+    uadd16  r6, r7, r6              ; 3c+3 | 7c+7 = temp2
+    usub16  r12, r8, r6             ; c (o1 | o5)
+    uadd16  r6, r11, r0             ; d (o3 | o7)
+    uadd16  r7, r10, r6             ; a+d
+
+    mov     r8, #4                  ; set up 4's
+    orr     r8, r8, #0x40000        ; 4|4
+
+    usub16  r6, r10, r6             ; a-d
+    uadd16  r6, r6, r8              ; a-d+4, 3|7
+    uadd16  r7, r7, r8              ; a+d+4, 0|4
+    uadd16  r10, r9, r12            ; b+c
+    usub16  r0, r9, r12             ; b-c
+    uadd16  r10, r10, r8            ; b+c+4, 1|5
+    uadd16  r8, r0, r8              ; b-c+4, 2|6
+
+    ldr     lr, [sp, #40]           ; dst stride
+
+    ldrb    r0, [r1]                ; pred p0
+    ldrb    r11, [r1, #1]           ; pred p1
+    ldrb    r12, [r1, #2]           ; pred p2
+
+    add     r0, r0, r7, asr #19     ; p0 + o0
+    add     r11, r11, r10, asr #19  ; p1 + o1
+    add     r12, r12, r8, asr #19   ; p2 + o2
+
+    usat    r0, #8, r0              ; d0 = clip8(p0 + o0)
+    usat    r11, #8, r11            ; d1 = clip8(p1 + o1)
+    usat    r12, #8, r12            ; d2 = clip8(p2 + o2)
+
+    add     r0, r0, r11, lsl #8     ; |--|--|d1|d0|
+
+    ldrb    r11, [r1, #3]           ; pred p3
+
+    add     r0, r0, r12, lsl #16    ; |--|d2|d1|d0|
+
+    add     r11, r11, r6, asr #19   ; p3 + o3
+
+    sxth    r7, r7                  ;
+    sxth    r10, r10                ;
+
+    usat    r11, #8, r11            ; d3 = clip8(p3 + o3)
+
+    sxth    r8, r8                  ;
+    sxth    r6, r6                  ;
+
+    add     r0, r0, r11, lsl #24    ; |d3|d2|d1|d0|
+
+    ldrb    r12, [r1, r2]!          ; pred p4
+    str     r0, [r3], lr
+    ldrb    r11, [r1, #1]           ; pred p5
+
+    add     r12, r12, r7, asr #3    ; p4 + o4
+    add     r11, r11, r10, asr #3   ; p5 + o5
+
+    usat    r12, #8, r12            ; d4 = clip8(p4 + o4)
+    usat    r11, #8, r11            ; d5 = clip8(p5 + o5)
+
+    ldrb    r7, [r1, #2]            ; pred p6
+    ldrb    r10, [r1, #3]           ; pred p6
+
+    add     r12, r12, r11, lsl #8   ; |--|--|d5|d4|
+
+    add     r7, r7, r8, asr #3      ; p6 + o6
+    add     r10, r10, r6, asr #3    ; p7 + o7
+
+    ldr     r0, [sp]                ; load input pointer
+
+    usat    r7, #8, r7              ; d6 = clip8(p6 + o6)
+    usat    r10, #8, r10            ; d7 = clip8(p7 + o7)
+
+    add     r12, r12, r7, lsl #16   ; |--|d6|d5|d4|
+    add     r12, r12, r10, lsl #24  ; |d7|d6|d5|d4|
+
+    str     r12, [r3], lr
+    add     r0, r0, #16
+    add     r1, r1, r2              ; pred + pitch
+
+    bcs loop2_dual
+
+    add     sp, sp, #4              ; idct_output buffer
+    ldmia   sp!, {r4 - r11, pc}
 
-    pkhbt   r7, r12, r7, lsl #16    ; 3c | 7c
-    pkhbt   r11, r14, r11, lsl #16  ; 3s | 7s = temp1 (d)                                                   td1
-    uadd16  r6, r7, r6  ; 3c+3 | 7c+7 = temp2  (c)                              tc2
-    usub16  r12, r8, r6 ; c (o1 | o5)                                                       c
-    uadd16  r6, r11, r1 ; d (o3 | o7)                               d
-    uadd16  r7, r10, r6 ; a+d                                   a+d
-    mov r8, #0x4    ; set up 4's                                        4
-    orr r8, r8, #0x40000    ;                                       4|4
-    usub16  r6, r10, r6 ; a-d                               a-d
-    uadd16  r6, r6, r8  ; a-d+4                             3|7
-    uadd16  r7, r7, r8  ; a+d+4                                 0|4
-    uadd16  r10, r9, r12    ; b+c                                               b+c
-    usub16  r1, r9, r12 ; b-c           b-c
-    uadd16  r10, r10, r8    ; b+c+4                                             1|5
-    uadd16  r1, r1, r8  ; b-c+4         2|6
-    mov r8, r10, asr #19    ; o1 >> 3
-    strh    r8, [r0, #2]    ; o1
-    mov r8, r1, asr #19 ; o2 >> 3
-    strh    r8, [r0, #4]    ; o2
-    mov r8, r6, asr #19 ; o3 >> 3
-    strh    r8, [r0, #6]    ; o3
-    mov r8, r7, asr #19 ; o0 >> 3
-    strh    r8, [r0], r2    ; o0        +p
-    sxth    r10, r10    ;
-    mov r8, r10, asr #3 ; o5 >> 3
-    strh    r8, [r0, #2]    ; o5
-    sxth    r1, r1  ;
-    mov r8, r1, asr #3  ; o6 >> 3
-    strh    r8, [r0, #4]    ; o6
-    sxth    r6, r6  ;
-    mov r8, r6, asr #3  ; o7 >> 3
-    strh    r8, [r0, #6]    ; o7
-    sxth    r7, r7  ;
-    mov r8, r7, asr #3  ; o4 >> 3
-    strh    r8, [r0], r2    ; o4        +p
-;;;;;   subs    r5, r5, #0x1    ; i--                           --
-    bne loop2_dual  ;
-            ;
-    ldmia   sp!, {r4 - r11, pc} ; replace vars, return                      restore
     ENDP
 
     END
diff --git a/media/libvpx/vp8/common/arm/armv6/intra4x4_predict_v6.asm b/media/libvpx/vp8/common/arm/armv6/intra4x4_predict_v6.asm
new file mode 100644
index 00000000000..a974cd12b3d
--- /dev/null
+++ b/media/libvpx/vp8/common/arm/armv6/intra4x4_predict_v6.asm
@@ -0,0 +1,606 @@
+;
+;  Copyright (c) 2011 The WebM project authors. All Rights Reserved.
+;
+;  Use of this source code is governed by a BSD-style license
+;  that can be found in the LICENSE file in the root of the source
+;  tree. An additional intellectual property rights grant can be found
+;  in the file PATENTS.  All contributing project authors may
+;  be found in the AUTHORS file in the root of the source tree.
+;
+
+
+    EXPORT  |vp8_intra4x4_predict_armv6|
+
+    ARM
+    REQUIRE8
+    PRESERVE8
+
+    AREA ||.text||, CODE, READONLY, ALIGN=2
+
+
+;void vp8_intra4x4_predict(unsigned char *src, int src_stride, int b_mode,
+;                          unsigned char *dst, int dst_stride)
+
+|vp8_intra4x4_predict_armv6| PROC
+    push        {r4-r12, lr}
+
+
+    cmp         r2, #10
+    addlt       pc, pc, r2, lsl #2       ; position independent switch
+    pop         {r4-r12, pc}             ; default
+    b           b_dc_pred
+    b           b_tm_pred
+    b           b_ve_pred
+    b           b_he_pred
+    b           b_ld_pred
+    b           b_rd_pred
+    b           b_vr_pred
+    b           b_vl_pred
+    b           b_hd_pred
+    b           b_hu_pred
+
+b_dc_pred
+    ; load values
+    ldr         r8, [r0, -r1]            ; Above
+    ldrb        r4, [r0, #-1]!           ; Left[0]
+    mov         r9, #0
+    ldrb        r5, [r0, r1]             ; Left[1]
+    ldrb        r6, [r0, r1, lsl #1]!    ; Left[2]
+    usad8       r12, r8, r9
+    ldrb        r7, [r0, r1]             ; Left[3]
+
+    ; calculate dc
+    add         r4, r4, r5
+    add         r4, r4, r6
+    add         r4, r4, r7
+    add         r4, r4, r12
+    add         r4, r4, #4
+    ldr         r0, [sp, #40]           ; load stride
+    mov         r12, r4, asr #3         ; (expected_dc + 4) >> 3
+
+    add         r12, r12, r12, lsl #8
+    add         r3, r3, r0
+    add         r12, r12, r12, lsl #16
+
+    ; store values
+    str         r12, [r3, -r0]
+    str         r12, [r3]
+    str         r12, [r3, r0]
+    str         r12, [r3, r0, lsl #1]
+
+    pop        {r4-r12, pc}
+
+b_tm_pred
+    sub         r10, r0, #1             ; Left
+    ldr         r8, [r0, -r1]           ; Above
+    ldrb        r9, [r10, -r1]          ; top_left
+    ldrb        r4, [r0, #-1]!          ; Left[0]
+    ldrb        r5, [r10, r1]!          ; Left[1]
+    ldrb        r6, [r0, r1, lsl #1]    ; Left[2]
+    ldrb        r7, [r10, r1, lsl #1]   ; Left[3]
+    ldr         r0, [sp, #40]           ; load stride
+
+
+    add         r9, r9, r9, lsl #16     ; [tl|tl]
+    uxtb16      r10, r8                 ; a[2|0]
+    uxtb16      r11, r8, ror #8         ; a[3|1]
+    ssub16      r10, r10, r9            ; a[2|0] - [tl|tl]
+    ssub16      r11, r11, r9            ; a[3|1] - [tl|tl]
+
+    add         r4, r4, r4, lsl #16     ; l[0|0]
+    add         r5, r5, r5, lsl #16     ; l[1|1]
+    add         r6, r6, r6, lsl #16     ; l[2|2]
+    add         r7, r7, r7, lsl #16     ; l[3|3]
+
+    sadd16      r1, r4, r10             ; l[0|0] + a[2|0] - [tl|tl]
+    sadd16      r2, r4, r11             ; l[0|0] + a[3|1] - [tl|tl]
+    usat16      r1, #8, r1
+    usat16      r2, #8, r2
+
+    sadd16      r4, r5, r10             ; l[1|1] + a[2|0] - [tl|tl]
+    sadd16      r5, r5, r11             ; l[1|1] + a[3|1] - [tl|tl]
+
+    add         r12, r1, r2, lsl #8     ; [3|2|1|0]
+    str         r12, [r3], r0
+
+    usat16      r4, #8, r4
+    usat16      r5, #8, r5
+
+    sadd16      r1, r6, r10             ; l[2|2] + a[2|0] - [tl|tl]
+    sadd16      r2, r6, r11             ; l[2|2] + a[3|1] - [tl|tl]
+
+    add         r12, r4, r5, lsl #8     ; [3|2|1|0]
+    str         r12, [r3], r0
+
+    usat16      r1, #8, r1
+    usat16      r2, #8, r2
+
+    sadd16      r4, r7, r10             ; l[3|3] + a[2|0] - [tl|tl]
+    sadd16      r5, r7, r11             ; l[3|3] + a[3|1] - [tl|tl]
+
+    add         r12, r1, r2, lsl #8     ; [3|2|1|0]
+
+    usat16      r4, #8, r4
+    usat16      r5, #8, r5
+
+    str         r12, [r3], r0
+
+    add         r12, r4, r5, lsl #8     ; [3|2|1|0]
+    str         r12, [r3], r0
+
+    pop        {r4-r12, pc}
+
+b_ve_pred
+    ldr         r8, [r0, -r1]!          ; a[3|2|1|0]
+    ldr         r11, c00FF00FF
+    ldrb        r9, [r0, #-1]           ; top_left
+    ldrb        r10, [r0, #4]           ; a[4]
+
+    ldr         r0, c00020002
+
+    uxtb16      r4, r8                  ; a[2|0]
+    uxtb16      r5, r8, ror #8          ; a[3|1]
+    ldr         r2, [sp, #40]           ; stride
+    pkhbt       r9, r9, r5, lsl #16     ; a[1|-1]
+
+    add         r9, r9, r4, lsl #1      ;[a[1]+2*a[2]       | tl+2*a[0]       ]
+    uxtab16     r9, r9, r5              ;[a[1]+2*a[2]+a[3]  | tl+2*a[0]+a[1]  ]
+    uxtab16     r9, r9, r0              ;[a[1]+2*a[2]+a[3]+2| tl+2*a[0]+a[1]+2]
+
+    add         r0, r0, r10, lsl #16    ;[a[4]+2            |                 2]
+    add         r0, r0, r4, asr #16     ;[a[4]+2            |            a[2]+2]
+    add         r0, r0, r5, lsl #1      ;[a[4]+2*a[3]+2     |     a[2]+2*a[1]+2]
+    uadd16      r4, r4, r0              ;[a[4]+2*a[3]+a[2]+2|a[2]+2*a[1]+a[0]+2]
+
+    and         r9, r11, r9, asr #2
+    and         r4, r11, r4, asr #2
+    add         r3, r3, r2              ; dst + dst_stride
+    add         r9, r9, r4, lsl #8
+
+    ; store values
+    str         r9, [r3, -r2]
+    str         r9, [r3]
+    str         r9, [r3, r2]
+    str         r9, [r3, r2, lsl #1]
+
+    pop        {r4-r12, pc}
+
+
+b_he_pred
+    sub         r10, r0, #1             ; Left
+    ldrb        r4, [r0, #-1]!          ; Left[0]
+    ldrb        r8, [r10, -r1]          ; top_left
+    ldrb        r5, [r10, r1]!          ; Left[1]
+    ldrb        r6, [r0, r1, lsl #1]    ; Left[2]
+    ldrb        r7, [r10, r1, lsl #1]   ; Left[3]
+
+    add         r8, r8, r4              ; tl   + l[0]
+    add         r9, r4, r5              ; l[0] + l[1]
+    add         r10, r5, r6             ; l[1] + l[2]
+    add         r11, r6, r7             ; l[2] + l[3]
+
+    mov         r0, #2<<14
+
+    add         r8, r8, r9              ; tl + 2*l[0] + l[1]
+    add         r4, r9, r10             ; l[0] + 2*l[1] + l[2]
+    add         r5, r10, r11            ; l[1] + 2*l[2] + l[3]
+    add         r6, r11, r7, lsl #1     ; l[2] + 2*l[3] + l[3]
+
+
+    add         r8, r0, r8, lsl #14     ; (tl + 2*l[0] + l[1])>>2 in top half
+    add         r9, r0, r4, lsl #14     ; (l[0] + 2*l[1] + l[2])>>2 in top half
+    add         r10,r0, r5, lsl #14     ; (l[1] + 2*l[2] + l[3])>>2 in top half
+    add         r11,r0, r6, lsl #14     ; (l[2] + 2*l[3] + l[3])>>2 in top half
+
+    pkhtb       r8, r8, r8, asr #16     ; l[-|0|-|0]
+    pkhtb       r9, r9, r9, asr #16     ; l[-|1|-|1]
+    pkhtb       r10, r10, r10, asr #16  ; l[-|2|-|2]
+    pkhtb       r11, r11, r11, asr #16  ; l[-|3|-|3]
+
+    ldr         r0, [sp, #40]           ; stride
+
+    add         r8, r8, r8, lsl #8      ; l[0|0|0|0]
+    add         r9, r9, r9, lsl #8      ; l[1|1|1|1]
+    add         r10, r10, r10, lsl #8   ; l[2|2|2|2]
+    add         r11, r11, r11, lsl #8   ; l[3|3|3|3]
+
+    ; store values
+    str         r8, [r3], r0
+    str         r9, [r3]
+    str         r10, [r3, r0]
+    str         r11, [r3, r0, lsl #1]
+
+    pop        {r4-r12, pc}
+
+b_ld_pred
+    ldr         r4, [r0, -r1]!          ; Above
+    ldr         r12, c00020002
+    ldr         r5, [r0, #4]
+    ldr         lr,  c00FF00FF
+
+    uxtb16      r6, r4                  ; a[2|0]
+    uxtb16      r7, r4, ror #8          ; a[3|1]
+    uxtb16      r8, r5                  ; a[6|4]
+    uxtb16      r9, r5, ror #8          ; a[7|5]
+    pkhtb       r10, r6, r8             ; a[2|4]
+    pkhtb       r11, r7, r9             ; a[3|5]
+
+
+    add         r4, r6, r7, lsl #1      ; [a2+2*a3      |      a0+2*a1]
+    add         r4, r4, r10, ror #16    ; [a2+2*a3+a4   |   a0+2*a1+a2]
+    uxtab16     r4, r4, r12             ; [a2+2*a3+a4+2 | a0+2*a1+a2+2]
+
+    add         r5, r7, r10, ror #15    ; [a3+2*a4      |      a1+2*a2]
+    add         r5, r5, r11, ror #16    ; [a3+2*a4+a5   |   a1+2*a2+a3]
+    uxtab16     r5, r5, r12             ; [a3+2*a4+a5+2 | a1+2*a2+a3+2]
+
+    pkhtb       r7, r9, r8, asr #16
+    add         r6, r8, r9, lsl #1      ; [a6+2*a7      |      a4+2*a5]
+    uadd16      r6, r6, r7              ; [a6+2*a7+a7   |   a4+2*a5+a6]
+    uxtab16     r6, r6, r12             ; [a6+2*a7+a7+2 | a4+2*a5+a6+2]
+
+    uxth        r7, r9                  ; [                         a5]
+    add         r7, r7, r8, asr #15     ; [                    a5+2*a6]
+    add         r7, r7, r9, asr #16     ; [                 a5+2*a6+a7]
+    uxtah       r7, r7, r12             ; [               a5+2*a6+a7+2]
+
+    ldr         r0, [sp, #40]           ; stride
+
+    ; scale down
+    and         r4, lr, r4, asr #2
+    and         r5, lr, r5, asr #2
+    and         r6, lr, r6, asr #2
+    mov         r7, r7, asr #2
+
+    add         r8, r4, r5, lsl #8      ; [3|2|1|0]
+    str         r8, [r3], r0
+
+    mov         r9, r8, lsr #8
+    add         r9, r9, r6, lsl #24     ; [4|3|2|1]
+    str         r9, [r3], r0
+
+    mov         r10, r9, lsr #8
+    add         r10, r10, r7, lsl #24   ; [5|4|3|2]
+    str         r10, [r3], r0
+
+    mov         r6, r6, lsr #16
+    mov         r11, r10, lsr #8
+    add         r11, r11, r6, lsl #24   ; [6|5|4|3]
+    str         r11, [r3], r0
+
+    pop        {r4-r12, pc}
+
+b_rd_pred
+    sub         r12, r0, r1             ; Above = src - src_stride
+    ldrb        r7, [r0, #-1]!          ; l[0] = pp[3]
+    ldr         lr, [r12]               ; Above = pp[8|7|6|5]
+    ldrb        r8, [r12, #-1]!         ; tl   = pp[4]
+    ldrb        r6, [r12, r1, lsl #1]   ; l[1] = pp[2]
+    ldrb        r5, [r0, r1, lsl #1]    ; l[2] = pp[1]
+    ldrb        r4, [r12, r1, lsl #2]   ; l[3] = pp[0]
+
+
+    uxtb16      r9, lr                  ; p[7|5]
+    uxtb16      r10, lr, ror #8         ; p[8|6]
+    add         r4, r4, r6, lsl #16     ; p[2|0]
+    add         r5, r5, r7, lsl #16     ; p[3|1]
+    add         r6, r6, r8, lsl #16     ; p[4|2]
+    pkhbt       r7, r7, r9, lsl #16     ; p[5|3]
+    pkhbt       r8, r8, r10, lsl #16    ; p[6|4]
+
+    ldr         r12, c00020002
+    ldr         lr,  c00FF00FF
+
+    add         r4, r4, r5, lsl #1      ; [p2+2*p3      |      p0+2*p1]
+    add         r4, r4, r6              ; [p2+2*p3+p4   |   p0+2*p1+p2]
+    uxtab16     r4, r4, r12             ; [p2+2*p3+p4+2 | p0+2*p1+p2+2]
+
+    add         r5, r5, r6, lsl #1      ; [p3+2*p4      |      p1+2*p2]
+    add         r5, r5, r7              ; [p3+2*p4+p5   |   p1+2*p2+p3]
+    uxtab16     r5, r5, r12             ; [p3+2*p4+p5+2 | p1+2*p2+p3+2]
+
+    add         r6, r7, r8, lsl #1      ; [p5+2*p6      |      p3+2*p4]
+    add         r6, r6, r9              ; [p5+2*p6+p7   |   p3+2*p4+p5]
+    uxtab16     r6, r6, r12             ; [p5+2*p6+p7+2 | p3+2*p4+p5+2]
+
+    add         r7, r8, r9, lsl #1      ; [p6+2*p7      |      p4+2*p5]
+    add         r7, r7, r10             ; [p6+2*p7+p8   |   p4+2*p5+p6]
+    uxtab16     r7, r7, r12             ; [p6+2*p7+p8+2 | p4+2*p5+p6+2]
+
+    ldr         r0, [sp, #40]           ; stride
+
+    ; scale down
+    and         r7, lr, r7, asr #2
+    and         r6, lr, r6, asr #2
+    and         r5, lr, r5, asr #2
+    and         r4, lr, r4, asr #2
+
+    add         r8, r6, r7, lsl #8      ; [6|5|4|3]
+    str         r8, [r3], r0
+
+    mov         r9, r8, lsl #8          ; [5|4|3|-]
+    uxtab       r9, r9, r4, ror #16     ; [5|4|3|2]
+    str         r9, [r3], r0
+
+    mov         r10, r9, lsl #8         ; [4|3|2|-]
+    uxtab       r10, r10, r5            ; [4|3|2|1]
+    str         r10, [r3], r0
+
+    mov         r11, r10, lsl #8        ; [3|2|1|-]
+    uxtab       r11, r11, r4            ; [3|2|1|0]
+    str         r11, [r3], r0
+
+    pop        {r4-r12, pc}
+
+b_vr_pred
+    sub         r12, r0, r1             ; Above = src - src_stride
+    ldrb        r7, [r0, #-1]!          ; l[0] = pp[3]
+    ldr         lr, [r12]               ; Above = pp[8|7|6|5]
+    ldrb        r8, [r12, #-1]!         ; tl   = pp[4]
+    ldrb        r6, [r12, r1, lsl #1]   ; l[1] = pp[2]
+    ldrb        r5, [r0, r1, lsl #1]    ; l[2] = pp[1]
+    ldrb        r4, [r12, r1, lsl #2]   ; l[3] = pp[0]
+
+    add         r5, r5, r7, lsl #16     ; p[3|1]
+    add         r6, r6, r8, lsl #16     ; p[4|2]
+    uxtb16      r9, lr                  ; p[7|5]
+    uxtb16      r10, lr, ror #8         ; p[8|6]
+    pkhbt       r7, r7, r9, lsl #16     ; p[5|3]
+    pkhbt       r8, r8, r10, lsl #16    ; p[6|4]
+
+    ldr         r4,  c00010001
+    ldr         r12, c00020002
+    ldr         lr,  c00FF00FF
+
+    add         r5, r5, r6, lsl #1      ; [p3+2*p4      |      p1+2*p2]
+    add         r5, r5, r7              ; [p3+2*p4+p5   |   p1+2*p2+p3]
+    uxtab16     r5, r5, r12             ; [p3+2*p4+p5+2 | p1+2*p2+p3+2]
+
+    add         r6, r6, r7, lsl #1      ; [p4+2*p5      |      p2+2*p3]
+    add         r6, r6, r8              ; [p4+2*p5+p6   |   p2+2*p3+p4]
+    uxtab16     r6, r6, r12             ; [p4+2*p5+p6+2 | p2+2*p3+p4+2]
+
+    uadd16      r11, r8, r9             ; [p6+p7        |        p4+p5]
+    uhadd16     r11, r11, r4            ; [(p6+p7+1)>>1 | (p4+p5+1)>>1]
+                                        ; [F|E]
+
+    add         r7, r7, r8, lsl #1      ; [p5+2*p6      |      p3+2*p4]
+    add         r7, r7, r9              ; [p5+2*p6+p7   |   p3+2*p4+p5]
+    uxtab16     r7, r7, r12             ; [p5+2*p6+p7+2 | p3+2*p4+p5+2]
+
+    uadd16      r2, r9, r10             ; [p7+p8        |        p5+p6]
+    uhadd16     r2, r2, r4              ; [(p7+p8+1)>>1 | (p5+p6+1)>>1]
+                                        ; [J|I]
+
+    add         r8, r8, r9, lsl #1      ; [p6+2*p7      |      p4+2*p5]
+    add         r8, r8, r10             ; [p6+2*p7+p8   |   p4+2*p5+p6]
+    uxtab16     r8, r8, r12             ; [p6+2*p7+p8+2 | p4+2*p5+p6+2]
+
+    ldr         r0, [sp, #40]           ; stride
+
+    ; scale down
+    and         r5, lr, r5, asr #2      ; [B|A]
+    and         r6, lr, r6, asr #2      ; [D|C]
+    and         r7, lr, r7, asr #2      ; [H|G]
+    and         r8, lr, r8, asr #2      ; [L|K]
+
+    add         r12, r11, r2, lsl #8    ; [J|F|I|E]
+    str         r12, [r3], r0
+
+    add         r12, r7, r8, lsl #8     ; [L|H|K|G]
+    str         r12, [r3], r0
+
+    pkhbt       r2, r6, r2, lsl #16     ; [-|I|-|C]
+    add         r2, r2, r11, lsl #8     ; [F|I|E|C]
+
+    pkhtb       r12, r6, r5             ; [-|D|-|A]
+    pkhtb       r10, r7, r5, asr #16    ; [-|H|-|B]
+    str         r2, [r3], r0
+    add         r12, r12, r10, lsl #8   ; [H|D|B|A]
+    str         r12, [r3], r0
+
+    pop        {r4-r12, pc}
+
+b_vl_pred
+    ldr         r4, [r0, -r1]!          ; [3|2|1|0]
+    ldr         r12, c00020002
+    ldr         r5, [r0, #4]            ; [7|6|5|4]
+    ldr         lr,  c00FF00FF
+    ldr         r2,  c00010001
+
+    mov         r0, r4, lsr #16         ; [-|-|3|2]
+    add         r0, r0, r5, lsl #16     ; [5|4|3|2]
+    uxtb16      r6, r4                  ; [2|0]
+    uxtb16      r7, r4, ror #8          ; [3|1]
+    uxtb16      r8, r0                  ; [4|2]
+    uxtb16      r9, r0, ror #8          ; [5|3]
+    uxtb16      r10, r5                 ; [6|4]
+    uxtb16      r11, r5, ror #8         ; [7|5]
+
+    uadd16      r4, r6, r7              ; [p2+p3        |        p0+p1]
+    uhadd16     r4, r4, r2              ; [(p2+p3+1)>>1 | (p0+p1+1)>>1]
+                                        ; [B|A]
+
+    add         r5, r6, r7, lsl #1      ; [p2+2*p3      |      p0+2*p1]
+    add         r5, r5, r8              ; [p2+2*p3+p4   |   p0+2*p1+p2]
+    uxtab16     r5, r5, r12             ; [p2+2*p3+p4+2 | p0+2*p1+p2+2]
+
+    uadd16      r6, r7, r8              ; [p3+p4        |        p1+p2]
+    uhadd16     r6, r6, r2              ; [(p3+p4+1)>>1 | (p1+p2+1)>>1]
+                                        ; [F|E]
+
+    add         r7, r7, r8, lsl #1      ; [p3+2*p4      |      p1+2*p2]
+    add         r7, r7, r9              ; [p3+2*p4+p5   |   p1+2*p2+p3]
+    uxtab16     r7, r7, r12             ; [p3+2*p4+p5+2 | p1+2*p2+p3+2]
+
+    add         r8, r8, r9, lsl #1      ; [p4+2*p5      |      p2+2*p3]
+    add         r8, r8, r10             ; [p4+2*p5+p6   |   p2+2*p3+p4]
+    uxtab16     r8, r8, r12             ; [p4+2*p5+p6+2 | p2+2*p3+p4+2]
+
+    add         r9, r9, r10, lsl #1     ; [p5+2*p6      |      p3+2*p4]
+    add         r9, r9, r11             ; [p5+2*p6+p7   |   p3+2*p4+p5]
+    uxtab16     r9, r9, r12             ; [p5+2*p6+p7+2 | p3+2*p4+p5+2]
+
+    ldr         r0, [sp, #40]           ; stride
+
+    ; scale down
+    and         r5, lr, r5, asr #2      ; [D|C]
+    and         r7, lr, r7, asr #2      ; [H|G]
+    and         r8, lr, r8, asr #2      ; [I|D]
+    and         r9, lr, r9, asr #2      ; [J|H]
+
+
+    add         r10, r4, r6, lsl #8     ; [F|B|E|A]
+    str         r10, [r3], r0
+
+    add         r5, r5, r7, lsl #8      ; [H|C|G|D]
+    str         r5, [r3], r0
+
+    pkhtb       r12, r8, r4, asr #16    ; [-|I|-|B]
+    pkhtb       r10, r9, r8             ; [-|J|-|D]
+
+    add         r12, r6, r12, lsl #8    ; [I|F|B|E]
+    str         r12, [r3], r0
+
+    add         r10, r7, r10, lsl #8    ; [J|H|D|G]
+    str         r10, [r3], r0
+
+    pop        {r4-r12, pc}
+
+b_hd_pred
+    sub         r12, r0, r1             ; Above = src - src_stride
+    ldrb        r7, [r0, #-1]!          ; l[0] = pp[3]
+    ldr         lr, [r12]               ; Above = pp[8|7|6|5]
+    ldrb        r8, [r12, #-1]!         ; tl   = pp[4]
+    ldrb        r6, [r0, r1]            ; l[1] = pp[2]
+    ldrb        r5, [r0, r1, lsl #1]    ; l[2] = pp[1]
+    ldrb        r4, [r12, r1, lsl #2]   ; l[3] = pp[0]
+
+    uxtb16      r9, lr                  ; p[7|5]
+    uxtb16      r10, lr, ror #8         ; p[8|6]
+
+    add         r4, r4, r5, lsl #16     ; p[1|0]
+    add         r5, r5, r6, lsl #16     ; p[2|1]
+    add         r6, r6, r7, lsl #16     ; p[3|2]
+    add         r7, r7, r8, lsl #16     ; p[4|3]
+
+    ldr         r12, c00020002
+    ldr         lr,  c00FF00FF
+    ldr         r2,  c00010001
+
+    pkhtb       r8, r7, r9              ; p[4|5]
+    pkhtb       r1, r9, r10             ; p[7|6]
+    pkhbt       r10, r8, r10, lsl #16   ; p[6|5]
+
+
+    uadd16      r11, r4, r5             ; [p1+p2        |        p0+p1]
+    uhadd16     r11, r11, r2            ; [(p1+p2+1)>>1 | (p0+p1+1)>>1]
+                                        ; [B|A]
+
+    add         r4, r4, r5, lsl #1      ; [p1+2*p2      |      p0+2*p1]
+    add         r4, r4, r6              ; [p1+2*p2+p3   |   p0+2*p1+p2]
+    uxtab16     r4, r4, r12             ; [p1+2*p2+p3+2 | p0+2*p1+p2+2]
+
+    uadd16      r0, r6, r7              ; [p3+p4        |        p2+p3]
+    uhadd16     r0, r0, r2              ; [(p3+p4+1)>>1 | (p2+p3+1)>>1]
+                                        ; [F|E]
+
+    add         r5, r6, r7, lsl #1      ; [p3+2*p4      |      p2+2*p3]
+    add         r5, r5, r8, ror #16     ; [p3+2*p4+p5   |   p2+2*p3+p4]
+    uxtab16     r5, r5, r12             ; [p3+2*p4+p5+2 | p2+2*p3+p4+2]
+
+    add         r6, r12, r8, ror #16    ; [p5+2         |         p4+2]
+    add         r6, r6, r10, lsl #1     ; [p5+2+2*p6    |    p4+2+2*p5]
+    uxtab16     r6, r6, r1              ; [p5+2+2*p6+p7 | p4+2+2*p5+p6]
+
+    ; scale down
+    and         r4, lr, r4, asr #2      ; [D|C]
+    and         r5, lr, r5, asr #2      ; [H|G]
+    and         r6, lr, r6, asr #2      ; [J|I]
+
+    ldr         lr, [sp, #40]           ; stride
+
+    pkhtb       r2, r0, r6              ; [-|F|-|I]
+    pkhtb       r12, r6, r5, asr #16    ; [-|J|-|H]
+    add         r12, r12, r2, lsl #8    ; [F|J|I|H]
+    add         r2, r0, r5, lsl #8      ; [H|F|G|E]
+    mov         r12, r12, ror #24       ; [J|I|H|F]
+    str         r12, [r3], lr
+
+
+    mov         r7, r11, asr #16        ; [-|-|-|B]
+    str         r2, [r3], lr
+    add         r7, r7, r0, lsl #16     ; [-|E|-|B]
+    add         r7, r7, r4, asr #8      ; [-|E|D|B]
+    add         r7, r7, r5, lsl #24     ; [G|E|D|B]
+    str         r7, [r3], lr
+
+    add         r5, r11, r4, lsl #8     ; [D|B|C|A]
+    str         r5, [r3], lr
+
+    pop        {r4-r12, pc}
+
+
+
+b_hu_pred
+    ldrb        r4, [r0, #-1]!          ; Left[0]
+    ldr         r12, c00020002
+    ldrb        r5, [r0, r1]!           ; Left[1]
+    ldr         lr,  c00FF00FF
+    ldrb        r6, [r0, r1]!           ; Left[2]
+    ldr         r2,  c00010001
+    ldrb        r7, [r0, r1]            ; Left[3]
+
+
+    add         r4, r4, r5, lsl #16     ; [1|0]
+    add         r5, r5, r6, lsl #16     ; [2|1]
+    add         r9, r6, r7, lsl #16     ; [3|2]
+
+    uadd16      r8, r4, r5              ; [p1+p2        |        p0+p1]
+    uhadd16     r8, r8, r2              ; [(p1+p2+1)>>1 | (p0+p1+1)>>1]
+                                        ; [B|A]
+
+    add         r4, r4, r5, lsl #1      ; [p1+2*p2      |      p0+2*p1]
+    add         r4, r4, r9              ; [p1+2*p2+p3   |   p0+2*p1+p2]
+    uxtab16     r4, r4, r12             ; [p1+2*p2+p3+2 | p0+2*p1+p2+2]
+    ldr         r2, [sp, #40]           ; stride
+    and         r4, lr, r4, asr #2      ; [D|C]
+
+    add         r10, r6, r7             ; [p2+p3]
+    add         r11, r10, r7, lsl #1    ; [p2+3*p3]
+    add         r10, r10, #1
+    add         r11, r11, #2
+    mov         r10, r10, asr #1        ; [E]
+    mov         r11, r11, asr #2        ; [F]
+
+    add         r9, r7, r9, asr #8      ; [-|-|G|G]
+    add         r0, r8, r4, lsl #8      ; [D|B|C|A]
+    add         r7, r9, r9, lsl #16     ; [G|G|G|G]
+
+    str         r0, [r3], r2
+
+    mov         r1, r8, asr #16         ; [-|-|-|B]
+    add         r1, r1, r4, asr #8      ; [-|-|D|B]
+    add         r1, r1, r10, lsl #16    ; [-|E|D|B]
+    add         r1, r1, r11, lsl #24    ; [F|E|D|B]
+    str         r1, [r3], r2
+
+    add         r10, r11, lsl #8        ; [-|-|F|E]
+    add         r10, r10, r9, lsl #16   ; [G|G|F|E]
+    str         r10, [r3]
+
+    str         r7, [r3, r2]
+
+    pop        {r4-r12, pc}
+
+    ENDP
+
+; constants
+c00010001
+    DCD         0x00010001
+c00020002
+    DCD         0x00020002
+c00FF00FF
+    DCD         0x00FF00FF
+
+    END
diff --git a/media/libvpx/vp8/common/arm/armv6/iwalsh_v6.asm b/media/libvpx/vp8/common/arm/armv6/iwalsh_v6.asm
index 463bff0f5d7..31ef09cada3 100644
--- a/media/libvpx/vp8/common/arm/armv6/iwalsh_v6.asm
+++ b/media/libvpx/vp8/common/arm/armv6/iwalsh_v6.asm
@@ -9,7 +9,6 @@
 ;
 
     EXPORT |vp8_short_inv_walsh4x4_v6|
-    EXPORT |vp8_short_inv_walsh4x4_1_v6|
 
     ARM
     REQUIRE8
@@ -17,19 +16,19 @@
 
     AREA    |.text|, CODE, READONLY  ; name this block of code
 
-;short vp8_short_inv_walsh4x4_v6(short *input, short *output)
+;short vp8_short_inv_walsh4x4_v6(short *input, short *mb_dqcoeff)
 |vp8_short_inv_walsh4x4_v6| PROC
 
-    stmdb       sp!, {r4 - r11, lr}
+    stmdb       sp!, {r4 - r12, lr}
 
-    ldr         r2, [r0], #4         ; [1  |  0]
-    ldr         r3, [r0], #4         ; [3  |  2]
-    ldr         r4, [r0], #4         ; [5  |  4]
-    ldr         r5, [r0], #4         ; [7  |  6]
-    ldr         r6, [r0], #4         ; [9  |  8]
-    ldr         r7, [r0], #4         ; [11 | 10]
-    ldr         r8, [r0], #4         ; [13 | 12]
-    ldr         r9, [r0]             ; [15 | 14]
+    ldr         r2, [r0, #0]         ; [1  |  0]
+    ldr         r3, [r0, #4]         ; [3  |  2]
+    ldr         r4, [r0, #8]         ; [5  |  4]
+    ldr         r5, [r0, #12]        ; [7  |  6]
+    ldr         r6, [r0, #16]        ; [9  |  8]
+    ldr         r7, [r0, #20]        ; [11 | 10]
+    ldr         r8, [r0, #24]        ; [13 | 12]
+    ldr         r9, [r0, #28]        ; [15 | 14]
 
     qadd16      r10, r2, r8          ; a1 [1+13  |  0+12]
     qadd16      r11, r4, r6          ; b1 [5+9   |  4+8]
@@ -69,24 +68,27 @@
     qadd16      r4, r4, r10          ; [b2+3|c2+3]
     qadd16      r5, r5, r10          ; [a2+3|d2+3]
 
-    asr         r12, r2, #3          ; [1  |  x]
-    pkhtb       r12, r12, r3, asr #19; [1  |  0]
-    lsl         lr, r3, #16          ; [~3 |  x]
-    lsl         r2, r2, #16          ; [~2 |  x]
-    asr         lr, lr, #3           ; [3  |  x]
-    pkhtb       lr, lr, r2, asr #19  ; [3  |  2]
+    asr         r12, r3, #19         ; [0]
+    strh        r12, [r1], #32
+    asr         lr, r2, #19          ; [1]
+    strh        lr, [r1], #32
+    sxth        r2, r2
+    sxth        r3, r3
+    asr         r2, r2, #3           ; [2]
+    strh        r2, [r1], #32
+    asr         r3, r3, #3           ; [3]
+    strh        r3, [r1], #32
 
-    asr         r2, r4, #3           ; [5  |  x]
-    pkhtb       r2, r2, r5, asr #19  ; [5  |  4]
-    lsl         r3, r5, #16          ; [~7 |  x]
-    lsl         r4, r4, #16          ; [~6 |  x]
-    asr         r3, r3, #3           ; [7  |  x]
-    pkhtb       r3, r3, r4, asr #19  ; [7  |  6]
-
-    str         r12, [r1], #4
-    str         lr, [r1], #4
-    str         r2, [r1], #4
-    str         r3, [r1], #4
+    asr         r12, r5, #19         ; [4]
+    strh        r12, [r1], #32
+    asr         lr, r4, #19          ; [5]
+    strh        lr, [r1], #32
+    sxth        r4, r4
+    sxth        r5, r5
+    asr         r4, r4, #3           ; [6]
+    strh        r4, [r1], #32
+    asr         r5, r5, #3           ; [7]
+    strh        r5, [r1], #32
 
     qsubaddx    r2, r6, r7           ; [c1|a1] [9-10  |  8+11]
     qaddsubx    r3, r6, r7           ; [b1|d1] [9+10  |  8-11]
@@ -103,50 +105,32 @@
     qadd16      r8, r8, r10          ; [b2+3|c2+3]
     qadd16      r9, r9, r10          ; [a2+3|d2+3]
 
-    asr         r2, r6, #3           ; [9  |  x]
-    pkhtb       r2, r2, r7, asr #19  ; [9  |  8]
-    lsl         r3, r7, #16          ; [~11|  x]
-    lsl         r4, r6, #16          ; [~10|  x]
-    asr         r3, r3, #3           ; [11 |  x]
-    pkhtb       r3, r3, r4, asr #19  ; [11 | 10]
+    asr         r12, r7, #19         ; [8]
+    strh        r12, [r1], #32
+    asr         lr, r6, #19          ; [9]
+    strh        lr, [r1], #32
+    sxth        r6, r6
+    sxth        r7, r7
+    asr         r6, r6, #3           ; [10]
+    strh        r6, [r1], #32
+    asr         r7, r7, #3           ; [11]
+    strh        r7, [r1], #32
 
-    asr         r4, r8, #3           ; [13 |  x]
-    pkhtb       r4, r4, r9, asr #19  ; [13 | 12]
-    lsl         r5, r9, #16          ; [~15|  x]
-    lsl         r6, r8, #16          ; [~14|  x]
-    asr         r5, r5, #3           ; [15 |  x]
-    pkhtb       r5, r5, r6, asr #19  ; [15 | 14]
+    asr         r12, r9, #19         ; [12]
+    strh        r12, [r1], #32
+    asr         lr, r8, #19          ; [13]
+    strh        lr, [r1], #32
+    sxth        r8, r8
+    sxth        r9, r9
+    asr         r8, r8, #3           ; [14]
+    strh        r8, [r1], #32
+    asr         r9, r9, #3           ; [15]
+    strh        r9, [r1], #32
 
-    str         r2, [r1], #4
-    str         r3, [r1], #4
-    str         r4, [r1], #4
-    str         r5, [r1]
-
-    ldmia       sp!, {r4 - r11, pc}
+    ldmia       sp!, {r4 - r12, pc}
     ENDP        ; |vp8_short_inv_walsh4x4_v6|
 
 
-;short vp8_short_inv_walsh4x4_1_v6(short *input, short *output)
-|vp8_short_inv_walsh4x4_1_v6| PROC
-
-    ldrsh       r2, [r0]             ; [0]
-    add         r2, r2, #3           ; [0] + 3
-    asr         r2, r2, #3           ; a1 ([0]+3) >> 3
-    lsl         r2, r2, #16          ; [a1 |  x]
-    orr         r2, r2, r2, lsr #16  ; [a1 | a1]
-
-    str         r2, [r1], #4
-    str         r2, [r1], #4
-    str         r2, [r1], #4
-    str         r2, [r1], #4
-    str         r2, [r1], #4
-    str         r2, [r1], #4
-    str         r2, [r1], #4
-    str         r2, [r1]
-
-    bx          lr
-    ENDP        ; |vp8_short_inv_walsh4x4_1_v6|
-
 ; Constant Pool
 c0x00030003 DCD 0x00030003
     END
diff --git a/media/libvpx/vp8/common/arm/armv6/recon_v6.asm b/media/libvpx/vp8/common/arm/armv6/recon_v6.asm
deleted file mode 100644
index 99c7bcf2dd8..00000000000
--- a/media/libvpx/vp8/common/arm/armv6/recon_v6.asm
+++ /dev/null
@@ -1,281 +0,0 @@
-;
-;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-;
-;  Use of this source code is governed by a BSD-style license
-;  that can be found in the LICENSE file in the root of the source
-;  tree. An additional intellectual property rights grant can be found
-;  in the file PATENTS.  All contributing project authors may
-;  be found in the AUTHORS file in the root of the source tree.
-;
-
-
-    EXPORT  |vp8_recon_b_armv6|
-    EXPORT  |vp8_recon2b_armv6|
-    EXPORT  |vp8_recon4b_armv6|
-
-    AREA    |.text|, CODE, READONLY  ; name this block of code
-prd     RN  r0
-dif     RN  r1
-dst     RN  r2
-stride      RN  r3
-
-;void recon_b(unsigned char *pred_ptr, short *diff_ptr, unsigned char *dst_ptr, int stride)
-; R0 char* pred_ptr
-; R1 short * dif_ptr
-; R2 char * dst_ptr
-; R3 int stride
-
-; Description:
-; Loop through the block adding the Pred and Diff together.  Clamp and then
-; store back into the Dst.
-
-; Restrictions :
-; all buffers are expected to be 4 byte aligned coming in and
-; going out.
-;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-;
-;
-;
-;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-|vp8_recon_b_armv6| PROC
-    stmdb   sp!, {r4 - r9, lr}
-
-    ;0, 1, 2, 3
-    ldr     r4, [prd], #16          ; 3 | 2 | 1 | 0
-    ldr     r6, [dif, #0]           ;     1 |     0
-    ldr     r7, [dif, #4]           ;     3 |     2
-
-    pkhbt   r8, r6, r7, lsl #16     ;     2 |     0
-    pkhtb   r9, r7, r6, asr #16     ;     3 |     1
-
-    uxtab16 r8, r8, r4              ;     2 |     0  +  3 | 2 | 2 | 0
-    uxtab16 r9, r9, r4, ror #8      ;     3 |     1  +  0 | 3 | 2 | 1
-
-    usat16  r8, #8, r8
-    usat16  r9, #8, r9
-    add     dif, dif, #32
-    orr     r8, r8, r9, lsl #8
-
-    str     r8, [dst], stride
-
-    ;0, 1, 2, 3
-    ldr     r4, [prd], #16          ; 3 | 2 | 1 | 0
-;;  ldr     r6, [dif, #8]           ;     1 |     0
-;;  ldr     r7, [dif, #12]          ;     3 |     2
-    ldr     r6, [dif, #0]           ;     1 |     0
-    ldr     r7, [dif, #4]           ;     3 |     2
-
-    pkhbt   r8, r6, r7, lsl #16     ;     2 |     0
-    pkhtb   r9, r7, r6, asr #16     ;     3 |     1
-
-    uxtab16 r8, r8, r4              ;     2 |     0  +  3 | 2 | 2 | 0
-    uxtab16 r9, r9, r4, ror #8      ;     3 |     1  +  0 | 3 | 2 | 1
-
-    usat16  r8, #8, r8
-    usat16  r9, #8, r9
-    add     dif, dif, #32
-    orr     r8, r8, r9, lsl #8
-
-    str     r8, [dst], stride
-
-    ;0, 1, 2, 3
-    ldr     r4, [prd], #16          ; 3 | 2 | 1 | 0
-;;  ldr     r6, [dif, #16]          ;     1 |     0
-;;  ldr     r7, [dif, #20]          ;     3 |     2
-    ldr     r6, [dif, #0]           ;     1 |     0
-    ldr     r7, [dif, #4]           ;     3 |     2
-
-    pkhbt   r8, r6, r7, lsl #16     ;     2 |     0
-    pkhtb   r9, r7, r6, asr #16     ;     3 |     1
-
-    uxtab16 r8, r8, r4              ;     2 |     0  +  3 | 2 | 2 | 0
-    uxtab16 r9, r9, r4, ror #8      ;     3 |     1  +  0 | 3 | 2 | 1
-
-    usat16  r8, #8, r8
-    usat16  r9, #8, r9
-    add     dif, dif, #32
-    orr     r8, r8, r9, lsl #8
-
-    str     r8, [dst], stride
-
-    ;0, 1, 2, 3
-    ldr     r4, [prd], #16          ; 3 | 2 | 1 | 0
-;;  ldr     r6, [dif, #24]          ;     1 |     0
-;;  ldr     r7, [dif, #28]          ;     3 |     2
-    ldr     r6, [dif, #0]           ;     1 |     0
-    ldr     r7, [dif, #4]           ;     3 |     2
-
-    pkhbt   r8, r6, r7, lsl #16     ;     2 |     0
-    pkhtb   r9, r7, r6, asr #16     ;     3 |     1
-
-    uxtab16 r8, r8, r4              ;     2 |     0  +  3 | 2 | 2 | 0
-    uxtab16 r9, r9, r4, ror #8      ;     3 |     1  +  0 | 3 | 2 | 1
-
-    usat16  r8, #8, r8
-    usat16  r9, #8, r9
-    orr     r8, r8, r9, lsl #8
-
-    str     r8, [dst], stride
-
-    ldmia   sp!, {r4 - r9, pc}
-
-    ENDP    ; |recon_b|
-
-;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-;
-;
-;
-;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-; R0 char  *pred_ptr
-; R1 short *dif_ptr
-; R2 char  *dst_ptr
-; R3 int stride
-|vp8_recon4b_armv6| PROC
-    stmdb   sp!, {r4 - r9, lr}
-
-    mov     lr, #4
-
-recon4b_loop
-    ;0, 1, 2, 3
-    ldr     r4, [prd], #4           ; 3 | 2 | 1 | 0
-    ldr     r6, [dif, #0]           ;     1 |     0
-    ldr     r7, [dif, #4]           ;     3 |     2
-
-    pkhbt   r8, r6, r7, lsl #16     ;     2 |     0
-    pkhtb   r9, r7, r6, asr #16     ;     3 |     1
-
-    uxtab16 r8, r8, r4              ;     2 |     0  +  3 | 2 | 2 | 0
-    uxtab16 r9, r9, r4, ror #8      ;     3 |     1  +  0 | 3 | 2 | 1
-
-    usat16  r8, #8, r8
-    usat16  r9, #8, r9
-    orr     r8, r8, r9, lsl #8
-
-    str     r8, [dst]
-
-    ;4, 5, 6, 7
-    ldr     r4, [prd], #4
-;;  ldr     r6, [dif, #32]
-;;  ldr     r7, [dif, #36]
-    ldr     r6, [dif, #8]
-    ldr     r7, [dif, #12]
-
-    pkhbt   r8, r6, r7, lsl #16
-    pkhtb   r9, r7, r6, asr #16
-
-    uxtab16 r8, r8, r4
-    uxtab16 r9, r9, r4, ror #8
-    usat16  r8, #8, r8
-    usat16  r9, #8, r9
-    orr     r8, r8, r9, lsl #8
-
-    str     r8, [dst, #4]
-
-    ;8, 9, 10, 11
-    ldr     r4, [prd], #4
-;;  ldr     r6, [dif, #64]
-;;  ldr     r7, [dif, #68]
-    ldr     r6, [dif, #16]
-    ldr     r7, [dif, #20]
-
-    pkhbt   r8, r6, r7, lsl #16
-    pkhtb   r9, r7, r6, asr #16
-
-    uxtab16 r8, r8, r4
-    uxtab16 r9, r9, r4, ror #8
-    usat16  r8, #8, r8
-    usat16  r9, #8, r9
-    orr     r8, r8, r9, lsl #8
-
-    str     r8, [dst, #8]
-
-    ;12, 13, 14, 15
-    ldr     r4, [prd], #4
-;;  ldr     r6, [dif, #96]
-;;  ldr     r7, [dif, #100]
-    ldr     r6, [dif, #24]
-    ldr     r7, [dif, #28]
-
-    pkhbt   r8, r6, r7, lsl #16
-    pkhtb   r9, r7, r6, asr #16
-
-    uxtab16 r8, r8, r4
-    uxtab16 r9, r9, r4, ror #8
-    usat16  r8, #8, r8
-    usat16  r9, #8, r9
-    orr     r8, r8, r9, lsl #8
-
-    str     r8, [dst, #12]
-
-    add     dst, dst, stride
-;;  add     dif, dif, #8
-    add     dif, dif, #32
-
-    subs    lr, lr, #1
-    bne     recon4b_loop
-
-    ldmia   sp!, {r4 - r9, pc}
-
-    ENDP    ; |Recon4B|
-
-;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-;
-;
-;
-;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-; R0 char  *pred_ptr
-; R1 short *dif_ptr
-; R2 char  *dst_ptr
-; R3 int stride
-|vp8_recon2b_armv6| PROC
-    stmdb   sp!, {r4 - r9, lr}
-
-    mov     lr, #4
-
-recon2b_loop
-    ;0, 1, 2, 3
-    ldr     r4, [prd], #4
-    ldr     r6, [dif, #0]
-    ldr     r7, [dif, #4]
-
-    pkhbt   r8, r6, r7, lsl #16
-    pkhtb   r9, r7, r6, asr #16
-
-    uxtab16 r8, r8, r4
-    uxtab16 r9, r9, r4, ror #8
-    usat16  r8, #8, r8
-    usat16  r9, #8, r9
-    orr     r8, r8, r9, lsl #8
-
-    str     r8, [dst]
-
-    ;4, 5, 6, 7
-    ldr     r4, [prd], #4
-;;  ldr     r6, [dif, #32]
-;;  ldr     r7, [dif, #36]
-    ldr     r6, [dif, #8]
-    ldr     r7, [dif, #12]
-
-    pkhbt   r8, r6, r7, lsl #16
-    pkhtb   r9, r7, r6, asr #16
-
-    uxtab16 r8, r8, r4
-    uxtab16 r9, r9, r4, ror #8
-    usat16  r8, #8, r8
-    usat16  r9, #8, r9
-    orr     r8, r8, r9, lsl #8
-
-    str     r8, [dst, #4]
-
-    add     dst, dst, stride
-;;  add     dif, dif, #8
-    add     dif, dif, #16
-
-    subs    lr, lr, #1
-    bne     recon2b_loop
-
-    ldmia   sp!, {r4 - r9, pc}
-
-    ENDP    ; |Recon2B|
-
-    END
diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_mse16x16_armv6.asm
similarity index 100%
rename from media/libvpx/vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm
rename to media/libvpx/vp8/common/arm/armv6/vp8_mse16x16_armv6.asm
diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_sad16x16_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_sad16x16_armv6.asm
similarity index 100%
rename from media/libvpx/vp8/encoder/arm/armv6/vp8_sad16x16_armv6.asm
rename to media/libvpx/vp8/common/arm/armv6/vp8_sad16x16_armv6.asm
diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm
similarity index 98%
rename from media/libvpx/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm
rename to media/libvpx/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm
index 5feaa8bc210..dc84c30daf5 100644
--- a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm
+++ b/media/libvpx/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm
@@ -144,7 +144,7 @@ loop
     ldr     r6, [sp, #40]       ; get address of sse
     mul     r0, r8, r8          ; sum * sum
     str     r11, [r6]           ; store sse
-    sub     r0, r11, r0, asr #8 ; return (sse - ((sum * sum) >> 8))
+    sub     r0, r11, r0, lsr #8 ; return (sse - ((sum * sum) >> 8))
 
     ldmfd   sp!, {r4-r12, pc}
 
diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance8x8_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_variance8x8_armv6.asm
similarity index 100%
rename from media/libvpx/vp8/encoder/arm/armv6/vp8_variance8x8_armv6.asm
rename to media/libvpx/vp8/common/arm/armv6/vp8_variance8x8_armv6.asm
diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
similarity index 99%
rename from media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
rename to media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
index 1b548979563..dd2ce685c8b 100644
--- a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
+++ b/media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm
@@ -169,7 +169,7 @@ loop
     ldr     r6, [sp, #40]       ; get address of sse
     mul     r0, r8, r8          ; sum * sum
     str     r11, [r6]           ; store sse
-    sub     r0, r11, r0, asr #8 ; return (sse - ((sum * sum) >> 8))
+    sub     r0, r11, r0, lsr #8 ; return (sse - ((sum * sum) >> 8))
 
     ldmfd   sp!, {r4-r12, pc}
 
diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
similarity index 99%
rename from media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
rename to media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
index 38c55edf8cf..f972d9b5bac 100644
--- a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
+++ b/media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm
@@ -210,7 +210,7 @@ loop
     ldr     r6, [sp, #40]       ; get address of sse
     mul     r0, r8, r8          ; sum * sum
     str     r11, [r6]           ; store sse
-    sub     r0, r11, r0, asr #8 ; return (sse - ((sum * sum) >> 8))
+    sub     r0, r11, r0, lsr #8 ; return (sse - ((sum * sum) >> 8))
 
     ldmfd   sp!, {r4-r12, pc}
 
diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm b/media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
similarity index 99%
rename from media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
rename to media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
index 22a50eb002e..f5da9c09eed 100644
--- a/media/libvpx/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
+++ b/media/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm
@@ -171,7 +171,7 @@ loop
     ldr     r6, [sp, #40]       ; get address of sse
     mul     r0, r8, r8          ; sum * sum
     str     r11, [r6]           ; store sse
-    sub     r0, r11, r0, asr #8 ; return (sse - ((sum * sum) >> 8))
+    sub     r0, r11, r0, lsr #8 ; return (sse - ((sum * sum) >> 8))
 
     ldmfd   sp!, {r4-r12, pc}
 
diff --git a/media/libvpx/vp8/decoder/arm/dequantize_arm.c b/media/libvpx/vp8/common/arm/dequantize_arm.c
similarity index 79%
rename from media/libvpx/vp8/decoder/arm/dequantize_arm.c
rename to media/libvpx/vp8/common/arm/dequantize_arm.c
index 98db6eefff3..7cf4bf94308 100644
--- a/media/libvpx/vp8/decoder/arm/dequantize_arm.c
+++ b/media/libvpx/vp8/common/arm/dequantize_arm.c
@@ -9,10 +9,9 @@
  */
 
 
-#include "vpx_ports/config.h"
-#include "vp8/decoder/dequantize.h"
+#include "vpx_config.h"
+#include "vp8/common/dequantize.h"
 #include "vp8/common/idct.h"
-#include "vpx_mem/vpx_mem.h"
 
 #if HAVE_ARMV7
 extern void vp8_dequantize_b_loop_neon(short *Q, short *DQC, short *DQ);
@@ -24,22 +23,20 @@ extern void vp8_dequantize_b_loop_v6(short *Q, short *DQC, short *DQ);
 
 #if HAVE_ARMV7
 
-void vp8_dequantize_b_neon(BLOCKD *d)
+void vp8_dequantize_b_neon(BLOCKD *d, short *DQC)
 {
     short *DQ  = d->dqcoeff;
     short *Q   = d->qcoeff;
-    short *DQC = d->dequant;
 
     vp8_dequantize_b_loop_neon(Q, DQC, DQ);
 }
 #endif
 
 #if HAVE_ARMV6
-void vp8_dequantize_b_v6(BLOCKD *d)
+void vp8_dequantize_b_v6(BLOCKD *d, short *DQC)
 {
     short *DQ  = d->dqcoeff;
     short *Q   = d->qcoeff;
-    short *DQC = d->dequant;
 
     vp8_dequantize_b_loop_v6(Q, DQC, DQ);
 }
diff --git a/media/libvpx/vp8/decoder/arm/dequantize_arm.h b/media/libvpx/vp8/common/arm/dequantize_arm.h
similarity index 64%
rename from media/libvpx/vp8/decoder/arm/dequantize_arm.h
rename to media/libvpx/vp8/common/arm/dequantize_arm.h
index b7d800d2603..0b4d8fe8902 100644
--- a/media/libvpx/vp8/decoder/arm/dequantize_arm.h
+++ b/media/libvpx/vp8/common/arm/dequantize_arm.h
@@ -15,8 +15,6 @@
 #if HAVE_ARMV6
 extern prototype_dequant_block(vp8_dequantize_b_v6);
 extern prototype_dequant_idct_add(vp8_dequant_idct_add_v6);
-extern prototype_dequant_dc_idct_add(vp8_dequant_dc_idct_add_v6);
-extern prototype_dequant_dc_idct_add_y_block(vp8_dequant_dc_idct_add_y_block_v6);
 extern prototype_dequant_idct_add_y_block(vp8_dequant_idct_add_y_block_v6);
 extern prototype_dequant_idct_add_uv_block(vp8_dequant_idct_add_uv_block_v6);
 
@@ -24,19 +22,13 @@ extern prototype_dequant_idct_add_uv_block(vp8_dequant_idct_add_uv_block_v6);
 #undef  vp8_dequant_block
 #define vp8_dequant_block vp8_dequantize_b_v6
 
-#undef vp8_dequant_idct_add
+#undef  vp8_dequant_idct_add
 #define vp8_dequant_idct_add vp8_dequant_idct_add_v6
 
-#undef vp8_dequant_dc_idct_add
-#define vp8_dequant_dc_idct_add vp8_dequant_dc_idct_add_v6
-
-#undef vp8_dequant_dc_idct_add_y_block
-#define vp8_dequant_dc_idct_add_y_block vp8_dequant_dc_idct_add_y_block_v6
-
-#undef vp8_dequant_idct_add_y_block
+#undef  vp8_dequant_idct_add_y_block
 #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_v6
 
-#undef vp8_dequant_idct_add_uv_block
+#undef  vp8_dequant_idct_add_uv_block
 #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_v6
 #endif
 #endif
@@ -44,30 +36,24 @@ extern prototype_dequant_idct_add_uv_block(vp8_dequant_idct_add_uv_block_v6);
 #if HAVE_ARMV7
 extern prototype_dequant_block(vp8_dequantize_b_neon);
 extern prototype_dequant_idct_add(vp8_dequant_idct_add_neon);
-extern prototype_dequant_dc_idct_add(vp8_dequant_dc_idct_add_neon);
-extern prototype_dequant_dc_idct_add_y_block(vp8_dequant_dc_idct_add_y_block_neon);
 extern prototype_dequant_idct_add_y_block(vp8_dequant_idct_add_y_block_neon);
 extern prototype_dequant_idct_add_uv_block(vp8_dequant_idct_add_uv_block_neon);
 
+
 #if !CONFIG_RUNTIME_CPU_DETECT
 #undef  vp8_dequant_block
 #define vp8_dequant_block vp8_dequantize_b_neon
 
-#undef vp8_dequant_idct_add
+#undef  vp8_dequant_idct_add
 #define vp8_dequant_idct_add vp8_dequant_idct_add_neon
 
-#undef vp8_dequant_dc_idct_add
-#define vp8_dequant_dc_idct_add vp8_dequant_dc_idct_add_neon
-
-#undef vp8_dequant_dc_idct_add_y_block
-#define vp8_dequant_dc_idct_add_y_block vp8_dequant_dc_idct_add_y_block_neon
-
-#undef vp8_dequant_idct_add_y_block
+#undef  vp8_dequant_idct_add_y_block
 #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_neon
 
-#undef vp8_dequant_idct_add_uv_block
+#undef  vp8_dequant_idct_add_uv_block
 #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_neon
 #endif
-#endif
+
+#endif
 
 #endif
diff --git a/media/libvpx/vp8/common/arm/filter_arm.c b/media/libvpx/vp8/common/arm/filter_arm.c
index 6582fb29aae..6d95eb8e349 100644
--- a/media/libvpx/vp8/common/arm/filter_arm.c
+++ b/media/libvpx/vp8/common/arm/filter_arm.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include <math.h>
 #include "vp8/common/filter.h"
 #include "vp8/common/subpixel.h"
diff --git a/media/libvpx/vp8/common/arm/idct_arm.h b/media/libvpx/vp8/common/arm/idct_arm.h
index 8b8d179172b..68c0cad11bf 100644
--- a/media/libvpx/vp8/common/arm/idct_arm.h
+++ b/media/libvpx/vp8/common/arm/idct_arm.h
@@ -13,50 +13,36 @@
 #define IDCT_ARM_H
 
 #if HAVE_ARMV6
-extern prototype_idct(vp8_short_idct4x4llm_1_v6);
 extern prototype_idct(vp8_short_idct4x4llm_v6_dual);
 extern prototype_idct_scalar_add(vp8_dc_only_idct_add_v6);
 extern prototype_second_order(vp8_short_inv_walsh4x4_1_v6);
 extern prototype_second_order(vp8_short_inv_walsh4x4_v6);
 
 #if !CONFIG_RUNTIME_CPU_DETECT
-#undef  vp8_idct_idct1
-#define vp8_idct_idct1 vp8_short_idct4x4llm_1_v6
-
 #undef  vp8_idct_idct16
 #define vp8_idct_idct16 vp8_short_idct4x4llm_v6_dual
 
 #undef  vp8_idct_idct1_scalar_add
 #define vp8_idct_idct1_scalar_add vp8_dc_only_idct_add_v6
 
-#undef  vp8_idct_iwalsh1
-#define vp8_idct_iwalsh1 vp8_short_inv_walsh4x4_1_v6
-
 #undef  vp8_idct_iwalsh16
 #define vp8_idct_iwalsh16 vp8_short_inv_walsh4x4_v6
 #endif
 #endif
 
 #if HAVE_ARMV7
-extern prototype_idct(vp8_short_idct4x4llm_1_neon);
 extern prototype_idct(vp8_short_idct4x4llm_neon);
 extern prototype_idct_scalar_add(vp8_dc_only_idct_add_neon);
 extern prototype_second_order(vp8_short_inv_walsh4x4_1_neon);
 extern prototype_second_order(vp8_short_inv_walsh4x4_neon);
 
 #if !CONFIG_RUNTIME_CPU_DETECT
-#undef  vp8_idct_idct1
-#define vp8_idct_idct1 vp8_short_idct4x4llm_1_neon
-
 #undef  vp8_idct_idct16
 #define vp8_idct_idct16 vp8_short_idct4x4llm_neon
 
 #undef  vp8_idct_idct1_scalar_add
 #define vp8_idct_idct1_scalar_add vp8_dc_only_idct_add_neon
 
-#undef  vp8_idct_iwalsh1
-#define vp8_idct_iwalsh1 vp8_short_inv_walsh4x4_1_neon
-
 #undef  vp8_idct_iwalsh16
 #define vp8_idct_iwalsh16 vp8_short_inv_walsh4x4_neon
 #endif
diff --git a/media/libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.asm b/media/libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.asm
index 49ba05fb0ec..65a4680c1b8 100644
--- a/media/libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.asm
+++ b/media/libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.asm
@@ -14,22 +14,26 @@
     PRESERVE8
 
     AREA ||.text||, CODE, READONLY, ALIGN=2
-;void vp8_dc_only_idct_add_neon(short input_dc, unsigned char *pred_ptr,
-;                               unsigned char *dst_ptr, int pitch, int stride)
+
+;void vp8_dc_only_idct_add_c(short input_dc, unsigned char *pred_ptr,
+;                            int pred_stride, unsigned char *dst_ptr,
+;                            int dst_stride)
+
 ; r0  input_dc
 ; r1  pred_ptr
-; r2  dst_ptr
-; r3  pitch
-; sp  stride
+; r2  pred_stride
+; r3  dst_ptr
+; sp  dst_stride
+
 |vp8_dc_only_idct_add_neon| PROC
     add             r0, r0, #4
     asr             r0, r0, #3
     ldr             r12, [sp]
     vdup.16         q0, r0
 
-    vld1.32         {d2[0]}, [r1], r3
-    vld1.32         {d2[1]}, [r1], r3
-    vld1.32         {d4[0]}, [r1], r3
+    vld1.32         {d2[0]}, [r1], r2
+    vld1.32         {d2[1]}, [r1], r2
+    vld1.32         {d4[0]}, [r1], r2
     vld1.32         {d4[1]}, [r1]
 
     vaddw.u8        q1, q0, d2
@@ -38,12 +42,13 @@
     vqmovun.s16     d2, q1
     vqmovun.s16     d4, q2
 
-    vst1.32         {d2[0]}, [r2], r12
-    vst1.32         {d2[1]}, [r2], r12
-    vst1.32         {d4[0]}, [r2], r12
-    vst1.32         {d4[1]}, [r2]
-
-    bx             lr
+    vst1.32         {d2[0]}, [r3], r12
+    vst1.32         {d2[1]}, [r3], r12
+    vst1.32         {d4[0]}, [r3], r12
+    vst1.32         {d4[1]}, [r3]
+ 
+    bx              lr
 
     ENDP
+
     END
diff --git a/media/libvpx/vp8/decoder/arm/neon/dequant_idct_neon.asm b/media/libvpx/vp8/common/arm/neon/dequant_idct_neon.asm
similarity index 81%
rename from media/libvpx/vp8/decoder/arm/neon/dequant_idct_neon.asm
rename to media/libvpx/vp8/common/arm/neon/dequant_idct_neon.asm
index 4bf66185796..602cce67697 100644
--- a/media/libvpx/vp8/decoder/arm/neon/dequant_idct_neon.asm
+++ b/media/libvpx/vp8/common/arm/neon/dequant_idct_neon.asm
@@ -15,25 +15,24 @@
     PRESERVE8
 
     AREA ||.text||, CODE, READONLY, ALIGN=2
-;void vp8_dequant_idct_neon(short *input, short *dq, unsigned char *pred,
-;                           unsigned char *dest, int pitch, int stride)
+;void vp8_dequant_idct_add_neon(short *input, short *dq,
+;                           unsigned char *dest, int stride)
 ; r0    short *input,
 ; r1    short *dq,
-; r2    unsigned char *pred
-; r3    unsigned char *dest
-; sp    int pitch
-; sp+4  int stride
+; r2    unsigned char *dest
+; r3    int stride
 
 |vp8_dequant_idct_add_neon| PROC
     vld1.16         {q3, q4}, [r0]
     vld1.16         {q5, q6}, [r1]
-    ldr             r1, [sp]                ; pitch
-    vld1.32         {d14[0]}, [r2], r1
-    vld1.32         {d14[1]}, [r2], r1
-    vld1.32         {d15[0]}, [r2], r1
-    vld1.32         {d15[1]}, [r2]
 
-    ldr             r1, [sp, #4]            ; stride
+    add             r1, r2, r3              ; r1 = dest + stride
+    lsl             r3, #1                  ; 2x stride
+
+    vld1.32         {d14[0]}, [r2], r3
+    vld1.32         {d14[1]}, [r1], r3
+    vld1.32         {d15[0]}, [r2]
+    vld1.32         {d15[1]}, [r1]
 
     adr             r12, cospi8sqrt2minus1  ; pointer to the first constant
 
@@ -110,13 +109,16 @@
     vaddw.u8        q1, q1, d14
     vaddw.u8        q2, q2, d15
 
+    sub             r2, r2, r3
+    sub             r1, r1, r3
+
     vqmovun.s16     d0, q1
     vqmovun.s16     d1, q2
 
-    vst1.32         {d0[0]}, [r3], r1
-    vst1.32         {d0[1]}, [r3], r1
-    vst1.32         {d1[0]}, [r3], r1
-    vst1.32         {d1[1]}, [r3]
+    vst1.32         {d0[0]}, [r2], r3
+    vst1.32         {d0[1]}, [r1], r3
+    vst1.32         {d1[0]}, [r2]
+    vst1.32         {d1[1]}, [r1]
 
     bx             lr
 
diff --git a/media/libvpx/vp8/decoder/arm/neon/dequantizeb_neon.asm b/media/libvpx/vp8/common/arm/neon/dequantizeb_neon.asm
similarity index 100%
rename from media/libvpx/vp8/decoder/arm/neon/dequantizeb_neon.asm
rename to media/libvpx/vp8/common/arm/neon/dequantizeb_neon.asm
diff --git a/media/libvpx/vp8/common/arm/neon/idct_blk_neon.c b/media/libvpx/vp8/common/arm/neon/idct_blk_neon.c
new file mode 100644
index 00000000000..cc55843d548
--- /dev/null
+++ b/media/libvpx/vp8/common/arm/neon/idct_blk_neon.c
@@ -0,0 +1,97 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "vpx_config.h"
+#include "vp8/common/idct.h"
+#include "vp8/common/dequantize.h"
+
+/* place these declarations here because we don't want to maintain them
+ * outside of this scope
+ */
+void idct_dequant_full_2x_neon(short *q, short *dq,
+                               unsigned char *dst, int stride);
+void idct_dequant_0_2x_neon(short *q, short dq,
+                            unsigned char *dst, int stride);
+
+
+void vp8_dequant_idct_add_y_block_neon(short *q, short *dq,
+                                       unsigned char *dst,
+                                       int stride, char *eobs)
+{
+    int i;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (((short *)(eobs))[0])
+        {
+            if (((short *)eobs)[0] & 0xfefe)
+                idct_dequant_full_2x_neon (q, dq, dst, stride);
+            else
+                idct_dequant_0_2x_neon (q, dq[0], dst, stride);
+        }
+
+        if (((short *)(eobs))[1])
+        {
+            if (((short *)eobs)[1] & 0xfefe)
+                idct_dequant_full_2x_neon (q+32, dq, dst+8, stride);
+            else
+                idct_dequant_0_2x_neon (q+32, dq[0], dst+8, stride);
+        }
+        q    += 64;
+        dst  += 4*stride;
+        eobs += 4;
+    }
+}
+
+void vp8_dequant_idct_add_uv_block_neon(short *q, short *dq,
+                                        unsigned char *dstu,
+                                        unsigned char *dstv,
+                                        int stride, char *eobs)
+{
+    if (((short *)(eobs))[0])
+    {
+        if (((short *)eobs)[0] & 0xfefe)
+            idct_dequant_full_2x_neon (q, dq, dstu, stride);
+        else
+            idct_dequant_0_2x_neon (q, dq[0], dstu, stride);
+    }
+
+    q    += 32;
+    dstu += 4*stride;
+
+    if (((short *)(eobs))[1])
+    {
+        if (((short *)eobs)[1] & 0xfefe)
+            idct_dequant_full_2x_neon (q, dq, dstu, stride);
+        else
+            idct_dequant_0_2x_neon (q, dq[0], dstu, stride);
+    }
+
+    q += 32;
+
+    if (((short *)(eobs))[2])
+    {
+        if (((short *)eobs)[2] & 0xfefe)
+            idct_dequant_full_2x_neon (q, dq, dstv, stride);
+        else
+            idct_dequant_0_2x_neon (q, dq[0], dstv, stride);
+    }
+
+    q    += 32;
+    dstv += 4*stride;
+
+    if (((short *)(eobs))[3])
+    {
+        if (((short *)eobs)[3] & 0xfefe)
+            idct_dequant_full_2x_neon (q, dq, dstv, stride);
+        else
+            idct_dequant_0_2x_neon (q, dq[0], dstv, stride);
+    }
+}
diff --git a/media/libvpx/vp8/decoder/arm/neon/idct_dequant_0_2x_neon.asm b/media/libvpx/vp8/common/arm/neon/idct_dequant_0_2x_neon.asm
similarity index 72%
rename from media/libvpx/vp8/decoder/arm/neon/idct_dequant_0_2x_neon.asm
rename to media/libvpx/vp8/common/arm/neon/idct_dequant_0_2x_neon.asm
index 456f8e1d41c..6c29c55860d 100644
--- a/media/libvpx/vp8/decoder/arm/neon/idct_dequant_0_2x_neon.asm
+++ b/media/libvpx/vp8/common/arm/neon/idct_dequant_0_2x_neon.asm
@@ -14,38 +14,38 @@
     PRESERVE8
 
     AREA ||.text||, CODE, READONLY, ALIGN=2
-;void idct_dequant_0_2x_neon(short *q, short dq, unsigned char *pre,
-;                            int pitch, unsigned char *dst, int stride);
+;void idct_dequant_0_2x_neon(short *q, short dq,
+;                            unsigned char *dst, int stride);
 ; r0   *q
 ; r1   dq
-; r2   *pre
-; r3   pitch
-; sp   *dst
-; sp+4 stride
+; r2   *dst
+; r3   stride
 |idct_dequant_0_2x_neon| PROC
+    push            {r4, r5}
+
     add             r12, r2, #4
     vld1.32         {d2[0]}, [r2], r3
-    vld1.32         {d2[1]}, [r2], r3
-    vld1.32         {d4[0]}, [r2], r3
-    vld1.32         {d4[1]}, [r2]
     vld1.32         {d8[0]}, [r12], r3
+    vld1.32         {d2[1]}, [r2], r3
     vld1.32         {d8[1]}, [r12], r3
+    vld1.32         {d4[0]}, [r2], r3
     vld1.32         {d10[0]}, [r12], r3
-    vld1.32         {d10[1]}, [r12]
+    vld1.32         {d4[1]}, [r2], r3
+    vld1.32         {d10[1]}, [r12], r3
 
     ldrh            r12, [r0]               ; lo q
-    ldrh            r2, [r0, #32]           ; hi q
-    mov             r3, #0
-    strh            r3, [r0]
-    strh            r3, [r0, #32]
+    ldrh            r4, [r0, #32]           ; hi q
+    mov             r5, #0
+    strh            r5, [r0]
+    strh            r5, [r0, #32]
 
     sxth            r12, r12                ; lo
     mul             r0, r12, r1
     add             r0, r0, #4
     asr             r0, r0, #3
     vdup.16         q0, r0
-    sxth            r2, r2                  ; hi
-    mul             r0, r2, r1
+    sxth            r4, r4                  ; hi
+    mul             r0, r4, r1
     add             r0, r0, #4
     asr             r0, r0, #3
     vdup.16         q3, r0
@@ -55,25 +55,25 @@
     vaddw.u8        q4, q3, d8              ; hi
     vaddw.u8        q5, q3, d10
 
-    ldr             r2, [sp]                ; dst
-    ldr             r3, [sp, #4]            ; stride
+    sub             r2, r2, r3, lsl #2      ; dst - 4*stride
+    add             r0, r2, #4
 
     vqmovun.s16     d2, q1                  ; lo
     vqmovun.s16     d4, q2
     vqmovun.s16     d8, q4                  ; hi
     vqmovun.s16     d10, q5
 
-    add             r0, r2, #4
     vst1.32         {d2[0]}, [r2], r3       ; lo
-    vst1.32         {d2[1]}, [r2], r3
-    vst1.32         {d4[0]}, [r2], r3
-    vst1.32         {d4[1]}, [r2]
     vst1.32         {d8[0]}, [r0], r3       ; hi
+    vst1.32         {d2[1]}, [r2], r3
     vst1.32         {d8[1]}, [r0], r3
+    vst1.32         {d4[0]}, [r2], r3
     vst1.32         {d10[0]}, [r0], r3
+    vst1.32         {d4[1]}, [r2]
     vst1.32         {d10[1]}, [r0]
 
-    bx             lr
+    pop             {r4, r5}
+    bx              lr
 
-    ENDP           ; |idct_dequant_0_2x_neon|
+    ENDP            ; |idct_dequant_0_2x_neon|
     END
diff --git a/media/libvpx/vp8/decoder/arm/neon/idct_dequant_full_2x_neon.asm b/media/libvpx/vp8/common/arm/neon/idct_dequant_full_2x_neon.asm
similarity index 82%
rename from media/libvpx/vp8/decoder/arm/neon/idct_dequant_full_2x_neon.asm
rename to media/libvpx/vp8/common/arm/neon/idct_dequant_full_2x_neon.asm
index 772ec468562..d5dce63f6bd 100644
--- a/media/libvpx/vp8/decoder/arm/neon/idct_dequant_full_2x_neon.asm
+++ b/media/libvpx/vp8/common/arm/neon/idct_dequant_full_2x_neon.asm
@@ -15,32 +15,30 @@
     PRESERVE8
 
     AREA ||.text||, CODE, READONLY, ALIGN=2
-;void idct_dequant_full_2x_neon(short *q, short *dq, unsigned char *pre,
-;                               unsigned char *dst, int pitch, int stride);
+;void idct_dequant_full_2x_neon(short *q, short *dq,
+;                               unsigned char *dst, int stride);
 ; r0    *q,
 ; r1    *dq,
-; r2    *pre
-; r3    *dst
-; sp    pitch
-; sp+4  stride
+; r2    *dst
+; r3    stride
 |idct_dequant_full_2x_neon| PROC
     vld1.16         {q0, q1}, [r1]          ; dq (same l/r)
     vld1.16         {q2, q3}, [r0]          ; l q
-    ldr             r1, [sp]                ; pitch
     add             r0, r0, #32
     vld1.16         {q4, q5}, [r0]          ; r q
     add             r12, r2, #4
+
     ; interleave the predictors
-    vld1.32         {d28[0]}, [r2], r1      ; l pre
-    vld1.32         {d28[1]}, [r12], r1     ; r pre
-    vld1.32         {d29[0]}, [r2], r1
-    vld1.32         {d29[1]}, [r12], r1
-    vld1.32         {d30[0]}, [r2], r1
-    vld1.32         {d30[1]}, [r12], r1
-    vld1.32         {d31[0]}, [r2]
+    vld1.32         {d28[0]}, [r2],  r3     ; l pre
+    vld1.32         {d28[1]}, [r12], r3     ; r pre
+    vld1.32         {d29[0]}, [r2],  r3
+    vld1.32         {d29[1]}, [r12], r3
+    vld1.32         {d30[0]}, [r2],  r3
+    vld1.32         {d30[1]}, [r12], r3
+    vld1.32         {d31[0]}, [r2],  r3
     vld1.32         {d31[1]}, [r12]
 
-    adr             r2, cospi8sqrt2minus1   ; pointer to the first constant
+    adr             r1, cospi8sqrt2minus1   ; pointer to the first constant
 
     ; dequant: q[i] = q[i] * dq[i]
     vmul.i16        q2, q2, q0
@@ -48,7 +46,7 @@
     vmul.i16        q4, q4, q0
     vmul.i16        q5, q5, q1
 
-    vld1.16         {d0}, [r2]
+    vld1.16         {d0}, [r1]
 
     ; q2: l0r0  q3: l8r8
     ; q4: l4r4  q5: l12r12
@@ -168,22 +166,23 @@
     sub             r0, r0, #32
     vst1.16         {q14, q15}, [r0]        ; write over low input
 
+    sub             r2, r2, r3, lsl #2      ; dst - 4*stride
+    add             r1, r2, #4              ; hi
+
     ;saturate and narrow
     vqmovun.s16     d0, q4                  ; lo
     vqmovun.s16     d1, q5
     vqmovun.s16     d2, q6                  ; hi
     vqmovun.s16     d3, q7
 
-    ldr             r1, [sp, #4]            ; stride
-    add             r2, r3, #4              ; hi
-    vst1.32         {d0[0]}, [r3], r1       ; lo
-    vst1.32         {d0[1]}, [r2], r1       ; hi
-    vst1.32         {d1[0]}, [r3], r1
-    vst1.32         {d1[1]}, [r2], r1
-    vst1.32         {d2[0]}, [r3], r1
-    vst1.32         {d2[1]}, [r2], r1
-    vst1.32         {d3[0]}, [r3]
-    vst1.32         {d3[1]}, [r2]
+    vst1.32         {d0[0]}, [r2], r3       ; lo
+    vst1.32         {d0[1]}, [r1], r3       ; hi
+    vst1.32         {d1[0]}, [r2], r3
+    vst1.32         {d1[1]}, [r1], r3
+    vst1.32         {d2[0]}, [r2], r3
+    vst1.32         {d2[1]}, [r1], r3
+    vst1.32         {d3[0]}, [r2]
+    vst1.32         {d3[1]}, [r1]
 
     bx             lr
 
diff --git a/media/libvpx/vp8/common/arm/neon/iwalsh_neon.asm b/media/libvpx/vp8/common/arm/neon/iwalsh_neon.asm
index 01c79d937e6..e8ea2a61976 100644
--- a/media/libvpx/vp8/common/arm/neon/iwalsh_neon.asm
+++ b/media/libvpx/vp8/common/arm/neon/iwalsh_neon.asm
@@ -8,7 +8,6 @@
 ;  be found in the AUTHORS file in the root of the source tree.
 ;
     EXPORT  |vp8_short_inv_walsh4x4_neon|
-    EXPORT  |vp8_short_inv_walsh4x4_1_neon|
 
     ARM
     REQUIRE8
@@ -16,7 +15,7 @@
 
     AREA    |.text|, CODE, READONLY  ; name this block of code
 
-;short vp8_short_inv_walsh4x4_neon(short *input, short *output)
+;short vp8_short_inv_walsh4x4_neon(short *input, short *mb_dqcoeff)
 |vp8_short_inv_walsh4x4_neon| PROC
 
     ; read in all four lines of values: d0->d3
@@ -59,22 +58,30 @@
     vshr.s16 q0, q0, #3 ;e/f >> 3
     vshr.s16 q1, q1, #3 ;g/h >> 3
 
-    vst4.i16 {d0,d1,d2,d3}, [r1@128]
+    mov      r2, #64
+    add      r3, r1, #32
+
+    vst1.i16 d0[0], [r1],r2
+    vst1.i16 d1[0], [r3],r2
+    vst1.i16 d2[0], [r1],r2
+    vst1.i16 d3[0], [r3],r2
+
+    vst1.i16 d0[1], [r1],r2
+    vst1.i16 d1[1], [r3],r2
+    vst1.i16 d2[1], [r1],r2
+    vst1.i16 d3[1], [r3],r2
+
+    vst1.i16 d0[2], [r1],r2
+    vst1.i16 d1[2], [r3],r2
+    vst1.i16 d2[2], [r1],r2
+    vst1.i16 d3[2], [r3],r2
+
+    vst1.i16 d0[3], [r1],r2
+    vst1.i16 d1[3], [r3],r2
+    vst1.i16 d2[3], [r1]
+    vst1.i16 d3[3], [r3]
 
     bx lr
     ENDP    ; |vp8_short_inv_walsh4x4_neon|
 
-
-;short vp8_short_inv_walsh4x4_1_neon(short *input, short *output)
-|vp8_short_inv_walsh4x4_1_neon| PROC
-    ldrsh r2, [r0]          ; load input[0]
-    add r3, r2, #3          ; add 3
-    add r2, r1, #16         ; base for last 8 output
-    asr r0, r3, #3          ; right shift 3
-    vdup.16 q0, r0          ; load and duplicate
-    vst1.16 {q0}, [r1@128]  ; write back 8
-    vst1.16 {q0}, [r2@128]  ; write back last 8
-    bx lr
-    ENDP    ; |vp8_short_inv_walsh4x4_1_neon|
-
     END
diff --git a/media/libvpx/vp8/common/arm/neon/recon16x16mb_neon.asm b/media/libvpx/vp8/common/arm/neon/recon16x16mb_neon.asm
deleted file mode 100644
index 3f1a30f481d..00000000000
--- a/media/libvpx/vp8/common/arm/neon/recon16x16mb_neon.asm
+++ /dev/null
@@ -1,131 +0,0 @@
-;
-;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-;
-;  Use of this source code is governed by a BSD-style license
-;  that can be found in the LICENSE file in the root of the source
-;  tree. An additional intellectual property rights grant can be found
-;  in the file PATENTS.  All contributing project authors may
-;  be found in the AUTHORS file in the root of the source tree.
-;
-
-
-    EXPORT  |vp8_recon16x16mb_neon|
-    ARM
-    REQUIRE8
-    PRESERVE8
-
-    AREA ||.text||, CODE, READONLY, ALIGN=2
-
-; r0    unsigned char  *pred_ptr,
-; r1    short *diff_ptr,
-; r2    unsigned char *dst_ptr,
-; r3    int ystride,
-; stack unsigned char *udst_ptr,
-; stack unsigned char *vdst_ptr
-
-|vp8_recon16x16mb_neon| PROC
-    mov             r12, #4             ;loop counter for Y loop
-
-recon16x16mb_loop_y
-    vld1.u8         {q12, q13}, [r0]!   ;load data from pred_ptr
-    vld1.16         {q8, q9}, [r1]!     ;load data from diff_ptr
-    vld1.u8         {q14, q15}, [r0]!
-    vld1.16         {q10, q11}, [r1]!
-
-    vmovl.u8        q0, d24             ;modify Pred data from 8 bits to 16 bits
-    vmovl.u8        q1, d25
-    vmovl.u8        q2, d26
-    vmovl.u8        q3, d27
-    vmovl.u8        q4, d28
-    vmovl.u8        q5, d29
-    vmovl.u8        q6, d30
-    vld1.16         {q12, q13}, [r1]!
-    vmovl.u8        q7, d31
-    vld1.16         {q14, q15}, [r1]!
-
-    pld             [r0]
-    pld             [r1]
-    pld             [r1, #64]
-
-    vadd.s16        q0, q0, q8          ;add Diff data and Pred data together
-    vadd.s16        q1, q1, q9
-    vadd.s16        q2, q2, q10
-    vadd.s16        q3, q3, q11
-    vadd.s16        q4, q4, q12
-    vadd.s16        q5, q5, q13
-    vadd.s16        q6, q6, q14
-    vadd.s16        q7, q7, q15
-
-    vqmovun.s16     d0, q0              ;CLAMP() saturation
-    vqmovun.s16     d1, q1
-    vqmovun.s16     d2, q2
-    vqmovun.s16     d3, q3
-    vqmovun.s16     d4, q4
-    vqmovun.s16     d5, q5
-    vst1.u8         {q0}, [r2], r3      ;store result
-    vqmovun.s16     d6, q6
-    vst1.u8         {q1}, [r2], r3
-    vqmovun.s16     d7, q7
-    vst1.u8         {q2}, [r2], r3
-    subs            r12, r12, #1
-
-    moveq           r12, #2             ;loop counter for UV loop
-
-    vst1.u8         {q3}, [r2], r3
-    bne             recon16x16mb_loop_y
-
-    mov             r3, r3, lsr #1      ;uv_stride = ystride>>1
-    ldr             r2, [sp]            ;load upred_ptr
-
-recon16x16mb_loop_uv
-    vld1.u8         {q12, q13}, [r0]!   ;load data from pred_ptr
-    vld1.16         {q8, q9}, [r1]!     ;load data from diff_ptr
-    vld1.u8         {q14, q15}, [r0]!
-    vld1.16         {q10, q11}, [r1]!
-
-    vmovl.u8        q0, d24             ;modify Pred data from 8 bits to 16 bits
-    vmovl.u8        q1, d25
-    vmovl.u8        q2, d26
-    vmovl.u8        q3, d27
-    vmovl.u8        q4, d28
-    vmovl.u8        q5, d29
-    vmovl.u8        q6, d30
-    vld1.16         {q12, q13}, [r1]!
-    vmovl.u8        q7, d31
-    vld1.16         {q14, q15}, [r1]!
-
-    vadd.s16        q0, q0, q8          ;add Diff data and Pred data together
-    vadd.s16        q1, q1, q9
-    vadd.s16        q2, q2, q10
-    vadd.s16        q3, q3, q11
-    vadd.s16        q4, q4, q12
-    vadd.s16        q5, q5, q13
-    vadd.s16        q6, q6, q14
-
-    vqmovun.s16     d0, q0              ;CLAMP() saturation
-    vadd.s16        q7, q7, q15
-    vqmovun.s16     d1, q1
-    vqmovun.s16     d2, q2
-    vqmovun.s16     d3, q3
-    vst1.u8         {d0}, [r2], r3      ;store result
-    vqmovun.s16     d4, q4
-    vst1.u8         {d1}, [r2], r3
-    vqmovun.s16     d5, q5
-    vst1.u8         {d2}, [r2], r3
-    vqmovun.s16     d6, q6
-    vst1.u8         {d3}, [r2], r3
-    vqmovun.s16     d7, q7
-    vst1.u8         {d4}, [r2], r3
-    subs            r12, r12, #1
-
-    vst1.u8         {d5}, [r2], r3
-    vst1.u8         {d6}, [r2], r3
-    vst1.u8         {d7}, [r2], r3
-
-    ldrne           r2, [sp, #4]        ;load vpred_ptr
-    bne             recon16x16mb_loop_uv
-
-    bx             lr
-
-    ENDP
-    END
diff --git a/media/libvpx/vp8/common/arm/neon/recon2b_neon.asm b/media/libvpx/vp8/common/arm/neon/recon2b_neon.asm
deleted file mode 100644
index 99b251c91a6..00000000000
--- a/media/libvpx/vp8/common/arm/neon/recon2b_neon.asm
+++ /dev/null
@@ -1,54 +0,0 @@
-;
-;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-;
-;  Use of this source code is governed by a BSD-style license
-;  that can be found in the LICENSE file in the root of the source
-;  tree. An additional intellectual property rights grant can be found
-;  in the file PATENTS.  All contributing project authors may
-;  be found in the AUTHORS file in the root of the source tree.
-;
-
-
-    EXPORT  |vp8_recon2b_neon|
-    ARM
-    REQUIRE8
-    PRESERVE8
-
-    AREA ||.text||, CODE, READONLY, ALIGN=2
-
-; r0    unsigned char  *pred_ptr,
-; r1    short *diff_ptr,
-; r2    unsigned char *dst_ptr,
-; r3    int stride
-
-|vp8_recon2b_neon| PROC
-    vld1.u8         {q8, q9}, [r0]      ;load data from pred_ptr
-    vld1.16         {q4, q5}, [r1]!     ;load data from diff_ptr
-
-    vmovl.u8        q0, d16             ;modify Pred data from 8 bits to 16 bits
-    vld1.16         {q6, q7}, [r1]!
-    vmovl.u8        q1, d17
-    vmovl.u8        q2, d18
-    vmovl.u8        q3, d19
-
-    vadd.s16        q0, q0, q4          ;add Diff data and Pred data together
-    vadd.s16        q1, q1, q5
-    vadd.s16        q2, q2, q6
-    vadd.s16        q3, q3, q7
-
-    vqmovun.s16     d0, q0              ;CLAMP() saturation
-    vqmovun.s16     d1, q1
-    vqmovun.s16     d2, q2
-    vqmovun.s16     d3, q3
-    add             r0, r2, r3
-
-    vst1.u8         {d0}, [r2]          ;store result
-    vst1.u8         {d1}, [r0], r3
-    add             r2, r0, r3
-    vst1.u8         {d2}, [r0]
-    vst1.u8         {d3}, [r2], r3
-
-    bx             lr
-
-    ENDP
-    END
diff --git a/media/libvpx/vp8/common/arm/neon/recon4b_neon.asm b/media/libvpx/vp8/common/arm/neon/recon4b_neon.asm
deleted file mode 100644
index 9917277461a..00000000000
--- a/media/libvpx/vp8/common/arm/neon/recon4b_neon.asm
+++ /dev/null
@@ -1,69 +0,0 @@
-;
-;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-;
-;  Use of this source code is governed by a BSD-style license
-;  that can be found in the LICENSE file in the root of the source
-;  tree. An additional intellectual property rights grant can be found
-;  in the file PATENTS.  All contributing project authors may
-;  be found in the AUTHORS file in the root of the source tree.
-;
-
-
-    EXPORT  |vp8_recon4b_neon|
-    ARM
-    REQUIRE8
-    PRESERVE8
-
-    AREA ||.text||, CODE, READONLY, ALIGN=2
-
-; r0    unsigned char  *pred_ptr,
-; r1    short *diff_ptr,
-; r2    unsigned char *dst_ptr,
-; r3    int stride
-
-|vp8_recon4b_neon| PROC
-    vld1.u8         {q12, q13}, [r0]!   ;load data from pred_ptr
-    vld1.16         {q8, q9}, [r1]!     ;load data from diff_ptr
-    vld1.u8         {q14, q15}, [r0]
-    vld1.16         {q10, q11}, [r1]!
-
-    vmovl.u8        q0, d24             ;modify Pred data from 8 bits to 16 bits
-    vmovl.u8        q1, d25
-    vmovl.u8        q2, d26
-    vmovl.u8        q3, d27
-    vmovl.u8        q4, d28
-    vmovl.u8        q5, d29
-    vmovl.u8        q6, d30
-    vld1.16         {q12, q13}, [r1]!
-    vmovl.u8        q7, d31
-    vld1.16         {q14, q15}, [r1]
-
-    vadd.s16        q0, q0, q8          ;add Diff data and Pred data together
-    vadd.s16        q1, q1, q9
-    vadd.s16        q2, q2, q10
-    vadd.s16        q3, q3, q11
-    vadd.s16        q4, q4, q12
-    vadd.s16        q5, q5, q13
-    vadd.s16        q6, q6, q14
-    vadd.s16        q7, q7, q15
-
-    vqmovun.s16     d0, q0              ;CLAMP() saturation
-    vqmovun.s16     d1, q1
-    vqmovun.s16     d2, q2
-    vqmovun.s16     d3, q3
-    vqmovun.s16     d4, q4
-    vqmovun.s16     d5, q5
-    vqmovun.s16     d6, q6
-    vqmovun.s16     d7, q7
-    add             r0, r2, r3
-
-    vst1.u8         {q0}, [r2]          ;store result
-    vst1.u8         {q1}, [r0], r3
-    add             r2, r0, r3
-    vst1.u8         {q2}, [r0]
-    vst1.u8         {q3}, [r2], r3
-
-    bx             lr
-
-    ENDP
-    END
diff --git a/media/libvpx/vp8/common/arm/neon/recon_neon.c b/media/libvpx/vp8/common/arm/neon/recon_neon.c
deleted file mode 100644
index 09fd2a56f58..00000000000
--- a/media/libvpx/vp8/common/arm/neon/recon_neon.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-#include "vpx_ports/config.h"
-#include "vp8/common/recon.h"
-#include "vp8/common/blockd.h"
-
-extern void vp8_recon16x16mb_neon(unsigned char *pred_ptr, short *diff_ptr, unsigned char *dst_ptr, int ystride, unsigned char *udst_ptr, unsigned char *vdst_ptr);
-
-void vp8_recon_mb_neon(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x)
-{
-    unsigned char *pred_ptr = &x->predictor[0];
-    short *diff_ptr = &x->diff[0];
-    unsigned char *dst_ptr = x->dst.y_buffer;
-    unsigned char *udst_ptr = x->dst.u_buffer;
-    unsigned char *vdst_ptr = x->dst.v_buffer;
-    int ystride = x->dst.y_stride;
-    /*int uv_stride = x->dst.uv_stride;*/
-
-    vp8_recon16x16mb_neon(pred_ptr, diff_ptr, dst_ptr, ystride, udst_ptr, vdst_ptr);
-}
diff --git a/media/libvpx/vp8/common/arm/neon/reconb_neon.asm b/media/libvpx/vp8/common/arm/neon/reconb_neon.asm
deleted file mode 100644
index 288c0ef01e4..00000000000
--- a/media/libvpx/vp8/common/arm/neon/reconb_neon.asm
+++ /dev/null
@@ -1,61 +0,0 @@
-;
-;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-;
-;  Use of this source code is governed by a BSD-style license
-;  that can be found in the LICENSE file in the root of the source
-;  tree. An additional intellectual property rights grant can be found
-;  in the file PATENTS.  All contributing project authors may
-;  be found in the AUTHORS file in the root of the source tree.
-;
-
-
-    EXPORT  |vp8_recon_b_neon|
-    ARM
-    REQUIRE8
-    PRESERVE8
-
-    AREA ||.text||, CODE, READONLY, ALIGN=2
-
-; r0    unsigned char  *pred_ptr,
-; r1    short *diff_ptr,
-; r2    unsigned char *dst_ptr,
-; r3    int stride
-
-|vp8_recon_b_neon| PROC
-    mov             r12, #16
-
-    vld1.u8         {d28}, [r0], r12    ;load 4 data/line from pred_ptr
-    vld1.16         {q10, q11}, [r1]!   ;load data from diff_ptr
-    vld1.u8         {d29}, [r0], r12
-    vld1.16         {q11, q12}, [r1]!
-    vld1.u8         {d30}, [r0], r12
-    vld1.16         {q12, q13}, [r1]!
-    vld1.u8         {d31}, [r0], r12
-    vld1.16         {q13}, [r1]
-
-    vmovl.u8        q0, d28             ;modify Pred data from 8 bits to 16 bits
-    vmovl.u8        q1, d29             ;Pred data in d0, d2, d4, d6
-    vmovl.u8        q2, d30
-    vmovl.u8        q3, d31
-
-    vadd.s16        d0, d0, d20         ;add Diff data and Pred data together
-    vadd.s16        d2, d2, d22
-    vadd.s16        d4, d4, d24
-    vadd.s16        d6, d6, d26
-
-    vqmovun.s16     d0, q0              ;CLAMP() saturation
-    vqmovun.s16     d1, q1
-    vqmovun.s16     d2, q2
-    vqmovun.s16     d3, q3
-    add             r1, r2, r3
-
-    vst1.32         {d0[0]}, [r2]       ;store result
-    vst1.32         {d1[0]}, [r1], r3
-    add             r2, r1, r3
-    vst1.32         {d2[0]}, [r1]
-    vst1.32         {d3[0]}, [r2], r3
-
-    bx             lr
-
-    ENDP
-    END
diff --git a/media/libvpx/vp8/encoder/arm/neon/sad16_neon.asm b/media/libvpx/vp8/common/arm/neon/sad16_neon.asm
similarity index 100%
rename from media/libvpx/vp8/encoder/arm/neon/sad16_neon.asm
rename to media/libvpx/vp8/common/arm/neon/sad16_neon.asm
diff --git a/media/libvpx/vp8/encoder/arm/neon/sad8_neon.asm b/media/libvpx/vp8/common/arm/neon/sad8_neon.asm
similarity index 100%
rename from media/libvpx/vp8/encoder/arm/neon/sad8_neon.asm
rename to media/libvpx/vp8/common/arm/neon/sad8_neon.asm
diff --git a/media/libvpx/vp8/common/arm/neon/shortidct4x4llm_1_neon.asm b/media/libvpx/vp8/common/arm/neon/shortidct4x4llm_1_neon.asm
deleted file mode 100644
index d7bdbae75af..00000000000
--- a/media/libvpx/vp8/common/arm/neon/shortidct4x4llm_1_neon.asm
+++ /dev/null
@@ -1,67 +0,0 @@
-;
-;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-;
-;  Use of this source code is governed by a BSD-style license
-;  that can be found in the LICENSE file in the root of the source
-;  tree. An additional intellectual property rights grant can be found
-;  in the file PATENTS.  All contributing project authors may
-;  be found in the AUTHORS file in the root of the source tree.
-;
-
-
-    EXPORT  |vp8_short_idct4x4llm_1_neon|
-    EXPORT  |vp8_dc_only_idct_neon|
-    ARM
-    REQUIRE8
-    PRESERVE8
-
-    AREA ||.text||, CODE, READONLY, ALIGN=2
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;void vp8_short_idct4x4llm_1_c(short *input, short *output, int pitch);
-; r0    short *input;
-; r1    short *output;
-; r2    int pitch;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-|vp8_short_idct4x4llm_1_neon| PROC
-    vld1.16         {d0[]}, [r0]            ;load input[0]
-
-    add             r3, r1, r2
-    add             r12, r3, r2
-
-    vrshr.s16       d0, d0, #3
-
-    add             r0, r12, r2
-
-    vst1.16         {d0}, [r1]
-    vst1.16         {d0}, [r3]
-    vst1.16         {d0}, [r12]
-    vst1.16         {d0}, [r0]
-
-    bx             lr
-    ENDP
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;void vp8_dc_only_idct_c(short input_dc, short *output, int pitch);
-; r0    short input_dc;
-; r1    short *output;
-; r2    int pitch;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-|vp8_dc_only_idct_neon| PROC
-    vdup.16         d0, r0
-
-    add             r3, r1, r2
-    add             r12, r3, r2
-
-    vrshr.s16       d0, d0, #3
-
-    add             r0, r12, r2
-
-    vst1.16         {d0}, [r1]
-    vst1.16         {d0}, [r3]
-    vst1.16         {d0}, [r12]
-    vst1.16         {d0}, [r0]
-
-    bx             lr
-
-    ENDP
-    END
diff --git a/media/libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.asm b/media/libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.asm
index b74c3152123..67d2ab0150d 100644
--- a/media/libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.asm
+++ b/media/libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.asm
@@ -17,18 +17,24 @@
     AREA ||.text||, CODE, READONLY, ALIGN=2
 
 ;*************************************************************
-;void vp8_short_idct4x4llm_c(short *input, short *output, int pitch)
+;void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch,
+;                            unsigned char *dst, int stride)
 ;r0 short * input
-;r1 short * output
+;r1 short * pred
 ;r2 int pitch
+;r3 unsigned char dst
+;sp int stride
 ;*************************************************************
-;static const int cospi8sqrt2minus1=20091;
-;static const int sinpi8sqrt2      =35468;
-;static const int rounding = 0;
-;Optimization note: The resulted data from dequantization are signed 13-bit data that is
-;in the range of [-4096, 4095]. This allows to use "vqdmulh"(neon) instruction since
-;it won't go out of range (13+16+1=30bits<32bits). This instruction gives the high half
-;result of the multiplication that is needed in IDCT.
+
+; static const int cospi8sqrt2minus1=20091;
+; static const int sinpi8sqrt2      =35468;
+; static const int rounding = 0;
+
+; Optimization note: The resulted data from dequantization are signed
+; 13-bit data that is in the range of [-4096, 4095]. This allows to
+; use "vqdmulh"(neon) instruction since it won't go out of range
+; (13+16+1=30bits<32bits). This instruction gives the high half
+; result of the multiplication that is needed in IDCT.
 
 |vp8_short_idct4x4llm_neon| PROC
     adr             r12, idct_coeff
@@ -36,6 +42,7 @@
     vld1.16         {d0}, [r12]
 
     vswp            d3, d4                  ;q2(vp[4] vp[12])
+    ldr             r0, [sp]                ; stride
 
     vqdmulh.s16     q3, q2, d0[2]
     vqdmulh.s16     q4, q2, d0[0]
@@ -94,21 +101,31 @@
     vrshr.s16       d4, d4, #3
     vrshr.s16       d5, d5, #3
 
-    add             r3, r1, r2
-    add             r12, r3, r2
-    add             r0, r12, r2
-
     vtrn.32         d2, d4
     vtrn.32         d3, d5
     vtrn.16         d2, d3
     vtrn.16         d4, d5
 
-    vst1.16         {d2}, [r1]
-    vst1.16         {d3}, [r3]
-    vst1.16         {d4}, [r12]
-    vst1.16         {d5}, [r0]
+    ; load prediction data
+    vld1.32         d6[0], [r1], r2
+    vld1.32         d6[1], [r1], r2
+    vld1.32         d7[0], [r1], r2
+    vld1.32         d7[1], [r1], r2
 
-    bx             lr
+    ; add prediction and residual
+    vaddw.u8        q1, q1, d6
+    vaddw.u8        q2, q2, d7
+
+    vqmovun.s16     d1, q1
+    vqmovun.s16     d2, q2
+
+    ; store to destination
+    vst1.32         d1[0], [r3], r0
+    vst1.32         d1[1], [r3], r0
+    vst1.32         d2[0], [r3], r0
+    vst1.32         d2[1], [r3], r0
+
+    bx              lr
 
     ENDP
 
diff --git a/media/libvpx/vp8/encoder/arm/neon/variance_neon.asm b/media/libvpx/vp8/common/arm/neon/variance_neon.asm
similarity index 94%
rename from media/libvpx/vp8/encoder/arm/neon/variance_neon.asm
rename to media/libvpx/vp8/common/arm/neon/variance_neon.asm
index e1a46869a43..e3b48327d3f 100644
--- a/media/libvpx/vp8/encoder/arm/neon/variance_neon.asm
+++ b/media/libvpx/vp8/common/arm/neon/variance_neon.asm
@@ -77,14 +77,14 @@ variance16x16_neon_loop
     ;vmov.32        r1, d1[0]
     ;mul            r0, r0, r0
     ;str            r1, [r12]
-    ;sub            r0, r1, r0, asr #8
+    ;sub            r0, r1, r0, lsr #8
 
-    ;sum is in [-255x256, 255x256]. sumxsum is 32-bit. Shift to right should
-    ;have sign-bit exension, which is vshr.s. Have to use s32 to make it right.
+    ; while sum is signed, sum * sum is always positive and must be treated as
+    ; unsigned to avoid propagating the sign bit.
     vmull.s32       q5, d0, d0
     vst1.32         {d1[0]}, [r12]              ;store sse
-    vshr.s32        d10, d10, #8
-    vsub.s32        d0, d1, d10
+    vshr.u32        d10, d10, #8
+    vsub.u32        d0, d1, d10
 
     vmov.32         r0, d0[0]                   ;return
     bx              lr
@@ -145,8 +145,8 @@ variance16x8_neon_loop
 
     vmull.s32       q5, d0, d0
     vst1.32         {d1[0]}, [r12]              ;store sse
-    vshr.s32        d10, d10, #7
-    vsub.s32        d0, d1, d10
+    vshr.u32        d10, d10, #7
+    vsub.u32        d0, d1, d10
 
     vmov.32         r0, d0[0]                   ;return
     bx              lr
@@ -200,8 +200,8 @@ variance8x16_neon_loop
 
     vmull.s32       q5, d0, d0
     vst1.32         {d1[0]}, [r12]              ;store sse
-    vshr.s32        d10, d10, #7
-    vsub.s32        d0, d1, d10
+    vshr.u32        d10, d10, #7
+    vsub.u32        d0, d1, d10
 
     vmov.32         r0, d0[0]                   ;return
     bx              lr
@@ -265,8 +265,8 @@ variance8x8_neon_loop
 
     vmull.s32       q5, d0, d0
     vst1.32         {d1[0]}, [r12]              ;store sse
-    vshr.s32        d10, d10, #6
-    vsub.s32        d0, d1, d10
+    vshr.u32        d10, d10, #6
+    vsub.u32        d0, d1, d10
 
     vmov.32         r0, d0[0]                   ;return
     bx              lr
diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_mse16x16_neon.asm b/media/libvpx/vp8/common/arm/neon/vp8_mse16x16_neon.asm
similarity index 100%
rename from media/libvpx/vp8/encoder/arm/neon/vp8_mse16x16_neon.asm
rename to media/libvpx/vp8/common/arm/neon/vp8_mse16x16_neon.asm
diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm
similarity index 98%
rename from media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm
rename to media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm
index 5107d8b9960..e7a3ed173f3 100644
--- a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm
+++ b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm
@@ -9,6 +9,11 @@
 ;
 
 
+bilinear_taps_coeff
+    DCD     128, 0, 112, 16, 96, 32, 80, 48, 64, 64, 48, 80, 32, 96, 16, 112
+
+;-----------------
+
     EXPORT  |vp8_sub_pixel_variance16x16_neon_func|
     ARM
     REQUIRE8
@@ -27,7 +32,7 @@
 |vp8_sub_pixel_variance16x16_neon_func| PROC
     push            {r4-r6, lr}
 
-    ldr             r12, _BilinearTaps_coeff_
+    adr             r12, bilinear_taps_coeff
     ldr             r4, [sp, #16]           ;load *dst_ptr from stack
     ldr             r5, [sp, #20]           ;load dst_pixels_per_line from stack
     ldr             r6, [sp, #24]           ;load *sse from stack
@@ -405,8 +410,8 @@ sub_pixel_variance16x16_neon_loop
 
     vmull.s32       q5, d0, d0
     vst1.32         {d1[0]}, [r6]               ;store sse
-    vshr.s32        d10, d10, #8
-    vsub.s32        d0, d1, d10
+    vshr.u32        d10, d10, #8
+    vsub.u32        d0, d1, d10
 
     add             sp, sp, #528
     vmov.32         r0, d0[0]                   ;return
@@ -415,11 +420,4 @@ sub_pixel_variance16x16_neon_loop
 
     ENDP
 
-;-----------------
-
-_BilinearTaps_coeff_
-    DCD     bilinear_taps_coeff
-bilinear_taps_coeff
-    DCD     128, 0, 112, 16, 96, 32, 80, 48, 64, 64, 48, 80, 32, 96, 16, 112
-
     END
diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm
similarity index 98%
rename from media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm
rename to media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm
index 0a2b71c49c6..155be4fc54b 100644
--- a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm
+++ b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm
@@ -112,8 +112,8 @@ vp8_filt_fpo16x16s_4_0_loop_neon
 
     vmull.s32       q5, d0, d0
     vst1.32         {d1[0]}, [lr]               ;store sse
-    vshr.s32        d10, d10, #8
-    vsub.s32        d0, d1, d10
+    vshr.u32        d10, d10, #8
+    vsub.u32        d0, d1, d10
 
     vmov.32         r0, d0[0]                   ;return
     pop             {pc}
@@ -208,8 +208,8 @@ vp8_filt_spo16x16s_0_4_loop_neon
 
     vmull.s32       q5, d0, d0
     vst1.32         {d1[0]}, [lr]               ;store sse
-    vshr.s32        d10, d10, #8
-    vsub.s32        d0, d1, d10
+    vshr.u32        d10, d10, #8
+    vsub.u32        d0, d1, d10
 
     vmov.32         r0, d0[0]                   ;return
     pop             {pc}
@@ -327,8 +327,8 @@ vp8_filt16x16s_4_4_loop_neon
 
     vmull.s32       q5, d0, d0
     vst1.32         {d1[0]}, [lr]               ;store sse
-    vshr.s32        d10, d10, #8
-    vsub.s32        d0, d1, d10
+    vshr.u32        d10, d10, #8
+    vsub.u32        d0, d1, d10
 
     vmov.32         r0, d0[0]                   ;return
     pop             {pc}
@@ -560,8 +560,8 @@ sub_pixel_variance16x16s_neon_loop
 
     vmull.s32       q5, d0, d0
     vst1.32         {d1[0]}, [lr]               ;store sse
-    vshr.s32        d10, d10, #8
-    vsub.s32        d0, d1, d10
+    vshr.u32        d10, d10, #8
+    vsub.u32        d0, d1, d10
 
     add             sp, sp, #256
     vmov.32         r0, d0[0]                   ;return
diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm
similarity index 97%
rename from media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm
rename to media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm
index 38b58780a26..f6b6847537f 100644
--- a/media/libvpx/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm
+++ b/media/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm
@@ -27,7 +27,7 @@
 |vp8_sub_pixel_variance8x8_neon| PROC
     push            {r4-r5, lr}
 
-    ldr             r12, _BilinearTaps_coeff_
+    adr             r12, bilinear_taps_coeff
     ldr             r4, [sp, #12]           ;load *dst_ptr from stack
     ldr             r5, [sp, #16]           ;load dst_pixels_per_line from stack
     ldr             lr, [sp, #20]           ;load *sse from stack
@@ -206,8 +206,8 @@ sub_pixel_variance8x8_neon_loop
 
     vmull.s32       q5, d0, d0
     vst1.32         {d1[0]}, [lr]               ;store sse
-    vshr.s32        d10, d10, #6
-    vsub.s32        d0, d1, d10
+    vshr.u32        d10, d10, #6
+    vsub.u32        d0, d1, d10
 
     vmov.32         r0, d0[0]                   ;return
     pop             {r4-r5, pc}
@@ -216,8 +216,6 @@ sub_pixel_variance8x8_neon_loop
 
 ;-----------------
 
-_BilinearTaps_coeff_
-    DCD     bilinear_taps_coeff
 bilinear_taps_coeff
     DCD     128, 0, 112, 16, 96, 32, 80, 48, 64, 64, 48, 80, 32, 96, 16, 112
 
diff --git a/media/libvpx/vp8/common/arm/recon_arm.h b/media/libvpx/vp8/common/arm/recon_arm.h
index 377cb2a0751..f8ef56ac68b 100644
--- a/media/libvpx/vp8/common/arm/recon_arm.h
+++ b/media/libvpx/vp8/common/arm/recon_arm.h
@@ -13,24 +13,13 @@
 #define RECON_ARM_H
 
 #if HAVE_ARMV6
-extern prototype_recon_block(vp8_recon_b_armv6);
-extern prototype_recon_block(vp8_recon2b_armv6);
-extern prototype_recon_block(vp8_recon4b_armv6);
 
 extern prototype_copy_block(vp8_copy_mem8x8_v6);
 extern prototype_copy_block(vp8_copy_mem8x4_v6);
 extern prototype_copy_block(vp8_copy_mem16x16_v6);
+extern prototype_intra4x4_predict(vp8_intra4x4_predict_armv6);
 
 #if !CONFIG_RUNTIME_CPU_DETECT
-#undef  vp8_recon_recon
-#define vp8_recon_recon vp8_recon_b_armv6
-
-#undef  vp8_recon_recon2
-#define vp8_recon_recon2 vp8_recon2b_armv6
-
-#undef  vp8_recon_recon4
-#define vp8_recon_recon4 vp8_recon4b_armv6
-
 #undef  vp8_recon_copy8x8
 #define vp8_recon_copy8x8 vp8_copy_mem8x8_v6
 
@@ -39,33 +28,22 @@ extern prototype_copy_block(vp8_copy_mem16x16_v6);
 
 #undef  vp8_recon_copy16x16
 #define vp8_recon_copy16x16 vp8_copy_mem16x16_v6
+
+#undef  vp8_recon_intra4x4_predict
+#define vp8_recon_intra4x4_predict vp8_intra4x4_predict_armv6
 #endif
 #endif
 
 #if HAVE_ARMV7
-extern prototype_recon_block(vp8_recon_b_neon);
-extern prototype_recon_block(vp8_recon2b_neon);
-extern prototype_recon_block(vp8_recon4b_neon);
 
 extern prototype_copy_block(vp8_copy_mem8x8_neon);
 extern prototype_copy_block(vp8_copy_mem8x4_neon);
 extern prototype_copy_block(vp8_copy_mem16x16_neon);
 
-extern prototype_recon_macroblock(vp8_recon_mb_neon);
-
 extern prototype_build_intra_predictors(vp8_build_intra_predictors_mby_neon);
 extern prototype_build_intra_predictors(vp8_build_intra_predictors_mby_s_neon);
 
 #if !CONFIG_RUNTIME_CPU_DETECT
-#undef  vp8_recon_recon
-#define vp8_recon_recon vp8_recon_b_neon
-
-#undef  vp8_recon_recon2
-#define vp8_recon_recon2 vp8_recon2b_neon
-
-#undef  vp8_recon_recon4
-#define vp8_recon_recon4 vp8_recon4b_neon
-
 #undef  vp8_recon_copy8x8
 #define vp8_recon_copy8x8 vp8_copy_mem8x8_neon
 
@@ -75,9 +53,6 @@ extern prototype_build_intra_predictors(vp8_build_intra_predictors_mby_s_neon);
 #undef  vp8_recon_copy16x16
 #define vp8_recon_copy16x16 vp8_copy_mem16x16_neon
 
-#undef  vp8_recon_recon_mb
-#define vp8_recon_recon_mb vp8_recon_mb_neon
-
 #undef  vp8_recon_build_intra_predictors_mby
 #define vp8_recon_build_intra_predictors_mby vp8_build_intra_predictors_mby_neon
 
diff --git a/media/libvpx/vp8/common/arm/reconintra_arm.c b/media/libvpx/vp8/common/arm/reconintra_arm.c
index f8f4dca3e73..cd82baf7cff 100644
--- a/media/libvpx/vp8/common/arm/reconintra_arm.c
+++ b/media/libvpx/vp8/common/arm/reconintra_arm.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/blockd.h"
 #include "vp8/common/reconintra.h"
 #include "vpx_mem/vpx_mem.h"
diff --git a/media/libvpx/vp8/encoder/arm/variance_arm.c b/media/libvpx/vp8/common/arm/variance_arm.c
similarity index 99%
rename from media/libvpx/vp8/encoder/arm/variance_arm.c
rename to media/libvpx/vp8/common/arm/variance_arm.c
index e77be9f73a1..914c9785074 100644
--- a/media/libvpx/vp8/encoder/arm/variance_arm.c
+++ b/media/libvpx/vp8/common/arm/variance_arm.c
@@ -9,11 +9,11 @@
  */
 
 #include "vpx_config.h"
-#include "vp8/encoder/variance.h"
+#include "vp8/common/variance.h"
 #include "vp8/common/filter.h"
-#include "vp8/common/arm/bilinearfilter_arm.h"
 
 #if HAVE_ARMV6
+#include "vp8/common/arm/bilinearfilter_arm.h"
 
 unsigned int vp8_sub_pixel_variance8x8_armv6
 (
diff --git a/media/libvpx/vp8/encoder/arm/variance_arm.h b/media/libvpx/vp8/common/arm/variance_arm.h
similarity index 100%
rename from media/libvpx/vp8/encoder/arm/variance_arm.h
rename to media/libvpx/vp8/common/arm/variance_arm.h
diff --git a/media/libvpx/vp8/common/asm_com_offsets.c b/media/libvpx/vp8/common/asm_com_offsets.c
index e135a4d7831..704a3f07f8d 100644
--- a/media/libvpx/vp8/common/asm_com_offsets.c
+++ b/media/libvpx/vp8/common/asm_com_offsets.c
@@ -13,6 +13,7 @@
 #include "vpx/vpx_codec.h"
 #include "vpx_ports/asm_offsets.h"
 #include "vpx_scale/yv12config.h"
+#include "vp8/common/blockd.h"
 
 BEGIN
 
@@ -34,6 +35,20 @@ END
 /* add asserts for any offset that is not supported by assembly code */
 /* add asserts for any size that is not supported by assembly code */
 
+#if HAVE_ARMV6
+/* switch case in vp8_intra4x4_predict_armv6 is based on these enumerated values */
+ct_assert(B_DC_PRED, B_DC_PRED == 0);
+ct_assert(B_TM_PRED, B_TM_PRED == 1);
+ct_assert(B_VE_PRED, B_VE_PRED == 2);
+ct_assert(B_HE_PRED, B_HE_PRED == 3);
+ct_assert(B_LD_PRED, B_LD_PRED == 4);
+ct_assert(B_RD_PRED, B_RD_PRED == 5);
+ct_assert(B_VR_PRED, B_VR_PRED == 6);
+ct_assert(B_VL_PRED, B_VL_PRED == 7);
+ct_assert(B_HD_PRED, B_HD_PRED == 8);
+ct_assert(B_HU_PRED, B_HU_PRED == 9);
+#endif
+
 #if HAVE_ARMV7
 /* vp8_yv12_extend_frame_borders_neon makes several assumptions based on this */
 ct_assert(VP8BORDERINPIXELS_VAL, VP8BORDERINPIXELS == 32)
diff --git a/media/libvpx/vp8/common/blockd.h b/media/libvpx/vp8/common/blockd.h
index 96155237a76..b237206e676 100644
--- a/media/libvpx/vp8/common/blockd.h
+++ b/media/libvpx/vp8/common/blockd.h
@@ -14,16 +14,13 @@
 
 void vpx_log(const char *format, ...);
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_scale/yv12config.h"
 #include "mv.h"
 #include "treecoder.h"
 #include "subpixel.h"
 #include "vpx_ports/mem.h"
 
-#define TRUE    1
-#define FALSE   0
-
 /*#define DCPRED 1*/
 #define DCPREDSIMTHRESH 0
 #define DCPREDCNTTHRESH 3
@@ -62,7 +59,7 @@ extern const unsigned char vp8_block2left[25];
 extern const unsigned char vp8_block2above[25];
 
 #define VP8_COMBINEENTROPYCONTEXTS( Dest, A, B) \
-    Dest = ((A)!=0) + ((B)!=0);
+    Dest = (A)+(B);
 
 
 typedef enum
@@ -170,12 +167,23 @@ typedef struct
     union b_mode_info bmi[16];
 } MODE_INFO;
 
+#if CONFIG_MULTI_RES_ENCODING
+/* The information needed to be stored for higher-resolution encoder */
+typedef struct
+{
+    MB_PREDICTION_MODE mode;
+    MV_REFERENCE_FRAME ref_frame;
+    int_mv mv;
+    //union b_mode_info bmi[16];
+    int dissim;    // dissimilarity level of the macroblock
+} LOWER_RES_INFO;
+#endif
+
 typedef struct
 {
     short *qcoeff;
     short *dqcoeff;
     unsigned char  *predictor;
-    short *diff;
     short *dequant;
 
     /* 16 Y blocks, 4 U blocks, 4 V blocks each with 16 entries */
@@ -187,21 +195,26 @@ typedef struct
     int dst;
     int dst_stride;
 
-    int eob;
+    char *eob;
 
     union b_mode_info bmi;
 } BLOCKD;
 
 typedef struct MacroBlockD
 {
-    DECLARE_ALIGNED(16, short, diff[400]);      /* from idct diff */
     DECLARE_ALIGNED(16, unsigned char,  predictor[384]);
     DECLARE_ALIGNED(16, short, qcoeff[400]);
     DECLARE_ALIGNED(16, short, dqcoeff[400]);
     DECLARE_ALIGNED(16, char,  eobs[25]);
 
+    DECLARE_ALIGNED(16, short,  dequant_y1[16]);
+    DECLARE_ALIGNED(16, short,  dequant_y1_dc[16]);
+    DECLARE_ALIGNED(16, short,  dequant_y2[16]);
+    DECLARE_ALIGNED(16, short,  dequant_uv[16]);
+
     /* 16 Y blocks, 4 U, 4 V, 1 DC 2nd order block, each with 16 entries. */
     BLOCKD block[25];
+    int fullpixel_mask;
 
     YV12_BUFFER_CONFIG pre; /* Filtered copy of previous frame reconstruction */
     YV12_BUFFER_CONFIG dst;
@@ -283,20 +296,4 @@ typedef struct MacroBlockD
 extern void vp8_build_block_doffsets(MACROBLOCKD *x);
 extern void vp8_setup_block_dptrs(MACROBLOCKD *x);
 
-static void update_blockd_bmi(MACROBLOCKD *xd)
-{
-    int i;
-    int is_4x4;
-    is_4x4 = (xd->mode_info_context->mbmi.mode == SPLITMV) ||
-              (xd->mode_info_context->mbmi.mode == B_PRED);
-
-    if (is_4x4)
-    {
-        for (i = 0; i < 16; i++)
-        {
-            xd->block[i].bmi = xd->mode_info_context->bmi[i];
-        }
-    }
-}
-
 #endif  /* __INC_BLOCKD_H */
diff --git a/media/libvpx/vp8/common/common.h b/media/libvpx/vp8/common/common.h
index 9a93da99168..2cc1c544cdf 100644
--- a/media/libvpx/vp8/common/common.h
+++ b/media/libvpx/vp8/common/common.h
@@ -18,8 +18,6 @@
 
 #include "vpx_mem/vpx_mem.h"
 
-#include "common_types.h"
-
 /* Only need this for fixed-size arrays, for structs just assign. */
 
 #define vp8_copy( Dest, Src) { \
diff --git a/media/libvpx/vp8/common/default_coef_probs.h b/media/libvpx/vp8/common/default_coef_probs.h
new file mode 100644
index 00000000000..0d195636bcb
--- /dev/null
+++ b/media/libvpx/vp8/common/default_coef_probs.h
@@ -0,0 +1,188 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+*/
+
+
+/*Generated file, included by entropy.c*/
+
+
+static const vp8_prob default_coef_probs [BLOCK_TYPES]
+                                         [COEF_BANDS]
+                                         [PREV_COEF_CONTEXTS]
+                                         [ENTROPY_NODES] =
+{
+    { /* Block Type ( 0 ) */
+        { /* Coeff Band ( 0 )*/
+            { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
+            { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
+            { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 1 )*/
+            { 253, 136, 254, 255, 228, 219, 128, 128, 128, 128, 128 },
+            { 189, 129, 242, 255, 227, 213, 255, 219, 128, 128, 128 },
+            { 106, 126, 227, 252, 214, 209, 255, 255, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 2 )*/
+            {   1,  98, 248, 255, 236, 226, 255, 255, 128, 128, 128 },
+            { 181, 133, 238, 254, 221, 234, 255, 154, 128, 128, 128 },
+            {  78, 134, 202, 247, 198, 180, 255, 219, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 3 )*/
+            {   1, 185, 249, 255, 243, 255, 128, 128, 128, 128, 128 },
+            { 184, 150, 247, 255, 236, 224, 128, 128, 128, 128, 128 },
+            {  77, 110, 216, 255, 236, 230, 128, 128, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 4 )*/
+            {   1, 101, 251, 255, 241, 255, 128, 128, 128, 128, 128 },
+            { 170, 139, 241, 252, 236, 209, 255, 255, 128, 128, 128 },
+            {  37, 116, 196, 243, 228, 255, 255, 255, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 5 )*/
+            {   1, 204, 254, 255, 245, 255, 128, 128, 128, 128, 128 },
+            { 207, 160, 250, 255, 238, 128, 128, 128, 128, 128, 128 },
+            { 102, 103, 231, 255, 211, 171, 128, 128, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 6 )*/
+            {   1, 152, 252, 255, 240, 255, 128, 128, 128, 128, 128 },
+            { 177, 135, 243, 255, 234, 225, 128, 128, 128, 128, 128 },
+            {  80, 129, 211, 255, 194, 224, 128, 128, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 7 )*/
+            {   1,   1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
+            { 246,   1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
+            { 255, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }
+        }
+    },
+    { /* Block Type ( 1 ) */
+        { /* Coeff Band ( 0 )*/
+            { 198,  35, 237, 223, 193, 187, 162, 160, 145, 155,  62 },
+            { 131,  45, 198, 221, 172, 176, 220, 157, 252, 221,   1 },
+            {  68,  47, 146, 208, 149, 167, 221, 162, 255, 223, 128 }
+        },
+        { /* Coeff Band ( 1 )*/
+            {   1, 149, 241, 255, 221, 224, 255, 255, 128, 128, 128 },
+            { 184, 141, 234, 253, 222, 220, 255, 199, 128, 128, 128 },
+            {  81,  99, 181, 242, 176, 190, 249, 202, 255, 255, 128 }
+        },
+        { /* Coeff Band ( 2 )*/
+            {   1, 129, 232, 253, 214, 197, 242, 196, 255, 255, 128 },
+            {  99, 121, 210, 250, 201, 198, 255, 202, 128, 128, 128 },
+            {  23,  91, 163, 242, 170, 187, 247, 210, 255, 255, 128 }
+        },
+        { /* Coeff Band ( 3 )*/
+            {   1, 200, 246, 255, 234, 255, 128, 128, 128, 128, 128 },
+            { 109, 178, 241, 255, 231, 245, 255, 255, 128, 128, 128 },
+            {  44, 130, 201, 253, 205, 192, 255, 255, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 4 )*/
+            {   1, 132, 239, 251, 219, 209, 255, 165, 128, 128, 128 },
+            {  94, 136, 225, 251, 218, 190, 255, 255, 128, 128, 128 },
+            {  22, 100, 174, 245, 186, 161, 255, 199, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 5 )*/
+            {   1, 182, 249, 255, 232, 235, 128, 128, 128, 128, 128 },
+            { 124, 143, 241, 255, 227, 234, 128, 128, 128, 128, 128 },
+            {  35,  77, 181, 251, 193, 211, 255, 205, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 6 )*/
+            {   1, 157, 247, 255, 236, 231, 255, 255, 128, 128, 128 },
+            { 121, 141, 235, 255, 225, 227, 255, 255, 128, 128, 128 },
+            {  45,  99, 188, 251, 195, 217, 255, 224, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 7 )*/
+            {   1,   1, 251, 255, 213, 255, 128, 128, 128, 128, 128 },
+            { 203,   1, 248, 255, 255, 128, 128, 128, 128, 128, 128 },
+            { 137,   1, 177, 255, 224, 255, 128, 128, 128, 128, 128 }
+        }
+    },
+    { /* Block Type ( 2 ) */
+        { /* Coeff Band ( 0 )*/
+            { 253,   9, 248, 251, 207, 208, 255, 192, 128, 128, 128 },
+            { 175,  13, 224, 243, 193, 185, 249, 198, 255, 255, 128 },
+            {  73,  17, 171, 221, 161, 179, 236, 167, 255, 234, 128 }
+        },
+        { /* Coeff Band ( 1 )*/
+            {   1,  95, 247, 253, 212, 183, 255, 255, 128, 128, 128 },
+            { 239,  90, 244, 250, 211, 209, 255, 255, 128, 128, 128 },
+            { 155,  77, 195, 248, 188, 195, 255, 255, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 2 )*/
+            {   1,  24, 239, 251, 218, 219, 255, 205, 128, 128, 128 },
+            { 201,  51, 219, 255, 196, 186, 128, 128, 128, 128, 128 },
+            {  69,  46, 190, 239, 201, 218, 255, 228, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 3 )*/
+            {   1, 191, 251, 255, 255, 128, 128, 128, 128, 128, 128 },
+            { 223, 165, 249, 255, 213, 255, 128, 128, 128, 128, 128 },
+            { 141, 124, 248, 255, 255, 128, 128, 128, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 4 )*/
+            {   1,  16, 248, 255, 255, 128, 128, 128, 128, 128, 128 },
+            { 190,  36, 230, 255, 236, 255, 128, 128, 128, 128, 128 },
+            { 149,   1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 5 )*/
+            {   1, 226, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
+            { 247, 192, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
+            { 240, 128, 255, 128, 128, 128, 128, 128, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 6 )*/
+            {   1, 134, 252, 255, 255, 128, 128, 128, 128, 128, 128 },
+            { 213,  62, 250, 255, 255, 128, 128, 128, 128, 128, 128 },
+            {  55,  93, 255, 128, 128, 128, 128, 128, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 7 )*/
+            { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
+            { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
+            { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }
+        }
+    },
+    { /* Block Type ( 3 ) */
+        { /* Coeff Band ( 0 )*/
+            { 202,  24, 213, 235, 186, 191, 220, 160, 240, 175, 255 },
+            { 126,  38, 182, 232, 169, 184, 228, 174, 255, 187, 128 },
+            {  61,  46, 138, 219, 151, 178, 240, 170, 255, 216, 128 }
+        },
+        { /* Coeff Band ( 1 )*/
+            {   1, 112, 230, 250, 199, 191, 247, 159, 255, 255, 128 },
+            { 166, 109, 228, 252, 211, 215, 255, 174, 128, 128, 128 },
+            {  39,  77, 162, 232, 172, 180, 245, 178, 255, 255, 128 }
+        },
+        { /* Coeff Band ( 2 )*/
+            {   1,  52, 220, 246, 198, 199, 249, 220, 255, 255, 128 },
+            { 124,  74, 191, 243, 183, 193, 250, 221, 255, 255, 128 },
+            {  24,  71, 130, 219, 154, 170, 243, 182, 255, 255, 128 }
+        },
+        { /* Coeff Band ( 3 )*/
+            {   1, 182, 225, 249, 219, 240, 255, 224, 128, 128, 128 },
+            { 149, 150, 226, 252, 216, 205, 255, 171, 128, 128, 128 },
+            {  28, 108, 170, 242, 183, 194, 254, 223, 255, 255, 128 }
+        },
+        { /* Coeff Band ( 4 )*/
+            {   1,  81, 230, 252, 204, 203, 255, 192, 128, 128, 128 },
+            { 123, 102, 209, 247, 188, 196, 255, 233, 128, 128, 128 },
+            {  20,  95, 153, 243, 164, 173, 255, 203, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 5 )*/
+            {   1, 222, 248, 255, 216, 213, 128, 128, 128, 128, 128 },
+            { 168, 175, 246, 252, 235, 205, 255, 255, 128, 128, 128 },
+            {  47, 116, 215, 255, 211, 212, 255, 255, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 6 )*/
+            {   1, 121, 236, 253, 212, 214, 255, 255, 128, 128, 128 },
+            { 141,  84, 213, 252, 201, 202, 255, 219, 128, 128, 128 },
+            {  42,  80, 160, 240, 162, 185, 255, 205, 128, 128, 128 }
+        },
+        { /* Coeff Band ( 7 )*/
+            {   1,   1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
+            { 244,   1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
+            { 238,   1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }
+        }
+    }
+};
diff --git a/media/libvpx/vp8/common/defaultcoefcounts.h b/media/libvpx/vp8/common/defaultcoefcounts.h
deleted file mode 100644
index 7a1e28b7b2d..00000000000
--- a/media/libvpx/vp8/common/defaultcoefcounts.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef __DEFAULTCOEFCOUNTS_H
-#define __DEFAULTCOEFCOUNTS_H
-
-#include "entropy.h"
-
-extern const unsigned int vp8_default_coef_counts[BLOCK_TYPES]
-                                                 [COEF_BANDS]
-                                                 [PREV_COEF_CONTEXTS]
-                                                 [MAX_ENTROPY_TOKENS];
-
-#endif //__DEFAULTCOEFCOUNTS_H
diff --git a/media/libvpx/vp8/common/dequantize.c b/media/libvpx/vp8/common/dequantize.c
new file mode 100644
index 00000000000..96245162f1e
--- /dev/null
+++ b/media/libvpx/vp8/common/dequantize.c
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+
+#include "vpx_config.h"
+#include "dequantize.h"
+#include "vp8/common/idct.h"
+#include "vpx_mem/vpx_mem.h"
+
+void vp8_dequantize_b_c(BLOCKD *d, short *DQC)
+{
+    int i;
+    short *DQ  = d->dqcoeff;
+    short *Q   = d->qcoeff;
+
+    for (i = 0; i < 16; i++)
+    {
+        DQ[i] = Q[i] * DQC[i];
+    }
+}
+
+void vp8_dequant_idct_add_c(short *input, short *dq,
+                            unsigned char *dest, int stride)
+{
+    int i;
+
+    for (i = 0; i < 16; i++)
+    {
+        input[i] = dq[i] * input[i];
+    }
+
+    vp8_short_idct4x4llm_c(input, dest, stride, dest, stride);
+
+    vpx_memset(input, 0, 32);
+
+}
diff --git a/media/libvpx/vp8/decoder/dequantize.h b/media/libvpx/vp8/common/dequantize.h
similarity index 65%
rename from media/libvpx/vp8/decoder/dequantize.h
rename to media/libvpx/vp8/common/dequantize.h
index 2e662a59382..429359190aa 100644
--- a/media/libvpx/vp8/decoder/dequantize.h
+++ b/media/libvpx/vp8/common/dequantize.h
@@ -14,32 +14,21 @@
 #include "vp8/common/blockd.h"
 
 #define prototype_dequant_block(sym) \
-    void sym(BLOCKD *x)
+    void sym(BLOCKD *x, short *DQC)
 
 #define prototype_dequant_idct_add(sym) \
     void sym(short *input, short *dq, \
-             unsigned char *pred, unsigned char *output, \
-             int pitch, int stride)
-
-#define prototype_dequant_dc_idct_add(sym) \
-    void sym(short *input, short *dq, \
-             unsigned char *pred, unsigned char *output, \
-             int pitch, int stride, \
-             int dc)
-
-#define prototype_dequant_dc_idct_add_y_block(sym) \
-    void sym(short *q, short *dq, \
-             unsigned char *pre, unsigned char *dst, \
-             int stride, char *eobs, short *dc)
+             unsigned char *output, \
+             int stride)
 
 #define prototype_dequant_idct_add_y_block(sym) \
     void sym(short *q, short *dq, \
-             unsigned char *pre, unsigned char *dst, \
+             unsigned char *dst, \
              int stride, char *eobs)
 
 #define prototype_dequant_idct_add_uv_block(sym) \
     void sym(short *q, short *dq, \
-             unsigned char *pre, unsigned char *dst_u, \
+             unsigned char *dst_u, \
              unsigned char *dst_v, int stride, char *eobs)
 
 #if ARCH_X86 || ARCH_X86_64
@@ -60,16 +49,6 @@ extern prototype_dequant_block(vp8_dequant_block);
 #endif
 extern prototype_dequant_idct_add(vp8_dequant_idct_add);
 
-#ifndef vp8_dequant_dc_idct_add
-#define vp8_dequant_dc_idct_add vp8_dequant_dc_idct_add_c
-#endif
-extern prototype_dequant_dc_idct_add(vp8_dequant_dc_idct_add);
-
-#ifndef vp8_dequant_dc_idct_add_y_block
-#define vp8_dequant_dc_idct_add_y_block vp8_dequant_dc_idct_add_y_block_c
-#endif
-extern prototype_dequant_dc_idct_add_y_block(vp8_dequant_dc_idct_add_y_block);
-
 #ifndef vp8_dequant_idct_add_y_block
 #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_c
 #endif
@@ -85,10 +64,6 @@ typedef prototype_dequant_block((*vp8_dequant_block_fn_t));
 
 typedef prototype_dequant_idct_add((*vp8_dequant_idct_add_fn_t));
 
-typedef prototype_dequant_dc_idct_add((*vp8_dequant_dc_idct_add_fn_t));
-
-typedef prototype_dequant_dc_idct_add_y_block((*vp8_dequant_dc_idct_add_y_block_fn_t));
-
 typedef prototype_dequant_idct_add_y_block((*vp8_dequant_idct_add_y_block_fn_t));
 
 typedef prototype_dequant_idct_add_uv_block((*vp8_dequant_idct_add_uv_block_fn_t));
@@ -97,8 +72,6 @@ typedef struct
 {
     vp8_dequant_block_fn_t               block;
     vp8_dequant_idct_add_fn_t            idct_add;
-    vp8_dequant_dc_idct_add_fn_t         dc_idct_add;
-    vp8_dequant_dc_idct_add_y_block_fn_t dc_idct_add_y_block;
     vp8_dequant_idct_add_y_block_fn_t    idct_add_y_block;
     vp8_dequant_idct_add_uv_block_fn_t   idct_add_uv_block;
 } vp8_dequant_rtcd_vtable_t;
diff --git a/media/libvpx/vp8/common/entropy.c b/media/libvpx/vp8/common/entropy.c
index 0eee60ec8b0..f3d5a9cb7e0 100644
--- a/media/libvpx/vp8/common/entropy.c
+++ b/media/libvpx/vp8/common/entropy.c
@@ -15,6 +15,7 @@
 #include "string.h"
 #include "blockd.h"
 #include "onyxc_int.h"
+#include "vpx_mem/vpx_mem.h"
 
 #define uchar unsigned char     /* typedefs can clash */
 #define uint  unsigned int
@@ -153,39 +154,15 @@ vp8_extra_bit_struct vp8_extra_bits[12] =
     { cat6, Pcat6, 11, 67},
     { 0, 0, 0, 0}
 };
-#include "defaultcoefcounts.h"
+
+#include "default_coef_probs.h"
 
 void vp8_default_coef_probs(VP8_COMMON *pc)
 {
-    int h = 0;
-
-    do
-    {
-        int i = 0;
-
-        do
-        {
-            int k = 0;
-
-            do
-            {
-                unsigned int branch_ct [ENTROPY_NODES] [2];
-                vp8_tree_probs_from_distribution(
-                    MAX_ENTROPY_TOKENS, vp8_coef_encodings, vp8_coef_tree,
-                    pc->fc.coef_probs[h][i][k],
-                    branch_ct,
-                    vp8_default_coef_counts[h][i][k],
-                    256, 1);
-
-            }
-            while (++k < PREV_COEF_CONTEXTS);
-        }
-        while (++i < COEF_BANDS);
-    }
-    while (++h < BLOCK_TYPES);
+    vpx_memcpy(pc->fc.coef_probs, default_coef_probs,
+                   sizeof(default_coef_probs));
 }
 
-
 void vp8_coef_tree_initialize()
 {
     init_bit_trees();
diff --git a/media/libvpx/vp8/common/entropymode.c b/media/libvpx/vp8/common/entropymode.c
index 930e896ce0b..a723ec0306b 100644
--- a/media/libvpx/vp8/common/entropymode.c
+++ b/media/libvpx/vp8/common/entropymode.c
@@ -24,14 +24,6 @@ static const unsigned int bmode_cts[VP8_BINTRAMODES] =
     43891, 17694, 10036, 3920, 3363, 2546, 5119, 3221, 2471, 1723
 };
 
-typedef enum
-{
-    SUBMVREF_NORMAL,
-    SUBMVREF_LEFT_ZED,
-    SUBMVREF_ABOVE_ZED,
-    SUBMVREF_LEFT_ABOVE_SAME,
-    SUBMVREF_LEFT_ABOVE_ZED
-} sumvfref_t;
 
 int vp8_mv_cont(const int_mv *l, const int_mv *a)
 {
diff --git a/media/libvpx/vp8/common/entropymode.h b/media/libvpx/vp8/common/entropymode.h
index fdb170df3b3..f4b48ff434e 100644
--- a/media/libvpx/vp8/common/entropymode.h
+++ b/media/libvpx/vp8/common/entropymode.h
@@ -15,6 +15,15 @@
 #include "onyxc_int.h"
 #include "treecoder.h"
 
+typedef enum
+{
+    SUBMVREF_NORMAL,
+    SUBMVREF_LEFT_ZED,
+    SUBMVREF_ABOVE_ZED,
+    SUBMVREF_LEFT_ABOVE_SAME,
+    SUBMVREF_LEFT_ABOVE_ZED
+} sumvfref_t;
+
 typedef const int vp8_mbsplit[16];
 
 #define VP8_NUMMBSPLITS 4
diff --git a/media/libvpx/vp8/common/extend.c b/media/libvpx/vp8/common/extend.c
index a2d3253328d..9089e16290c 100644
--- a/media/libvpx/vp8/common/extend.c
+++ b/media/libvpx/vp8/common/extend.c
@@ -102,6 +102,60 @@ void vp8_copy_and_extend_frame(YV12_BUFFER_CONFIG *src,
 }
 
 
+void vp8_copy_and_extend_frame_with_rect(YV12_BUFFER_CONFIG *src,
+                                         YV12_BUFFER_CONFIG *dst,
+                                         int srcy, int srcx,
+                                         int srch, int srcw)
+{
+    int et = dst->border;
+    int el = dst->border;
+    int eb = dst->border + dst->y_height - src->y_height;
+    int er = dst->border + dst->y_width - src->y_width;
+    int src_y_offset = srcy * src->y_stride + srcx;
+    int dst_y_offset = srcy * dst->y_stride + srcx;
+    int src_uv_offset = ((srcy * src->uv_stride) >> 1) + (srcx >> 1);
+    int dst_uv_offset = ((srcy * dst->uv_stride) >> 1) + (srcx >> 1);
+
+    // If the side is not touching the bounder then don't extend.
+    if (srcy)
+      et = 0;
+    if (srcx)
+      el = 0;
+    if (srcy + srch != src->y_height)
+      eb = 0;
+    if (srcx + srcw != src->y_width)
+      er = 0;
+
+    copy_and_extend_plane(src->y_buffer + src_y_offset,
+                          src->y_stride,
+                          dst->y_buffer + dst_y_offset,
+                          dst->y_stride,
+                          srch, srcw,
+                          et, el, eb, er);
+
+    et = (et + 1) >> 1;
+    el = (el + 1) >> 1;
+    eb = (eb + 1) >> 1;
+    er = (er + 1) >> 1;
+    srch = (srch + 1) >> 1;
+    srcw = (srcw + 1) >> 1;
+
+    copy_and_extend_plane(src->u_buffer + src_uv_offset,
+                          src->uv_stride,
+                          dst->u_buffer + dst_uv_offset,
+                          dst->uv_stride,
+                          srch, srcw,
+                          et, el, eb, er);
+
+    copy_and_extend_plane(src->v_buffer + src_uv_offset,
+                          src->uv_stride,
+                          dst->v_buffer + dst_uv_offset,
+                          dst->uv_stride,
+                          srch, srcw,
+                          et, el, eb, er);
+}
+
+
 /* note the extension is only for the last row, for intra prediction purpose */
 void vp8_extend_mb_row(YV12_BUFFER_CONFIG *ybf, unsigned char *YPtr, unsigned char *UPtr, unsigned char *VPtr)
 {
diff --git a/media/libvpx/vp8/common/extend.h b/media/libvpx/vp8/common/extend.h
index 9e0be4e0661..74a0b177d94 100644
--- a/media/libvpx/vp8/common/extend.h
+++ b/media/libvpx/vp8/common/extend.h
@@ -17,5 +17,9 @@
 void vp8_extend_mb_row(YV12_BUFFER_CONFIG *ybf, unsigned char *YPtr, unsigned char *UPtr, unsigned char *VPtr);
 void vp8_copy_and_extend_frame(YV12_BUFFER_CONFIG *src,
                                YV12_BUFFER_CONFIG *dst);
+void vp8_copy_and_extend_frame_with_rect(YV12_BUFFER_CONFIG *src,
+                                         YV12_BUFFER_CONFIG *dst,
+                                         int srcy, int srcx,
+                                         int srch, int srcw);
 
 #endif
diff --git a/media/libvpx/vp8/common/findnearmv.c b/media/libvpx/vp8/common/findnearmv.c
index c1022363eca..e8ee40f56c6 100644
--- a/media/libvpx/vp8/common/findnearmv.c
+++ b/media/libvpx/vp8/common/findnearmv.c
@@ -134,13 +134,51 @@ void vp8_find_near_mvs
     best_mv->as_int = near_mvs[0].as_int;
     nearest->as_int = near_mvs[CNT_NEAREST].as_int;
     nearby->as_int = near_mvs[CNT_NEAR].as_int;
-
-    //TODO: move clamp outside findnearmv
-    vp8_clamp_mv2(nearest, xd);
-    vp8_clamp_mv2(nearby, xd);
-    vp8_clamp_mv2(best_mv, xd);
 }
 
+
+static void invert_and_clamp_mvs(int_mv *inv, int_mv *src, MACROBLOCKD *xd)
+{
+    inv->as_mv.row = src->as_mv.row * -1;
+    inv->as_mv.col = src->as_mv.col * -1;
+    vp8_clamp_mv2(inv, xd);
+    vp8_clamp_mv2(src, xd);
+}
+
+
+int vp8_find_near_mvs_bias
+(
+    MACROBLOCKD *xd,
+    const MODE_INFO *here,
+    int_mv mode_mv_sb[2][MB_MODE_COUNT],
+    int_mv best_mv_sb[2],
+    int cnt[4],
+    int refframe,
+    int *ref_frame_sign_bias
+)
+{
+    int sign_bias = ref_frame_sign_bias[refframe];
+
+    vp8_find_near_mvs(xd,
+                      here,
+                      &mode_mv_sb[sign_bias][NEARESTMV],
+                      &mode_mv_sb[sign_bias][NEARMV],
+                      &best_mv_sb[sign_bias],
+                      cnt,
+                      refframe,
+                      ref_frame_sign_bias);
+
+    invert_and_clamp_mvs(&mode_mv_sb[!sign_bias][NEARESTMV],
+                         &mode_mv_sb[sign_bias][NEARESTMV], xd);
+    invert_and_clamp_mvs(&mode_mv_sb[!sign_bias][NEARMV],
+                         &mode_mv_sb[sign_bias][NEARMV], xd);
+    invert_and_clamp_mvs(&best_mv_sb[!sign_bias],
+                         &best_mv_sb[sign_bias], xd);
+
+    return sign_bias;
+}
+
+
 vp8_prob *vp8_mv_ref_probs(
     vp8_prob p[VP8_MVREFS-1], const int near_mv_ref_ct[4]
 )
diff --git a/media/libvpx/vp8/common/findnearmv.h b/media/libvpx/vp8/common/findnearmv.h
index c142a04151f..06ef060c2d6 100644
--- a/media/libvpx/vp8/common/findnearmv.h
+++ b/media/libvpx/vp8/common/findnearmv.h
@@ -18,18 +18,14 @@
 #include "treecoder.h"
 
 
-static void mv_bias(int refmb_ref_frame_sign_bias, int refframe, int_mv *mvp, const int *ref_frame_sign_bias)
+static void mv_bias(int refmb_ref_frame_sign_bias, int refframe, int_mv *mvp,
+                    const int *ref_frame_sign_bias)
 {
-    MV xmv;
-    xmv = mvp->as_mv;
-
     if (refmb_ref_frame_sign_bias != ref_frame_sign_bias[refframe])
     {
-        xmv.row *= -1;
-        xmv.col *= -1;
+        mvp->as_mv.row *= -1;
+        mvp->as_mv.col *= -1;
     }
-
-    mvp->as_mv = xmv;
 }
 
 #define LEFT_TOP_MARGIN (16 << 3)
@@ -64,10 +60,10 @@ static unsigned int vp8_check_mv_bounds(int_mv *mv, int mb_to_left_edge,
                                 int mb_to_bottom_edge)
 {
     unsigned int need_to_clamp;
-    need_to_clamp = (mv->as_mv.col < mb_to_left_edge) ? 1 : 0;
-    need_to_clamp |= (mv->as_mv.col > mb_to_right_edge) ? 1 : 0;
-    need_to_clamp |= (mv->as_mv.row < mb_to_top_edge) ? 1 : 0;
-    need_to_clamp |= (mv->as_mv.row > mb_to_bottom_edge) ? 1 : 0;
+    need_to_clamp = (mv->as_mv.col < mb_to_left_edge);
+    need_to_clamp |= (mv->as_mv.col > mb_to_right_edge);
+    need_to_clamp |= (mv->as_mv.row < mb_to_top_edge);
+    need_to_clamp |= (mv->as_mv.row > mb_to_bottom_edge);
     return need_to_clamp;
 }
 
@@ -81,6 +77,19 @@ void vp8_find_near_mvs
     int *ref_frame_sign_bias
 );
 
+
+int vp8_find_near_mvs_bias
+(
+    MACROBLOCKD *xd,
+    const MODE_INFO *here,
+    int_mv mode_mv_sb[2][MB_MODE_COUNT],
+    int_mv best_mv_sb[2],
+    int cnt[4],
+    int refframe,
+    int *ref_frame_sign_bias
+);
+
+
 vp8_prob *vp8_mv_ref_probs(
     vp8_prob p[VP8_MVREFS-1], const int near_mv_ref_ct[4]
 );
diff --git a/media/libvpx/vp8/common/g_common.h b/media/libvpx/vp8/common/g_common.h
deleted file mode 100644
index 5f523980b74..00000000000
--- a/media/libvpx/vp8/common/g_common.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-extern void (*vp8_clear_system_state)(void);
-extern void (*vp8_plane_add_noise)(unsigned char *Start, unsigned int Width, unsigned int Height, int Pitch, int DPitch, int q);
-extern void (*de_interlace)
-(
-    unsigned char *src_ptr,
-    unsigned char *dst_ptr,
-    int Width,
-    int Height,
-    int Stride
-);
diff --git a/media/libvpx/vp8/common/generic/systemdependent.c b/media/libvpx/vp8/common/generic/systemdependent.c
index c61629407d8..5e577e2b21f 100644
--- a/media/libvpx/vp8/common/generic/systemdependent.c
+++ b/media/libvpx/vp8/common/generic/systemdependent.c
@@ -9,12 +9,12 @@
  */
 
 
-#include "vpx_ports/config.h"
-#include "vp8/common/g_common.h"
+#include "vpx_config.h"
 #include "vp8/common/subpixel.h"
 #include "vp8/common/loopfilter.h"
 #include "vp8/common/recon.h"
 #include "vp8/common/idct.h"
+#include "vp8/common/variance.h"
 #include "vp8/common/onyxc_int.h"
 
 #if CONFIG_MULTITHREAD
@@ -70,7 +70,14 @@ void vp8_machine_specific_config(VP8_COMMON *ctx)
 #if CONFIG_RUNTIME_CPU_DETECT
     VP8_COMMON_RTCD *rtcd = &ctx->rtcd;
 
-    rtcd->idct.idct1        = vp8_short_idct4x4llm_1_c;
+
+    rtcd->dequant.block             = vp8_dequantize_b_c;
+    rtcd->dequant.idct_add          = vp8_dequant_idct_add_c;
+    rtcd->dequant.idct_add_y_block  = vp8_dequant_idct_add_y_block_c;
+    rtcd->dequant.idct_add_uv_block =
+        vp8_dequant_idct_add_uv_block_c;
+
+
     rtcd->idct.idct16       = vp8_short_idct4x4llm_c;
     rtcd->idct.idct1_scalar_add = vp8_dc_only_idct_add_c;
     rtcd->idct.iwalsh1      = vp8_short_inv_walsh4x4_1_c;
@@ -79,11 +86,7 @@ void vp8_machine_specific_config(VP8_COMMON *ctx)
     rtcd->recon.copy16x16   = vp8_copy_mem16x16_c;
     rtcd->recon.copy8x8     = vp8_copy_mem8x8_c;
     rtcd->recon.copy8x4     = vp8_copy_mem8x4_c;
-    rtcd->recon.recon       = vp8_recon_b_c;
-    rtcd->recon.recon2      = vp8_recon2b_c;
-    rtcd->recon.recon4      = vp8_recon4b_c;
-    rtcd->recon.recon_mb    = vp8_recon_mb_c;
-    rtcd->recon.recon_mby   = vp8_recon_mby_c;
+
     rtcd->recon.build_intra_predictors_mby =
         vp8_build_intra_predictors_mby;
     rtcd->recon.build_intra_predictors_mby_s =
@@ -93,7 +96,7 @@ void vp8_machine_specific_config(VP8_COMMON *ctx)
     rtcd->recon.build_intra_predictors_mbuv_s =
         vp8_build_intra_predictors_mbuv_s;
     rtcd->recon.intra4x4_predict =
-        vp8_intra4x4_predict;
+        vp8_intra4x4_predict_c;
 
     rtcd->subpix.sixtap16x16   = vp8_sixtap_predict16x16_c;
     rtcd->subpix.sixtap8x8     = vp8_sixtap_predict8x8_c;
@@ -113,6 +116,57 @@ void vp8_machine_specific_config(VP8_COMMON *ctx)
     rtcd->loopfilter.simple_mb_h = vp8_loop_filter_simple_horizontal_edge_c;
     rtcd->loopfilter.simple_b_h  = vp8_loop_filter_bhs_c;
 
+    rtcd->variance.sad16x16              = vp8_sad16x16_c;
+    rtcd->variance.sad16x8               = vp8_sad16x8_c;
+    rtcd->variance.sad8x16               = vp8_sad8x16_c;
+    rtcd->variance.sad8x8                = vp8_sad8x8_c;
+    rtcd->variance.sad4x4                = vp8_sad4x4_c;
+
+    rtcd->variance.sad16x16x3            = vp8_sad16x16x3_c;
+    rtcd->variance.sad16x8x3             = vp8_sad16x8x3_c;
+    rtcd->variance.sad8x16x3             = vp8_sad8x16x3_c;
+    rtcd->variance.sad8x8x3              = vp8_sad8x8x3_c;
+    rtcd->variance.sad4x4x3              = vp8_sad4x4x3_c;
+
+    rtcd->variance.sad16x16x8            = vp8_sad16x16x8_c;
+    rtcd->variance.sad16x8x8             = vp8_sad16x8x8_c;
+    rtcd->variance.sad8x16x8             = vp8_sad8x16x8_c;
+    rtcd->variance.sad8x8x8              = vp8_sad8x8x8_c;
+    rtcd->variance.sad4x4x8              = vp8_sad4x4x8_c;
+
+    rtcd->variance.sad16x16x4d           = vp8_sad16x16x4d_c;
+    rtcd->variance.sad16x8x4d            = vp8_sad16x8x4d_c;
+    rtcd->variance.sad8x16x4d            = vp8_sad8x16x4d_c;
+    rtcd->variance.sad8x8x4d             = vp8_sad8x8x4d_c;
+    rtcd->variance.sad4x4x4d             = vp8_sad4x4x4d_c;
+#if ARCH_X86 || ARCH_X86_64
+    rtcd->variance.copy32xn              = vp8_copy32xn_c;
+#endif
+    rtcd->variance.var4x4                = vp8_variance4x4_c;
+    rtcd->variance.var8x8                = vp8_variance8x8_c;
+    rtcd->variance.var8x16               = vp8_variance8x16_c;
+    rtcd->variance.var16x8               = vp8_variance16x8_c;
+    rtcd->variance.var16x16              = vp8_variance16x16_c;
+
+    rtcd->variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;
+    rtcd->variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_c;
+    rtcd->variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
+    rtcd->variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;
+    rtcd->variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_c;
+    rtcd->variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_c;
+    rtcd->variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_c;
+    rtcd->variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_c;
+    rtcd->variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_c;
+
+    rtcd->variance.mse16x16              = vp8_mse16x16_c;
+    rtcd->variance.getmbss               = vp8_get_mb_ss_c;
+
+    rtcd->variance.get4x4sse_cs          = vp8_get4x4sse_cs_c;
+#if CONFIG_INTERNAL_STATS
+    rtcd->variance.ssimpf_8x8            = vp8_ssim_parms_8x8_c;
+    rtcd->variance.ssimpf_16x16          = vp8_ssim_parms_16x16_c;
+#endif
+
 #if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_INTERNAL_STATS)
     rtcd->postproc.down             = vp8_mbpost_proc_down_c;
     rtcd->postproc.across           = vp8_mbpost_proc_across_ip_c;
diff --git a/media/libvpx/vp8/common/idct.h b/media/libvpx/vp8/common/idct.h
index f5fd94dfd4e..7371f85ff95 100644
--- a/media/libvpx/vp8/common/idct.h
+++ b/media/libvpx/vp8/common/idct.h
@@ -16,12 +16,14 @@
     void sym(short *input, short *output)
 
 #define prototype_idct(sym) \
-    void sym(short *input, short *output, int pitch)
+    void sym(short *input, unsigned char *pred, int pitch, unsigned char *dst, \
+             int dst_stride)
 
 #define prototype_idct_scalar_add(sym) \
     void sym(short input, \
-             unsigned char *pred, unsigned char *output, \
-             int pitch, int stride)
+            unsigned char *pred, int pred_stride, \
+            unsigned char *dst, \
+            int dst_stride)
 
 #if ARCH_X86 || ARCH_X86_64
 #include "x86/idct_x86.h"
@@ -31,15 +33,14 @@
 #include "arm/idct_arm.h"
 #endif
 
-#ifndef vp8_idct_idct1
-#define vp8_idct_idct1 vp8_short_idct4x4llm_1_c
-#endif
-extern prototype_idct(vp8_idct_idct1);
-
 #ifndef vp8_idct_idct16
 #define vp8_idct_idct16 vp8_short_idct4x4llm_c
 #endif
 extern prototype_idct(vp8_idct_idct16);
+/* add this prototype to prevent compiler warning about implicit
+ * declaration of vp8_short_idct4x4llm_c function in dequantize.c
+ * when building, for example, neon optimized version */
+extern prototype_idct(vp8_short_idct4x4llm_c);
 
 #ifndef vp8_idct_idct1_scalar_add
 #define vp8_idct_idct1_scalar_add vp8_dc_only_idct_add_c
@@ -63,7 +64,6 @@ typedef prototype_second_order((*vp8_second_order_fn_t));
 
 typedef struct
 {
-    vp8_idct_fn_t            idct1;
     vp8_idct_fn_t            idct16;
     vp8_idct_scalar_add_fn_t idct1_scalar_add;
 
diff --git a/media/libvpx/vp8/common/idct_blk.c b/media/libvpx/vp8/common/idct_blk.c
new file mode 100644
index 00000000000..249fad4ea27
--- /dev/null
+++ b/media/libvpx/vp8/common/idct_blk.c
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "vpx_config.h"
+#include "vp8/common/idct.h"
+#include "dequantize.h"
+
+void vp8_dequant_idct_add_c(short *input, short *dq,
+                            unsigned char *dest, int stride);
+void vp8_dc_only_idct_add_c(short input_dc, unsigned char * pred,
+                            int pred_stride, unsigned char *dst_ptr,
+                            int dst_stride);
+
+void vp8_dequant_idct_add_y_block_c
+            (short *q, short *dq,
+             unsigned char *dst, int stride, char *eobs)
+{
+    int i, j;
+
+    for (i = 0; i < 4; i++)
+    {
+        for (j = 0; j < 4; j++)
+        {
+            if (*eobs++ > 1)
+                vp8_dequant_idct_add_c (q, dq, dst, stride);
+            else
+            {
+                vp8_dc_only_idct_add_c (q[0]*dq[0], dst, stride, dst, stride);
+                ((int *)q)[0] = 0;
+            }
+
+            q   += 16;
+            dst += 4;
+        }
+
+        dst += 4*stride - 16;
+    }
+}
+
+void vp8_dequant_idct_add_uv_block_c
+            (short *q, short *dq,
+             unsigned char *dstu, unsigned char *dstv, int stride, char *eobs)
+{
+    int i, j;
+
+    for (i = 0; i < 2; i++)
+    {
+        for (j = 0; j < 2; j++)
+        {
+            if (*eobs++ > 1)
+                vp8_dequant_idct_add_c (q, dq, dstu, stride);
+            else
+            {
+                vp8_dc_only_idct_add_c (q[0]*dq[0], dstu, stride, dstu, stride);
+                ((int *)q)[0] = 0;
+            }
+
+            q    += 16;
+            dstu += 4;
+        }
+
+        dstu += 4*stride - 8;
+    }
+
+    for (i = 0; i < 2; i++)
+    {
+        for (j = 0; j < 2; j++)
+        {
+            if (*eobs++ > 1)
+                vp8_dequant_idct_add_c (q, dq, dstv, stride);
+            else
+            {
+                vp8_dc_only_idct_add_c (q[0]*dq[0], dstv, stride, dstv, stride);
+                ((int *)q)[0] = 0;
+            }
+
+            q    += 16;
+            dstv += 4;
+        }
+
+        dstv += 4*stride - 8;
+    }
+}
diff --git a/media/libvpx/vp8/common/idctllm.c b/media/libvpx/vp8/common/idctllm.c
index 196062df67b..47af52f04e7 100644
--- a/media/libvpx/vp8/common/idctllm.c
+++ b/media/libvpx/vp8/common/idctllm.c
@@ -24,28 +24,31 @@
  **************************************************************************/
 static const int cospi8sqrt2minus1 = 20091;
 static const int sinpi8sqrt2      = 35468;
-static const int rounding = 0;
-void vp8_short_idct4x4llm_c(short *input, short *output, int pitch)
+
+void vp8_short_idct4x4llm_c(short *input, unsigned char *pred_ptr,
+                            int pred_stride, unsigned char *dst_ptr,
+                            int dst_stride)
 {
     int i;
+    int r, c;
     int a1, b1, c1, d1;
-
+    short output[16];
     short *ip = input;
     short *op = output;
     int temp1, temp2;
-    int shortpitch = pitch >> 1;
+    int shortpitch = 4;
 
     for (i = 0; i < 4; i++)
     {
         a1 = ip[0] + ip[8];
         b1 = ip[0] - ip[8];
 
-        temp1 = (ip[4] * sinpi8sqrt2 + rounding) >> 16;
-        temp2 = ip[12] + ((ip[12] * cospi8sqrt2minus1 + rounding) >> 16);
+        temp1 = (ip[4] * sinpi8sqrt2) >> 16;
+        temp2 = ip[12] + ((ip[12] * cospi8sqrt2minus1) >> 16);
         c1 = temp1 - temp2;
 
-        temp1 = ip[4] + ((ip[4] * cospi8sqrt2minus1 + rounding) >> 16);
-        temp2 = (ip[12] * sinpi8sqrt2 + rounding) >> 16;
+        temp1 = ip[4] + ((ip[4] * cospi8sqrt2minus1) >> 16);
+        temp2 = (ip[12] * sinpi8sqrt2) >> 16;
         d1 = temp1 + temp2;
 
         op[shortpitch*0] = a1 + d1;
@@ -66,12 +69,12 @@ void vp8_short_idct4x4llm_c(short *input, short *output, int pitch)
         a1 = ip[0] + ip[2];
         b1 = ip[0] - ip[2];
 
-        temp1 = (ip[1] * sinpi8sqrt2 + rounding) >> 16;
-        temp2 = ip[3] + ((ip[3] * cospi8sqrt2minus1 + rounding) >> 16);
+        temp1 = (ip[1] * sinpi8sqrt2) >> 16;
+        temp2 = ip[3] + ((ip[3] * cospi8sqrt2minus1) >> 16);
         c1 = temp1 - temp2;
 
-        temp1 = ip[1] + ((ip[1] * cospi8sqrt2minus1 + rounding) >> 16);
-        temp2 = (ip[3] * sinpi8sqrt2 + rounding) >> 16;
+        temp1 = ip[1] + ((ip[1] * cospi8sqrt2minus1) >> 16);
+        temp2 = (ip[3] * sinpi8sqrt2) >> 16;
         d1 = temp1 + temp2;
 
 
@@ -84,27 +87,31 @@ void vp8_short_idct4x4llm_c(short *input, short *output, int pitch)
         ip += shortpitch;
         op += shortpitch;
     }
-}
 
-void vp8_short_idct4x4llm_1_c(short *input, short *output, int pitch)
-{
-    int i;
-    int a1;
-    short *op = output;
-    int shortpitch = pitch >> 1;
-    a1 = ((input[0] + 4) >> 3);
-
-    for (i = 0; i < 4; i++)
+    ip = output;
+    for (r = 0; r < 4; r++)
     {
-        op[0] = a1;
-        op[1] = a1;
-        op[2] = a1;
-        op[3] = a1;
-        op += shortpitch;
+        for (c = 0; c < 4; c++)
+        {
+            int a = ip[c] + pred_ptr[c] ;
+
+            if (a < 0)
+                a = 0;
+
+            if (a > 255)
+                a = 255;
+
+            dst_ptr[c] = (unsigned char) a ;
+        }
+        ip += 4;
+        dst_ptr += dst_stride;
+        pred_ptr += pred_stride;
     }
 }
 
-void vp8_dc_only_idct_add_c(short input_dc, unsigned char *pred_ptr, unsigned char *dst_ptr, int pitch, int stride)
+void vp8_dc_only_idct_add_c(short input_dc, unsigned char *pred_ptr,
+                            int pred_stride, unsigned char *dst_ptr,
+                            int dst_stride)
 {
     int a1 = ((input_dc + 4) >> 3);
     int r, c;
@@ -124,14 +131,15 @@ void vp8_dc_only_idct_add_c(short input_dc, unsigned char *pred_ptr, unsigned ch
             dst_ptr[c] = (unsigned char) a ;
         }
 
-        dst_ptr += stride;
-        pred_ptr += pitch;
+        dst_ptr += dst_stride;
+        pred_ptr += pred_stride;
     }
 
 }
 
-void vp8_short_inv_walsh4x4_c(short *input, short *output)
+void vp8_short_inv_walsh4x4_c(short *input, short *mb_dqcoeff)
 {
+    short output[16];
     int i;
     int a1, b1, c1, d1;
     int a2, b2, c2, d2;
@@ -176,22 +184,21 @@ void vp8_short_inv_walsh4x4_c(short *input, short *output)
         ip += 4;
         op += 4;
     }
+
+    for(i = 0; i < 16; i++)
+    {
+        mb_dqcoeff[i * 16] = output[i];
+    }
 }
 
-void vp8_short_inv_walsh4x4_1_c(short *input, short *output)
+void vp8_short_inv_walsh4x4_1_c(short *input, short *mb_dqcoeff)
 {
     int i;
     int a1;
-    short *op = output;
 
     a1 = ((input[0] + 3) >> 3);
-
-    for (i = 0; i < 4; i++)
+    for(i = 0; i < 16; i++)
     {
-        op[0] = a1;
-        op[1] = a1;
-        op[2] = a1;
-        op[3] = a1;
-        op += 4;
+        mb_dqcoeff[i * 16] = a1;
     }
 }
diff --git a/media/libvpx/vp8/common/invtrans.c b/media/libvpx/vp8/common/invtrans.c
deleted file mode 100644
index 81a3f2d890e..00000000000
--- a/media/libvpx/vp8/common/invtrans.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-#include "invtrans.h"
-
-
-
-static void recon_dcblock(MACROBLOCKD *x)
-{
-    BLOCKD *b = &x->block[24];
-    int i;
-
-    for (i = 0; i < 16; i++)
-    {
-        x->block[i].dqcoeff[0] = b->diff[i];
-    }
-
-}
-
-void vp8_inverse_transform_b(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch)
-{
-    if (b->eob > 1)
-        IDCT_INVOKE(rtcd, idct16)(b->dqcoeff, b->diff, pitch);
-    else
-        IDCT_INVOKE(rtcd, idct1)(b->dqcoeff, b->diff, pitch);
-}
-
-
-void vp8_inverse_transform_mby(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *x)
-{
-    int i;
-
-    /* do 2nd order transform on the dc block */
-    IDCT_INVOKE(rtcd, iwalsh16)(x->block[24].dqcoeff, x->block[24].diff);
-
-    recon_dcblock(x);
-
-    for (i = 0; i < 16; i++)
-    {
-        vp8_inverse_transform_b(rtcd, &x->block[i], 32);
-    }
-
-}
-void vp8_inverse_transform_mbuv(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *x)
-{
-    int i;
-
-    for (i = 16; i < 24; i++)
-    {
-        vp8_inverse_transform_b(rtcd, &x->block[i], 16);
-    }
-
-}
-
-
-void vp8_inverse_transform_mb(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *x)
-{
-    int i;
-
-    if (x->mode_info_context->mbmi.mode != B_PRED &&
-        x->mode_info_context->mbmi.mode != SPLITMV)
-    {
-        /* do 2nd order transform on the dc block */
-
-        IDCT_INVOKE(rtcd, iwalsh16)(&x->block[24].dqcoeff[0], x->block[24].diff);
-        recon_dcblock(x);
-    }
-
-    for (i = 0; i < 16; i++)
-    {
-        vp8_inverse_transform_b(rtcd, &x->block[i], 32);
-    }
-
-
-    for (i = 16; i < 24; i++)
-    {
-        vp8_inverse_transform_b(rtcd, &x->block[i], 16);
-    }
-
-}
diff --git a/media/libvpx/vp8/common/invtrans.h b/media/libvpx/vp8/common/invtrans.h
index b3ffb70734c..f49e2e5773a 100644
--- a/media/libvpx/vp8/common/invtrans.h
+++ b/media/libvpx/vp8/common/invtrans.h
@@ -12,12 +12,52 @@
 #ifndef __INC_INVTRANS_H
 #define __INC_INVTRANS_H
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "idct.h"
 #include "blockd.h"
-extern void vp8_inverse_transform_b(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch);
-extern void vp8_inverse_transform_mb(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *x);
-extern void vp8_inverse_transform_mby(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *x);
-extern void vp8_inverse_transform_mbuv(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *x);
+#include "onyxc_int.h"
 
+#if CONFIG_MULTITHREAD
+#include "vpx_mem/vpx_mem.h"
+#endif
+
+static void eob_adjust(char *eobs, short *diff)
+{
+    /* eob adjust.... the idct can only skip if both the dc and eob are zero */
+    int js;
+    for(js = 0; js < 16; js++)
+    {
+        if((eobs[js] == 0) && (diff[0] != 0))
+            eobs[js]++;
+        diff+=16;
+    }
+}
+
+static void vp8_inverse_transform_mby(MACROBLOCKD *xd,
+                                      const VP8_COMMON_RTCD *rtcd)
+{
+    short *DQC = xd->dequant_y1;
+
+    if (xd->mode_info_context->mbmi.mode != SPLITMV)
+    {
+        /* do 2nd order transform on the dc block */
+        if (xd->eobs[24] > 1)
+        {
+            IDCT_INVOKE(&rtcd->idct, iwalsh16)
+                (&xd->block[24].dqcoeff[0], xd->qcoeff);
+        }
+        else
+        {
+            IDCT_INVOKE(&rtcd->idct, iwalsh1)
+                (&xd->block[24].dqcoeff[0], xd->qcoeff);
+        }
+        eob_adjust(xd->eobs, xd->qcoeff);
+
+        DQC = xd->dequant_y1_dc;
+    }
+    DEQUANT_INVOKE (&rtcd->dequant, idct_add_y_block)
+                    (xd->qcoeff, DQC,
+                     xd->dst.y_buffer,
+                     xd->dst.y_stride, xd->eobs);
+}
 #endif
diff --git a/media/libvpx/vp8/common/loopfilter.c b/media/libvpx/vp8/common/loopfilter.c
index fe0644bdda4..a38b49eb918 100644
--- a/media/libvpx/vp8/common/loopfilter.c
+++ b/media/libvpx/vp8/common/loopfilter.c
@@ -506,7 +506,8 @@ void vp8_loop_filter_partial_frame
     unsigned char *y_ptr;
     int mb_row;
     int mb_col;
-    int mb_cols = post->y_width  >> 4;
+    int mb_cols = post->y_width >> 4;
+    int mb_rows = post->y_height >> 4;
 
     int linestocopy, i;
 
@@ -521,15 +522,9 @@ void vp8_loop_filter_partial_frame
 
     int lvl_seg[MAX_MB_SEGMENTS];
 
-    mode_info_context = cm->mi + (post->y_height >> 5) * (mb_cols + 1);
-
-    /* 3 is a magic number. 4 is probably magic too */
-    linestocopy = (post->y_height >> (4 + 3));
-
-    if (linestocopy < 1)
-        linestocopy = 1;
-
-    linestocopy <<= 4;
+    /* number of MB rows to use in partial filtering */
+    linestocopy = mb_rows / PARTIAL_FRAME_FRACTION;
+    linestocopy = linestocopy ? linestocopy << 4 : 16;     /* 16 lines per MB */
 
     /* Note the baseline filter values for each segment */
     /* See vp8_loop_filter_frame_init. Rather than call that for each change
@@ -554,8 +549,9 @@ void vp8_loop_filter_partial_frame
         }
     }
 
-    /* Set up the buffer pointers */
-    y_ptr = post->y_buffer + (post->y_height >> 5) * 16 * post->y_stride;
+    /* Set up the buffer pointers; partial image starts at ~middle of frame */
+    y_ptr = post->y_buffer + ((post->y_height >> 5) * 16) * post->y_stride;
+    mode_info_context = cm->mi + (post->y_height >> 5) * (mb_cols + 1);
 
     /* vp8_filter each macro block */
     for (mb_row = 0; mb_row<(linestocopy >> 4); mb_row++)
diff --git a/media/libvpx/vp8/common/loopfilter.h b/media/libvpx/vp8/common/loopfilter.h
index 9887cf55b33..340339a91af 100644
--- a/media/libvpx/vp8/common/loopfilter.h
+++ b/media/libvpx/vp8/common/loopfilter.h
@@ -15,7 +15,10 @@
 #include "vpx_ports/mem.h"
 #include "vpx_config.h"
 
-#define MAX_LOOP_FILTER 63
+#define MAX_LOOP_FILTER             63
+/* fraction of total macroblock rows to be used in fast filter level picking */
+/* has to be > 2 */
+#define PARTIAL_FRAME_FRACTION      8
 
 typedef enum
 {
diff --git a/media/libvpx/vp8/common/loopfilter_filters.c b/media/libvpx/vp8/common/loopfilter_filters.c
index c4f406da256..3c8ab76b385 100644
--- a/media/libvpx/vp8/common/loopfilter_filters.c
+++ b/media/libvpx/vp8/common/loopfilter_filters.c
@@ -13,13 +13,9 @@
 #include "loopfilter.h"
 #include "onyxc_int.h"
 
-#ifdef __SUNPRO_C
-#define __inline inline
-#endif
-
 typedef unsigned char uc;
 
-static __inline signed char vp8_signed_char_clamp(int t)
+static signed char vp8_signed_char_clamp(int t)
 {
     t = (t < -128 ? -128 : t);
     t = (t > 127 ? 127 : t);
@@ -28,24 +24,23 @@ static __inline signed char vp8_signed_char_clamp(int t)
 
 
 /* should we apply any filter at all ( 11111111 yes, 00000000 no) */
-static __inline signed char vp8_filter_mask(uc limit, uc blimit,
-                                     uc p3, uc p2, uc p1, uc p0,
-                                     uc q0, uc q1, uc q2, uc q3)
+static signed char vp8_filter_mask(uc limit, uc blimit,
+                            uc p3, uc p2, uc p1, uc p0,
+                            uc q0, uc q1, uc q2, uc q3)
 {
     signed char mask = 0;
-    mask |= (abs(p3 - p2) > limit) * -1;
-    mask |= (abs(p2 - p1) > limit) * -1;
-    mask |= (abs(p1 - p0) > limit) * -1;
-    mask |= (abs(q1 - q0) > limit) * -1;
-    mask |= (abs(q2 - q1) > limit) * -1;
-    mask |= (abs(q3 - q2) > limit) * -1;
-    mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2  > blimit) * -1;
-    mask = ~mask;
-    return mask;
+    mask |= (abs(p3 - p2) > limit);
+    mask |= (abs(p2 - p1) > limit);
+    mask |= (abs(p1 - p0) > limit);
+    mask |= (abs(q1 - q0) > limit);
+    mask |= (abs(q2 - q1) > limit);
+    mask |= (abs(q3 - q2) > limit);
+    mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2  > blimit);
+    return mask - 1;
 }
 
 /* is there high variance internal edge ( 11111111 yes, 00000000 no) */
-static __inline signed char vp8_hevmask(uc thresh, uc p1, uc p0, uc q0, uc q1)
+static signed char vp8_hevmask(uc thresh, uc p1, uc p0, uc q0, uc q1)
 {
     signed char hev = 0;
     hev  |= (abs(p1 - p0) > thresh) * -1;
@@ -53,7 +48,7 @@ static __inline signed char vp8_hevmask(uc thresh, uc p1, uc p0, uc q0, uc q1)
     return hev;
 }
 
-static __inline void vp8_filter(signed char mask, uc hev, uc *op1,
+static void vp8_filter(signed char mask, uc hev, uc *op1,
         uc *op0, uc *oq0, uc *oq1)
 
 {
@@ -163,7 +158,7 @@ void vp8_loop_filter_vertical_edge_c
     while (++i < count * 8);
 }
 
-static __inline void vp8_mbfilter(signed char mask, uc hev,
+static void vp8_mbfilter(signed char mask, uc hev,
                            uc *op2, uc *op1, uc *op0, uc *oq0, uc *oq1, uc *oq2)
 {
     signed char s, u;
@@ -284,7 +279,7 @@ void vp8_mbloop_filter_vertical_edge_c
 }
 
 /* should we apply any filter at all ( 11111111 yes, 00000000 no) */
-static __inline signed char vp8_simple_filter_mask(uc blimit, uc p1, uc p0, uc q0, uc q1)
+static signed char vp8_simple_filter_mask(uc blimit, uc p1, uc p0, uc q0, uc q1)
 {
 /* Why does this cause problems for win32?
  * error C2143: syntax error : missing ';' before 'type'
@@ -294,7 +289,7 @@ static __inline signed char vp8_simple_filter_mask(uc blimit, uc p1, uc p0, uc q
     return mask;
 }
 
-static __inline void vp8_simple_filter(signed char mask, uc *op1, uc *op0, uc *oq0, uc *oq1)
+static void vp8_simple_filter(signed char mask, uc *op1, uc *op0, uc *oq0, uc *oq1)
 {
     signed char vp8_filter, Filter1, Filter2;
     signed char p1 = (signed char) * op1 ^ 0x80;
diff --git a/media/libvpx/vp8/common/mbpitch.c b/media/libvpx/vp8/common/mbpitch.c
index 054042c0b3e..f8971d754e5 100644
--- a/media/libvpx/vp8/common/mbpitch.c
+++ b/media/libvpx/vp8/common/mbpitch.c
@@ -87,7 +87,6 @@ void vp8_setup_block_dptrs(MACROBLOCKD *x)
     {
         for (c = 0; c < 4; c++)
         {
-            x->block[r*4+c].diff      = &x->diff[r * 4 * 16 + c * 4];
             x->block[r*4+c].predictor = x->predictor + r * 4 * 16 + c * 4;
         }
     }
@@ -96,7 +95,6 @@ void vp8_setup_block_dptrs(MACROBLOCKD *x)
     {
         for (c = 0; c < 2; c++)
         {
-            x->block[16+r*2+c].diff      = &x->diff[256 + r * 4 * 8 + c * 4];
             x->block[16+r*2+c].predictor = x->predictor + 256 + r * 4 * 8 + c * 4;
 
         }
@@ -106,18 +104,16 @@ void vp8_setup_block_dptrs(MACROBLOCKD *x)
     {
         for (c = 0; c < 2; c++)
         {
-            x->block[20+r*2+c].diff      = &x->diff[320+ r * 4 * 8 + c * 4];
             x->block[20+r*2+c].predictor = x->predictor + 320 + r * 4 * 8 + c * 4;
 
         }
     }
 
-    x->block[24].diff = &x->diff[384];
-
     for (r = 0; r < 25; r++)
     {
         x->block[r].qcoeff  = x->qcoeff  + r * 16;
         x->block[r].dqcoeff = x->dqcoeff + r * 16;
+        x->block[r].eob     = x->eobs + r;
     }
 }
 
diff --git a/media/libvpx/vp8/common/onyx.h b/media/libvpx/vp8/common/onyx.h
index 015b4c4d405..500dff0b017 100644
--- a/media/libvpx/vp8/common/onyx.h
+++ b/media/libvpx/vp8/common/onyx.h
@@ -17,12 +17,14 @@ extern "C"
 {
 #endif
 
+#include "vpx_config.h"
 #include "vpx/internal/vpx_codec_internal.h"
 #include "vpx/vp8cx.h"
+#include "vpx/vpx_encoder.h"
 #include "vpx_scale/yv12config.h"
-#include "type_aliases.h"
 #include "ppflags.h"
-    typedef int *VP8_PTR;
+
+    struct VP8_COMP;
 
     /* Create/destroy static data structures. */
 
@@ -58,19 +60,19 @@ extern "C"
         MODE_BESTQUALITY    = 0x2,
         MODE_FIRSTPASS      = 0x3,
         MODE_SECONDPASS     = 0x4,
-        MODE_SECONDPASS_BEST = 0x5,
+        MODE_SECONDPASS_BEST = 0x5
     } MODE;
 
     typedef enum
     {
         FRAMEFLAGS_KEY    = 1,
         FRAMEFLAGS_GOLDEN = 2,
-        FRAMEFLAGS_ALTREF = 4,
+        FRAMEFLAGS_ALTREF = 4
     } FRAMETYPE_FLAGS;
 
 
 #include <assert.h>
-    static __inline void Scale2Ratio(int mode, int *hr, int *hs)
+    static void Scale2Ratio(int mode, int *hr, int *hs)
     {
         switch (mode)
         {
@@ -103,7 +105,7 @@ extern "C"
         int Version;            // 4 versions of bitstream defined 0 best quality/slowest decode, 3 lowest quality/fastest decode
         int Width;              // width of data passed to the compressor
         int Height;             // height of data passed to the compressor
-        double frame_rate;       // set to passed in framerate
+        struct vpx_rational  timebase;
         int target_bandwidth;    // bandwidth to be used in kilobits per second
 
         int noise_sensitivity;   // parameter used for applying pre processing blur: recommendation 0
@@ -145,9 +147,13 @@ extern "C"
         int over_shoot_pct;
 
         // buffering parameters
-        int starting_buffer_level;  // in seconds
-        int optimal_buffer_level;
-        int maximum_buffer_size;
+        int64_t starting_buffer_level;  // in bytes
+        int64_t optimal_buffer_level;
+        int64_t maximum_buffer_size;
+
+        int64_t starting_buffer_level_in_ms;  // in milli-seconds
+        int64_t optimal_buffer_level_in_ms;
+        int64_t maximum_buffer_size_in_ms;
 
         // controlling quality
         int fixed_q;
@@ -198,32 +204,53 @@ extern "C"
         struct vpx_codec_pkt_list  *output_pkt_list;
 
         vp8e_tuning tuning;
+
+        // Temporal scaling parameters
+        unsigned int number_of_layers;
+        unsigned int target_bitrate[MAX_PERIODICITY];
+        unsigned int rate_decimator[MAX_PERIODICITY];
+        unsigned int periodicity;
+        unsigned int layer_id[MAX_PERIODICITY];
+
+#if CONFIG_MULTI_RES_ENCODING
+        /* Number of total resolutions encoded */
+        unsigned int mr_total_resolutions;
+
+        /* Current encoder ID */
+        unsigned int mr_encoder_id;
+
+        /* Down-sampling factor */
+        vpx_rational_t mr_down_sampling_factor;
+
+        /* Memory location to store low-resolution encoder's mode info */
+        void* mr_low_res_mode_info;
+#endif
     } VP8_CONFIG;
 
 
     void vp8_initialize();
 
-    VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf);
-    void vp8_remove_compressor(VP8_PTR *comp);
+    struct VP8_COMP* vp8_create_compressor(VP8_CONFIG *oxcf);
+    void vp8_remove_compressor(struct VP8_COMP* *comp);
 
-    void vp8_init_config(VP8_PTR onyx, VP8_CONFIG *oxcf);
-    void vp8_change_config(VP8_PTR onyx, VP8_CONFIG *oxcf);
+    void vp8_init_config(struct VP8_COMP* onyx, VP8_CONFIG *oxcf);
+    void vp8_change_config(struct VP8_COMP* onyx, VP8_CONFIG *oxcf);
 
 // receive a frames worth of data caller can assume that a copy of this frame is made
 // and not just a copy of the pointer..
-    int vp8_receive_raw_frame(VP8_PTR comp, unsigned int frame_flags, YV12_BUFFER_CONFIG *sd, int64_t time_stamp, int64_t end_time_stamp);
-    int vp8_get_compressed_data(VP8_PTR comp, unsigned int *frame_flags, unsigned long *size, unsigned char *dest, int64_t *time_stamp, int64_t *time_end, int flush);
-    int vp8_get_preview_raw_frame(VP8_PTR comp, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t *flags);
+    int vp8_receive_raw_frame(struct VP8_COMP* comp, unsigned int frame_flags, YV12_BUFFER_CONFIG *sd, int64_t time_stamp, int64_t end_time_stamp);
+    int vp8_get_compressed_data(struct VP8_COMP* comp, unsigned int *frame_flags, unsigned long *size, unsigned char *dest, unsigned char *dest_end, int64_t *time_stamp, int64_t *time_end, int flush);
+    int vp8_get_preview_raw_frame(struct VP8_COMP* comp, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t *flags);
 
-    int vp8_use_as_reference(VP8_PTR comp, int ref_frame_flags);
-    int vp8_update_reference(VP8_PTR comp, int ref_frame_flags);
-    int vp8_get_reference(VP8_PTR comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd);
-    int vp8_set_reference(VP8_PTR comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd);
-    int vp8_update_entropy(VP8_PTR comp, int update);
-    int vp8_set_roimap(VP8_PTR comp, unsigned char *map, unsigned int rows, unsigned int cols, int delta_q[4], int delta_lf[4], unsigned int threshold[4]);
-    int vp8_set_active_map(VP8_PTR comp, unsigned char *map, unsigned int rows, unsigned int cols);
-    int vp8_set_internal_size(VP8_PTR comp, VPX_SCALING horiz_mode, VPX_SCALING vert_mode);
-    int vp8_get_quantizer(VP8_PTR c);
+    int vp8_use_as_reference(struct VP8_COMP* comp, int ref_frame_flags);
+    int vp8_update_reference(struct VP8_COMP* comp, int ref_frame_flags);
+    int vp8_get_reference(struct VP8_COMP* comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd);
+    int vp8_set_reference(struct VP8_COMP* comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd);
+    int vp8_update_entropy(struct VP8_COMP* comp, int update);
+    int vp8_set_roimap(struct VP8_COMP* comp, unsigned char *map, unsigned int rows, unsigned int cols, int delta_q[4], int delta_lf[4], unsigned int threshold[4]);
+    int vp8_set_active_map(struct VP8_COMP* comp, unsigned char *map, unsigned int rows, unsigned int cols);
+    int vp8_set_internal_size(struct VP8_COMP* comp, VPX_SCALING horiz_mode, VPX_SCALING vert_mode);
+    int vp8_get_quantizer(struct VP8_COMP* c);
 
 #ifdef __cplusplus
 }
diff --git a/media/libvpx/vp8/common/onyxc_int.h b/media/libvpx/vp8/common/onyxc_int.h
index 936fa9f239b..e521fde5c02 100644
--- a/media/libvpx/vp8/common/onyxc_int.h
+++ b/media/libvpx/vp8/common/onyxc_int.h
@@ -19,9 +19,11 @@
 #include "entropy.h"
 #include "idct.h"
 #include "recon.h"
+#include "variance.h"
 #if CONFIG_POSTPROC
 #include "postproc.h"
 #endif
+#include "dequantize.h"
 
 /*#ifdef PACKET_TESTING*/
 #include "header.h"
@@ -73,10 +75,12 @@ typedef enum
 typedef struct VP8_COMMON_RTCD
 {
 #if CONFIG_RUNTIME_CPU_DETECT
+    vp8_dequant_rtcd_vtable_t        dequant;
     vp8_idct_rtcd_vtable_t        idct;
     vp8_recon_rtcd_vtable_t       recon;
     vp8_subpix_rtcd_vtable_t      subpix;
     vp8_loopfilter_rtcd_vtable_t  loopfilter;
+    vp8_variance_rtcd_vtable_t    variance;
 #if CONFIG_POSTPROC
     vp8_postproc_rtcd_vtable_t    postproc;
 #endif
@@ -91,9 +95,9 @@ typedef struct VP8Common
 {
     struct vpx_internal_error_info  error;
 
-    DECLARE_ALIGNED(16, short, Y1dequant[QINDEX_RANGE][16]);
-    DECLARE_ALIGNED(16, short, Y2dequant[QINDEX_RANGE][16]);
-    DECLARE_ALIGNED(16, short, UVdequant[QINDEX_RANGE][16]);
+    DECLARE_ALIGNED(16, short, Y1dequant[QINDEX_RANGE][2]);
+    DECLARE_ALIGNED(16, short, Y2dequant[QINDEX_RANGE][2]);
+    DECLARE_ALIGNED(16, short, UVdequant[QINDEX_RANGE][2]);
 
     int Width;
     int Height;
@@ -112,6 +116,8 @@ typedef struct VP8Common
     YV12_BUFFER_CONFIG post_proc_buffer;
     YV12_BUFFER_CONFIG temp_scale_frame;
 
+    YV12_BUFFER_CONFIG post_proc_buffer_int;
+    int post_proc_buffer_int_used;
 
     FRAME_TYPE last_frame_type;  /* Save last frame's frame type for motion search. */
     FRAME_TYPE frame_type;
diff --git a/media/libvpx/vp8/common/onyxd.h b/media/libvpx/vp8/common/onyxd.h
index 08f1cca803e..35a8b6e5529 100644
--- a/media/libvpx/vp8/common/onyxd.h
+++ b/media/libvpx/vp8/common/onyxd.h
@@ -18,13 +18,13 @@
 extern "C"
 {
 #endif
-#include "type_aliases.h"
 #include "vpx_scale/yv12config.h"
 #include "ppflags.h"
 #include "vpx_ports/mem.h"
 #include "vpx/vpx_codec.h"
 
-    typedef void   *VP8D_PTR;
+    struct VP8D_COMP;
+
     typedef struct
     {
         int     Width;
@@ -33,7 +33,7 @@ extern "C"
         int     postprocess;
         int     max_threads;
         int     error_concealment;
-        int     input_partition;
+        int     input_fragments;
     } VP8D_CONFIG;
     typedef enum
     {
@@ -49,19 +49,19 @@ extern "C"
 
     void vp8dx_initialize(void);
 
-    void vp8dx_set_setting(VP8D_PTR comp, VP8D_SETTING oxst, int x);
+    void vp8dx_set_setting(struct VP8D_COMP* comp, VP8D_SETTING oxst, int x);
 
-    int vp8dx_get_setting(VP8D_PTR comp, VP8D_SETTING oxst);
+    int vp8dx_get_setting(struct VP8D_COMP* comp, VP8D_SETTING oxst);
 
-    int vp8dx_receive_compressed_data(VP8D_PTR comp, unsigned long size, const unsigned char *dest, int64_t time_stamp);
-    int vp8dx_get_raw_frame(VP8D_PTR comp, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags);
+    int vp8dx_receive_compressed_data(struct VP8D_COMP* comp, unsigned long size, const unsigned char *dest, int64_t time_stamp);
+    int vp8dx_get_raw_frame(struct VP8D_COMP* comp, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags);
 
-    vpx_codec_err_t vp8dx_get_reference(VP8D_PTR comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd);
-    vpx_codec_err_t vp8dx_set_reference(VP8D_PTR comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd);
+    vpx_codec_err_t vp8dx_get_reference(struct VP8D_COMP* comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd);
+    vpx_codec_err_t vp8dx_set_reference(struct VP8D_COMP* comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd);
 
-    VP8D_PTR vp8dx_create_decompressor(VP8D_CONFIG *oxcf);
+    struct VP8D_COMP* vp8dx_create_decompressor(VP8D_CONFIG *oxcf);
 
-    void vp8dx_remove_decompressor(VP8D_PTR comp);
+    void vp8dx_remove_decompressor(struct VP8D_COMP* comp);
 
 #ifdef __cplusplus
 }
diff --git a/media/libvpx/vp8/common/postproc.c b/media/libvpx/vp8/common/postproc.c
index 14c3b7bf354..23188126081 100644
--- a/media/libvpx/vp8/common/postproc.c
+++ b/media/libvpx/vp8/common/postproc.c
@@ -9,12 +9,15 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_scale/yv12config.h"
 #include "postproc.h"
+#include "common.h"
+#include "recon.h"
 #include "vpx_scale/yv12extend.h"
 #include "vpx_scale/vpxscale.h"
 #include "systemdependent.h"
+#include "variance.h"
 
 #include <math.h>
 #include <stdlib.h>
@@ -26,6 +29,7 @@
     ( (0.439*(float)(t>>16)) - (0.368*(float)(t>>8&0xff)) - (0.071*(float)(t&0xff)) + 128)
 
 /* global constants */
+#define MFQE_PRECISION 4
 #if CONFIG_POSTPROC_VISUALIZER
 static const unsigned char MB_PREDICTION_MODE_colors[MB_MODE_COUNT][3] =
 {
@@ -121,7 +125,6 @@ const short vp8_rv[] =
     0, 9, 5, 5, 11, 10, 13, 9, 10, 13,
 };
 
-
 extern void vp8_blit_text(const char *msg, unsigned char *address, const int pitch);
 extern void vp8_blit_line(int x0, int x1, int y0, int y1, unsigned char *image, const int pitch);
 /***********************************************************************************************************
@@ -175,6 +178,12 @@ void vp8_post_proc_down_and_across_c
         p_src = dst_ptr;
         p_dst = dst_ptr;
 
+        for (i = -8; i<0; i++)
+          p_src[i]=p_src[0];
+
+        for (i = cols; i<cols+8; i++)
+          p_src[i]=p_src[cols-1];
+
         for (i = 0; i < 8; i++)
             d[i] = p_src[i];
 
@@ -225,12 +234,19 @@ void vp8_mbpost_proc_across_ip_c(unsigned char *src, int pitch, int rows, int co
     unsigned char *s = src;
     unsigned char d[16];
 
-
     for (r = 0; r < rows; r++)
     {
         int sumsq = 0;
         int sum   = 0;
 
+        for (i = -8; i<0; i++)
+          s[i]=s[0];
+
+        // 17 avoids valgrind warning - we buffer values in c in d
+        // and only write them when we've read 8 ahead...
+        for (i = cols; i<cols+17; i++)
+          s[i]=s[cols-1];
+
         for (i = -8; i <= 6; i++)
         {
             sumsq += s[i] * s[i];
@@ -269,7 +285,7 @@ void vp8_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, i
     int r, c, i;
     const short *rv3 = &vp8_rv[63&rand()];
 
-    for (c = 0; c < cols; c++)
+    for (c = 0; c < cols; c++ )
     {
         unsigned char *s = &dst[c];
         int sumsq = 0;
@@ -277,6 +293,14 @@ void vp8_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, i
         unsigned char d[16];
         const short *rv2 = rv3 + ((c * 17) & 127);
 
+        for (i = -8; i < 0; i++)
+          s[i*pitch]=s[0];
+
+        // 17 avoids valgrind warning - we buffer values in c in d
+        // and only write them when we've read 8 ahead...
+        for (i = rows; i < rows+17; i++)
+          s[i*pitch]=s[(rows-1)*pitch];
+
         for (i = -8; i <= 6; i++)
         {
             sumsq += s[i*pitch] * s[i*pitch];
@@ -317,17 +341,18 @@ static void vp8_deblock_and_de_macro_block(YV12_BUFFER_CONFIG         *source,
     POSTPROC_INVOKE(rtcd, across)(post->y_buffer, post->y_stride, post->y_height, post->y_width, q2mbl(q));
     POSTPROC_INVOKE(rtcd, down)(post->y_buffer, post->y_stride, post->y_height, post->y_width, q2mbl(q));
 
+
     POSTPROC_INVOKE(rtcd, downacross)(source->u_buffer, post->u_buffer, source->uv_stride, post->uv_stride, source->uv_height, source->uv_width, ppl);
     POSTPROC_INVOKE(rtcd, downacross)(source->v_buffer, post->v_buffer, source->uv_stride, post->uv_stride, source->uv_height, source->uv_width, ppl);
 
 }
 
 void vp8_deblock(YV12_BUFFER_CONFIG         *source,
-                        YV12_BUFFER_CONFIG         *post,
-                        int                         q,
-                        int                         low_var_thresh,
-                        int                         flag,
-                        vp8_postproc_rtcd_vtable_t *rtcd)
+                 YV12_BUFFER_CONFIG         *post,
+                 int                         q,
+                 int                         low_var_thresh,
+                 int                         flag,
+                 vp8_postproc_rtcd_vtable_t *rtcd)
 {
     double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
     int ppl = (int)(level + .5);
@@ -672,12 +697,222 @@ static void constrain_line (int x0, int *x1, int y0, int *y1, int width, int hei
 }
 
 
+static void multiframe_quality_enhance_block
+(
+    int blksize, /* Currently only values supported are 16, 8, 4 */
+    int qcurr,
+    int qprev,
+    unsigned char *y,
+    unsigned char *u,
+    unsigned char *v,
+    int y_stride,
+    int uv_stride,
+    unsigned char *yd,
+    unsigned char *ud,
+    unsigned char *vd,
+    int yd_stride,
+    int uvd_stride,
+    vp8_variance_rtcd_vtable_t *rtcd
+)
+{
+    static const unsigned char VP8_ZEROS[16]=
+    {
+         0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    };
+    int blksizeby2 = blksize >> 1;
+    int qdiff = qcurr - qprev;
+
+    int i, j;
+    unsigned char *yp;
+    unsigned char *ydp;
+    unsigned char *up;
+    unsigned char *udp;
+    unsigned char *vp;
+    unsigned char *vdp;
+
+    unsigned int act, sse, sad, thr;
+    if (blksize == 16)
+    {
+        act = (VARIANCE_INVOKE(rtcd, var16x16)(yd, yd_stride, VP8_ZEROS, 0, &sse)+128)>>8;
+        sad = (VARIANCE_INVOKE(rtcd, sad16x16)(y, y_stride, yd, yd_stride, 0)+128)>>8;
+    }
+    else if (blksize == 8)
+    {
+        act = (VARIANCE_INVOKE(rtcd, var8x8)(yd, yd_stride, VP8_ZEROS, 0, &sse)+32)>>6;
+        sad = (VARIANCE_INVOKE(rtcd, sad8x8)(y, y_stride, yd, yd_stride, 0)+32)>>6;
+    }
+    else
+    {
+        act = (VARIANCE_INVOKE(rtcd, var4x4)(yd, yd_stride, VP8_ZEROS, 0, &sse)+8)>>4;
+        sad = (VARIANCE_INVOKE(rtcd, sad4x4)(y, y_stride, yd, yd_stride, 0)+8)>>4;
+    }
+    /* thr = qdiff/8 + log2(act) + log4(qprev) */
+    thr = (qdiff>>3);
+    while (act>>=1) thr++;
+    while (qprev>>=2) thr++;
+    if (sad < thr)
+    {
+        static const int roundoff = (1 << (MFQE_PRECISION - 1));
+        int ifactor = (sad << MFQE_PRECISION) / thr;
+        ifactor >>= (qdiff >> 5);
+        // TODO: SIMD optimize this section
+        if (ifactor)
+        {
+            int icfactor = (1 << MFQE_PRECISION) - ifactor;
+            for (yp = y, ydp = yd, i = 0; i < blksize; ++i, yp += y_stride, ydp += yd_stride)
+            {
+                for (j = 0; j < blksize; ++j)
+                    ydp[j] = (int)((yp[j] * ifactor + ydp[j] * icfactor + roundoff) >> MFQE_PRECISION);
+            }
+            for (up = u, udp = ud, i = 0; i < blksizeby2; ++i, up += uv_stride, udp += uvd_stride)
+            {
+                for (j = 0; j < blksizeby2; ++j)
+                    udp[j] = (int)((up[j] * ifactor + udp[j] * icfactor + roundoff) >> MFQE_PRECISION);
+            }
+            for (vp = v, vdp = vd, i = 0; i < blksizeby2; ++i, vp += uv_stride, vdp += uvd_stride)
+            {
+                for (j = 0; j < blksizeby2; ++j)
+                    vdp[j] = (int)((vp[j] * ifactor + vdp[j] * icfactor + roundoff) >> MFQE_PRECISION);
+            }
+        }
+    }
+    else
+    {
+        if (blksize == 16)
+        {
+            vp8_recon_copy16x16(y, y_stride, yd, yd_stride);
+            vp8_recon_copy8x8(u, uv_stride, ud, uvd_stride);
+            vp8_recon_copy8x8(v, uv_stride, vd, uvd_stride);
+        }
+        else if (blksize == 8)
+        {
+            vp8_recon_copy8x8(y, y_stride, yd, yd_stride);
+            for (up = u, udp = ud, i = 0; i < blksizeby2; ++i, up += uv_stride, udp += uvd_stride)
+                vpx_memcpy(udp, up, blksizeby2);
+            for (vp = v, vdp = vd, i = 0; i < blksizeby2; ++i, vp += uv_stride, vdp += uvd_stride)
+                vpx_memcpy(vdp, vp, blksizeby2);
+        }
+        else
+        {
+            for (yp = y, ydp = yd, i = 0; i < blksize; ++i, yp += y_stride, ydp += yd_stride)
+                vpx_memcpy(ydp, yp, blksize);
+            for (up = u, udp = ud, i = 0; i < blksizeby2; ++i, up += uv_stride, udp += uvd_stride)
+                vpx_memcpy(udp, up, blksizeby2);
+            for (vp = v, vdp = vd, i = 0; i < blksizeby2; ++i, vp += uv_stride, vdp += uvd_stride)
+                vpx_memcpy(vdp, vp, blksizeby2);
+        }
+    }
+}
+
 #if CONFIG_RUNTIME_CPU_DETECT
 #define RTCD_VTABLE(oci) (&(oci)->rtcd.postproc)
 #else
 #define RTCD_VTABLE(oci) NULL
 #endif
 
+void vp8_multiframe_quality_enhance
+(
+    VP8_COMMON *cm
+)
+{
+    YV12_BUFFER_CONFIG *show = cm->frame_to_show;
+    YV12_BUFFER_CONFIG *dest = &cm->post_proc_buffer;
+
+    FRAME_TYPE frame_type = cm->frame_type;
+    /* Point at base of Mb MODE_INFO list has motion vectors etc */
+    const MODE_INFO *mode_info_context = cm->mi;
+    int mb_row;
+    int mb_col;
+    int qcurr = cm->base_qindex;
+    int qprev = cm->postproc_state.last_base_qindex;
+
+    unsigned char *y_ptr, *u_ptr, *v_ptr;
+    unsigned char *yd_ptr, *ud_ptr, *vd_ptr;
+
+    /* Set up the buffer pointers */
+    y_ptr = show->y_buffer;
+    u_ptr = show->u_buffer;
+    v_ptr = show->v_buffer;
+    yd_ptr = dest->y_buffer;
+    ud_ptr = dest->u_buffer;
+    vd_ptr = dest->v_buffer;
+
+    /* postprocess each macro block */
+    for (mb_row = 0; mb_row < cm->mb_rows; mb_row++)
+    {
+        for (mb_col = 0; mb_col < cm->mb_cols; mb_col++)
+        {
+            /* if motion is high there will likely be no benefit */
+            if (((frame_type == INTER_FRAME &&
+                  abs(mode_info_context->mbmi.mv.as_mv.row) <= 10 &&
+                  abs(mode_info_context->mbmi.mv.as_mv.col) <= 10) ||
+                 (frame_type == KEY_FRAME)))
+            {
+                if (mode_info_context->mbmi.mode == B_PRED || mode_info_context->mbmi.mode == SPLITMV)
+                {
+                    int i, j;
+                    for (i=0; i<2; ++i)
+                        for (j=0; j<2; ++j)
+                            multiframe_quality_enhance_block(8,
+                                                             qcurr,
+                                                             qprev,
+                                                             y_ptr + 8*(i*show->y_stride+j),
+                                                             u_ptr + 4*(i*show->uv_stride+j),
+                                                             v_ptr + 4*(i*show->uv_stride+j),
+                                                             show->y_stride,
+                                                             show->uv_stride,
+                                                             yd_ptr + 8*(i*dest->y_stride+j),
+                                                             ud_ptr + 4*(i*dest->uv_stride+j),
+                                                             vd_ptr + 4*(i*dest->uv_stride+j),
+                                                             dest->y_stride,
+                                                             dest->uv_stride,
+                                                             &cm->rtcd.variance);
+                }
+                else
+                {
+                    multiframe_quality_enhance_block(16,
+                                                     qcurr,
+                                                     qprev,
+                                                     y_ptr,
+                                                     u_ptr,
+                                                     v_ptr,
+                                                     show->y_stride,
+                                                     show->uv_stride,
+                                                     yd_ptr,
+                                                     ud_ptr,
+                                                     vd_ptr,
+                                                     dest->y_stride,
+                                                     dest->uv_stride,
+                                                     &cm->rtcd.variance);
+
+                }
+            }
+            else
+            {
+                vp8_recon_copy16x16(y_ptr, show->y_stride, yd_ptr, dest->y_stride);
+                vp8_recon_copy8x8(u_ptr, show->uv_stride, ud_ptr, dest->uv_stride);
+                vp8_recon_copy8x8(v_ptr, show->uv_stride, vd_ptr, dest->uv_stride);
+            }
+            y_ptr += 16;
+            u_ptr += 8;
+            v_ptr += 8;
+            yd_ptr += 16;
+            ud_ptr += 8;
+            vd_ptr += 8;
+            mode_info_context++;     /* step to next MB */
+        }
+
+        y_ptr += show->y_stride  * 16 - 16 * cm->mb_cols;
+        u_ptr += show->uv_stride *  8 - 8 * cm->mb_cols;
+        v_ptr += show->uv_stride *  8 - 8 * cm->mb_cols;
+        yd_ptr += dest->y_stride  * 16 - 16 * cm->mb_cols;
+        ud_ptr += dest->uv_stride *  8 - 8 * cm->mb_cols;
+        vd_ptr += dest->uv_stride *  8 - 8 * cm->mb_cols;
+
+        mode_info_context++;         /* Skip border mb */
+    }
+}
+
 int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t *ppflags)
 {
     int q = oci->filter_level * 10 / 6;
@@ -699,27 +934,75 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t
         dest->y_width = oci->Width;
         dest->y_height = oci->Height;
         dest->uv_height = dest->y_height / 2;
+        oci->postproc_state.last_base_qindex = oci->base_qindex;
         return 0;
+    }
 
+    /* Allocate post_proc_buffer_int if needed */
+    if ((flags & VP8D_MFQE) && !oci->post_proc_buffer_int_used)
+    {
+        if ((flags & VP8D_DEBLOCK) || (flags & VP8D_DEMACROBLOCK))
+        {
+            int width = (oci->Width + 15) & ~15;
+            int height = (oci->Height + 15) & ~15;
+
+            if (vp8_yv12_alloc_frame_buffer(&oci->post_proc_buffer_int,
+                                            width, height, VP8BORDERINPIXELS))
+                vpx_internal_error(&oci->error, VPX_CODEC_MEM_ERROR,
+                                   "Failed to allocate MFQE framebuffer");
+
+            oci->post_proc_buffer_int_used = 1;
+
+            // insure that postproc is set to all 0's so that post proc
+            // doesn't pull random data in from edge
+            vpx_memset((&oci->post_proc_buffer_int)->buffer_alloc,126,(&oci->post_proc_buffer)->frame_size);
+
+        }
     }
 
 #if ARCH_X86||ARCH_X86_64
     vpx_reset_mmx_state();
 #endif
 
-    if (flags & VP8D_DEMACROBLOCK)
+    if ((flags & VP8D_MFQE) &&
+         oci->current_video_frame >= 2 &&
+         oci->base_qindex - oci->postproc_state.last_base_qindex >= 10)
+    {
+        vp8_multiframe_quality_enhance(oci);
+        if (((flags & VP8D_DEBLOCK) || (flags & VP8D_DEMACROBLOCK)) &&
+            oci->post_proc_buffer_int_used)
+        {
+            vp8_yv12_copy_frame_ptr(&oci->post_proc_buffer, &oci->post_proc_buffer_int);
+            if (flags & VP8D_DEMACROBLOCK)
+            {
+                vp8_deblock_and_de_macro_block(&oci->post_proc_buffer_int, &oci->post_proc_buffer,
+                                               q + (deblock_level - 5) * 10, 1, 0, RTCD_VTABLE(oci));
+            }
+            else if (flags & VP8D_DEBLOCK)
+            {
+                vp8_deblock(&oci->post_proc_buffer_int, &oci->post_proc_buffer,
+                            q, 1, 0, RTCD_VTABLE(oci));
+            }
+        }
+        /* Move partially towards the base q of the previous frame */
+        oci->postproc_state.last_base_qindex = (3*oci->postproc_state.last_base_qindex + oci->base_qindex)>>2;
+    }
+    else if (flags & VP8D_DEMACROBLOCK)
     {
         vp8_deblock_and_de_macro_block(oci->frame_to_show, &oci->post_proc_buffer,
                                        q + (deblock_level - 5) * 10, 1, 0, RTCD_VTABLE(oci));
+        oci->postproc_state.last_base_qindex = oci->base_qindex;
     }
     else if (flags & VP8D_DEBLOCK)
     {
         vp8_deblock(oci->frame_to_show, &oci->post_proc_buffer,
                     q, 1, 0, RTCD_VTABLE(oci));
+        oci->postproc_state.last_base_qindex = oci->base_qindex;
     }
     else
     {
         vp8_yv12_copy_frame_ptr(oci->frame_to_show, &oci->post_proc_buffer);
+        oci->postproc_state.last_base_qindex = oci->base_qindex;
     }
 
     if (flags & VP8D_ADDNOISE)
diff --git a/media/libvpx/vp8/common/postproc.h b/media/libvpx/vp8/common/postproc.h
index c641b9ca599..d5aaf621666 100644
--- a/media/libvpx/vp8/common/postproc.h
+++ b/media/libvpx/vp8/common/postproc.h
@@ -104,6 +104,7 @@ struct postproc_state
     int           last_q;
     int           last_noise;
     char          noise[3072];
+    int           last_base_qindex;
     DECLARE_ALIGNED(16, char, blackclamp[16]);
     DECLARE_ALIGNED(16, char, whiteclamp[16]);
     DECLARE_ALIGNED(16, char, bothclamp[16]);
diff --git a/media/libvpx/vp8/common/ppflags.h b/media/libvpx/vp8/common/ppflags.h
index 65b0cab6a4b..665e21fd965 100644
--- a/media/libvpx/vp8/common/ppflags.h
+++ b/media/libvpx/vp8/common/ppflags.h
@@ -23,7 +23,8 @@ enum
     VP8D_DEBUG_TXT_RATE_INFO    = 1<<6,
     VP8D_DEBUG_DRAW_MV          = 1<<7,
     VP8D_DEBUG_CLR_BLK_MODES    = 1<<8,
-    VP8D_DEBUG_CLR_FRM_REF_BLKS = 1<<9
+    VP8D_DEBUG_CLR_FRM_REF_BLKS = 1<<9,
+    VP8D_MFQE                   = 1<<10
 };
 
 typedef struct
diff --git a/media/libvpx/vp8/common/recon.c b/media/libvpx/vp8/common/recon.c
deleted file mode 100644
index d72d6e41044..00000000000
--- a/media/libvpx/vp8/common/recon.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-#include "vpx_ports/config.h"
-#include "recon.h"
-#include "blockd.h"
-
-void vp8_recon_b_c
-(
-    unsigned char *pred_ptr,
-    short *diff_ptr,
-    unsigned char *dst_ptr,
-    int stride
-)
-{
-    int r, c;
-
-    for (r = 0; r < 4; r++)
-    {
-        for (c = 0; c < 4; c++)
-        {
-            int a = diff_ptr[c] + pred_ptr[c] ;
-
-            if (a < 0)
-                a = 0;
-
-            if (a > 255)
-                a = 255;
-
-            dst_ptr[c] = (unsigned char) a ;
-        }
-
-        dst_ptr += stride;
-        diff_ptr += 16;
-        pred_ptr += 16;
-    }
-}
-
-void vp8_recon4b_c
-(
-    unsigned char *pred_ptr,
-    short *diff_ptr,
-    unsigned char *dst_ptr,
-    int stride
-)
-{
-    int r, c;
-
-    for (r = 0; r < 4; r++)
-    {
-        for (c = 0; c < 16; c++)
-        {
-            int a = diff_ptr[c] + pred_ptr[c] ;
-
-            if (a < 0)
-                a = 0;
-
-            if (a > 255)
-                a = 255;
-
-            dst_ptr[c] = (unsigned char) a ;
-        }
-
-        dst_ptr += stride;
-        diff_ptr += 16;
-        pred_ptr += 16;
-    }
-}
-
-void vp8_recon2b_c
-(
-    unsigned char *pred_ptr,
-    short *diff_ptr,
-    unsigned char *dst_ptr,
-    int stride
-)
-{
-    int r, c;
-
-    for (r = 0; r < 4; r++)
-    {
-        for (c = 0; c < 8; c++)
-        {
-            int a = diff_ptr[c] + pred_ptr[c] ;
-
-            if (a < 0)
-                a = 0;
-
-            if (a > 255)
-                a = 255;
-
-            dst_ptr[c] = (unsigned char) a ;
-        }
-
-        dst_ptr += stride;
-        diff_ptr += 8;
-        pred_ptr += 8;
-    }
-}
-
-void vp8_recon_mby_c(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x)
-{
-#if ARCH_ARM
-    BLOCKD *b = &x->block[0];
-    RECON_INVOKE(rtcd, recon4)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-
-    /*b = &x->block[4];*/
-    b += 4;
-    RECON_INVOKE(rtcd, recon4)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-
-    /*b = &x->block[8];*/
-    b += 4;
-    RECON_INVOKE(rtcd, recon4)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-
-    /*b = &x->block[12];*/
-    b += 4;
-    RECON_INVOKE(rtcd, recon4)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-#else
-    int i;
-
-    for (i = 0; i < 16; i += 4)
-    {
-        BLOCKD *b = &x->block[i];
-
-        RECON_INVOKE(rtcd, recon4)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-    }
-#endif
-}
-
-void vp8_recon_mb_c(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x)
-{
-#if ARCH_ARM
-    BLOCKD *b = &x->block[0];
-
-    RECON_INVOKE(rtcd, recon4)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-    b += 4;
-    RECON_INVOKE(rtcd, recon4)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-    b += 4;
-    RECON_INVOKE(rtcd, recon4)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-    b += 4;
-    RECON_INVOKE(rtcd, recon4)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-    b += 4;
-
-    /*b = &x->block[16];*/
-
-    RECON_INVOKE(rtcd, recon2)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-    b++;
-    b++;
-    RECON_INVOKE(rtcd, recon2)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-    b++;
-    b++;
-    RECON_INVOKE(rtcd, recon2)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-    b++;
-    b++;
-    RECON_INVOKE(rtcd, recon2)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-#else
-    int i;
-
-    for (i = 0; i < 16; i += 4)
-    {
-        BLOCKD *b = &x->block[i];
-
-        RECON_INVOKE(rtcd, recon4)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-    }
-
-    for (i = 16; i < 24; i += 2)
-    {
-        BLOCKD *b = &x->block[i];
-
-        RECON_INVOKE(rtcd, recon2)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-    }
-#endif
-}
diff --git a/media/libvpx/vp8/common/recon.h b/media/libvpx/vp8/common/recon.h
index 7cfc779cdf7..98c5f63a565 100644
--- a/media/libvpx/vp8/common/recon.h
+++ b/media/libvpx/vp8/common/recon.h
@@ -18,7 +18,7 @@
     void sym(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch)
 
 #define prototype_recon_block(sym) \
-    void sym(unsigned char *pred, short *diff, unsigned char *dst, int pitch)
+    void sym(unsigned char *pred, short *diff, int diff_stride, unsigned char *dst, int pitch)
 
 #define prototype_recon_macroblock(sym) \
     void sym(const struct vp8_recon_rtcd_vtable *rtcd, MACROBLOCKD *x)
@@ -27,7 +27,8 @@
     void sym(MACROBLOCKD *x)
 
 #define prototype_intra4x4_predict(sym) \
-    void sym(BLOCKD *x, int b_mode, unsigned char *predictor)
+    void sym(unsigned char *src, int src_stride, int b_mode, \
+             unsigned char *dst, int dst_stride)
 
 struct vp8_recon_rtcd_vtable;
 
@@ -54,31 +55,6 @@ extern prototype_copy_block(vp8_recon_copy8x8);
 #endif
 extern prototype_copy_block(vp8_recon_copy8x4);
 
-#ifndef vp8_recon_recon
-#define vp8_recon_recon vp8_recon_b_c
-#endif
-extern prototype_recon_block(vp8_recon_recon);
-
-#ifndef vp8_recon_recon2
-#define vp8_recon_recon2 vp8_recon2b_c
-#endif
-extern prototype_recon_block(vp8_recon_recon2);
-
-#ifndef vp8_recon_recon4
-#define vp8_recon_recon4 vp8_recon4b_c
-#endif
-extern prototype_recon_block(vp8_recon_recon4);
-
-#ifndef vp8_recon_recon_mb
-#define vp8_recon_recon_mb vp8_recon_mb_c
-#endif
-extern prototype_recon_macroblock(vp8_recon_recon_mb);
-
-#ifndef vp8_recon_recon_mby
-#define vp8_recon_recon_mby vp8_recon_mby_c
-#endif
-extern prototype_recon_macroblock(vp8_recon_recon_mby);
-
 #ifndef vp8_recon_build_intra_predictors_mby
 #define vp8_recon_build_intra_predictors_mby vp8_build_intra_predictors_mby
 #endif
@@ -104,15 +80,13 @@ extern prototype_build_intra_predictors\
     (vp8_recon_build_intra_predictors_mbuv_s);
 
 #ifndef vp8_recon_intra4x4_predict
-#define vp8_recon_intra4x4_predict vp8_intra4x4_predict
+#define vp8_recon_intra4x4_predict vp8_intra4x4_predict_c
 #endif
 extern prototype_intra4x4_predict\
     (vp8_recon_intra4x4_predict);
 
 
 typedef prototype_copy_block((*vp8_copy_block_fn_t));
-typedef prototype_recon_block((*vp8_recon_fn_t));
-typedef prototype_recon_macroblock((*vp8_recon_mb_fn_t));
 typedef prototype_build_intra_predictors((*vp8_build_intra_pred_fn_t));
 typedef prototype_intra4x4_predict((*vp8_intra4x4_pred_fn_t));
 typedef struct vp8_recon_rtcd_vtable
@@ -120,11 +94,7 @@ typedef struct vp8_recon_rtcd_vtable
     vp8_copy_block_fn_t  copy16x16;
     vp8_copy_block_fn_t  copy8x8;
     vp8_copy_block_fn_t  copy8x4;
-    vp8_recon_fn_t       recon;
-    vp8_recon_fn_t       recon2;
-    vp8_recon_fn_t       recon4;
-    vp8_recon_mb_fn_t    recon_mb;
-    vp8_recon_mb_fn_t    recon_mby;
+
     vp8_build_intra_pred_fn_t  build_intra_predictors_mby_s;
     vp8_build_intra_pred_fn_t  build_intra_predictors_mby;
     vp8_build_intra_pred_fn_t  build_intra_predictors_mbuv_s;
@@ -138,5 +108,4 @@ typedef struct vp8_recon_rtcd_vtable
 #define RECON_INVOKE(ctx,fn) vp8_recon_##fn
 #endif
 
-void vp8_recon_intra_mbuv(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x);
 #endif
diff --git a/media/libvpx/vp8/common/reconinter.c b/media/libvpx/vp8/common/reconinter.c
index 84cda1334eb..6c7af41d404 100644
--- a/media/libvpx/vp8/common/reconinter.c
+++ b/media/libvpx/vp8/common/reconinter.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx/vpx_integer.h"
 #include "recon.h"
 #include "subpixel.h"
@@ -19,10 +19,6 @@
 #include "onyxc_int.h"
 #endif
 
-static const int bbb[4] = {0, 2, 8, 10};
-
-
-
 void vp8_copy_mem16x16_c(
     unsigned char *src,
     int src_stride,
@@ -127,7 +123,6 @@ void vp8_copy_mem8x4_c(
 }
 
 
-
 void vp8_build_inter_predictors_b(BLOCKD *d, int pitch, vp8_subpix_fn_t sppf)
 {
     int r;
@@ -163,100 +158,188 @@ void vp8_build_inter_predictors_b(BLOCKD *d, int pitch, vp8_subpix_fn_t sppf)
     }
 }
 
-static void build_inter_predictors4b(MACROBLOCKD *x, BLOCKD *d, int pitch)
+static void build_inter_predictors4b(MACROBLOCKD *x, BLOCKD *d, unsigned char *dst, int dst_stride)
 {
     unsigned char *ptr_base;
     unsigned char *ptr;
-    unsigned char *pred_ptr = d->predictor;
 
     ptr_base = *(d->base_pre);
     ptr = ptr_base + d->pre + (d->bmi.mv.as_mv.row >> 3) * d->pre_stride + (d->bmi.mv.as_mv.col >> 3);
 
     if (d->bmi.mv.as_mv.row & 7 || d->bmi.mv.as_mv.col & 7)
     {
-        x->subpixel_predict8x8(ptr, d->pre_stride, d->bmi.mv.as_mv.col & 7, d->bmi.mv.as_mv.row & 7, pred_ptr, pitch);
+        x->subpixel_predict8x8(ptr, d->pre_stride, d->bmi.mv.as_mv.col & 7, d->bmi.mv.as_mv.row & 7, dst, dst_stride);
     }
     else
     {
-        RECON_INVOKE(&x->rtcd->recon, copy8x8)(ptr, d->pre_stride, pred_ptr, pitch);
+        RECON_INVOKE(&x->rtcd->recon, copy8x8)(ptr, d->pre_stride, dst, dst_stride);
     }
 }
 
-static void build_inter_predictors2b(MACROBLOCKD *x, BLOCKD *d, int pitch)
+static void build_inter_predictors2b(MACROBLOCKD *x, BLOCKD *d, unsigned char *dst, int dst_stride)
 {
     unsigned char *ptr_base;
     unsigned char *ptr;
-    unsigned char *pred_ptr = d->predictor;
 
     ptr_base = *(d->base_pre);
     ptr = ptr_base + d->pre + (d->bmi.mv.as_mv.row >> 3) * d->pre_stride + (d->bmi.mv.as_mv.col >> 3);
 
     if (d->bmi.mv.as_mv.row & 7 || d->bmi.mv.as_mv.col & 7)
     {
-        x->subpixel_predict8x4(ptr, d->pre_stride, d->bmi.mv.as_mv.col & 7, d->bmi.mv.as_mv.row & 7, pred_ptr, pitch);
+        x->subpixel_predict8x4(ptr, d->pre_stride, d->bmi.mv.as_mv.col & 7, d->bmi.mv.as_mv.row & 7, dst, dst_stride);
     }
     else
     {
-        RECON_INVOKE(&x->rtcd->recon, copy8x4)(ptr, d->pre_stride, pred_ptr, pitch);
+        RECON_INVOKE(&x->rtcd->recon, copy8x4)(ptr, d->pre_stride, dst, dst_stride);
+    }
+}
+
+static void build_inter_predictors_b(BLOCKD *d, unsigned char *dst, int dst_stride, vp8_subpix_fn_t sppf)
+{
+    int r;
+    unsigned char *ptr_base;
+    unsigned char *ptr;
+
+    ptr_base = *(d->base_pre);
+
+    if (d->bmi.mv.as_mv.row & 7 || d->bmi.mv.as_mv.col & 7)
+    {
+        ptr = ptr_base + d->pre + (d->bmi.mv.as_mv.row >> 3) * d->pre_stride + (d->bmi.mv.as_mv.col >> 3);
+        sppf(ptr, d->pre_stride, d->bmi.mv.as_mv.col & 7, d->bmi.mv.as_mv.row & 7, dst, dst_stride);
+    }
+    else
+    {
+        ptr_base += d->pre + (d->bmi.mv.as_mv.row >> 3) * d->pre_stride + (d->bmi.mv.as_mv.col >> 3);
+        ptr = ptr_base;
+
+        for (r = 0; r < 4; r++)
+        {
+#if !(CONFIG_FAST_UNALIGNED)
+          dst[0]  = ptr[0];
+          dst[1]  = ptr[1];
+          dst[2]  = ptr[2];
+          dst[3]  = ptr[3];
+#else
+            *(uint32_t *)dst = *(uint32_t *)ptr ;
+#endif
+            dst     += dst_stride;
+            ptr         += d->pre_stride;
+        }
     }
 }
 
 
 /*encoder only*/
-void vp8_build_inter_predictors_mbuv(MACROBLOCKD *x)
+void vp8_build_inter16x16_predictors_mbuv(MACROBLOCKD *x)
 {
-    int i;
+    unsigned char *uptr, *vptr;
+    unsigned char *upred_ptr = &x->predictor[256];
+    unsigned char *vpred_ptr = &x->predictor[320];
 
-    if (x->mode_info_context->mbmi.mode != SPLITMV)
+    int mv_row = x->mode_info_context->mbmi.mv.as_mv.row;
+    int mv_col = x->mode_info_context->mbmi.mv.as_mv.col;
+    int offset;
+    int pre_stride = x->block[16].pre_stride;
+
+    /* calc uv motion vectors */
+    if (mv_row < 0)
+        mv_row -= 1;
+    else
+        mv_row += 1;
+
+    if (mv_col < 0)
+        mv_col -= 1;
+    else
+        mv_col += 1;
+
+    mv_row /= 2;
+    mv_col /= 2;
+
+    mv_row &= x->fullpixel_mask;
+    mv_col &= x->fullpixel_mask;
+
+    offset = (mv_row >> 3) * pre_stride + (mv_col >> 3);
+    uptr = x->pre.u_buffer + offset;
+    vptr = x->pre.v_buffer + offset;
+
+    if ((mv_row | mv_col) & 7)
     {
-        unsigned char *uptr, *vptr;
-        unsigned char *upred_ptr = &x->predictor[256];
-        unsigned char *vpred_ptr = &x->predictor[320];
+        x->subpixel_predict8x8(uptr, pre_stride, mv_col & 7, mv_row & 7, upred_ptr, 8);
+        x->subpixel_predict8x8(vptr, pre_stride, mv_col & 7, mv_row & 7, vpred_ptr, 8);
+    }
+    else
+    {
+        RECON_INVOKE(&x->rtcd->recon, copy8x8)(uptr, pre_stride, upred_ptr, 8);
+        RECON_INVOKE(&x->rtcd->recon, copy8x8)(vptr, pre_stride, vpred_ptr, 8);
+    }
+}
 
-        int mv_row = x->block[16].bmi.mv.as_mv.row;
-        int mv_col = x->block[16].bmi.mv.as_mv.col;
-        int offset;
-        int pre_stride = x->block[16].pre_stride;
+/*encoder only*/
+void vp8_build_inter4x4_predictors_mbuv(MACROBLOCKD *x)
+{
+    int i, j;
 
-        offset = (mv_row >> 3) * pre_stride + (mv_col >> 3);
-        uptr = x->pre.u_buffer + offset;
-        vptr = x->pre.v_buffer + offset;
-
-        if ((mv_row | mv_col) & 7)
+    /* build uv mvs */
+    for (i = 0; i < 2; i++)
+    {
+        for (j = 0; j < 2; j++)
         {
-            x->subpixel_predict8x8(uptr, pre_stride, mv_col & 7, mv_row & 7, upred_ptr, 8);
-            x->subpixel_predict8x8(vptr, pre_stride, mv_col & 7, mv_row & 7, vpred_ptr, 8);
+            int yoffset = i * 8 + j * 2;
+            int uoffset = 16 + i * 2 + j;
+            int voffset = 20 + i * 2 + j;
+
+            int temp;
+
+            temp = x->block[yoffset  ].bmi.mv.as_mv.row
+                   + x->block[yoffset+1].bmi.mv.as_mv.row
+                   + x->block[yoffset+4].bmi.mv.as_mv.row
+                   + x->block[yoffset+5].bmi.mv.as_mv.row;
+
+            if (temp < 0) temp -= 4;
+            else temp += 4;
+
+            x->block[uoffset].bmi.mv.as_mv.row = (temp / 8) & x->fullpixel_mask;
+
+            temp = x->block[yoffset  ].bmi.mv.as_mv.col
+                   + x->block[yoffset+1].bmi.mv.as_mv.col
+                   + x->block[yoffset+4].bmi.mv.as_mv.col
+                   + x->block[yoffset+5].bmi.mv.as_mv.col;
+
+            if (temp < 0) temp -= 4;
+            else temp += 4;
+
+            x->block[uoffset].bmi.mv.as_mv.col = (temp / 8) & x->fullpixel_mask;
+
+            x->block[voffset].bmi.mv.as_mv.row =
+                x->block[uoffset].bmi.mv.as_mv.row ;
+            x->block[voffset].bmi.mv.as_mv.col =
+                x->block[uoffset].bmi.mv.as_mv.col ;
         }
+    }
+
+    for (i = 16; i < 24; i += 2)
+    {
+        BLOCKD *d0 = &x->block[i];
+        BLOCKD *d1 = &x->block[i+1];
+
+        if (d0->bmi.mv.as_int == d1->bmi.mv.as_int)
+            build_inter_predictors2b(x, d0, d0->predictor, 8);
         else
         {
-            RECON_INVOKE(&x->rtcd->recon, copy8x8)(uptr, pre_stride, upred_ptr, 8);
-            RECON_INVOKE(&x->rtcd->recon, copy8x8)(vptr, pre_stride, vpred_ptr, 8);
-        }
-    }
-    else
-    {
-        for (i = 16; i < 24; i += 2)
-        {
-            BLOCKD *d0 = &x->block[i];
-            BLOCKD *d1 = &x->block[i+1];
-
-            if (d0->bmi.mv.as_int == d1->bmi.mv.as_int)
-                build_inter_predictors2b(x, d0, 8);
-            else
-            {
-                vp8_build_inter_predictors_b(d0, 8, x->subpixel_predict);
-                vp8_build_inter_predictors_b(d1, 8, x->subpixel_predict);
-            }
+            vp8_build_inter_predictors_b(d0, 8, x->subpixel_predict);
+            vp8_build_inter_predictors_b(d1, 8, x->subpixel_predict);
         }
     }
 }
 
+
 /*encoder only*/
-void vp8_build_inter16x16_predictors_mby(MACROBLOCKD *x)
+void vp8_build_inter16x16_predictors_mby(MACROBLOCKD *x,
+                                         unsigned char *dst_y,
+                                         int dst_ystride)
 {
     unsigned char *ptr_base;
     unsigned char *ptr;
-    unsigned char *pred_ptr = x->predictor;
     int mv_row = x->mode_info_context->mbmi.mv.as_mv.row;
     int mv_col = x->mode_info_context->mbmi.mv.as_mv.col;
     int pre_stride = x->block[0].pre_stride;
@@ -266,14 +349,52 @@ void vp8_build_inter16x16_predictors_mby(MACROBLOCKD *x)
 
     if ((mv_row | mv_col) & 7)
     {
-        x->subpixel_predict16x16(ptr, pre_stride, mv_col & 7, mv_row & 7, pred_ptr, 16);
+        x->subpixel_predict16x16(ptr, pre_stride, mv_col & 7, mv_row & 7,
+                                 dst_y, dst_ystride);
     }
     else
     {
-        RECON_INVOKE(&x->rtcd->recon, copy16x16)(ptr, pre_stride, pred_ptr, 16);
+        RECON_INVOKE(&x->rtcd->recon, copy16x16)(ptr, pre_stride, dst_y,
+            dst_ystride);
     }
 }
 
+static void clamp_mv_to_umv_border(MV *mv, const MACROBLOCKD *xd)
+{
+    /* If the MV points so far into the UMV border that no visible pixels
+     * are used for reconstruction, the subpel part of the MV can be
+     * discarded and the MV limited to 16 pixels with equivalent results.
+     *
+     * This limit kicks in at 19 pixels for the top and left edges, for
+     * the 16 pixels plus 3 taps right of the central pixel when subpel
+     * filtering. The bottom and right edges use 16 pixels plus 2 pixels
+     * left of the central pixel when filtering.
+     */
+    if (mv->col < (xd->mb_to_left_edge - (19 << 3)))
+        mv->col = xd->mb_to_left_edge - (16 << 3);
+    else if (mv->col > xd->mb_to_right_edge + (18 << 3))
+        mv->col = xd->mb_to_right_edge + (16 << 3);
+
+    if (mv->row < (xd->mb_to_top_edge - (19 << 3)))
+        mv->row = xd->mb_to_top_edge - (16 << 3);
+    else if (mv->row > xd->mb_to_bottom_edge + (18 << 3))
+        mv->row = xd->mb_to_bottom_edge + (16 << 3);
+}
+
+/* A version of the above function for chroma block MVs.*/
+static void clamp_uvmv_to_umv_border(MV *mv, const MACROBLOCKD *xd)
+{
+    mv->col = (2*mv->col < (xd->mb_to_left_edge - (19 << 3))) ?
+        (xd->mb_to_left_edge - (16 << 3)) >> 1 : mv->col;
+    mv->col = (2*mv->col > xd->mb_to_right_edge + (18 << 3)) ?
+        (xd->mb_to_right_edge + (16 << 3)) >> 1 : mv->col;
+
+    mv->row = (2*mv->row < (xd->mb_to_top_edge - (19 << 3))) ?
+        (xd->mb_to_top_edge - (16 << 3)) >> 1 : mv->row;
+    mv->row = (2*mv->row > xd->mb_to_bottom_edge + (18 << 3)) ?
+        (xd->mb_to_bottom_edge + (16 << 3)) >> 1 : mv->row;
+}
+
 void vp8_build_inter16x16_predictors_mb(MACROBLOCKD *x,
                                         unsigned char *dst_y,
                                         unsigned char *dst_u,
@@ -285,54 +406,92 @@ void vp8_build_inter16x16_predictors_mb(MACROBLOCKD *x,
     unsigned char *ptr;
     unsigned char *uptr, *vptr;
 
-    int mv_row = x->mode_info_context->mbmi.mv.as_mv.row;
-    int mv_col = x->mode_info_context->mbmi.mv.as_mv.col;
+    int_mv _16x16mv;
 
     unsigned char *ptr_base = x->pre.y_buffer;
     int pre_stride = x->block[0].pre_stride;
 
-    ptr = ptr_base + (mv_row >> 3) * pre_stride + (mv_col >> 3);
+    _16x16mv.as_int = x->mode_info_context->mbmi.mv.as_int;
 
-    if ((mv_row | mv_col) & 7)
+    if (x->mode_info_context->mbmi.need_to_clamp_mvs)
     {
-        x->subpixel_predict16x16(ptr, pre_stride, mv_col & 7, mv_row & 7, dst_y, dst_ystride);
+        clamp_mv_to_umv_border(&_16x16mv.as_mv, x);
+    }
+
+    ptr = ptr_base + ( _16x16mv.as_mv.row >> 3) * pre_stride + (_16x16mv.as_mv.col >> 3);
+
+    if ( _16x16mv.as_int & 0x00070007)
+    {
+        x->subpixel_predict16x16(ptr, pre_stride, _16x16mv.as_mv.col & 7,  _16x16mv.as_mv.row & 7, dst_y, dst_ystride);
     }
     else
     {
         RECON_INVOKE(&x->rtcd->recon, copy16x16)(ptr, pre_stride, dst_y, dst_ystride);
     }
 
-    mv_row = x->block[16].bmi.mv.as_mv.row;
-    mv_col = x->block[16].bmi.mv.as_mv.col;
+    /* calc uv motion vectors */
+    if ( _16x16mv.as_mv.row < 0)
+      _16x16mv.as_mv.row -= 1;
+    else
+      _16x16mv.as_mv.row += 1;
+
+    if (_16x16mv.as_mv.col < 0)
+        _16x16mv.as_mv.col -= 1;
+    else
+        _16x16mv.as_mv.col += 1;
+
+    _16x16mv.as_mv.row /= 2;
+    _16x16mv.as_mv.col /= 2;
+
+    _16x16mv.as_mv.row &= x->fullpixel_mask;
+    _16x16mv.as_mv.col &= x->fullpixel_mask;
+
     pre_stride >>= 1;
-    offset = (mv_row >> 3) * pre_stride + (mv_col >> 3);
+    offset = ( _16x16mv.as_mv.row >> 3) * pre_stride + (_16x16mv.as_mv.col >> 3);
     uptr = x->pre.u_buffer + offset;
     vptr = x->pre.v_buffer + offset;
 
-    if ((mv_row | mv_col) & 7)
+    if ( _16x16mv.as_int & 0x00070007)
     {
-        x->subpixel_predict8x8(uptr, pre_stride, mv_col & 7, mv_row & 7, dst_u, dst_uvstride);
-        x->subpixel_predict8x8(vptr, pre_stride, mv_col & 7, mv_row & 7, dst_v, dst_uvstride);
+        x->subpixel_predict8x8(uptr, pre_stride, _16x16mv.as_mv.col & 7,  _16x16mv.as_mv.row & 7, dst_u, dst_uvstride);
+        x->subpixel_predict8x8(vptr, pre_stride, _16x16mv.as_mv.col & 7,  _16x16mv.as_mv.row & 7, dst_v, dst_uvstride);
     }
     else
     {
         RECON_INVOKE(&x->rtcd->recon, copy8x8)(uptr, pre_stride, dst_u, dst_uvstride);
         RECON_INVOKE(&x->rtcd->recon, copy8x8)(vptr, pre_stride, dst_v, dst_uvstride);
     }
-
 }
 
-void vp8_build_inter4x4_predictors_mb(MACROBLOCKD *x)
+static void build_inter4x4_predictors_mb(MACROBLOCKD *x)
 {
     int i;
 
     if (x->mode_info_context->mbmi.partitioning < 3)
     {
-        for (i = 0; i < 4; i++)
+        BLOCKD *b;
+        int dst_stride = x->block[ 0].dst_stride;
+
+        x->block[ 0].bmi = x->mode_info_context->bmi[ 0];
+        x->block[ 2].bmi = x->mode_info_context->bmi[ 2];
+        x->block[ 8].bmi = x->mode_info_context->bmi[ 8];
+        x->block[10].bmi = x->mode_info_context->bmi[10];
+        if (x->mode_info_context->mbmi.need_to_clamp_mvs)
         {
-            BLOCKD *d = &x->block[bbb[i]];
-            build_inter_predictors4b(x, d, 16);
+            clamp_mv_to_umv_border(&x->block[ 0].bmi.mv.as_mv, x);
+            clamp_mv_to_umv_border(&x->block[ 2].bmi.mv.as_mv, x);
+            clamp_mv_to_umv_border(&x->block[ 8].bmi.mv.as_mv, x);
+            clamp_mv_to_umv_border(&x->block[10].bmi.mv.as_mv, x);
         }
+
+        b = &x->block[ 0];
+        build_inter_predictors4b(x, b, *(b->base_dst) + b->dst, dst_stride);
+        b = &x->block[ 2];
+        build_inter_predictors4b(x, b, *(b->base_dst) + b->dst, dst_stride);
+        b = &x->block[ 8];
+        build_inter_predictors4b(x, b, *(b->base_dst) + b->dst, dst_stride);
+        b = &x->block[10];
+        build_inter_predictors4b(x, b, *(b->base_dst) + b->dst, dst_stride);
     }
     else
     {
@@ -340,13 +499,22 @@ void vp8_build_inter4x4_predictors_mb(MACROBLOCKD *x)
         {
             BLOCKD *d0 = &x->block[i];
             BLOCKD *d1 = &x->block[i+1];
+            int dst_stride = x->block[ 0].dst_stride;
+
+            x->block[i+0].bmi = x->mode_info_context->bmi[i+0];
+            x->block[i+1].bmi = x->mode_info_context->bmi[i+1];
+            if (x->mode_info_context->mbmi.need_to_clamp_mvs)
+            {
+                clamp_mv_to_umv_border(&x->block[i+0].bmi.mv.as_mv, x);
+                clamp_mv_to_umv_border(&x->block[i+1].bmi.mv.as_mv, x);
+            }
 
             if (d0->bmi.mv.as_int == d1->bmi.mv.as_int)
-                build_inter_predictors2b(x, d0, 16);
+                build_inter_predictors2b(x, d0, *(d0->base_dst) + d0->dst, dst_stride);
             else
             {
-                vp8_build_inter_predictors_b(d0, 16, x->subpixel_predict);
-                vp8_build_inter_predictors_b(d1, 16, x->subpixel_predict);
+                build_inter_predictors_b(d0, *(d0->base_dst) + d0->dst, dst_stride, x->subpixel_predict);
+                build_inter_predictors_b(d1, *(d1->base_dst) + d1->dst, dst_stride, x->subpixel_predict);
             }
 
         }
@@ -357,109 +525,77 @@ void vp8_build_inter4x4_predictors_mb(MACROBLOCKD *x)
     {
         BLOCKD *d0 = &x->block[i];
         BLOCKD *d1 = &x->block[i+1];
+        int dst_stride = x->block[ 16].dst_stride;
+
+        /* Note: uv mvs already clamped in build_4x4uvmvs() */
 
         if (d0->bmi.mv.as_int == d1->bmi.mv.as_int)
-            build_inter_predictors2b(x, d0, 8);
+            build_inter_predictors2b(x, d0, *(d0->base_dst) + d0->dst, dst_stride);
         else
         {
-            vp8_build_inter_predictors_b(d0, 8, x->subpixel_predict);
-            vp8_build_inter_predictors_b(d1, 8, x->subpixel_predict);
+            build_inter_predictors_b(d0, *(d0->base_dst) + d0->dst, dst_stride, x->subpixel_predict);
+            build_inter_predictors_b(d1, *(d1->base_dst) + d1->dst, dst_stride, x->subpixel_predict);
         }
     }
 }
 
-void vp8_build_inter_predictors_mb(MACROBLOCKD *x)
-{
-    if (x->mode_info_context->mbmi.mode != SPLITMV)
-    {
-        vp8_build_inter16x16_predictors_mb(x, x->predictor, &x->predictor[256],
-                                           &x->predictor[320], 16, 8);
-    }
-    else
-    {
-        vp8_build_inter4x4_predictors_mb(x);
-    }
-}
-
-void vp8_build_uvmvs(MACROBLOCKD *x, int fullpixel)
+static
+void build_4x4uvmvs(MACROBLOCKD *x)
 {
     int i, j;
 
-    if (x->mode_info_context->mbmi.mode == SPLITMV)
+    for (i = 0; i < 2; i++)
     {
-        for (i = 0; i < 2; i++)
+        for (j = 0; j < 2; j++)
         {
-            for (j = 0; j < 2; j++)
-            {
-                int yoffset = i * 8 + j * 2;
-                int uoffset = 16 + i * 2 + j;
-                int voffset = 20 + i * 2 + j;
+            int yoffset = i * 8 + j * 2;
+            int uoffset = 16 + i * 2 + j;
+            int voffset = 20 + i * 2 + j;
 
-                int temp;
+            int temp;
 
-                temp = x->block[yoffset  ].bmi.mv.as_mv.row
-                       + x->block[yoffset+1].bmi.mv.as_mv.row
-                       + x->block[yoffset+4].bmi.mv.as_mv.row
-                       + x->block[yoffset+5].bmi.mv.as_mv.row;
+            temp = x->mode_info_context->bmi[yoffset + 0].mv.as_mv.row
+                 + x->mode_info_context->bmi[yoffset + 1].mv.as_mv.row
+                 + x->mode_info_context->bmi[yoffset + 4].mv.as_mv.row
+                 + x->mode_info_context->bmi[yoffset + 5].mv.as_mv.row;
 
-                if (temp < 0) temp -= 4;
-                else temp += 4;
+            if (temp < 0) temp -= 4;
+            else temp += 4;
 
-                x->block[uoffset].bmi.mv.as_mv.row = temp / 8;
+            x->block[uoffset].bmi.mv.as_mv.row = (temp / 8) & x->fullpixel_mask;
 
-                if (fullpixel)
-                    x->block[uoffset].bmi.mv.as_mv.row = (temp / 8) & 0xfffffff8;
+            temp = x->mode_info_context->bmi[yoffset + 0].mv.as_mv.col
+                 + x->mode_info_context->bmi[yoffset + 1].mv.as_mv.col
+                 + x->mode_info_context->bmi[yoffset + 4].mv.as_mv.col
+                 + x->mode_info_context->bmi[yoffset + 5].mv.as_mv.col;
 
-                temp = x->block[yoffset  ].bmi.mv.as_mv.col
-                       + x->block[yoffset+1].bmi.mv.as_mv.col
-                       + x->block[yoffset+4].bmi.mv.as_mv.col
-                       + x->block[yoffset+5].bmi.mv.as_mv.col;
+            if (temp < 0) temp -= 4;
+            else temp += 4;
 
-                if (temp < 0) temp -= 4;
-                else temp += 4;
+            x->block[uoffset].bmi.mv.as_mv.col = (temp / 8) & x->fullpixel_mask;
 
-                x->block[uoffset].bmi.mv.as_mv.col = temp / 8;
+            if (x->mode_info_context->mbmi.need_to_clamp_mvs)
+                clamp_uvmv_to_umv_border(&x->block[uoffset].bmi.mv.as_mv, x);
 
-                if (fullpixel)
-                    x->block[uoffset].bmi.mv.as_mv.col = (temp / 8) & 0xfffffff8;
-
-                x->block[voffset].bmi.mv.as_mv.row = x->block[uoffset].bmi.mv.as_mv.row ;
-                x->block[voffset].bmi.mv.as_mv.col = x->block[uoffset].bmi.mv.as_mv.col ;
-            }
-        }
-    }
-    else
-    {
-        int mvrow = x->mode_info_context->mbmi.mv.as_mv.row;
-        int mvcol = x->mode_info_context->mbmi.mv.as_mv.col;
-
-        if (mvrow < 0)
-            mvrow -= 1;
-        else
-            mvrow += 1;
-
-        if (mvcol < 0)
-            mvcol -= 1;
-        else
-            mvcol += 1;
-
-        mvrow /= 2;
-        mvcol /= 2;
-
-        for (i = 0; i < 8; i++)
-        {
-            x->block[ 16 + i].bmi.mv.as_mv.row = mvrow;
-            x->block[ 16 + i].bmi.mv.as_mv.col = mvcol;
-
-            if (fullpixel)
-            {
-                x->block[ 16 + i].bmi.mv.as_mv.row = mvrow & 0xfffffff8;
-                x->block[ 16 + i].bmi.mv.as_mv.col = mvcol & 0xfffffff8;
-            }
+            x->block[voffset].bmi.mv.as_mv.row =
+                x->block[uoffset].bmi.mv.as_mv.row ;
+            x->block[voffset].bmi.mv.as_mv.col =
+                x->block[uoffset].bmi.mv.as_mv.col ;
         }
     }
 }
 
-
-
-
+void vp8_build_inter_predictors_mb(MACROBLOCKD *xd)
+{
+    if (xd->mode_info_context->mbmi.mode != SPLITMV)
+    {
+        vp8_build_inter16x16_predictors_mb(xd, xd->dst.y_buffer,
+                                           xd->dst.u_buffer, xd->dst.v_buffer,
+                                           xd->dst.y_stride, xd->dst.uv_stride);
+    }
+    else
+    {
+        build_4x4uvmvs(xd);
+        build_inter4x4_predictors_mb(xd);
+    }
+}
diff --git a/media/libvpx/vp8/common/reconinter.h b/media/libvpx/vp8/common/reconinter.h
index a68e4aaba92..f57ff73c577 100644
--- a/media/libvpx/vp8/common/reconinter.h
+++ b/media/libvpx/vp8/common/reconinter.h
@@ -21,9 +21,13 @@ extern void vp8_build_inter16x16_predictors_mb(MACROBLOCKD *x,
                                                int dst_uvstride);
 
 
-extern void vp8_build_inter16x16_predictors_mby(MACROBLOCKD *x);
-extern void vp8_build_uvmvs(MACROBLOCKD *x, int fullpixel);
-extern void vp8_build_inter_predictors_b(BLOCKD *d, int pitch, vp8_subpix_fn_t sppf);
-extern void vp8_build_inter_predictors_mbuv(MACROBLOCKD *x);
+extern void vp8_build_inter16x16_predictors_mby(MACROBLOCKD *x,
+                                                unsigned char *dst_y,
+                                                int dst_ystride);
+extern void vp8_build_inter_predictors_b(BLOCKD *d, int pitch,
+                                         vp8_subpix_fn_t sppf);
+
+extern void vp8_build_inter16x16_predictors_mbuv(MACROBLOCKD *x);
+extern void vp8_build_inter4x4_predictors_mbuv(MACROBLOCKD *x);
 
 #endif
diff --git a/media/libvpx/vp8/common/reconintra.c b/media/libvpx/vp8/common/reconintra.c
index 9cf5f6a88d2..c0863eeb1c9 100644
--- a/media/libvpx/vp8/common/reconintra.c
+++ b/media/libvpx/vp8/common/reconintra.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "recon.h"
 #include "reconintra.h"
 #include "vpx_mem/vpx_mem.h"
@@ -17,16 +17,6 @@
 /* For skip_recon_mb(), add vp8_build_intra_predictors_mby_s(MACROBLOCKD *x) and
  * vp8_build_intra_predictors_mbuv_s(MACROBLOCKD *x).
  */
-void vp8_recon_intra_mbuv(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x)
-{
-    int i;
-
-    for (i = 16; i < 24; i += 2)
-    {
-        BLOCKD *b = &x->block[i];
-        RECON_INVOKE(rtcd, recon2)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
-    }
-}
 
 void vp8_build_intra_predictors_mby(MACROBLOCKD *x)
 {
diff --git a/media/libvpx/vp8/common/reconintra4x4.c b/media/libvpx/vp8/common/reconintra4x4.c
index 18c514541b6..64dac5de4fb 100644
--- a/media/libvpx/vp8/common/reconintra4x4.c
+++ b/media/libvpx/vp8/common/reconintra4x4.c
@@ -9,25 +9,22 @@
  */
 
 
-#include "vpx_ports/config.h"
 #include "recon.h"
-#include "vpx_mem/vpx_mem.h"
-#include "reconintra.h"
 
-void vp8_intra4x4_predict(BLOCKD *x,
-                          int b_mode,
-                          unsigned char *predictor)
+void vp8_intra4x4_predict_c(unsigned char *src, int src_stride,
+                            int b_mode,
+                            unsigned char *dst, int dst_stride)
 {
     int i, r, c;
 
-    unsigned char *Above = *(x->base_dst) + x->dst - x->dst_stride;
+    unsigned char *Above = src - src_stride;
     unsigned char Left[4];
     unsigned char top_left = Above[-1];
 
-    Left[0] = (*(x->base_dst))[x->dst - 1];
-    Left[1] = (*(x->base_dst))[x->dst - 1 + x->dst_stride];
-    Left[2] = (*(x->base_dst))[x->dst - 1 + 2 * x->dst_stride];
-    Left[3] = (*(x->base_dst))[x->dst - 1 + 3 * x->dst_stride];
+    Left[0] = src[-1];
+    Left[1] = src[-1 + src_stride];
+    Left[2] = src[-1 + 2 * src_stride];
+    Left[3] = src[-1 + 3 * src_stride];
 
     switch (b_mode)
     {
@@ -47,10 +44,10 @@ void vp8_intra4x4_predict(BLOCKD *x,
         {
             for (c = 0; c < 4; c++)
             {
-                predictor[c] = expected_dc;
+                dst[c] = expected_dc;
             }
 
-            predictor += 16;
+            dst += dst_stride;
         }
     }
     break;
@@ -69,10 +66,10 @@ void vp8_intra4x4_predict(BLOCKD *x,
                 if (pred > 255)
                     pred = 255;
 
-                predictor[c] = pred;
+                dst[c] = pred;
             }
 
-            predictor += 16;
+            dst += dst_stride;
         }
     }
     break;
@@ -91,10 +88,10 @@ void vp8_intra4x4_predict(BLOCKD *x,
             for (c = 0; c < 4; c++)
             {
 
-                predictor[c] = ap[c];
+                dst[c] = ap[c];
             }
 
-            predictor += 16;
+            dst += dst_stride;
         }
 
     }
@@ -114,32 +111,32 @@ void vp8_intra4x4_predict(BLOCKD *x,
         {
             for (c = 0; c < 4; c++)
             {
-                predictor[c] = lp[r];
+                dst[c] = lp[r];
             }
 
-            predictor += 16;
+            dst += dst_stride;
         }
     }
     break;
     case B_LD_PRED:
     {
         unsigned char *ptr = Above;
-        predictor[0 * 16 + 0] = (ptr[0] + ptr[1] * 2 + ptr[2] + 2) >> 2;
-        predictor[0 * 16 + 1] =
-            predictor[1 * 16 + 0] = (ptr[1] + ptr[2] * 2 + ptr[3] + 2) >> 2;
-        predictor[0 * 16 + 2] =
-            predictor[1 * 16 + 1] =
-                predictor[2 * 16 + 0] = (ptr[2] + ptr[3] * 2 + ptr[4] + 2) >> 2;
-        predictor[0 * 16 + 3] =
-            predictor[1 * 16 + 2] =
-                predictor[2 * 16 + 1] =
-                    predictor[3 * 16 + 0] = (ptr[3] + ptr[4] * 2 + ptr[5] + 2) >> 2;
-        predictor[1 * 16 + 3] =
-            predictor[2 * 16 + 2] =
-                predictor[3 * 16 + 1] = (ptr[4] + ptr[5] * 2 + ptr[6] + 2) >> 2;
-        predictor[2 * 16 + 3] =
-            predictor[3 * 16 + 2] = (ptr[5] + ptr[6] * 2 + ptr[7] + 2) >> 2;
-        predictor[3 * 16 + 3] = (ptr[6] + ptr[7] * 2 + ptr[7] + 2) >> 2;
+        dst[0 * dst_stride + 0] = (ptr[0] + ptr[1] * 2 + ptr[2] + 2) >> 2;
+        dst[0 * dst_stride + 1] =
+            dst[1 * dst_stride + 0] = (ptr[1] + ptr[2] * 2 + ptr[3] + 2) >> 2;
+        dst[0 * dst_stride + 2] =
+            dst[1 * dst_stride + 1] =
+                dst[2 * dst_stride + 0] = (ptr[2] + ptr[3] * 2 + ptr[4] + 2) >> 2;
+        dst[0 * dst_stride + 3] =
+            dst[1 * dst_stride + 2] =
+                dst[2 * dst_stride + 1] =
+                    dst[3 * dst_stride + 0] = (ptr[3] + ptr[4] * 2 + ptr[5] + 2) >> 2;
+        dst[1 * dst_stride + 3] =
+            dst[2 * dst_stride + 2] =
+                dst[3 * dst_stride + 1] = (ptr[4] + ptr[5] * 2 + ptr[6] + 2) >> 2;
+        dst[2 * dst_stride + 3] =
+            dst[3 * dst_stride + 2] = (ptr[5] + ptr[6] * 2 + ptr[7] + 2) >> 2;
+        dst[3 * dst_stride + 3] = (ptr[6] + ptr[7] * 2 + ptr[7] + 2) >> 2;
 
     }
     break;
@@ -158,22 +155,22 @@ void vp8_intra4x4_predict(BLOCKD *x,
         pp[7] = Above[2];
         pp[8] = Above[3];
 
-        predictor[3 * 16 + 0] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
-        predictor[3 * 16 + 1] =
-            predictor[2 * 16 + 0] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
-        predictor[3 * 16 + 2] =
-            predictor[2 * 16 + 1] =
-                predictor[1 * 16 + 0] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
-        predictor[3 * 16 + 3] =
-            predictor[2 * 16 + 2] =
-                predictor[1 * 16 + 1] =
-                    predictor[0 * 16 + 0] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
-        predictor[2 * 16 + 3] =
-            predictor[1 * 16 + 2] =
-                predictor[0 * 16 + 1] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
-        predictor[1 * 16 + 3] =
-            predictor[0 * 16 + 2] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
-        predictor[0 * 16 + 3] = (pp[6] + pp[7] * 2 + pp[8] + 2) >> 2;
+        dst[3 * dst_stride + 0] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
+        dst[3 * dst_stride + 1] =
+            dst[2 * dst_stride + 0] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
+        dst[3 * dst_stride + 2] =
+            dst[2 * dst_stride + 1] =
+                dst[1 * dst_stride + 0] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
+        dst[3 * dst_stride + 3] =
+            dst[2 * dst_stride + 2] =
+                dst[1 * dst_stride + 1] =
+                    dst[0 * dst_stride + 0] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
+        dst[2 * dst_stride + 3] =
+            dst[1 * dst_stride + 2] =
+                dst[0 * dst_stride + 1] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
+        dst[1 * dst_stride + 3] =
+            dst[0 * dst_stride + 2] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
+        dst[0 * dst_stride + 3] = (pp[6] + pp[7] * 2 + pp[8] + 2) >> 2;
 
     }
     break;
@@ -193,22 +190,22 @@ void vp8_intra4x4_predict(BLOCKD *x,
         pp[8] = Above[3];
 
 
-        predictor[3 * 16 + 0] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
-        predictor[2 * 16 + 0] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
-        predictor[3 * 16 + 1] =
-            predictor[1 * 16 + 0] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
-        predictor[2 * 16 + 1] =
-            predictor[0 * 16 + 0] = (pp[4] + pp[5] + 1) >> 1;
-        predictor[3 * 16 + 2] =
-            predictor[1 * 16 + 1] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
-        predictor[2 * 16 + 2] =
-            predictor[0 * 16 + 1] = (pp[5] + pp[6] + 1) >> 1;
-        predictor[3 * 16 + 3] =
-            predictor[1 * 16 + 2] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
-        predictor[2 * 16 + 3] =
-            predictor[0 * 16 + 2] = (pp[6] + pp[7] + 1) >> 1;
-        predictor[1 * 16 + 3] = (pp[6] + pp[7] * 2 + pp[8] + 2) >> 2;
-        predictor[0 * 16 + 3] = (pp[7] + pp[8] + 1) >> 1;
+        dst[3 * dst_stride + 0] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
+        dst[2 * dst_stride + 0] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
+        dst[3 * dst_stride + 1] =
+            dst[1 * dst_stride + 0] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
+        dst[2 * dst_stride + 1] =
+            dst[0 * dst_stride + 0] = (pp[4] + pp[5] + 1) >> 1;
+        dst[3 * dst_stride + 2] =
+            dst[1 * dst_stride + 1] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
+        dst[2 * dst_stride + 2] =
+            dst[0 * dst_stride + 1] = (pp[5] + pp[6] + 1) >> 1;
+        dst[3 * dst_stride + 3] =
+            dst[1 * dst_stride + 2] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
+        dst[2 * dst_stride + 3] =
+            dst[0 * dst_stride + 2] = (pp[6] + pp[7] + 1) >> 1;
+        dst[1 * dst_stride + 3] = (pp[6] + pp[7] * 2 + pp[8] + 2) >> 2;
+        dst[0 * dst_stride + 3] = (pp[7] + pp[8] + 1) >> 1;
 
     }
     break;
@@ -217,22 +214,22 @@ void vp8_intra4x4_predict(BLOCKD *x,
 
         unsigned char *pp = Above;
 
-        predictor[0 * 16 + 0] = (pp[0] + pp[1] + 1) >> 1;
-        predictor[1 * 16 + 0] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
-        predictor[2 * 16 + 0] =
-            predictor[0 * 16 + 1] = (pp[1] + pp[2] + 1) >> 1;
-        predictor[1 * 16 + 1] =
-            predictor[3 * 16 + 0] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
-        predictor[2 * 16 + 1] =
-            predictor[0 * 16 + 2] = (pp[2] + pp[3] + 1) >> 1;
-        predictor[3 * 16 + 1] =
-            predictor[1 * 16 + 2] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
-        predictor[0 * 16 + 3] =
-            predictor[2 * 16 + 2] = (pp[3] + pp[4] + 1) >> 1;
-        predictor[1 * 16 + 3] =
-            predictor[3 * 16 + 2] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
-        predictor[2 * 16 + 3] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
-        predictor[3 * 16 + 3] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
+        dst[0 * dst_stride + 0] = (pp[0] + pp[1] + 1) >> 1;
+        dst[1 * dst_stride + 0] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
+        dst[2 * dst_stride + 0] =
+            dst[0 * dst_stride + 1] = (pp[1] + pp[2] + 1) >> 1;
+        dst[1 * dst_stride + 1] =
+            dst[3 * dst_stride + 0] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
+        dst[2 * dst_stride + 1] =
+            dst[0 * dst_stride + 2] = (pp[2] + pp[3] + 1) >> 1;
+        dst[3 * dst_stride + 1] =
+            dst[1 * dst_stride + 2] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
+        dst[0 * dst_stride + 3] =
+            dst[2 * dst_stride + 2] = (pp[3] + pp[4] + 1) >> 1;
+        dst[1 * dst_stride + 3] =
+            dst[3 * dst_stride + 2] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
+        dst[2 * dst_stride + 3] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
+        dst[3 * dst_stride + 3] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
     }
     break;
 
@@ -250,22 +247,22 @@ void vp8_intra4x4_predict(BLOCKD *x,
         pp[8] = Above[3];
 
 
-        predictor[3 * 16 + 0] = (pp[0] + pp[1] + 1) >> 1;
-        predictor[3 * 16 + 1] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
-        predictor[2 * 16 + 0] =
-            predictor[3 * 16 + 2] = (pp[1] + pp[2] + 1) >> 1;
-        predictor[2 * 16 + 1] =
-            predictor[3 * 16 + 3] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
-        predictor[2 * 16 + 2] =
-            predictor[1 * 16 + 0] = (pp[2] + pp[3] + 1) >> 1;
-        predictor[2 * 16 + 3] =
-            predictor[1 * 16 + 1] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
-        predictor[1 * 16 + 2] =
-            predictor[0 * 16 + 0] = (pp[3] + pp[4] + 1) >> 1;
-        predictor[1 * 16 + 3] =
-            predictor[0 * 16 + 1] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
-        predictor[0 * 16 + 2] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
-        predictor[0 * 16 + 3] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
+        dst[3 * dst_stride + 0] = (pp[0] + pp[1] + 1) >> 1;
+        dst[3 * dst_stride + 1] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
+        dst[2 * dst_stride + 0] =
+            dst[3 * dst_stride + 2] = (pp[1] + pp[2] + 1) >> 1;
+        dst[2 * dst_stride + 1] =
+            dst[3 * dst_stride + 3] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
+        dst[2 * dst_stride + 2] =
+            dst[1 * dst_stride + 0] = (pp[2] + pp[3] + 1) >> 1;
+        dst[2 * dst_stride + 3] =
+            dst[1 * dst_stride + 1] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
+        dst[1 * dst_stride + 2] =
+            dst[0 * dst_stride + 0] = (pp[3] + pp[4] + 1) >> 1;
+        dst[1 * dst_stride + 3] =
+            dst[0 * dst_stride + 1] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
+        dst[0 * dst_stride + 2] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
+        dst[0 * dst_stride + 3] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
     }
     break;
 
@@ -273,28 +270,33 @@ void vp8_intra4x4_predict(BLOCKD *x,
     case B_HU_PRED:
     {
         unsigned char *pp = Left;
-        predictor[0 * 16 + 0] = (pp[0] + pp[1] + 1) >> 1;
-        predictor[0 * 16 + 1] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
-        predictor[0 * 16 + 2] =
-            predictor[1 * 16 + 0] = (pp[1] + pp[2] + 1) >> 1;
-        predictor[0 * 16 + 3] =
-            predictor[1 * 16 + 1] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
-        predictor[1 * 16 + 2] =
-            predictor[2 * 16 + 0] = (pp[2] + pp[3] + 1) >> 1;
-        predictor[1 * 16 + 3] =
-            predictor[2 * 16 + 1] = (pp[2] + pp[3] * 2 + pp[3] + 2) >> 2;
-        predictor[2 * 16 + 2] =
-            predictor[2 * 16 + 3] =
-                predictor[3 * 16 + 0] =
-                    predictor[3 * 16 + 1] =
-                        predictor[3 * 16 + 2] =
-                            predictor[3 * 16 + 3] = pp[3];
+        dst[0 * dst_stride + 0] = (pp[0] + pp[1] + 1) >> 1;
+        dst[0 * dst_stride + 1] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
+        dst[0 * dst_stride + 2] =
+            dst[1 * dst_stride + 0] = (pp[1] + pp[2] + 1) >> 1;
+        dst[0 * dst_stride + 3] =
+            dst[1 * dst_stride + 1] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
+        dst[1 * dst_stride + 2] =
+            dst[2 * dst_stride + 0] = (pp[2] + pp[3] + 1) >> 1;
+        dst[1 * dst_stride + 3] =
+            dst[2 * dst_stride + 1] = (pp[2] + pp[3] * 2 + pp[3] + 2) >> 2;
+        dst[2 * dst_stride + 2] =
+            dst[2 * dst_stride + 3] =
+                dst[3 * dst_stride + 0] =
+                    dst[3 * dst_stride + 1] =
+                        dst[3 * dst_stride + 2] =
+                            dst[3 * dst_stride + 3] = pp[3];
     }
     break;
 
 
     }
 }
+
+
+
+
+
 /* copy 4 bytes from the above right down so that the 4x4 prediction modes using pixels above and
  * to the right prediction have filled in pixels to use.
  */
@@ -311,5 +313,3 @@ void vp8_intra_prediction_down_copy(MACROBLOCKD *x)
     *dst_ptr1 = *src_ptr;
     *dst_ptr2 = *src_ptr;
 }
-
-
diff --git a/media/libvpx/vp8/encoder/sad_c.c b/media/libvpx/vp8/common/sad_c.c
similarity index 99%
rename from media/libvpx/vp8/encoder/sad_c.c
rename to media/libvpx/vp8/common/sad_c.c
index c734458a9d2..43a35c346ce 100644
--- a/media/libvpx/vp8/encoder/sad_c.c
+++ b/media/libvpx/vp8/common/sad_c.c
@@ -10,7 +10,7 @@
 
 
 #include <stdlib.h>
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx/vpx_integer.h"
 
 unsigned int vp8_sad16x16_c(
@@ -39,7 +39,7 @@ unsigned int vp8_sad16x16_c(
 }
 
 
-static __inline
+static
 unsigned int sad_mx_n_c(
     const unsigned char *src_ptr,
     int  src_stride,
diff --git a/media/libvpx/vp8/common/systemdependent.h b/media/libvpx/vp8/common/systemdependent.h
index db996987a18..f99c4bb2af5 100644
--- a/media/libvpx/vp8/common/systemdependent.h
+++ b/media/libvpx/vp8/common/systemdependent.h
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #if ARCH_X86 || ARCH_X86_64
 void vpx_reset_mmx_state(void);
 #define vp8_clear_system_state() vpx_reset_mmx_state()
diff --git a/media/libvpx/vp8/common/textblit.c b/media/libvpx/vp8/common/textblit.c
deleted file mode 100644
index 1756100a7e5..00000000000
--- a/media/libvpx/vp8/common/textblit.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <stdlib.h>
-
-
-void vp8_blit_text(const char *msg, unsigned char *address, const int pitch)
-{
-    int letter_bitmap;
-    unsigned char *output_pos = address;
-    int colpos;
-    const int font[] =
-    {
-        0x0, 0x5C00, 0x8020, 0xAFABEA, 0xD7EC0, 0x1111111, 0x1855740, 0x18000,
-        0x45C0, 0x74400, 0x51140, 0x23880, 0xC4000, 0x21080, 0x80000, 0x111110,
-        0xE9D72E, 0x87E40, 0x12AD732, 0xAAD62A, 0x4F94C4, 0x4D6B7, 0x456AA,
-        0x3E8423, 0xAAD6AA, 0xAAD6A2, 0x2800, 0x2A00, 0x8A880, 0x52940, 0x22A20,
-        0x15422, 0x6AD62E, 0x1E4A53E, 0xAAD6BF, 0x8C62E, 0xE8C63F, 0x118D6BF,
-        0x1094BF, 0xCAC62E, 0x1F2109F, 0x118FE31, 0xF8C628, 0x8A89F, 0x108421F,
-        0x1F1105F, 0x1F4105F, 0xE8C62E, 0x2294BF, 0x164C62E, 0x12694BF, 0x8AD6A2,
-        0x10FC21, 0x1F8421F, 0x744107, 0xF8220F, 0x1151151, 0x117041, 0x119D731,
-        0x47E0, 0x1041041, 0xFC400, 0x10440, 0x1084210, 0x820
-    };
-    colpos = 0;
-
-    while (msg[colpos] != 0)
-    {
-        char letter = msg[colpos];
-        int fontcol, fontrow;
-
-        if (letter <= 'Z' && letter >= ' ')
-            letter_bitmap = font[letter-' '];
-        else if (letter <= 'z' && letter >= 'a')
-            letter_bitmap = font[letter-'a'+'A' - ' '];
-        else
-            letter_bitmap = font[0];
-
-        for (fontcol = 6; fontcol >= 0 ; fontcol--)
-            for (fontrow = 0; fontrow < 5; fontrow++)
-                output_pos[fontrow *pitch + fontcol] =
-                    ((letter_bitmap >> (fontcol * 5)) & (1 << fontrow) ? 255 : 0);
-
-        output_pos += 7;
-        colpos++;
-    }
-}
-
-static void plot (const int x, const int y, unsigned char *image, const int pitch)
-{
-    image [x+y*pitch] ^= 255;
-}
-
-/* Bresenham line algorithm */
-void vp8_blit_line(int x0, int x1, int y0, int y1, unsigned char *image, const int pitch)
-{
-    int steep = abs(y1 - y0) > abs(x1 - x0);
-    int deltax, deltay;
-    int error, ystep, y, x;
-
-    if (steep)
-    {
-        int t;
-        t = x0;
-        x0 = y0;
-        y0 = t;
-
-        t = x1;
-        x1 = y1;
-        y1 = t;
-    }
-
-    if (x0 > x1)
-    {
-        int t;
-        t = x0;
-        x0 = x1;
-        x1 = t;
-
-        t = y0;
-        y0 = y1;
-        y1 = t;
-    }
-
-    deltax = x1 - x0;
-    deltay = abs(y1 - y0);
-    error  = deltax / 2;
-
-    y = y0;
-
-    if (y0 < y1)
-        ystep = 1;
-    else
-        ystep = -1;
-
-    if (steep)
-    {
-        for (x = x0; x <= x1; x++)
-        {
-            plot(y,x, image, pitch);
-
-            error = error - deltay;
-            if (error < 0)
-            {
-                y = y + ystep;
-                error = error + deltax;
-            }
-        }
-    }
-    else
-    {
-        for (x = x0; x <= x1; x++)
-        {
-            plot(x,y, image, pitch);
-
-            error = error - deltay;
-            if (error < 0)
-            {
-                y = y + ystep;
-                error = error + deltax;
-            }
-        }
-    }
-}
diff --git a/media/libvpx/vp8/common/threading.h b/media/libvpx/vp8/common/threading.h
index 5927cb165a4..da6347d3c8e 100644
--- a/media/libvpx/vp8/common/threading.h
+++ b/media/libvpx/vp8/common/threading.h
@@ -17,7 +17,6 @@
 /* Thread management macros */
 #ifdef _WIN32
 /* Win32 */
-#define _WIN32_WINNT 0x500 /* WINBASE.H - Enable signal_object_and_wait */
 #include <process.h>
 #include <windows.h>
 #define THREAD_FUNCTION DWORD WINAPI
diff --git a/media/libvpx/vp8/common/type_aliases.h b/media/libvpx/vp8/common/type_aliases.h
deleted file mode 100644
index 22b531a7675..00000000000
--- a/media/libvpx/vp8/common/type_aliases.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/****************************************************************************
-*
-*   Module Title :     type_aliases.h
-*
-*   Description  :     Standard type aliases
-*
-****************************************************************************/
-#ifndef __INC_TYPE_ALIASES_H
-#define __INC_TYPE_ALIASES_H
-
-/****************************************************************************
-* Macros
-****************************************************************************/
-#define EXPORT
-#define IMPORT          extern      /* Used to declare imported data & routines */
-#define PRIVATE         static      /* Used to declare & define module-local data */
-#define LOCAL           static      /* Used to define all persistent routine-local data */
-#define STD_IN_PATH     0           /* Standard input path */
-#define STD_OUT_PATH    1           /* Standard output path */
-#define STD_ERR_PATH    2           /* Standard error path */
-#define STD_IN_FILE     stdin       /* Standard input file pointer */
-#define STD_OUT_FILE    stdout      /* Standard output file pointer */
-#define STD_ERR_FILE    stderr      /* Standard error file pointer */
-#define max_int         0x7FFFFFFF
-
-#define __export
-#define _export
-
-#define CCONV
-
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL    0
-#else
-#define NULL    ((void *)0)
-#endif
-#endif
-
-#ifndef FALSE
-#define FALSE   0
-#endif
-
-#ifndef TRUE
-#define TRUE    1
-#endif
-
-/****************************************************************************
-* Typedefs
-****************************************************************************/
-#ifndef TYPE_INT8
-#define TYPE_INT8
-typedef signed char     INT8;
-#endif
-
-#ifndef TYPE_INT16
-/*#define TYPE_INT16*/
-typedef signed short    INT16;
-#endif
-
-#ifndef TYPE_INT32
-/*#define TYPE_INT32*/
-typedef signed int      INT32;
-#endif
-
-#ifndef TYPE_UINT8
-/*#define TYPE_UINT8*/
-typedef unsigned char   UINT8;
-#endif
-
-#ifndef TYPE_UINT32
-/*#define TYPE_UINT32*/
-typedef unsigned int    UINT32;
-#endif
-
-#ifndef TYPE_UINT16
-/*#define TYPE_UINT16*/
-typedef unsigned short  UINT16;
-#endif
-
-#ifndef TYPE_BOOL
-/*#define TYPE_BOOL*/
-typedef int             BOOL;
-#endif
-
-typedef unsigned char   BOOLEAN;
-
-#ifdef _MSC_VER
-typedef __int64 INT64;
-#else
-
-#ifndef TYPE_INT64
-#ifdef _TMS320C6X
-/* for now we only have 40bits */
-typedef long INT64;
-#else
-typedef long long INT64;
-#endif
-#endif
-
-#endif
-
-/* Floating point */
-typedef  double         FLOAT64;
-typedef  float          FLOAT32;
-
-#endif
diff --git a/media/libvpx/vp8/encoder/variance.h b/media/libvpx/vp8/common/variance.h
similarity index 97%
rename from media/libvpx/vp8/encoder/variance.h
rename to media/libvpx/vp8/common/variance.h
index 5fd6d3ae0ae..6c2a71ccc60 100644
--- a/media/libvpx/vp8/encoder/variance.h
+++ b/media/libvpx/vp8/common/variance.h
@@ -83,7 +83,7 @@
       const unsigned char *ref_ptr, \
       int Refstride, \
       unsigned int *sse \
-    );
+    )
 
 #define prototype_ssimpf(sym) \
     void (sym) \
@@ -97,7 +97,7 @@
         unsigned long *sum_sq_s, \
         unsigned long *sum_sq_r, \
         unsigned long *sum_sxr \
-      );
+      )
 
 #define prototype_getmbss(sym) unsigned int (sym)(const short *)
 
@@ -320,15 +320,15 @@ extern prototype_variance(vp8_variance_mse16x16);
 #endif
 extern prototype_get16x16prederror(vp8_variance_get4x4sse_cs);
 
-#ifndef vp8_ssimpf
-#define vp8_ssimpf ssim_parms_c
-#endif
-extern prototype_ssimpf(vp8_ssimpf)
-
 #ifndef vp8_ssimpf_8x8
-#define vp8_ssimpf_8x8 ssim_parms_8x8_c
+#define vp8_ssimpf_8x8 vp8_ssim_parms_8x8_c
 #endif
-extern prototype_ssimpf(vp8_ssimpf_8x8)
+extern prototype_ssimpf(vp8_ssimpf_8x8);
+
+#ifndef vp8_ssimpf_16x16
+#define vp8_ssimpf_16x16 vp8_ssim_parms_16x16_c
+#endif
+extern prototype_ssimpf(vp8_ssimpf_16x16);
 
 typedef prototype_sad(*vp8_sad_fn_t);
 typedef prototype_sad_multi_same_address(*vp8_sad_multi_fn_t);
@@ -394,7 +394,7 @@ typedef struct
 
 #if CONFIG_INTERNAL_STATS
     vp8_ssimpf_fn_t          ssimpf_8x8;
-    vp8_ssimpf_fn_t          ssimpf;
+    vp8_ssimpf_fn_t          ssimpf_16x16;
 #endif
 
 } vp8_variance_rtcd_vtable_t;
@@ -417,8 +417,10 @@ typedef struct
 
 #if CONFIG_RUNTIME_CPU_DETECT
 #define VARIANCE_INVOKE(ctx,fn) (ctx)->fn
+#define SSIMPF_INVOKE(ctx,fn) (ctx)->ssimpf_##fn
 #else
 #define VARIANCE_INVOKE(ctx,fn) vp8_variance_##fn
+#define SSIMPF_INVOKE(ctx,fn) vp8_ssimpf_##fn
 #endif
 
 #endif
diff --git a/media/libvpx/vp8/encoder/variance_c.c b/media/libvpx/vp8/common/variance_c.c
similarity index 94%
rename from media/libvpx/vp8/encoder/variance_c.c
rename to media/libvpx/vp8/common/variance_c.c
index c7b9c220936..3702cab9a0c 100644
--- a/media/libvpx/vp8/encoder/variance_c.c
+++ b/media/libvpx/vp8/common/variance_c.c
@@ -10,7 +10,7 @@
 
 
 #include "variance.h"
-#include "vp8/common/filter.h"
+#include "filter.h"
 
 
 unsigned int vp8_get_mb_ss_c
@@ -75,7 +75,7 @@ unsigned int vp8_variance16x16_c(
 
     variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 16, &var, &avg);
     *sse = var;
-    return (var - ((avg * avg) >> 8));
+    return (var - ((unsigned int)(avg * avg) >> 8));
 }
 
 unsigned int vp8_variance8x16_c(
@@ -91,7 +91,7 @@ unsigned int vp8_variance8x16_c(
 
     variance(src_ptr, source_stride, ref_ptr, recon_stride, 8, 16, &var, &avg);
     *sse = var;
-    return (var - ((avg * avg) >> 7));
+    return (var - ((unsigned int)(avg * avg) >> 7));
 }
 
 unsigned int vp8_variance16x8_c(
@@ -107,7 +107,7 @@ unsigned int vp8_variance16x8_c(
 
     variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 8, &var, &avg);
     *sse = var;
-    return (var - ((avg * avg) >> 7));
+    return (var - ((unsigned int)(avg * avg) >> 7));
 }
 
 
@@ -124,7 +124,7 @@ unsigned int vp8_variance8x8_c(
 
     variance(src_ptr, source_stride, ref_ptr, recon_stride, 8, 8, &var, &avg);
     *sse = var;
-    return (var - ((avg * avg) >> 6));
+    return (var - ((unsigned int)(avg * avg) >> 6));
 }
 
 unsigned int vp8_variance4x4_c(
@@ -140,7 +140,7 @@ unsigned int vp8_variance4x4_c(
 
     variance(src_ptr, source_stride, ref_ptr, recon_stride, 4, 4, &var, &avg);
     *sse = var;
-    return (var - ((avg * avg) >> 4));
+    return (var - ((unsigned int)(avg * avg) >> 4));
 }
 
 
@@ -456,3 +456,29 @@ unsigned int vp8_sub_pixel_variance8x16_c
 
     return vp8_variance8x16_c(temp2, 8, dst_ptr, dst_pixels_per_line, sse);
 }
+
+unsigned int vp8_get4x4sse_cs_c
+(
+    const unsigned char *src_ptr,
+    int  source_stride,
+    const unsigned char *ref_ptr,
+    int  recon_stride
+)
+{
+    int distortion = 0;
+    int r, c;
+
+    for (r = 0; r < 4; r++)
+    {
+        for (c = 0; c < 4; c++)
+        {
+            int diff = src_ptr[c] - ref_ptr[c];
+            distortion += diff * diff;
+        }
+
+        src_ptr += source_stride;
+        ref_ptr += recon_stride;
+    }
+
+    return distortion;
+}
diff --git a/media/libvpx/vp8/decoder/x86/dequantize_mmx.asm b/media/libvpx/vp8/common/x86/dequantize_mmx.asm
similarity index 50%
rename from media/libvpx/vp8/decoder/x86/dequantize_mmx.asm
rename to media/libvpx/vp8/common/x86/dequantize_mmx.asm
index 0d6133a462e..de9eba89f7b 100644
--- a/media/libvpx/vp8/decoder/x86/dequantize_mmx.asm
+++ b/media/libvpx/vp8/common/x86/dequantize_mmx.asm
@@ -50,14 +50,17 @@ sym(vp8_dequantize_b_impl_mmx):
     ret
 
 
-;void dequant_idct_add_mmx(short *input, short *dq, unsigned char *pred, unsigned char *dest, int pitch, int stride)
+;void dequant_idct_add_mmx(
+;short *input,            0
+;short *dq,               1
+;unsigned char *dest,     2
+;int stride)              3
 global sym(vp8_dequant_idct_add_mmx)
 sym(vp8_dequant_idct_add_mmx):
     push        rbp
     mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 6
+    SHADOW_ARGS_TO_STACK 4
     GET_GOT     rbx
-    push        rsi
     push        rdi
     ; end prolog
 
@@ -77,8 +80,8 @@ sym(vp8_dequant_idct_add_mmx):
         movq        mm3,    [rax+24]
         pmullw      mm3,    [rdx+24]
 
-        mov         rdx,    arg(3) ;dest
-        mov         rsi,    arg(2) ;pred
+        mov         rdx,    arg(2) ;dest
+
         pxor        mm7,    mm7
 
 
@@ -89,8 +92,7 @@ sym(vp8_dequant_idct_add_mmx):
         movq        [rax+24],mm7
 
 
-        movsxd      rax,            dword ptr arg(4) ;pitch
-        movsxd      rdi,            dword ptr arg(5) ;stride
+        movsxd      rdi,            dword ptr arg(3) ;stride
 
         psubw       mm0,            mm2             ; b1= 0-2
         paddw       mm2,            mm2             ;
@@ -211,28 +213,27 @@ sym(vp8_dequant_idct_add_mmx):
 
         pxor        mm7,            mm7
 
-        movd        mm4,            [rsi]
+        movd        mm4,            [rdx]
         punpcklbw   mm4,            mm7
         paddsw      mm0,            mm4
         packuswb    mm0,            mm7
         movd        [rdx],          mm0
 
-        movd        mm4,            [rsi+rax]
+        movd        mm4,            [rdx+rdi]
         punpcklbw   mm4,            mm7
         paddsw      mm1,            mm4
         packuswb    mm1,            mm7
         movd        [rdx+rdi],      mm1
 
-        movd        mm4,            [rsi+2*rax]
+        movd        mm4,            [rdx+2*rdi]
         punpcklbw   mm4,            mm7
         paddsw      mm2,            mm4
         packuswb    mm2,            mm7
         movd        [rdx+rdi*2],    mm2
 
         add         rdx,            rdi
-        add         rsi,            rax
 
-        movd        mm4,            [rsi+2*rax]
+        movd        mm4,            [rdx+2*rdi]
         punpcklbw   mm4,            mm7
         paddsw      mm5,            mm4
         packuswb    mm5,            mm7
@@ -240,215 +241,11 @@ sym(vp8_dequant_idct_add_mmx):
 
     ; begin epilog
     pop rdi
-    pop rsi
     RESTORE_GOT
     UNSHADOW_ARGS
     pop         rbp
     ret
 
-
-;void dequant_dc_idct_add_mmx(short *input, short *dq, unsigned char *pred, unsigned char *dest, int pitch, int stride, int Dc)
-global sym(vp8_dequant_dc_idct_add_mmx)
-sym(vp8_dequant_dc_idct_add_mmx):
-    push        rbp
-    mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 7
-    GET_GOT     rbx
-    push        rsi
-    push        rdi
-    ; end prolog
-
-        mov         rax,    arg(0) ;input
-        mov         rdx,    arg(1) ;dq
-
-        movq        mm0,    [rax   ]
-        pmullw      mm0,    [rdx]
-
-        movq        mm1,    [rax +8]
-        pmullw      mm1,    [rdx +8]
-
-        movq        mm2,    [rax+16]
-        pmullw      mm2,    [rdx+16]
-
-        movq        mm3,    [rax+24]
-        pmullw      mm3,    [rdx+24]
-
-        mov         rdx,    arg(3) ;dest
-        mov         rsi,    arg(2) ;pred
-        pxor        mm7,    mm7
-
-
-        movq        [rax],   mm7
-        movq        [rax+8], mm7
-
-        movq        [rax+16],mm7
-        movq        [rax+24],mm7
-
-        ; move lower word of Dc to lower word of mm0
-        psrlq       mm0,    16
-        movzx       rcx,    word ptr arg(6) ;Dc
-        psllq       mm0,    16
-        movq        mm7,    rcx
-        por         mm0,    mm7
-
-        movsxd      rax,            dword ptr arg(4) ;pitch
-        movsxd      rdi,            dword ptr arg(5) ;stride
-
-        psubw       mm0,            mm2             ; b1= 0-2
-        paddw       mm2,            mm2             ;
-
-        movq        mm5,            mm1
-        paddw       mm2,            mm0             ; a1 =0+2
-
-        pmulhw      mm5,            [GLOBAL(x_s1sqr2)];
-        paddw       mm5,            mm1             ; ip1 * sin(pi/8) * sqrt(2)
-
-        movq        mm7,            mm3             ;
-        pmulhw      mm7,            [GLOBAL(x_c1sqr2less1)];
-
-        paddw       mm7,            mm3             ; ip3 * cos(pi/8) * sqrt(2)
-        psubw       mm7,            mm5             ; c1
-
-        movq        mm5,            mm1
-        movq        mm4,            mm3
-
-        pmulhw      mm5,            [GLOBAL(x_c1sqr2less1)]
-        paddw       mm5,            mm1
-
-        pmulhw      mm3,            [GLOBAL(x_s1sqr2)]
-        paddw       mm3,            mm4
-
-        paddw       mm3,            mm5             ; d1
-        movq        mm6,            mm2             ; a1
-
-        movq        mm4,            mm0             ; b1
-        paddw       mm2,            mm3             ;0
-
-        paddw       mm4,            mm7             ;1
-        psubw       mm0,            mm7             ;2
-
-        psubw       mm6,            mm3             ;3
-
-        movq        mm1,            mm2             ; 03 02 01 00
-        movq        mm3,            mm4             ; 23 22 21 20
-
-        punpcklwd   mm1,            mm0             ; 11 01 10 00
-        punpckhwd   mm2,            mm0             ; 13 03 12 02
-
-        punpcklwd   mm3,            mm6             ; 31 21 30 20
-        punpckhwd   mm4,            mm6             ; 33 23 32 22
-
-        movq        mm0,            mm1             ; 11 01 10 00
-        movq        mm5,            mm2             ; 13 03 12 02
-
-        punpckldq   mm0,            mm3             ; 30 20 10 00
-        punpckhdq   mm1,            mm3             ; 31 21 11 01
-
-        punpckldq   mm2,            mm4             ; 32 22 12 02
-        punpckhdq   mm5,            mm4             ; 33 23 13 03
-
-        movq        mm3,            mm5             ; 33 23 13 03
-
-        psubw       mm0,            mm2             ; b1= 0-2
-        paddw       mm2,            mm2             ;
-
-        movq        mm5,            mm1
-        paddw       mm2,            mm0             ; a1 =0+2
-
-        pmulhw      mm5,            [GLOBAL(x_s1sqr2)];
-        paddw       mm5,            mm1             ; ip1 * sin(pi/8) * sqrt(2)
-
-        movq        mm7,            mm3             ;
-        pmulhw      mm7,            [GLOBAL(x_c1sqr2less1)];
-
-        paddw       mm7,            mm3             ; ip3 * cos(pi/8) * sqrt(2)
-        psubw       mm7,            mm5             ; c1
-
-        movq        mm5,            mm1
-        movq        mm4,            mm3
-
-        pmulhw      mm5,            [GLOBAL(x_c1sqr2less1)]
-        paddw       mm5,            mm1
-
-        pmulhw      mm3,            [GLOBAL(x_s1sqr2)]
-        paddw       mm3,            mm4
-
-        paddw       mm3,            mm5             ; d1
-        paddw       mm0,            [GLOBAL(fours)]
-
-        paddw       mm2,            [GLOBAL(fours)]
-        movq        mm6,            mm2             ; a1
-
-        movq        mm4,            mm0             ; b1
-        paddw       mm2,            mm3             ;0
-
-        paddw       mm4,            mm7             ;1
-        psubw       mm0,            mm7             ;2
-
-        psubw       mm6,            mm3             ;3
-        psraw       mm2,            3
-
-        psraw       mm0,            3
-        psraw       mm4,            3
-
-        psraw       mm6,            3
-
-        movq        mm1,            mm2             ; 03 02 01 00
-        movq        mm3,            mm4             ; 23 22 21 20
-
-        punpcklwd   mm1,            mm0             ; 11 01 10 00
-        punpckhwd   mm2,            mm0             ; 13 03 12 02
-
-        punpcklwd   mm3,            mm6             ; 31 21 30 20
-        punpckhwd   mm4,            mm6             ; 33 23 32 22
-
-        movq        mm0,            mm1             ; 11 01 10 00
-        movq        mm5,            mm2             ; 13 03 12 02
-
-        punpckldq   mm0,            mm3             ; 30 20 10 00
-        punpckhdq   mm1,            mm3             ; 31 21 11 01
-
-        punpckldq   mm2,            mm4             ; 32 22 12 02
-        punpckhdq   mm5,            mm4             ; 33 23 13 03
-
-        pxor        mm7,            mm7
-
-        movd        mm4,            [rsi]
-        punpcklbw   mm4,            mm7
-        paddsw      mm0,            mm4
-        packuswb    mm0,            mm7
-        movd        [rdx],          mm0
-
-        movd        mm4,            [rsi+rax]
-        punpcklbw   mm4,            mm7
-        paddsw      mm1,            mm4
-        packuswb    mm1,            mm7
-        movd        [rdx+rdi],      mm1
-
-        movd        mm4,            [rsi+2*rax]
-        punpcklbw   mm4,            mm7
-        paddsw      mm2,            mm4
-        packuswb    mm2,            mm7
-        movd        [rdx+rdi*2],    mm2
-
-        add         rdx,            rdi
-        add         rsi,            rax
-
-        movd        mm4,            [rsi+2*rax]
-        punpcklbw   mm4,            mm7
-        paddsw      mm5,            mm4
-        packuswb    mm5,            mm7
-        movd        [rdx+rdi*2],    mm5
-
-    ; begin epilog
-    pop rdi
-    pop rsi
-    RESTORE_GOT
-    UNSHADOW_ARGS
-    pop         rbp
-    ret
-
-
 SECTION_RODATA
 align 16
 x_s1sqr2:
diff --git a/media/libvpx/vp8/decoder/x86/dequantize_x86.h b/media/libvpx/vp8/common/x86/dequantize_x86.h
similarity index 76%
rename from media/libvpx/vp8/decoder/x86/dequantize_x86.h
rename to media/libvpx/vp8/common/x86/dequantize_x86.h
index dc68daab356..49bcb7f19cf 100644
--- a/media/libvpx/vp8/decoder/x86/dequantize_x86.h
+++ b/media/libvpx/vp8/common/x86/dequantize_x86.h
@@ -22,8 +22,6 @@
 #if HAVE_MMX
 extern prototype_dequant_block(vp8_dequantize_b_mmx);
 extern prototype_dequant_idct_add(vp8_dequant_idct_add_mmx);
-extern prototype_dequant_dc_idct_add(vp8_dequant_dc_idct_add_mmx);
-extern prototype_dequant_dc_idct_add_y_block(vp8_dequant_dc_idct_add_y_block_mmx);
 extern prototype_dequant_idct_add_y_block(vp8_dequant_idct_add_y_block_mmx);
 extern prototype_dequant_idct_add_uv_block(vp8_dequant_idct_add_uv_block_mmx);
 
@@ -34,12 +32,6 @@ extern prototype_dequant_idct_add_uv_block(vp8_dequant_idct_add_uv_block_mmx);
 #undef  vp8_dequant_idct_add
 #define vp8_dequant_idct_add vp8_dequant_idct_add_mmx
 
-#undef  vp8_dequant_dc_idct_add
-#define vp8_dequant_dc_idct_add vp8_dequant_dc_idct_add_mmx
-
-#undef vp8_dequant_dc_idct_add_y_block
-#define vp8_dequant_dc_idct_add_y_block vp8_dequant_dc_idct_add_y_block_mmx
-
 #undef vp8_dequant_idct_add_y_block
 #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_mmx
 
@@ -50,14 +42,10 @@ extern prototype_dequant_idct_add_uv_block(vp8_dequant_idct_add_uv_block_mmx);
 #endif
 
 #if HAVE_SSE2
-extern prototype_dequant_dc_idct_add_y_block(vp8_dequant_dc_idct_add_y_block_sse2);
 extern prototype_dequant_idct_add_y_block(vp8_dequant_idct_add_y_block_sse2);
 extern prototype_dequant_idct_add_uv_block(vp8_dequant_idct_add_uv_block_sse2);
 
 #if !CONFIG_RUNTIME_CPU_DETECT
-#undef vp8_dequant_dc_idct_add_y_block
-#define vp8_dequant_dc_idct_add_y_block vp8_dequant_dc_idct_add_y_block_sse2
-
 #undef vp8_dequant_idct_add_y_block
 #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_sse2
 
diff --git a/media/libvpx/vp8/common/x86/filter_x86.c b/media/libvpx/vp8/common/x86/filter_x86.c
new file mode 100644
index 00000000000..ebab814f4aa
--- /dev/null
+++ b/media/libvpx/vp8/common/x86/filter_x86.c
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2011 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "vpx_ports/mem.h"
+
+DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_4[8][8]) =
+{
+    { 128, 128, 128, 128,   0,   0,   0,   0 },
+    { 112, 112, 112, 112,  16,  16,  16,  16 },
+    {  96,  96,  96,  96,  32,  32,  32,  32 },
+    {  80,  80,  80,  80,  48,  48,  48,  48 },
+    {  64,  64,  64,  64,  64,  64,  64,  64 },
+    {  48,  48,  48,  48,  80,  80,  80,  80 },
+    {  32,  32,  32,  32,  96,  96,  96,  96 },
+    {  16,  16,  16,  16, 112, 112, 112, 112 }
+};
+
+DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_8[8][16]) =
+{
+    { 128, 128, 128, 128, 128, 128, 128, 128,   0,   0,   0,   0,   0,   0,   0,   0 },
+    { 112, 112, 112, 112, 112, 112, 112, 112,  16,  16,  16,  16,  16,  16,  16,  16 },
+    {  96,  96,  96,  96,  96,  96,  96,  96,  32,  32,  32,  32,  32,  32,  32,  32 },
+    {  80,  80,  80,  80,  80,  80,  80,  80,  48,  48,  48,  48,  48,  48,  48,  48 },
+    {  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64 },
+    {  48,  48,  48,  48,  48,  48,  48,  48,  80,  80,  80,  80,  80,  80,  80,  80 },
+    {  32,  32,  32,  32,  32,  32,  32,  32,  96,  96,  96,  96,  96,  96,  96,  96 },
+    {  16,  16,  16,  16,  16,  16,  16,  16, 112, 112, 112, 112, 112, 112, 112, 112 }
+};
diff --git a/media/libvpx/vp8/common/x86/filter_x86.h b/media/libvpx/vp8/common/x86/filter_x86.h
new file mode 100644
index 00000000000..efcc4dc2aec
--- /dev/null
+++ b/media/libvpx/vp8/common/x86/filter_x86.h
@@ -0,0 +1,19 @@
+/*
+ *  Copyright (c) 2011 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef FILTER_X86_H
+#define FILTER_X86_H
+
+/* x86 assembly specific copy of vp8/common/filter.c:vp8_bilinear_filters with
+ * duplicated values */
+extern const short vp8_bilinear_filters_x86_4[8][8];  /* duplicated 4x */
+extern const short vp8_bilinear_filters_x86_8[8][16]; /* duplicated 8x */
+
+#endif /* FILTER_X86_H */
diff --git a/media/libvpx/vp8/common/x86/idct_blk_mmx.c b/media/libvpx/vp8/common/x86/idct_blk_mmx.c
new file mode 100644
index 00000000000..8ff4837083d
--- /dev/null
+++ b/media/libvpx/vp8/common/x86/idct_blk_mmx.c
@@ -0,0 +1,127 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "vpx_config.h"
+#include "vp8/common/idct.h"
+#include "vp8/common/dequantize.h"
+
+extern void vp8_dequantize_b_impl_mmx(short *sq, short *dq, short *q);
+
+void vp8_dequantize_b_mmx(BLOCKD *d, short *DQC)
+{
+    short *sq = (short *) d->qcoeff;
+    short *dq = (short *) d->dqcoeff;
+
+    vp8_dequantize_b_impl_mmx(sq, dq, DQC);
+}
+
+void vp8_dequant_idct_add_y_block_mmx
+            (short *q, short *dq,
+             unsigned char *dst, int stride, char *eobs)
+{
+    int i;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (eobs[0] > 1)
+            vp8_dequant_idct_add_mmx (q, dq, dst, stride);
+        else if (eobs[0] == 1)
+        {
+            vp8_dc_only_idct_add_mmx (q[0]*dq[0], dst, stride, dst, stride);
+            ((int *)q)[0] = 0;
+        }
+
+        if (eobs[1] > 1)
+            vp8_dequant_idct_add_mmx (q+16, dq, dst+4, stride);
+        else if (eobs[1] == 1)
+        {
+            vp8_dc_only_idct_add_mmx (q[16]*dq[0], dst+4, stride,
+                                      dst+4, stride);
+            ((int *)(q+16))[0] = 0;
+        }
+
+        if (eobs[2] > 1)
+            vp8_dequant_idct_add_mmx (q+32, dq, dst+8, stride);
+        else if (eobs[2] == 1)
+        {
+            vp8_dc_only_idct_add_mmx (q[32]*dq[0], dst+8, stride,
+                                      dst+8, stride);
+            ((int *)(q+32))[0] = 0;
+        }
+
+        if (eobs[3] > 1)
+            vp8_dequant_idct_add_mmx (q+48, dq, dst+12, stride);
+        else if (eobs[3] == 1)
+        {
+            vp8_dc_only_idct_add_mmx (q[48]*dq[0], dst+12, stride,
+                                      dst+12, stride);
+            ((int *)(q+48))[0] = 0;
+        }
+
+        q    += 64;
+        dst  += 4*stride;
+        eobs += 4;
+    }
+}
+
+void vp8_dequant_idct_add_uv_block_mmx
+            (short *q, short *dq,
+             unsigned char *dstu, unsigned char *dstv, int stride, char *eobs)
+{
+    int i;
+
+    for (i = 0; i < 2; i++)
+    {
+        if (eobs[0] > 1)
+            vp8_dequant_idct_add_mmx (q, dq, dstu, stride);
+        else if (eobs[0] == 1)
+        {
+            vp8_dc_only_idct_add_mmx (q[0]*dq[0], dstu, stride, dstu, stride);
+            ((int *)q)[0] = 0;
+        }
+
+        if (eobs[1] > 1)
+            vp8_dequant_idct_add_mmx (q+16, dq, dstu+4, stride);
+        else if (eobs[1] == 1)
+        {
+            vp8_dc_only_idct_add_mmx (q[16]*dq[0], dstu+4, stride,
+                                      dstu+4, stride);
+            ((int *)(q+16))[0] = 0;
+        }
+
+        q    += 32;
+        dstu += 4*stride;
+        eobs += 2;
+    }
+
+    for (i = 0; i < 2; i++)
+    {
+        if (eobs[0] > 1)
+            vp8_dequant_idct_add_mmx (q, dq, dstv, stride);
+        else if (eobs[0] == 1)
+        {
+            vp8_dc_only_idct_add_mmx (q[0]*dq[0], dstv, stride, dstv, stride);
+            ((int *)q)[0] = 0;
+        }
+
+        if (eobs[1] > 1)
+            vp8_dequant_idct_add_mmx (q+16, dq, dstv+4, stride);
+        else if (eobs[1] == 1)
+        {
+            vp8_dc_only_idct_add_mmx (q[16]*dq[0], dstv+4, stride,
+                                      dstv+4, stride);
+            ((int *)(q+16))[0] = 0;
+        }
+
+        q    += 32;
+        dstv += 4*stride;
+        eobs += 2;
+    }
+}
diff --git a/media/libvpx/vp8/common/x86/idct_blk_sse2.c b/media/libvpx/vp8/common/x86/idct_blk_sse2.c
new file mode 100644
index 00000000000..44e440c0c5f
--- /dev/null
+++ b/media/libvpx/vp8/common/x86/idct_blk_sse2.c
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "vpx_config.h"
+#include "vp8/common/idct.h"
+#include "vp8/common/dequantize.h"
+
+void vp8_idct_dequant_0_2x_sse2
+            (short *q, short *dq ,
+             unsigned char *dst, int dst_stride);
+void vp8_idct_dequant_full_2x_sse2
+            (short *q, short *dq ,
+             unsigned char *dst, int dst_stride);
+
+void vp8_dequant_idct_add_y_block_sse2
+            (short *q, short *dq,
+             unsigned char *dst, int stride, char *eobs)
+{
+    int i;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (((short *)(eobs))[0])
+        {
+            if (((short *)(eobs))[0] & 0xfefe)
+                vp8_idct_dequant_full_2x_sse2 (q, dq, dst, stride);
+            else
+                vp8_idct_dequant_0_2x_sse2 (q, dq, dst, stride);
+        }
+        if (((short *)(eobs))[1])
+        {
+            if (((short *)(eobs))[1] & 0xfefe)
+                vp8_idct_dequant_full_2x_sse2 (q+32, dq, dst+8, stride);
+            else
+                vp8_idct_dequant_0_2x_sse2 (q+32, dq, dst+8, stride);
+        }
+        q    += 64;
+        dst  += stride*4;
+        eobs += 4;
+    }
+}
+
+void vp8_dequant_idct_add_uv_block_sse2
+            (short *q, short *dq,
+             unsigned char *dstu, unsigned char *dstv, int stride, char *eobs)
+{
+    if (((short *)(eobs))[0])
+    {
+        if (((short *)(eobs))[0] & 0xfefe)
+            vp8_idct_dequant_full_2x_sse2 (q, dq, dstu, stride);
+        else
+            vp8_idct_dequant_0_2x_sse2 (q, dq, dstu, stride);
+    }
+    q    += 32;
+    dstu += stride*4;
+
+    if (((short *)(eobs))[1])
+    {
+        if (((short *)(eobs))[1] & 0xfefe)
+            vp8_idct_dequant_full_2x_sse2 (q, dq, dstu, stride);
+        else
+            vp8_idct_dequant_0_2x_sse2 (q, dq, dstu, stride);
+    }
+    q    += 32;
+
+    if (((short *)(eobs))[2])
+    {
+        if (((short *)(eobs))[2] & 0xfefe)
+            vp8_idct_dequant_full_2x_sse2 (q, dq, dstv, stride);
+        else
+            vp8_idct_dequant_0_2x_sse2 (q, dq, dstv, stride);
+    }
+    q    += 32;
+    dstv += stride*4;
+
+    if (((short *)(eobs))[3])
+    {
+      if (((short *)(eobs))[3] & 0xfefe)
+          vp8_idct_dequant_full_2x_sse2 (q, dq, dstv, stride);
+      else
+          vp8_idct_dequant_0_2x_sse2 (q, dq, dstv, stride);
+    }
+}
diff --git a/media/libvpx/vp8/common/x86/idct_x86.h b/media/libvpx/vp8/common/x86/idct_x86.h
index f6e568cdcdd..06e3ea4b55b 100644
--- a/media/libvpx/vp8/common/x86/idct_x86.h
+++ b/media/libvpx/vp8/common/x86/idct_x86.h
@@ -20,17 +20,12 @@
  */
 
 #if HAVE_MMX
-extern prototype_idct(vp8_short_idct4x4llm_1_mmx);
 extern prototype_idct(vp8_short_idct4x4llm_mmx);
 extern prototype_idct_scalar_add(vp8_dc_only_idct_add_mmx);
 
 extern prototype_second_order(vp8_short_inv_walsh4x4_mmx);
-extern prototype_second_order(vp8_short_inv_walsh4x4_1_mmx);
 
 #if !CONFIG_RUNTIME_CPU_DETECT
-#undef  vp8_idct_idct1
-#define vp8_idct_idct1 vp8_short_idct4x4llm_1_mmx
-
 #undef  vp8_idct_idct16
 #define vp8_idct_idct16 vp8_short_idct4x4llm_mmx
 
@@ -40,9 +35,6 @@ extern prototype_second_order(vp8_short_inv_walsh4x4_1_mmx);
 #undef vp8_idct_iwalsh16
 #define vp8_idct_iwalsh16 vp8_short_inv_walsh4x4_mmx
 
-#undef vp8_idct_iwalsh1
-#define vp8_idct_iwalsh1 vp8_short_inv_walsh4x4_1_mmx
-
 #endif
 #endif
 
diff --git a/media/libvpx/vp8/common/x86/idctllm_mmx.asm b/media/libvpx/vp8/common/x86/idctllm_mmx.asm
index 465626b8fa3..0c9c205c2c3 100644
--- a/media/libvpx/vp8/common/x86/idctllm_mmx.asm
+++ b/media/libvpx/vp8/common/x86/idctllm_mmx.asm
@@ -32,197 +32,10 @@
 ; **************************************************************************/
 
 
-;void short_idct4x4llm_mmx(short *input, short *output, int pitch)
+;void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred,
+;int pitch, unsigned char *dest,int stride)
 global sym(vp8_short_idct4x4llm_mmx)
 sym(vp8_short_idct4x4llm_mmx):
-    push        rbp
-    mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 3
-    GET_GOT     rbx
-    ; end prolog
-
-        mov         rax,            arg(0) ;input
-        mov         rdx,            arg(1) ;output
-
-        movq        mm0,            [rax   ]
-        movq        mm1,            [rax+ 8]
-
-        movq        mm2,            [rax+16]
-        movq        mm3,            [rax+24]
-
-        movsxd      rax,            dword ptr arg(2) ;pitch
-
-        psubw       mm0,            mm2             ; b1= 0-2
-        paddw       mm2,            mm2             ;
-
-        movq        mm5,            mm1
-        paddw       mm2,            mm0             ; a1 =0+2
-
-        pmulhw      mm5,            [GLOBAL(x_s1sqr2)]       ;
-        paddw       mm5,            mm1             ; ip1 * sin(pi/8) * sqrt(2)
-
-        movq        mm7,            mm3             ;
-        pmulhw      mm7,            [GLOBAL(x_c1sqr2less1)]   ;
-
-        paddw       mm7,            mm3             ; ip3 * cos(pi/8) * sqrt(2)
-        psubw       mm7,            mm5             ; c1
-
-        movq        mm5,            mm1
-        movq        mm4,            mm3
-
-        pmulhw      mm5,            [GLOBAL(x_c1sqr2less1)]
-        paddw       mm5,            mm1
-
-        pmulhw      mm3,            [GLOBAL(x_s1sqr2)]
-        paddw       mm3,            mm4
-
-        paddw       mm3,            mm5             ; d1
-        movq        mm6,            mm2             ; a1
-
-        movq        mm4,            mm0             ; b1
-        paddw       mm2,            mm3             ;0
-
-        paddw       mm4,            mm7             ;1
-        psubw       mm0,            mm7             ;2
-
-        psubw       mm6,            mm3             ;3
-
-        movq        mm1,            mm2             ; 03 02 01 00
-        movq        mm3,            mm4             ; 23 22 21 20
-
-        punpcklwd   mm1,            mm0             ; 11 01 10 00
-        punpckhwd   mm2,            mm0             ; 13 03 12 02
-
-        punpcklwd   mm3,            mm6             ; 31 21 30 20
-        punpckhwd   mm4,            mm6             ; 33 23 32 22
-
-        movq        mm0,            mm1             ; 11 01 10 00
-        movq        mm5,            mm2             ; 13 03 12 02
-
-        punpckldq   mm0,            mm3             ; 30 20 10 00
-        punpckhdq   mm1,            mm3             ; 31 21 11 01
-
-        punpckldq   mm2,            mm4             ; 32 22 12 02
-        punpckhdq   mm5,            mm4             ; 33 23 13 03
-
-        movq        mm3,            mm5             ; 33 23 13 03
-
-        psubw       mm0,            mm2             ; b1= 0-2
-        paddw       mm2,            mm2             ;
-
-        movq        mm5,            mm1
-        paddw       mm2,            mm0             ; a1 =0+2
-
-        pmulhw      mm5,            [GLOBAL(x_s1sqr2)]        ;
-        paddw       mm5,            mm1             ; ip1 * sin(pi/8) * sqrt(2)
-
-        movq        mm7,            mm3             ;
-        pmulhw      mm7,            [GLOBAL(x_c1sqr2less1)]   ;
-
-        paddw       mm7,            mm3             ; ip3 * cos(pi/8) * sqrt(2)
-        psubw       mm7,            mm5             ; c1
-
-        movq        mm5,            mm1
-        movq        mm4,            mm3
-
-        pmulhw      mm5,            [GLOBAL(x_c1sqr2less1)]
-        paddw       mm5,            mm1
-
-        pmulhw      mm3,            [GLOBAL(x_s1sqr2)]
-        paddw       mm3,            mm4
-
-        paddw       mm3,            mm5             ; d1
-        paddw       mm0,            [GLOBAL(fours)]
-
-        paddw       mm2,            [GLOBAL(fours)]
-        movq        mm6,            mm2             ; a1
-
-        movq        mm4,            mm0             ; b1
-        paddw       mm2,            mm3             ;0
-
-        paddw       mm4,            mm7             ;1
-        psubw       mm0,            mm7             ;2
-
-        psubw       mm6,            mm3             ;3
-        psraw       mm2,            3
-
-        psraw       mm0,            3
-        psraw       mm4,            3
-
-        psraw       mm6,            3
-
-        movq        mm1,            mm2             ; 03 02 01 00
-        movq        mm3,            mm4             ; 23 22 21 20
-
-        punpcklwd   mm1,            mm0             ; 11 01 10 00
-        punpckhwd   mm2,            mm0             ; 13 03 12 02
-
-        punpcklwd   mm3,            mm6             ; 31 21 30 20
-        punpckhwd   mm4,            mm6             ; 33 23 32 22
-
-        movq        mm0,            mm1             ; 11 01 10 00
-        movq        mm5,            mm2             ; 13 03 12 02
-
-        punpckldq   mm0,            mm3             ; 30 20 10 00
-        punpckhdq   mm1,            mm3             ; 31 21 11 01
-
-        punpckldq   mm2,            mm4             ; 32 22 12 02
-        punpckhdq   mm5,            mm4             ; 33 23 13 03
-
-        movq        [rdx],          mm0
-
-        movq        [rdx+rax],      mm1
-        movq        [rdx+rax*2],    mm2
-
-        add         rdx,            rax
-        movq        [rdx+rax*2],    mm5
-
-    ; begin epilog
-    RESTORE_GOT
-    UNSHADOW_ARGS
-    pop         rbp
-    ret
-
-
-;void short_idct4x4llm_1_mmx(short *input, short *output, int pitch)
-global sym(vp8_short_idct4x4llm_1_mmx)
-sym(vp8_short_idct4x4llm_1_mmx):
-    push        rbp
-    mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 3
-    GET_GOT     rbx
-    ; end prolog
-
-        mov         rax,            arg(0) ;input
-        movd        mm0,            [rax]
-
-        paddw       mm0,            [GLOBAL(fours)]
-        mov         rdx,            arg(1) ;output
-
-        psraw       mm0,            3
-        movsxd      rax,            dword ptr arg(2) ;pitch
-
-        punpcklwd   mm0,            mm0
-        punpckldq   mm0,            mm0
-
-        movq        [rdx],          mm0
-        movq        [rdx+rax],      mm0
-
-        movq        [rdx+rax*2],    mm0
-        add         rdx,            rax
-
-        movq        [rdx+rax*2],    mm0
-
-
-    ; begin epilog
-    RESTORE_GOT
-    UNSHADOW_ARGS
-    pop         rbp
-    ret
-
-;void vp8_dc_only_idct_add_mmx(short input_dc, unsigned char *pred_ptr, unsigned char *dst_ptr, int pitch, int stride)
-global sym(vp8_dc_only_idct_add_mmx)
-sym(vp8_dc_only_idct_add_mmx):
     push        rbp
     mov         rbp, rsp
     SHADOW_ARGS_TO_STACK 5
@@ -231,46 +44,171 @@ sym(vp8_dc_only_idct_add_mmx):
     push        rdi
     ; end prolog
 
-        mov         rsi,            arg(1) ;s -- prediction
-        mov         rdi,            arg(2) ;d -- destination
-        movsxd      rax,            dword ptr arg(4) ;stride
-        movsxd      rdx,            dword ptr arg(3) ;pitch
-        pxor        mm0,            mm0
+    mov         rax,    arg(0)              ;input
+    mov         rsi,    arg(1)              ;pred
 
-        movd        mm5,            arg(0) ;input_dc
+    movq        mm0,    [rax   ]
+    movq        mm1,    [rax+ 8]
+    movq        mm2,    [rax+16]
+    movq        mm3,    [rax+24]
 
-        paddw       mm5,            [GLOBAL(fours)]
+%if 0
+    pxor        mm7,    mm7
+    movq        [rax],   mm7
+    movq        [rax+8], mm7
+    movq        [rax+16],mm7
+    movq        [rax+24],mm7
+%endif
+    movsxd      rax,    dword ptr arg(2)    ;pitch
+    mov         rdx,    arg(3)              ;dest
+    movsxd      rdi,    dword ptr arg(4)    ;stride
 
-        psraw       mm5,            3
 
-        punpcklwd   mm5,            mm5
-        punpckldq   mm5,            mm5
+    psubw       mm0,            mm2             ; b1= 0-2
+    paddw       mm2,            mm2             ;
 
-        movd        mm1,            [rsi]
-        punpcklbw   mm1,            mm0
-        paddsw      mm1,            mm5
-        packuswb    mm1,            mm0              ; pack and unpack to saturate
-        movd        [rdi],          mm1
+    movq        mm5,            mm1
+    paddw       mm2,            mm0             ; a1 =0+2
 
-        movd        mm2,            [rsi+rdx]
-        punpcklbw   mm2,            mm0
-        paddsw      mm2,            mm5
-        packuswb    mm2,            mm0              ; pack and unpack to saturate
-        movd        [rdi+rax],      mm2
+    pmulhw      mm5,            [GLOBAL(x_s1sqr2)];
+    paddw       mm5,            mm1             ; ip1 * sin(pi/8) * sqrt(2)
 
-        movd        mm3,            [rsi+2*rdx]
-        punpcklbw   mm3,            mm0
-        paddsw      mm3,            mm5
-        packuswb    mm3,            mm0              ; pack and unpack to saturate
-        movd        [rdi+2*rax],    mm3
+    movq        mm7,            mm3             ;
+    pmulhw      mm7,            [GLOBAL(x_c1sqr2less1)];
 
-        add         rdi,            rax
-        add         rsi,            rdx
-        movd        mm4,            [rsi+2*rdx]
-        punpcklbw   mm4,            mm0
-        paddsw      mm4,            mm5
-        packuswb    mm4,            mm0              ; pack and unpack to saturate
-        movd        [rdi+2*rax],    mm4
+    paddw       mm7,            mm3             ; ip3 * cos(pi/8) * sqrt(2)
+    psubw       mm7,            mm5             ; c1
+
+    movq        mm5,            mm1
+    movq        mm4,            mm3
+
+    pmulhw      mm5,            [GLOBAL(x_c1sqr2less1)]
+    paddw       mm5,            mm1
+
+    pmulhw      mm3,            [GLOBAL(x_s1sqr2)]
+    paddw       mm3,            mm4
+
+    paddw       mm3,            mm5             ; d1
+    movq        mm6,            mm2             ; a1
+
+    movq        mm4,            mm0             ; b1
+    paddw       mm2,            mm3             ;0
+
+    paddw       mm4,            mm7             ;1
+    psubw       mm0,            mm7             ;2
+
+    psubw       mm6,            mm3             ;3
+
+    movq        mm1,            mm2             ; 03 02 01 00
+    movq        mm3,            mm4             ; 23 22 21 20
+
+    punpcklwd   mm1,            mm0             ; 11 01 10 00
+    punpckhwd   mm2,            mm0             ; 13 03 12 02
+
+    punpcklwd   mm3,            mm6             ; 31 21 30 20
+    punpckhwd   mm4,            mm6             ; 33 23 32 22
+
+    movq        mm0,            mm1             ; 11 01 10 00
+    movq        mm5,            mm2             ; 13 03 12 02
+
+    punpckldq   mm0,            mm3             ; 30 20 10 00
+    punpckhdq   mm1,            mm3             ; 31 21 11 01
+
+    punpckldq   mm2,            mm4             ; 32 22 12 02
+    punpckhdq   mm5,            mm4             ; 33 23 13 03
+
+    movq        mm3,            mm5             ; 33 23 13 03
+
+    psubw       mm0,            mm2             ; b1= 0-2
+    paddw       mm2,            mm2             ;
+
+    movq        mm5,            mm1
+    paddw       mm2,            mm0             ; a1 =0+2
+
+    pmulhw      mm5,            [GLOBAL(x_s1sqr2)];
+    paddw       mm5,            mm1             ; ip1 * sin(pi/8) * sqrt(2)
+
+    movq        mm7,            mm3             ;
+    pmulhw      mm7,            [GLOBAL(x_c1sqr2less1)];
+
+    paddw       mm7,            mm3             ; ip3 * cos(pi/8) * sqrt(2)
+    psubw       mm7,            mm5             ; c1
+
+    movq        mm5,            mm1
+    movq        mm4,            mm3
+
+    pmulhw      mm5,            [GLOBAL(x_c1sqr2less1)]
+    paddw       mm5,            mm1
+
+    pmulhw      mm3,            [GLOBAL(x_s1sqr2)]
+    paddw       mm3,            mm4
+
+    paddw       mm3,            mm5             ; d1
+    paddw       mm0,            [GLOBAL(fours)]
+
+    paddw       mm2,            [GLOBAL(fours)]
+    movq        mm6,            mm2             ; a1
+
+    movq        mm4,            mm0             ; b1
+    paddw       mm2,            mm3             ;0
+
+    paddw       mm4,            mm7             ;1
+    psubw       mm0,            mm7             ;2
+
+    psubw       mm6,            mm3             ;3
+    psraw       mm2,            3
+
+    psraw       mm0,            3
+    psraw       mm4,            3
+
+    psraw       mm6,            3
+
+    movq        mm1,            mm2             ; 03 02 01 00
+    movq        mm3,            mm4             ; 23 22 21 20
+
+    punpcklwd   mm1,            mm0             ; 11 01 10 00
+    punpckhwd   mm2,            mm0             ; 13 03 12 02
+
+    punpcklwd   mm3,            mm6             ; 31 21 30 20
+    punpckhwd   mm4,            mm6             ; 33 23 32 22
+
+    movq        mm0,            mm1             ; 11 01 10 00
+    movq        mm5,            mm2             ; 13 03 12 02
+
+    punpckldq   mm0,            mm3             ; 30 20 10 00
+    punpckhdq   mm1,            mm3             ; 31 21 11 01
+
+    punpckldq   mm2,            mm4             ; 32 22 12 02
+    punpckhdq   mm5,            mm4             ; 33 23 13 03
+
+    pxor        mm7,            mm7
+
+    movd        mm4,            [rsi]
+    punpcklbw   mm4,            mm7
+    paddsw      mm0,            mm4
+    packuswb    mm0,            mm7
+    movd        [rdx],          mm0
+
+    movd        mm4,            [rsi+rax]
+    punpcklbw   mm4,            mm7
+    paddsw      mm1,            mm4
+    packuswb    mm1,            mm7
+    movd        [rdx+rdi],      mm1
+
+    movd        mm4,            [rsi+2*rax]
+    punpcklbw   mm4,            mm7
+    paddsw      mm2,            mm4
+    packuswb    mm2,            mm7
+    movd        [rdx+rdi*2],    mm2
+
+    add         rdx,            rdi
+    add         rsi,            rax
+
+    movd        mm4,            [rsi+2*rax]
+    punpcklbw   mm4,            mm7
+    paddsw      mm5,            mm4
+    packuswb    mm5,            mm7
+    movd        [rdx+rdi*2],    mm5
 
     ; begin epilog
     pop rdi
@@ -280,6 +218,71 @@ sym(vp8_dc_only_idct_add_mmx):
     pop         rbp
     ret
 
+;void vp8_dc_only_idct_add_mmx(
+;short input_dc,
+;unsigned char *pred_ptr,
+;int pred_stride,
+;unsigned char *dst_ptr,
+;int stride)
+global sym(vp8_dc_only_idct_add_mmx)
+sym(vp8_dc_only_idct_add_mmx):
+    push        rbp
+    mov         rbp, rsp
+    SHADOW_ARGS_TO_STACK 5
+    GET_GOT     rbx
+    ; end prolog
+
+        movd        mm5,            arg(0) ;input_dc
+        mov         rax,            arg(1) ;pred_ptr
+        movsxd      rdx,            dword ptr arg(2) ;pred_stride
+
+        pxor        mm0,            mm0
+
+        paddw       mm5,            [GLOBAL(fours)]
+        lea         rcx,            [rdx + rdx*2]
+
+        psraw       mm5,            3
+
+        punpcklwd   mm5,            mm5
+
+        punpckldq   mm5,            mm5
+
+        movd        mm1,            [rax]
+        movd        mm2,            [rax+rdx]
+        movd        mm3,            [rax+2*rdx]
+        movd        mm4,            [rax+rcx]
+
+        mov         rax,            arg(3) ;d -- destination
+        movsxd      rdx,            dword ptr arg(4) ;dst_stride
+
+        punpcklbw   mm1,            mm0
+        paddsw      mm1,            mm5
+        packuswb    mm1,            mm0              ; pack and unpack to saturate
+        lea         rcx,            [rdx + rdx*2]
+
+        punpcklbw   mm2,            mm0
+        paddsw      mm2,            mm5
+        packuswb    mm2,            mm0              ; pack and unpack to saturate
+
+        punpcklbw   mm3,            mm0
+        paddsw      mm3,            mm5
+        packuswb    mm3,            mm0              ; pack and unpack to saturate
+
+        punpcklbw   mm4,            mm0
+        paddsw      mm4,            mm5
+        packuswb    mm4,            mm0              ; pack and unpack to saturate
+
+        movd        [rax],          mm1
+        movd        [rax+rdx],      mm2
+        movd        [rax+2*rdx],    mm3
+        movd        [rax+rcx],      mm4
+
+    ; begin epilog
+    RESTORE_GOT
+    UNSHADOW_ARGS
+    pop         rbp
+    ret
+
 SECTION_RODATA
 align 16
 x_s1sqr2:
diff --git a/media/libvpx/vp8/common/x86/idctllm_sse2.asm b/media/libvpx/vp8/common/x86/idctllm_sse2.asm
index 34a7e18aea7..abeb0b682e7 100644
--- a/media/libvpx/vp8/common/x86/idctllm_sse2.asm
+++ b/media/libvpx/vp8/common/x86/idctllm_sse2.asm
@@ -11,21 +11,19 @@
 
 %include "vpx_ports/x86_abi_support.asm"
 
-;void idct_dequant_0_2x_sse2
+;void vp8_idct_dequant_0_2x_sse2
 ; (
 ;   short *qcoeff       - 0
 ;   short *dequant      - 1
-;   unsigned char *pre  - 2
-;   unsigned char *dst  - 3
-;   int dst_stride      - 4
-;   int blk_stride      - 5
+;   unsigned char *dst  - 2
+;   int dst_stride      - 3
 ; )
 
-global sym(idct_dequant_0_2x_sse2)
-sym(idct_dequant_0_2x_sse2):
+global sym(vp8_idct_dequant_0_2x_sse2)
+sym(vp8_idct_dequant_0_2x_sse2):
     push        rbp
     mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 6
+    SHADOW_ARGS_TO_STACK 4
     GET_GOT     rbx
     ; end prolog
 
@@ -47,19 +45,20 @@ sym(idct_dequant_0_2x_sse2):
         movd        [rax],          xmm5
         movd        [rax+32],       xmm5
 ;pshufb
+        mov         rax,            arg(2) ; dst
+        movsxd      rdx,            dword ptr arg(3) ; dst_stride
+
         pshuflw     xmm4,           xmm4,       00000000b
         pshufhw     xmm4,           xmm4,       00000000b
 
-        mov         rax,            arg(2) ; pre
+        lea         rcx,            [rdx + rdx*2]
         paddw       xmm4,           [GLOBAL(fours)]
 
-        movsxd      rcx,            dword ptr arg(5) ; blk_stride
         psraw       xmm4,           3
 
         movq        xmm0,           [rax]
-        movq        xmm1,           [rax+rcx]
-        movq        xmm2,           [rax+2*rcx]
-        lea         rcx,            [3*rcx]
+        movq        xmm1,           [rax+rdx]
+        movq        xmm2,           [rax+2*rdx]
         movq        xmm3,           [rax+rcx]
 
         punpcklbw   xmm0,           xmm5
@@ -67,8 +66,6 @@ sym(idct_dequant_0_2x_sse2):
         punpcklbw   xmm2,           xmm5
         punpcklbw   xmm3,           xmm5
 
-        mov         rax,            arg(3) ; dst
-        movsxd      rdx,            dword ptr arg(4) ; dst_stride
 
     ; Add to predict buffer
         paddw       xmm0,           xmm4
@@ -97,11 +94,18 @@ sym(idct_dequant_0_2x_sse2):
     pop         rbp
     ret
 
-global sym(idct_dequant_full_2x_sse2)
-sym(idct_dequant_full_2x_sse2):
+;void vp8_idct_dequant_full_2x_sse2
+; (
+;   short *qcoeff       - 0
+;   short *dequant      - 1
+;   unsigned char *dst  - 2
+;   int dst_stride      - 3
+; )
+global sym(vp8_idct_dequant_full_2x_sse2)
+sym(vp8_idct_dequant_full_2x_sse2):
     push        rbp
     mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 7
+    SHADOW_ARGS_TO_STACK 4
     SAVE_XMM 7
     GET_GOT     rbx
     push        rsi
@@ -111,14 +115,13 @@ sym(idct_dequant_full_2x_sse2):
     ; special case when 2 blocks have 0 or 1 coeffs
     ; dc is set as first coeff, so no need to load qcoeff
         mov         rax,            arg(0) ; qcoeff
-        mov         rsi,            arg(2) ; pre
-        mov         rdi,            arg(3) ; dst
-        movsxd      rcx,            dword ptr arg(5) ; blk_stride
+        mov         rdx,            arg(1)  ; dequant
+        mov         rdi,            arg(2) ; dst
+
 
     ; Zero out xmm7, for use unpacking
         pxor        xmm7,           xmm7
 
-        mov         rdx,            arg(1)  ; dequant
 
     ; note the transpose of xmm1 and xmm2, necessary for shuffle
     ;   to spit out sensicle data
@@ -138,6 +141,7 @@ sym(idct_dequant_full_2x_sse2):
         pmullw      xmm2,           [rdx+16]
         pmullw      xmm1,           [rdx]
         pmullw      xmm3,           [rdx+16]
+        movsxd      rdx,            dword ptr arg(3) ; dst_stride
 
     ; repack so block 0 row x and block 1 row x are together
         movdqa      xmm4,           xmm0
@@ -162,6 +166,7 @@ sym(idct_dequant_full_2x_sse2):
         paddw       xmm2,           xmm0        ; a1 = 0+2
 
         pmulhw      xmm5,           [GLOBAL(x_s1sqr2)]
+        lea         rcx,            [rdx + rdx*2]   ;dst_stride * 3
         paddw       xmm5,           xmm1        ; ip1 * sin(pi/8) * sqrt(2)
 
         movdqa      xmm7,           xmm3
@@ -304,8 +309,8 @@ sym(idct_dequant_full_2x_sse2):
         pxor        xmm7,           xmm7
 
     ; Load up predict blocks
-        movq        xmm4,           [rsi]
-        movq        xmm5,           [rsi+rcx]
+        movq        xmm4,           [rdi]
+        movq        xmm5,           [rdi+rdx]
 
         punpcklbw   xmm4,           xmm7
         punpcklbw   xmm5,           xmm7
@@ -313,9 +318,8 @@ sym(idct_dequant_full_2x_sse2):
         paddw       xmm0,           xmm4
         paddw       xmm1,           xmm5
 
-        movq        xmm4,           [rsi+2*rcx]
-        lea         rcx,            [3*rcx]
-        movq        xmm5,           [rsi+rcx]
+        movq        xmm4,           [rdi+2*rdx]
+        movq        xmm5,           [rdi+rcx]
 
         punpcklbw   xmm4,           xmm7
         punpcklbw   xmm5,           xmm7
@@ -331,18 +335,11 @@ sym(idct_dequant_full_2x_sse2):
         packuswb    xmm2,           xmm7
         packuswb    xmm3,           xmm7
 
-    ; Load destination stride before writing out,
-    ;   doesn't need to persist
-        movsxd      rdx,            dword ptr arg(4) ; dst_stride
-
     ; store blocks back out
         movq        [rdi],          xmm0
         movq        [rdi + rdx],    xmm1
-
-        lea         rdi,            [rdi + 2*rdx]
-
-        movq        [rdi],          xmm2
-        movq        [rdi + rdx],    xmm3
+        movq        [rdi + rdx*2],  xmm2
+        movq        [rdi + rcx],    xmm3
 
     ; begin epilog
     pop         rdi
@@ -353,31 +350,29 @@ sym(idct_dequant_full_2x_sse2):
     pop         rbp
     ret
 
-;void idct_dequant_dc_0_2x_sse2
+;void vp8_idct_dequant_dc_0_2x_sse2
 ; (
 ;   short *qcoeff       - 0
 ;   short *dequant      - 1
-;   unsigned char *pre  - 2
-;   unsigned char *dst  - 3
-;   int dst_stride      - 4
-;   short *dc           - 5
+;   unsigned char *dst  - 2
+;   int dst_stride      - 3
+;   short *dc           - 4
 ; )
-global sym(idct_dequant_dc_0_2x_sse2)
-sym(idct_dequant_dc_0_2x_sse2):
+global sym(vp8_idct_dequant_dc_0_2x_sse2)
+sym(vp8_idct_dequant_dc_0_2x_sse2):
     push        rbp
     mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 7
+    SHADOW_ARGS_TO_STACK 5
     GET_GOT     rbx
-    push        rsi
     push        rdi
     ; end prolog
 
     ; special case when 2 blocks have 0 or 1 coeffs
     ; dc is set as first coeff, so no need to load qcoeff
         mov         rax,            arg(0) ; qcoeff
-        mov         rsi,            arg(2) ; pre
-        mov         rdi,            arg(3) ; dst
-        mov         rdx,            arg(5) ; dc
+
+        mov         rdi,            arg(2) ; dst
+        mov         rdx,            arg(4) ; dc
 
     ; Zero out xmm5, for use unpacking
         pxor        xmm5,           xmm5
@@ -385,11 +380,13 @@ sym(idct_dequant_dc_0_2x_sse2):
     ; load up 2 dc words here == 2*16 = doubleword
         movd        xmm4,           [rdx]
 
+        movsxd      rdx,            dword ptr arg(3) ; dst_stride
+        lea         rcx, [rdx + rdx*2]
     ; Load up predict blocks
-        movq        xmm0,           [rsi]
-        movq        xmm1,           [rsi+16]
-        movq        xmm2,           [rsi+32]
-        movq        xmm3,           [rsi+48]
+        movq        xmm0,           [rdi]
+        movq        xmm1,           [rdi+rdx*1]
+        movq        xmm2,           [rdi+rdx*2]
+        movq        xmm3,           [rdi+rcx]
 
     ; Duplicate and expand dc across
         punpcklwd   xmm4,           xmm4
@@ -417,48 +414,46 @@ sym(idct_dequant_dc_0_2x_sse2):
         packuswb    xmm2,           xmm5
         packuswb    xmm3,           xmm5
 
-    ; Load destination stride before writing out,
-    ;   doesn't need to persist
-        movsxd      rdx,            dword ptr arg(4) ; dst_stride
-
     ; store blocks back out
         movq        [rdi],          xmm0
         movq        [rdi + rdx],    xmm1
-
-        lea         rdi,            [rdi + 2*rdx]
-
-        movq        [rdi],          xmm2
-        movq        [rdi + rdx],    xmm3
+        movq        [rdi + rdx*2],  xmm2
+        movq        [rdi + rcx],    xmm3
 
     ; begin epilog
     pop         rdi
-    pop         rsi
     RESTORE_GOT
     UNSHADOW_ARGS
     pop         rbp
     ret
-
-global sym(idct_dequant_dc_full_2x_sse2)
-sym(idct_dequant_dc_full_2x_sse2):
+;void vp8_idct_dequant_dc_full_2x_sse2
+; (
+;   short *qcoeff       - 0
+;   short *dequant      - 1
+;   unsigned char *dst  - 2
+;   int dst_stride      - 3
+;   short *dc           - 4
+; )
+global sym(vp8_idct_dequant_dc_full_2x_sse2)
+sym(vp8_idct_dequant_dc_full_2x_sse2):
     push        rbp
     mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 7
+    SHADOW_ARGS_TO_STACK 5
     SAVE_XMM 7
     GET_GOT     rbx
-    push        rsi
     push        rdi
     ; end prolog
 
     ; special case when 2 blocks have 0 or 1 coeffs
     ; dc is set as first coeff, so no need to load qcoeff
         mov         rax,            arg(0) ; qcoeff
-        mov         rsi,            arg(2) ; pre
-        mov         rdi,            arg(3) ; dst
+        mov         rdx,            arg(1)  ; dequant
+
+        mov         rdi,            arg(2) ; dst
 
     ; Zero out xmm7, for use unpacking
         pxor        xmm7,           xmm7
 
-        mov         rdx,            arg(1)  ; dequant
 
     ; note the transpose of xmm1 and xmm2, necessary for shuffle
     ;   to spit out sensicle data
@@ -480,7 +475,7 @@ sym(idct_dequant_dc_full_2x_sse2):
         pmullw      xmm3,           [rdx+16]
 
     ; DC component
-        mov         rdx,            arg(5)
+        mov         rdx,            arg(4)
 
     ; repack so block 0 row x and block 1 row x are together
         movdqa      xmm4,           xmm0
@@ -651,8 +646,10 @@ sym(idct_dequant_dc_full_2x_sse2):
         pxor        xmm7,           xmm7
 
     ; Load up predict blocks
-        movq        xmm4,           [rsi]
-        movq        xmm5,           [rsi+16]
+        movsxd      rdx,            dword ptr arg(3) ; dst_stride
+        movq        xmm4,           [rdi]
+        movq        xmm5,           [rdi+rdx]
+        lea         rcx,            [rdx + rdx*2]
 
         punpcklbw   xmm4,           xmm7
         punpcklbw   xmm5,           xmm7
@@ -660,8 +657,8 @@ sym(idct_dequant_dc_full_2x_sse2):
         paddw       xmm0,           xmm4
         paddw       xmm1,           xmm5
 
-        movq        xmm4,           [rsi+32]
-        movq        xmm5,           [rsi+48]
+        movq        xmm4,           [rdi+rdx*2]
+        movq        xmm5,           [rdi+rcx]
 
         punpcklbw   xmm4,           xmm7
         punpcklbw   xmm5,           xmm7
@@ -679,7 +676,7 @@ sym(idct_dequant_dc_full_2x_sse2):
 
     ; Load destination stride before writing out,
     ;   doesn't need to persist
-        movsxd      rdx,            dword ptr arg(4) ; dst_stride
+        movsxd      rdx,            dword ptr arg(3) ; dst_stride
 
     ; store blocks back out
         movq        [rdi],          xmm0
@@ -693,7 +690,6 @@ sym(idct_dequant_dc_full_2x_sse2):
 
     ; begin epilog
     pop         rdi
-    pop         rsi
     RESTORE_GOT
     RESTORE_XMM
     UNSHADOW_ARGS
diff --git a/media/libvpx/vp8/common/x86/iwalsh_mmx.asm b/media/libvpx/vp8/common/x86/iwalsh_mmx.asm
index 10b5274dca2..6582687e128 100644
--- a/media/libvpx/vp8/common/x86/iwalsh_mmx.asm
+++ b/media/libvpx/vp8/common/x86/iwalsh_mmx.asm
@@ -11,162 +11,129 @@
 
 %include "vpx_ports/x86_abi_support.asm"
 
-;void vp8_short_inv_walsh4x4_1_mmx(short *input, short *output)
-global sym(vp8_short_inv_walsh4x4_1_mmx)
-sym(vp8_short_inv_walsh4x4_1_mmx):
-    push        rbp
-    mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 2
-    push        rsi
-    push        rdi
-    ; end prolog
-
-    mov     rsi, arg(0)
-    mov     rax, 3
-
-    mov     rdi, arg(1)
-    add     rax, [rsi]          ;input[0] + 3
-
-    movd    mm0, eax
-
-    punpcklwd mm0, mm0          ;x x val val
-
-    punpckldq mm0, mm0          ;val val val val
-
-    psraw   mm0, 3            ;(input[0] + 3) >> 3
-
-    movq  [rdi + 0], mm0
-    movq  [rdi + 8], mm0
-    movq  [rdi + 16], mm0
-    movq  [rdi + 24], mm0
-
-    ; begin epilog
-    pop rdi
-    pop rsi
-    UNSHADOW_ARGS
-    pop         rbp
-    ret
-
 ;void vp8_short_inv_walsh4x4_mmx(short *input, short *output)
 global sym(vp8_short_inv_walsh4x4_mmx)
 sym(vp8_short_inv_walsh4x4_mmx):
     push        rbp
     mov         rbp, rsp
     SHADOW_ARGS_TO_STACK 2
-    push        rsi
-    push        rdi
     ; end prolog
 
-    mov     rax, 3
-    mov     rsi, arg(0)
-    mov     rdi, arg(1)
-    shl     rax, 16
+    mov         rdx, arg(0)
+    mov         rax, 30003h
 
-    movq    mm0, [rsi + 0]        ;ip[0]
-    movq    mm1, [rsi + 8]        ;ip[4]
-    or      rax, 3            ;00030003h
+    movq        mm0, [rdx + 0]    ;ip[0]
+    movq        mm1, [rdx + 8]    ;ip[4]
+    movd        mm7, rax
 
-    movq    mm2, [rsi + 16]       ;ip[8]
-    movq    mm3, [rsi + 24]       ;ip[12]
+    movq        mm2, [rdx + 16]   ;ip[8]
+    movq        mm3, [rdx + 24]   ;ip[12]
+    punpcklwd   mm7, mm7          ;0003000300030003h
+    mov         rdx, arg(1)
 
-    movq    mm7, rax
-    movq    mm4, mm0
+    movq        mm4, mm0
+    movq        mm5, mm1
 
-    punpcklwd mm7, mm7          ;0003000300030003h
-    movq    mm5, mm1
+    paddw       mm4, mm3          ;ip[0] + ip[12] aka al
+    paddw       mm5, mm2          ;ip[4] + ip[8] aka bl
 
-    paddw   mm4, mm3          ;ip[0] + ip[12] aka al
-    paddw   mm5, mm2          ;ip[4] + ip[8] aka bl
+    movq        mm6, mm4          ;temp al
+    paddw       mm4, mm5          ;al + bl
+    psubw       mm6, mm5          ;al - bl
 
-    movq    mm6, mm4          ;temp al
+    psubw       mm0, mm3          ;ip[0] - ip[12] aka d1
+    psubw       mm1, mm2          ;ip[4] - ip[8] aka c1
 
-    paddw   mm4, mm5          ;al + bl
-    psubw   mm6, mm5          ;al - bl
-
-    psubw   mm0, mm3          ;ip[0] - ip[12] aka d1
-    psubw   mm1, mm2          ;ip[4] - ip[8] aka c1
-
-    movq    mm5, mm0          ;temp dl
-
-    paddw   mm0, mm1          ;dl + cl
-    psubw   mm5, mm1          ;dl - cl
+    movq        mm5, mm0          ;temp dl
+    paddw       mm0, mm1          ;dl + cl
+    psubw       mm5, mm1          ;dl - cl
 
     ; 03 02 01 00
     ; 13 12 11 10
     ; 23 22 21 20
     ; 33 32 31 30
 
-    movq    mm3, mm4          ; 03 02 01 00
-    punpcklwd mm4, mm0          ; 11 01 10 00
-    punpckhwd mm3, mm0          ; 13 03 12 02
+    movq        mm3, mm4          ; 03 02 01 00
+    punpcklwd   mm4, mm0          ; 11 01 10 00
+    punpckhwd   mm3, mm0          ; 13 03 12 02
 
-    movq    mm1, mm6          ; 23 22 21 20
-    punpcklwd mm6, mm5          ; 31 21 30 20
-    punpckhwd mm1, mm5          ; 33 23 32 22
+    movq        mm1, mm6          ; 23 22 21 20
+    punpcklwd   mm6, mm5          ; 31 21 30 20
+    punpckhwd   mm1, mm5          ; 33 23 32 22
 
-    movq    mm0, mm4          ; 11 01 10 00
-    movq    mm2, mm3          ; 13 03 12 02
+    movq        mm0, mm4          ; 11 01 10 00
+    movq        mm2, mm3          ; 13 03 12 02
 
-    punpckldq mm0, mm6          ; 30 20 10 00 aka ip[0]
-    punpckhdq mm4, mm6          ; 31 21 11 01 aka ip[4]
+    punpckldq   mm0, mm6          ; 30 20 10 00 aka ip[0]
+    punpckhdq   mm4, mm6          ; 31 21 11 01 aka ip[4]
 
-    punpckldq mm2, mm1          ; 32 22 12 02 aka ip[8]
-    punpckhdq mm3, mm1          ; 33 23 13 03 aka ip[12]
+    punpckldq   mm2, mm1          ; 32 22 12 02 aka ip[8]
+    punpckhdq   mm3, mm1          ; 33 23 13 03 aka ip[12]
 ;~~~~~~~~~~~~~~~~~~~~~
-    movq    mm1, mm0
-    movq    mm5, mm4
+    movq        mm1, mm0
+    movq        mm5, mm4
+    paddw       mm1, mm3          ;ip[0] + ip[12] aka al
+    paddw       mm5, mm2          ;ip[4] + ip[8] aka bl
 
-    paddw   mm1, mm3          ;ip[0] + ip[12] aka al
-    paddw   mm5, mm2          ;ip[4] + ip[8] aka bl
+    movq        mm6, mm1          ;temp al
+    paddw       mm1, mm5          ;al + bl
+    psubw       mm6, mm5          ;al - bl
+    paddw       mm1, mm7
+    paddw       mm6, mm7
+    psraw       mm1, 3
+    psraw       mm6, 3
 
-    movq    mm6, mm1          ;temp al
+    psubw       mm0, mm3          ;ip[0] - ip[12] aka d1
+    psubw       mm4, mm2          ;ip[4] - ip[8] aka c1
 
-    paddw   mm1, mm5          ;al + bl
-    psubw   mm6, mm5          ;al - bl
-
-    psubw   mm0, mm3          ;ip[0] - ip[12] aka d1
-    psubw   mm4, mm2          ;ip[4] - ip[8] aka c1
-
-    movq    mm5, mm0          ;temp dl
-
-    paddw   mm0, mm4          ;dl + cl
-    psubw   mm5, mm4          ;dl - cl
+    movq        mm5, mm0          ;temp dl
+    paddw       mm0, mm4          ;dl + cl
+    psubw       mm5, mm4          ;dl - cl
+    paddw       mm0, mm7
+    paddw       mm5, mm7
+    psraw       mm0, 3
+    psraw       mm5, 3
 ;~~~~~~~~~~~~~~~~~~~~~
-    movq    mm3, mm1          ; 03 02 01 00
-    punpcklwd mm1, mm0          ; 11 01 10 00
-    punpckhwd mm3, mm0          ; 13 03 12 02
 
-    movq    mm4, mm6          ; 23 22 21 20
-    punpcklwd mm6, mm5          ; 31 21 30 20
-    punpckhwd mm4, mm5          ; 33 23 32 22
+    movd        eax, mm1
+    movd        ecx, mm0
+    psrlq       mm0, 32
+    psrlq       mm1, 32
+    mov         word ptr[rdx+32*0], ax
+    mov         word ptr[rdx+32*1], cx
+    shr         eax, 16
+    shr         ecx, 16
+    mov         word ptr[rdx+32*4], ax
+    mov         word ptr[rdx+32*5], cx
+    movd        eax, mm1
+    movd        ecx, mm0
+    mov         word ptr[rdx+32*8], ax
+    mov         word ptr[rdx+32*9], cx
+    shr         eax, 16
+    shr         ecx, 16
+    mov         word ptr[rdx+32*12], ax
+    mov         word ptr[rdx+32*13], cx
 
-    movq    mm0, mm1          ; 11 01 10 00
-    movq    mm2, mm3          ; 13 03 12 02
-
-    punpckldq mm0, mm6          ; 30 20 10 00 aka ip[0]
-    punpckhdq mm1, mm6          ; 31 21 11 01 aka ip[4]
-
-    punpckldq mm2, mm4          ; 32 22 12 02 aka ip[8]
-    punpckhdq mm3, mm4          ; 33 23 13 03 aka ip[12]
-
-    paddw   mm0, mm7
-    paddw   mm1, mm7
-    paddw   mm2, mm7
-    paddw   mm3, mm7
-
-    psraw   mm0, 3
-    psraw   mm1, 3
-    psraw   mm2, 3
-    psraw   mm3, 3
-
-    movq  [rdi + 0], mm0
-    movq  [rdi + 8], mm1
-    movq  [rdi + 16], mm2
-    movq  [rdi + 24], mm3
+    movd        eax, mm6
+    movd        ecx, mm5
+    psrlq       mm5, 32
+    psrlq       mm6, 32
+    mov         word ptr[rdx+32*2], ax
+    mov         word ptr[rdx+32*3], cx
+    shr         eax, 16
+    shr         ecx, 16
+    mov         word ptr[rdx+32*6], ax
+    mov         word ptr[rdx+32*7], cx
+    movd        eax, mm6
+    movd        ecx, mm5
+    mov         word ptr[rdx+32*10], ax
+    mov         word ptr[rdx+32*11], cx
+    shr         eax, 16
+    shr         ecx, 16
+    mov         word ptr[rdx+32*14], ax
+    mov         word ptr[rdx+32*15], cx
 
     ; begin epilog
-    pop rdi
-    pop rsi
     UNSHADOW_ARGS
     pop         rbp
     ret
diff --git a/media/libvpx/vp8/common/x86/iwalsh_sse2.asm b/media/libvpx/vp8/common/x86/iwalsh_sse2.asm
index 1da4fd8da91..51cb5e21c17 100644
--- a/media/libvpx/vp8/common/x86/iwalsh_sse2.asm
+++ b/media/libvpx/vp8/common/x86/iwalsh_sse2.asm
@@ -17,103 +17,105 @@ sym(vp8_short_inv_walsh4x4_sse2):
     push        rbp
     mov         rbp, rsp
     SHADOW_ARGS_TO_STACK 2
-    SAVE_XMM 6
-    push        rsi
-    push        rdi
     ; end prolog
 
-    mov     rsi, arg(0)
-    mov     rdi, arg(1)
-    mov     rax, 3
+    mov         rcx, arg(0)
+    mov         rdx, arg(1)
+    mov         rax, 30003h
 
-    movdqa    xmm0, [rsi + 0]       ;ip[4] ip[0]
-    movdqa    xmm1, [rsi + 16]      ;ip[12] ip[8]
+    movdqa      xmm0, [rcx + 0]     ;ip[4] ip[0]
+    movdqa      xmm1, [rcx + 16]    ;ip[12] ip[8]
 
-    shl     rax, 16
-    or      rax, 3            ;00030003h
 
-    pshufd    xmm2, xmm1, 4eh       ;ip[8] ip[12]
-    movdqa    xmm3, xmm0          ;ip[4] ip[0]
+    pshufd      xmm2, xmm1, 4eh     ;ip[8] ip[12]
+    movdqa      xmm3, xmm0          ;ip[4] ip[0]
 
-    paddw   xmm0, xmm2          ;ip[4]+ip[8] ip[0]+ip[12] aka b1 a1
-    psubw   xmm3, xmm2          ;ip[4]-ip[8] ip[0]-ip[12] aka c1 d1
+    paddw       xmm0, xmm2          ;ip[4]+ip[8] ip[0]+ip[12] aka b1 a1
+    psubw       xmm3, xmm2          ;ip[4]-ip[8] ip[0]-ip[12] aka c1 d1
 
-    movdqa    xmm4, xmm0
+    movdqa      xmm4, xmm0
     punpcklqdq  xmm0, xmm3          ;d1 a1
     punpckhqdq  xmm4, xmm3          ;c1 b1
-    movd    xmm6, eax
 
-    movdqa    xmm1, xmm4          ;c1 b1
-    paddw   xmm4, xmm0          ;dl+cl a1+b1 aka op[4] op[0]
-    psubw   xmm0, xmm1          ;d1-c1 a1-b1 aka op[12] op[8]
+    movdqa      xmm1, xmm4          ;c1 b1
+    paddw       xmm4, xmm0          ;dl+cl a1+b1 aka op[4] op[0]
+    psubw       xmm0, xmm1          ;d1-c1 a1-b1 aka op[12] op[8]
 
-;;;temp output
-;;  movdqu  [rdi + 0], xmm4
-;;  movdqu  [rdi + 16], xmm3
-
-;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     ; 13 12 11 10 03 02 01 00
     ;
     ; 33 32 31 30 23 22 21 20
     ;
-    movdqa    xmm3, xmm4          ; 13 12 11 10 03 02 01 00
-    punpcklwd xmm4, xmm0          ; 23 03 22 02 21 01 20 00
-    punpckhwd xmm3, xmm0          ; 33 13 32 12 31 11 30 10
-    movdqa    xmm1, xmm4          ; 23 03 22 02 21 01 20 00
-    punpcklwd xmm4, xmm3          ; 31 21 11 01 30 20 10 00
-    punpckhwd xmm1, xmm3          ; 33 23 13 03 32 22 12 02
+    movdqa      xmm3, xmm4          ; 13 12 11 10 03 02 01 00
+    punpcklwd   xmm4, xmm0          ; 23 03 22 02 21 01 20 00
+    punpckhwd   xmm3, xmm0          ; 33 13 32 12 31 11 30 10
+    movdqa      xmm1, xmm4          ; 23 03 22 02 21 01 20 00
+    punpcklwd   xmm4, xmm3          ; 31 21 11 01 30 20 10 00
+    punpckhwd   xmm1, xmm3          ; 33 23 13 03 32 22 12 02
     ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    pshufd    xmm2, xmm1, 4eh       ;ip[8] ip[12]
-    movdqa    xmm3, xmm4          ;ip[4] ip[0]
+    movd        xmm0, eax
+    pshufd      xmm2, xmm1, 4eh     ;ip[8] ip[12]
+    movdqa      xmm3, xmm4          ;ip[4] ip[0]
 
-    pshufd    xmm6, xmm6, 0       ;03 03 03 03 03 03 03 03
+    pshufd      xmm0, xmm0, 0       ;03 03 03 03 03 03 03 03
 
-    paddw   xmm4, xmm2          ;ip[4]+ip[8] ip[0]+ip[12] aka b1 a1
-    psubw   xmm3, xmm2          ;ip[4]-ip[8] ip[0]-ip[12] aka c1 d1
+    paddw       xmm4, xmm2          ;ip[4]+ip[8] ip[0]+ip[12] aka b1 a1
+    psubw       xmm3, xmm2          ;ip[4]-ip[8] ip[0]-ip[12] aka c1 d1
 
-    movdqa    xmm5, xmm4
+    movdqa      xmm5, xmm4
     punpcklqdq  xmm4, xmm3          ;d1 a1
     punpckhqdq  xmm5, xmm3          ;c1 b1
 
-    movdqa    xmm1, xmm5          ;c1 b1
-    paddw   xmm5, xmm4          ;dl+cl a1+b1 aka op[4] op[0]
-    psubw   xmm4, xmm1          ;d1-c1 a1-b1 aka op[12] op[8]
-;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    ; 13 12 11 10 03 02 01 00
-    ;
-    ; 33 32 31 30 23 22 21 20
-    ;
-    movdqa    xmm0, xmm5          ; 13 12 11 10 03 02 01 00
-    punpcklwd xmm5, xmm4          ; 23 03 22 02 21 01 20 00
-    punpckhwd xmm0, xmm4          ; 33 13 32 12 31 11 30 10
-    movdqa    xmm1, xmm5          ; 23 03 22 02 21 01 20 00
-    punpcklwd xmm5, xmm0          ; 31 21 11 01 30 20 10 00
-    punpckhwd xmm1, xmm0          ; 33 23 13 03 32 22 12 02
-;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    paddw   xmm5, xmm6
-    paddw   xmm1, xmm6
+    movdqa      xmm1, xmm5          ;c1 b1
+    paddw       xmm5, xmm4          ;dl+cl a1+b1 aka op[4] op[0]
+    psubw       xmm4, xmm1          ;d1-c1 a1-b1 aka op[12] op[8]
 
-    psraw   xmm5, 3
-    psraw   xmm1, 3
+    paddw       xmm5, xmm0
+    paddw       xmm4, xmm0
+    psraw       xmm5, 3
+    psraw       xmm4, 3
 
-    movdqa  [rdi + 0], xmm5
-    movdqa  [rdi + 16], xmm1
+    movd        eax, xmm5
+    movd        ecx, xmm4
+    psrldq      xmm5, 4
+    psrldq      xmm4, 4
+    mov         word ptr[rdx+32*0], ax
+    mov         word ptr[rdx+32*2], cx
+    shr         eax, 16
+    shr         ecx, 16
+    mov         word ptr[rdx+32*4], ax
+    mov         word ptr[rdx+32*6], cx
+    movd        eax, xmm5
+    movd        ecx, xmm4
+    psrldq      xmm5, 4
+    psrldq      xmm4, 4
+    mov         word ptr[rdx+32*8], ax
+    mov         word ptr[rdx+32*10], cx
+    shr         eax, 16
+    shr         ecx, 16
+    mov         word ptr[rdx+32*12], ax
+    mov         word ptr[rdx+32*14], cx
+
+    movd        eax, xmm5
+    movd        ecx, xmm4
+    psrldq      xmm5, 4
+    psrldq      xmm4, 4
+    mov         word ptr[rdx+32*1], ax
+    mov         word ptr[rdx+32*3], cx
+    shr         eax, 16
+    shr         ecx, 16
+    mov         word ptr[rdx+32*5], ax
+    mov         word ptr[rdx+32*7], cx
+    movd        eax, xmm5
+    movd        ecx, xmm4
+    mov         word ptr[rdx+32*9], ax
+    mov         word ptr[rdx+32*11], cx
+    shr         eax, 16
+    shr         ecx, 16
+    mov         word ptr[rdx+32*13], ax
+    mov         word ptr[rdx+32*15], cx
 
     ; begin epilog
-    pop rdi
-    pop rsi
-    RESTORE_XMM
     UNSHADOW_ARGS
     pop         rbp
     ret
-
-SECTION_RODATA
-align 16
-x_s1sqr2:
-    times 4 dw 0x8A8C
-align 16
-x_c1sqr2less1:
-    times 4 dw 0x4E7B
-align 16
-fours:
-    times 4 dw 0x0004
diff --git a/media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm b/media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm
new file mode 100644
index 00000000000..4918eb5bd9f
--- /dev/null
+++ b/media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm
@@ -0,0 +1,813 @@
+;
+;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+;
+;  Use of this source code is governed by a BSD-style license
+;  that can be found in the LICENSE file in the root of the source
+;  tree. An additional intellectual property rights grant can be found
+;  in the file PATENTS.  All contributing project authors may
+;  be found in the AUTHORS file in the root of the source tree.
+;
+
+
+%include "vpx_ports/x86_abi_support.asm"
+
+%macro LF_ABS 2
+        ; %1 value not preserved
+        ; %2 value preserved
+        ; output in %1
+        movdqa      scratch1, %2            ; v2
+
+        psubusb     scratch1, %1            ; v2 - v1
+        psubusb     %1, %2                  ; v1 - v2
+        por         %1, scratch1            ; abs(v2 - v1)
+%endmacro
+
+%macro LF_FILTER_HEV_MASK 8-9
+
+        LF_ABS      %1, %2                  ; abs(p3 - p2)
+        LF_ABS      %2, %3                  ; abs(p2 - p1)
+        pmaxub      %1, %2                  ; accumulate mask
+%if %0 == 8
+        movdqa      scratch2, %3            ; save p1
+        LF_ABS      scratch2, %4            ; abs(p1 - p0)
+%endif
+        LF_ABS      %4, %5                  ; abs(p0 - q0)
+        LF_ABS      %5, %6                  ; abs(q0 - q1)
+%if %0 == 8
+        pmaxub      %5, scratch2            ; accumulate hev
+%else
+        pmaxub      %5, %9
+%endif
+        pmaxub      %1, %5                  ; accumulate mask
+
+        LF_ABS      %3, %6                  ; abs(p1 - q1)
+        LF_ABS      %6, %7                  ; abs(q1 - q2)
+        pmaxub      %1, %6                  ; accumulate mask
+        LF_ABS      %7, %8                  ; abs(q2 - q3)
+        pmaxub      %1, %7                  ; accumulate mask
+
+        paddusb     %4, %4                  ; 2 * abs(p0 - q0)
+        pand        %3, [GLOBAL(tfe)]
+        psrlw       %3, 1                   ; abs(p1 - q1) / 2
+        paddusb     %4, %3                  ; abs(p0 - q0) * 2 + abs(p1 - q1) / 2
+
+        psubusb     %1, [limit]
+        psubusb     %4, [blimit]
+        por         %1, %4
+        pcmpeqb     %1, zero                ; mask
+
+        psubusb     %5, [thresh]
+        pcmpeqb     %5, zero                ; ~hev
+%endmacro
+
+%macro LF_FILTER 6
+        ; %1-%4: p1-q1
+        ; %5: mask
+        ; %6: hev
+
+        movdqa      scratch2, %6            ; save hev
+
+        pxor        %1, [GLOBAL(t80)]       ; ps1
+        pxor        %4, [GLOBAL(t80)]       ; qs1
+        movdqa      scratch1, %1
+        psubsb      scratch1, %4            ; signed_char_clamp(ps1 - qs1)
+        pandn       scratch2, scratch1      ; vp8_filter &= hev
+
+        pxor        %2, [GLOBAL(t80)]       ; ps0
+        pxor        %3, [GLOBAL(t80)]       ; qs0
+        movdqa      scratch1, %3
+        psubsb      scratch1, %2            ; qs0 - ps0
+        paddsb      scratch2, scratch1      ; vp8_filter += (qs0 - ps0)
+        paddsb      scratch2, scratch1      ; vp8_filter += (qs0 - ps0)
+        paddsb      scratch2, scratch1      ; vp8_filter += (qs0 - ps0)
+        pand        %5, scratch2            ; &= mask
+
+        movdqa      scratch2, %5
+        paddsb      %5, [GLOBAL(t4)]        ; Filter1
+        paddsb      scratch2, [GLOBAL(t3)]  ; Filter2
+
+        ; Filter1 >> 3
+        movdqa      scratch1, zero
+        pcmpgtb     scratch1, %5
+        psrlw       %5, 3
+        pand        scratch1, [GLOBAL(te0)]
+        pand        %5, [GLOBAL(t1f)]
+        por         %5, scratch1
+
+        psubsb      %3, %5                  ; qs0 - Filter1
+        pxor        %3, [GLOBAL(t80)]
+
+        ; Filter2 >> 3
+        movdqa      scratch1, zero
+        pcmpgtb     scratch1, scratch2
+        psrlw       scratch2, 3
+        pand        scratch1, [GLOBAL(te0)]
+        pand        scratch2, [GLOBAL(t1f)]
+        por         scratch2, scratch1
+
+        paddsb      %2, scratch2            ; ps0 + Filter2
+        pxor        %2, [GLOBAL(t80)]
+
+        ; outer tap adjustments
+        paddsb      %5, [GLOBAL(t1)]
+        movdqa      scratch1, zero
+        pcmpgtb     scratch1, %5
+        psrlw       %5, 1
+        pand        scratch1, [GLOBAL(t80)]
+        pand        %5, [GLOBAL(t7f)]
+        por         %5, scratch1
+        pand        %5, %6                  ; vp8_filter &= ~hev
+
+        psubsb      %4, %5                  ; qs1 - vp8_filter
+        pxor        %4, [GLOBAL(t80)]
+
+        paddsb      %1, %5                  ; ps1 + vp8_filter
+        pxor        %1, [GLOBAL(t80)]
+%endmacro
+
+;void vp8_loop_filter_bh_y_sse2
+;(
+;    unsigned char *src_ptr,
+;    int            src_pixel_step,
+;    const char    *blimit,
+;    const char    *limit,
+;    const char    *thresh
+;)
+global sym(vp8_loop_filter_bh_y_sse2)
+sym(vp8_loop_filter_bh_y_sse2):
+
+%ifidn __OUTPUT_FORMAT__,x64
+    %define src      rcx ; src_ptr
+    %define stride   rdx ; src_pixel_step
+    %define blimit   r8
+    %define limit    r9
+    %define thresh   r10
+
+    %define spp      rax
+    %define stride3  r11
+    %define stride5  r12
+    %define stride7  r13
+
+    push    rbp
+    mov     rbp, rsp
+    push    r12
+    push    r13
+    mov     thresh, arg(4)
+%else
+    %define src      rdi ; src_ptr
+    %define stride   rsi ; src_pixel_step
+    %define blimit   rdx
+    %define limit    rcx
+    %define thresh   r8
+
+    %define spp      rax
+    %define stride3  r9
+    %define stride5  r10
+    %define stride7  r11
+%endif
+
+    %define scratch1 xmm5
+    %define scratch2 xmm6
+    %define zero     xmm7
+
+    %define i0       [src]
+    %define i1       [spp]
+    %define i2       [src + 2 * stride]
+    %define i3       [spp + 2 * stride]
+    %define i4       [src + 4 * stride]
+    %define i5       [spp + 4 * stride]
+    %define i6       [src + 2 * stride3]
+    %define i7       [spp + 2 * stride3]
+    %define i8       [src + 8 * stride]
+    %define i9       [spp + 8 * stride]
+    %define i10      [src + 2 * stride5]
+    %define i11      [spp + 2 * stride5]
+    %define i12      [src + 4 * stride3]
+    %define i13      [spp + 4 * stride3]
+    %define i14      [src + 2 * stride7]
+    %define i15      [spp + 2 * stride7]
+
+    ; prep work
+    lea         spp, [src + stride]
+    lea         stride3, [stride + 2 * stride]
+    lea         stride5, [stride3 + 2 * stride]
+    lea         stride7, [stride3 + 4 * stride]
+    pxor        zero, zero
+
+        ; load the first set into registers
+        movdqa       xmm0, i0
+        movdqa       xmm1, i1
+        movdqa       xmm2, i2
+        movdqa       xmm3, i3
+        movdqa       xmm4, i4
+        movdqa       xmm8, i5
+        movdqa       xmm9, i6   ; q2, will contain abs(p1-p0)
+        movdqa       xmm10, i7
+LF_FILTER_HEV_MASK xmm0, xmm1, xmm2, xmm3, xmm4, xmm8, xmm9, xmm10
+
+        movdqa       xmm1, i2
+        movdqa       xmm2, i3
+        movdqa       xmm3, i4
+        movdqa       xmm8, i5
+LF_FILTER xmm1, xmm2, xmm3, xmm8, xmm0, xmm4
+        movdqa       i2, xmm1
+        movdqa       i3, xmm2
+
+; second set
+        movdqa       i4, xmm3
+        movdqa       i5, xmm8
+
+        movdqa       xmm0, i6
+        movdqa       xmm1, i7
+        movdqa       xmm2, i8
+        movdqa       xmm4, i9
+        movdqa       xmm10, i10   ; q2, will contain abs(p1-p0)
+        movdqa       xmm11, i11
+LF_FILTER_HEV_MASK xmm3, xmm8, xmm0, xmm1, xmm2, xmm4, xmm10, xmm11, xmm9
+
+        movdqa       xmm0, i6
+        movdqa       xmm1, i7
+        movdqa       xmm4, i8
+        movdqa       xmm8, i9
+LF_FILTER xmm0, xmm1, xmm4, xmm8, xmm3, xmm2
+        movdqa       i6, xmm0
+        movdqa       i7, xmm1
+
+; last set
+        movdqa       i8, xmm4
+        movdqa       i9, xmm8
+
+        movdqa       xmm0, i10
+        movdqa       xmm1, i11
+        movdqa       xmm2, i12
+        movdqa       xmm3, i13
+        movdqa       xmm9, i14   ; q2, will contain abs(p1-p0)
+        movdqa       xmm11, i15
+LF_FILTER_HEV_MASK xmm4, xmm8, xmm0, xmm1, xmm2, xmm3, xmm9, xmm11, xmm10
+
+        movdqa       xmm0, i10
+        movdqa       xmm1, i11
+        movdqa       xmm3, i12
+        movdqa       xmm8, i13
+LF_FILTER xmm0, xmm1, xmm3, xmm8, xmm4, xmm2
+        movdqa       i10, xmm0
+        movdqa       i11, xmm1
+        movdqa       i12, xmm3
+        movdqa       i13, xmm8
+
+%ifidn __OUTPUT_FORMAT__,x64
+    pop    r13
+    pop    r12
+    pop    rbp
+%endif
+
+    ret
+
+
+;void vp8_loop_filter_bv_y_sse2
+;(
+;    unsigned char *src_ptr,
+;    int            src_pixel_step,
+;    const char    *blimit,
+;    const char    *limit,
+;    const char    *thresh
+;)
+
+global sym(vp8_loop_filter_bv_y_sse2)
+sym(vp8_loop_filter_bv_y_sse2):
+
+%ifidn __OUTPUT_FORMAT__,x64
+    %define src      rcx ; src_ptr
+    %define stride   rdx ; src_pixel_step
+    %define blimit   r8
+    %define limit    r9
+    %define thresh   r10
+
+    %define spp      rax
+    %define stride3  r11
+    %define stride5  r12
+    %define stride7  r13
+
+    push    rbp
+    mov     rbp, rsp
+    SAVE_XMM 15
+    push    r12
+    push    r13
+    mov     thresh, arg(4)
+%else
+    %define src      rdi
+    %define stride   rsi
+    %define blimit   rdx
+    %define limit    rcx
+    %define thresh   r8
+
+    %define spp      rax
+    %define stride3  r9
+    %define stride5  r10
+    %define stride7  r11
+%endif
+
+    %define scratch1 xmm5
+    %define scratch2 xmm6
+    %define zero     xmm7
+
+    %define s0       [src]
+    %define s1       [spp]
+    %define s2       [src + 2 * stride]
+    %define s3       [spp + 2 * stride]
+    %define s4       [src + 4 * stride]
+    %define s5       [spp + 4 * stride]
+    %define s6       [src + 2 * stride3]
+    %define s7       [spp + 2 * stride3]
+    %define s8       [src + 8 * stride]
+    %define s9       [spp + 8 * stride]
+    %define s10      [src + 2 * stride5]
+    %define s11      [spp + 2 * stride5]
+    %define s12      [src + 4 * stride3]
+    %define s13      [spp + 4 * stride3]
+    %define s14      [src + 2 * stride7]
+    %define s15      [spp + 2 * stride7]
+
+    %define i0       [rsp]
+    %define i1       [rsp + 16]
+    %define i2       [rsp + 32]
+    %define i3       [rsp + 48]
+    %define i4       [rsp + 64]
+    %define i5       [rsp + 80]
+    %define i6       [rsp + 96]
+    %define i7       [rsp + 112]
+    %define i8       [rsp + 128]
+    %define i9       [rsp + 144]
+    %define i10      [rsp + 160]
+    %define i11      [rsp + 176]
+    %define i12      [rsp + 192]
+    %define i13      [rsp + 208]
+    %define i14      [rsp + 224]
+    %define i15      [rsp + 240]
+
+    ALIGN_STACK 16, rax
+
+    ; reserve stack space
+    %define      temp_storage  0 ; size is 256 (16*16)
+    %define      stack_size 256
+    sub          rsp, stack_size
+
+    ; prep work
+    lea         spp, [src + stride]
+    lea         stride3, [stride + 2 * stride]
+    lea         stride5, [stride3 + 2 * stride]
+    lea         stride7, [stride3 + 4 * stride]
+
+        ; 8-f
+        movdqa      xmm0, s8
+        movdqa      xmm1, xmm0
+        punpcklbw   xmm0, s9                ; 80 90
+        punpckhbw   xmm1, s9                ; 88 98
+
+        movdqa      xmm2, s10
+        movdqa      xmm3, xmm2
+        punpcklbw   xmm2, s11 ; a0 b0
+        punpckhbw   xmm3, s11 ; a8 b8
+
+        movdqa      xmm4, xmm0
+        punpcklwd   xmm0, xmm2              ; 80 90 a0 b0
+        punpckhwd   xmm4, xmm2              ; 84 94 a4 b4
+
+        movdqa      xmm2, xmm1
+        punpcklwd   xmm1, xmm3              ; 88 98 a8 b8
+        punpckhwd   xmm2, xmm3              ; 8c 9c ac bc
+
+        ; using xmm[0124]
+        ; work on next 4 rows
+
+        movdqa      xmm3, s12
+        movdqa      xmm5, xmm3
+        punpcklbw   xmm3, s13 ; c0 d0
+        punpckhbw   xmm5, s13 ; c8 d8
+
+        movdqa      xmm6, s14
+        movdqa      xmm7, xmm6
+        punpcklbw   xmm6, s15 ; e0 f0
+        punpckhbw   xmm7, s15 ; e8 f8
+
+        movdqa      xmm8, xmm3
+        punpcklwd   xmm3, xmm6              ; c0 d0 e0 f0
+        punpckhwd   xmm8, xmm6              ; c4 d4 e4 f4
+
+        movdqa      xmm6, xmm5
+        punpcklwd   xmm5, xmm7              ; c8 d8 e8 f8
+        punpckhwd   xmm6, xmm7              ; cc dc ec fc
+
+        ; pull the third and fourth sets together
+
+        movdqa      xmm7, xmm0
+        punpckldq   xmm0, xmm3              ; 80 90 a0 b0 c0 d0 e0 f0
+        punpckhdq   xmm7, xmm3              ; 82 92 a2 b2 c2 d2 e2 f2
+
+        movdqa      xmm3, xmm4
+        punpckldq   xmm4, xmm8              ; 84 94 a4 b4 c4 d4 e4 f4
+        punpckhdq   xmm3, xmm8              ; 86 96 a6 b6 c6 d6 e6 f6
+
+        movdqa      xmm8, xmm1
+        punpckldq   xmm1, xmm5              ; 88 88 a8 b8 c8 d8 e8 f8
+        punpckhdq   xmm8, xmm5              ; 8a 9a aa ba ca da ea fa
+
+        movdqa      xmm5, xmm2
+        punpckldq   xmm2, xmm6              ; 8c 9c ac bc cc dc ec fc
+        punpckhdq   xmm5, xmm6              ; 8e 9e ae be ce de ee fe
+
+        ; save the calculations. we only have 15 registers ...
+        movdqa      i0, xmm0
+        movdqa      i1, xmm7
+        movdqa      i2, xmm4
+        movdqa      i3, xmm3
+        movdqa      i4, xmm1
+        movdqa      i5, xmm8
+        movdqa      i6, xmm2
+        movdqa      i7, xmm5
+
+        ; 0-7
+        movdqa      xmm0, s0
+        movdqa      xmm1, xmm0
+        punpcklbw   xmm0, s1 ; 00 10
+        punpckhbw   xmm1, s1 ; 08 18
+
+        movdqa      xmm2, s2
+        movdqa      xmm3, xmm2
+        punpcklbw   xmm2, s3 ; 20 30
+        punpckhbw   xmm3, s3 ; 28 38
+
+        movdqa      xmm4, xmm0
+        punpcklwd   xmm0, xmm2              ; 00 10 20 30
+        punpckhwd   xmm4, xmm2              ; 04 14 24 34
+
+        movdqa      xmm2, xmm1
+        punpcklwd   xmm1, xmm3              ; 08 18 28 38
+        punpckhwd   xmm2, xmm3              ; 0c 1c 2c 3c
+
+        ; using xmm[0124]
+        ; work on next 4 rows
+
+        movdqa      xmm3, s4
+        movdqa      xmm5, xmm3
+        punpcklbw   xmm3, s5 ; 40 50
+        punpckhbw   xmm5, s5 ; 48 58
+
+        movdqa      xmm6, s6
+        movdqa      xmm7, xmm6
+        punpcklbw   xmm6, s7   ; 60 70
+        punpckhbw   xmm7, s7   ; 68 78
+
+        movdqa      xmm8, xmm3
+        punpcklwd   xmm3, xmm6              ; 40 50 60 70
+        punpckhwd   xmm8, xmm6              ; 44 54 64 74
+
+        movdqa      xmm6, xmm5
+        punpcklwd   xmm5, xmm7              ; 48 58 68 78
+        punpckhwd   xmm6, xmm7              ; 4c 5c 6c 7c
+
+        ; pull the first two sets together
+
+        movdqa      xmm7, xmm0
+        punpckldq   xmm0, xmm3              ; 00 10 20 30 40 50 60 70
+        punpckhdq   xmm7, xmm3              ; 02 12 22 32 42 52 62 72
+
+        movdqa      xmm3, xmm4
+        punpckldq   xmm4, xmm8              ; 04 14 24 34 44 54 64 74
+        punpckhdq   xmm3, xmm8              ; 06 16 26 36 46 56 66 76
+
+        movdqa      xmm8, xmm1
+        punpckldq   xmm1, xmm5              ; 08 18 28 38 48 58 68 78
+        punpckhdq   xmm8, xmm5              ; 0a 1a 2a 3a 4a 5a 6a 7a
+
+        movdqa      xmm5, xmm2
+        punpckldq   xmm2, xmm6              ; 0c 1c 2c 3c 4c 5c 6c 7c
+        punpckhdq   xmm5, xmm6              ; 0e 1e 2e 3e 4e 5e 6e 7e
+        ; final combination
+
+        movdqa      xmm6, xmm0
+        punpcklqdq  xmm0, i0
+        punpckhqdq  xmm6, i0
+
+        movdqa      xmm9, xmm7
+        punpcklqdq  xmm7, i1
+        punpckhqdq  xmm9, i1
+
+        movdqa      xmm10, xmm4
+        punpcklqdq  xmm4, i2
+        punpckhqdq  xmm10, i2
+
+        movdqa      xmm11, xmm3
+        punpcklqdq  xmm3, i3
+        punpckhqdq  xmm11, i3
+
+        movdqa      xmm12, xmm1
+        punpcklqdq  xmm1, i4
+        punpckhqdq  xmm12, i4
+
+        movdqa      xmm13, xmm8
+        punpcklqdq  xmm8, i5
+        punpckhqdq  xmm13, i5
+
+        movdqa      xmm14, xmm2
+        punpcklqdq  xmm2, i6
+        punpckhqdq  xmm14, i6
+
+        movdqa      xmm15, xmm5
+        punpcklqdq  xmm5, i7
+        punpckhqdq  xmm15, i7
+
+        movdqa      i0, xmm0
+        movdqa      i1, xmm6
+        movdqa      i2, xmm7
+        movdqa      i3, xmm9
+        movdqa      i4, xmm4
+        movdqa      i5, xmm10
+        movdqa      i6, xmm3
+        movdqa      i7, xmm11
+        movdqa      i8, xmm1
+        movdqa      i9, xmm12
+        movdqa      i10, xmm8
+        movdqa      i11, xmm13
+        movdqa      i12, xmm2
+        movdqa      i13, xmm14
+        movdqa      i14, xmm5
+        movdqa      i15, xmm15
+
+; TRANSPOSED DATA AVAILABLE ON THE STACK
+
+        movdqa      xmm12, xmm6
+        movdqa      xmm13, xmm7
+
+        pxor        zero, zero
+
+LF_FILTER_HEV_MASK xmm0, xmm12, xmm13, xmm9, xmm4, xmm10, xmm3, xmm11
+
+        movdqa       xmm1, i2
+        movdqa       xmm2, i3
+        movdqa       xmm8, i4
+        movdqa       xmm9, i5
+LF_FILTER xmm1, xmm2, xmm8, xmm9, xmm0, xmm4
+        movdqa       i2, xmm1
+        movdqa       i3, xmm2
+
+; second set
+        movdqa       i4, xmm8
+        movdqa       i5, xmm9
+
+        movdqa       xmm0, i6
+        movdqa       xmm1, i7
+        movdqa       xmm2, i8
+        movdqa       xmm4, i9
+        movdqa       xmm10, i10   ; q2, will contain abs(p1-p0)
+        movdqa       xmm11, i11
+LF_FILTER_HEV_MASK xmm8, xmm9, xmm0, xmm1, xmm2, xmm4, xmm10, xmm11, xmm3
+
+        movdqa       xmm0, i6
+        movdqa       xmm1, i7
+        movdqa       xmm3, i8
+        movdqa       xmm4, i9
+LF_FILTER xmm0, xmm1, xmm3, xmm4, xmm8, xmm2
+        movdqa       i6, xmm0
+        movdqa       i7, xmm1
+
+; last set
+        movdqa       i8, xmm3
+        movdqa       i9, xmm4
+
+        movdqa       xmm0, i10
+        movdqa       xmm1, i11
+        movdqa       xmm2, i12
+        movdqa       xmm8, i13
+        movdqa       xmm9, i14   ; q2, will contain abs(p1-p0)
+        movdqa       xmm11, i15
+LF_FILTER_HEV_MASK xmm3, xmm4, xmm0, xmm1, xmm2, xmm8, xmm9, xmm11, xmm10
+
+        movdqa       xmm0, i10
+        movdqa       xmm1, i11
+        movdqa       xmm4, i12
+        movdqa       xmm8, i13
+LF_FILTER xmm0, xmm1, xmm4, xmm8, xmm3, xmm2
+        movdqa       i10, xmm0
+        movdqa       i11, xmm1
+        movdqa       i12, xmm4
+        movdqa       i13, xmm8
+
+
+; RESHUFFLE AND WRITE OUT
+        ; 8-f
+        movdqa      xmm0, i8
+        movdqa      xmm1, xmm0
+        punpcklbw   xmm0, i9                ; 80 90
+        punpckhbw   xmm1, i9                ; 88 98
+
+        movdqa      xmm2, i10
+        movdqa      xmm3, xmm2
+        punpcklbw   xmm2, i11               ; a0 b0
+        punpckhbw   xmm3, i11               ; a8 b8
+
+        movdqa      xmm4, xmm0
+        punpcklwd   xmm0, xmm2              ; 80 90 a0 b0
+        punpckhwd   xmm4, xmm2              ; 84 94 a4 b4
+
+        movdqa      xmm2, xmm1
+        punpcklwd   xmm1, xmm3              ; 88 98 a8 b8
+        punpckhwd   xmm2, xmm3              ; 8c 9c ac bc
+
+        ; using xmm[0124]
+        ; work on next 4 rows
+
+        movdqa      xmm3, i12
+        movdqa      xmm5, xmm3
+        punpcklbw   xmm3, i13               ; c0 d0
+        punpckhbw   xmm5, i13               ; c8 d8
+
+        movdqa      xmm6, i14
+        movdqa      xmm7, xmm6
+        punpcklbw   xmm6, i15               ; e0 f0
+        punpckhbw   xmm7, i15               ; e8 f8
+
+        movdqa      xmm8, xmm3
+        punpcklwd   xmm3, xmm6              ; c0 d0 e0 f0
+        punpckhwd   xmm8, xmm6              ; c4 d4 e4 f4
+
+        movdqa      xmm6, xmm5
+        punpcklwd   xmm5, xmm7              ; c8 d8 e8 f8
+        punpckhwd   xmm6, xmm7              ; cc dc ec fc
+
+        ; pull the third and fourth sets together
+
+        movdqa      xmm7, xmm0
+        punpckldq   xmm0, xmm3              ; 80 90 a0 b0 c0 d0 e0 f0
+        punpckhdq   xmm7, xmm3              ; 82 92 a2 b2 c2 d2 e2 f2
+
+        movdqa      xmm3, xmm4
+        punpckldq   xmm4, xmm8              ; 84 94 a4 b4 c4 d4 e4 f4
+        punpckhdq   xmm3, xmm8              ; 86 96 a6 b6 c6 d6 e6 f6
+
+        movdqa      xmm8, xmm1
+        punpckldq   xmm1, xmm5              ; 88 88 a8 b8 c8 d8 e8 f8
+        punpckhdq   xmm8, xmm5              ; 8a 9a aa ba ca da ea fa
+
+        movdqa      xmm5, xmm2
+        punpckldq   xmm2, xmm6              ; 8c 9c ac bc cc dc ec fc
+        punpckhdq   xmm5, xmm6              ; 8e 9e ae be ce de ee fe
+
+        ; save the calculations. we only have 15 registers ...
+        movdqa      i8, xmm0
+        movdqa      i9, xmm7
+        movdqa      i10, xmm4
+        movdqa      i11, xmm3
+        movdqa      i12, xmm1
+        movdqa      i13, xmm8
+        movdqa      i14, xmm2
+        movdqa      i15, xmm5
+
+        ; 0-7
+        movdqa      xmm0, i0
+        movdqa      xmm1, xmm0
+        punpcklbw   xmm0, i1                ; 00 10
+        punpckhbw   xmm1, i1                ; 08 18
+
+        movdqa      xmm2, i2
+        movdqa      xmm3, xmm2
+        punpcklbw   xmm2, i3                ; 20 30
+        punpckhbw   xmm3, i3                ; 28 38
+
+        movdqa      xmm4, xmm0
+        punpcklwd   xmm0, xmm2              ; 00 10 20 30
+        punpckhwd   xmm4, xmm2              ; 04 14 24 34
+
+        movdqa      xmm2, xmm1
+        punpcklwd   xmm1, xmm3              ; 08 18 28 38
+        punpckhwd   xmm2, xmm3              ; 0c 1c 2c 3c
+
+        ; using xmm[0124]
+        ; work on next 4 rows
+
+        movdqa      xmm3, i4
+        movdqa      xmm5, xmm3
+        punpcklbw   xmm3, i5                ; 40 50
+        punpckhbw   xmm5, i5                ; 48 58
+
+        movdqa      xmm6, i6
+        movdqa      xmm7, xmm6
+        punpcklbw   xmm6, i7                ; 60 70
+        punpckhbw   xmm7, i7                ; 68 78
+
+        movdqa      xmm8, xmm3
+        punpcklwd   xmm3, xmm6              ; 40 50 60 70
+        punpckhwd   xmm8, xmm6              ; 44 54 64 74
+
+        movdqa      xmm6, xmm5
+        punpcklwd   xmm5, xmm7              ; 48 58 68 78
+        punpckhwd   xmm6, xmm7              ; 4c 5c 6c 7c
+
+        ; pull the first two sets together
+
+        movdqa      xmm7, xmm0
+        punpckldq   xmm0, xmm3              ; 00 10 20 30 40 50 60 70
+        punpckhdq   xmm7, xmm3              ; 02 12 22 32 42 52 62 72
+
+        movdqa      xmm3, xmm4
+        punpckldq   xmm4, xmm8              ; 04 14 24 34 44 54 64 74
+        punpckhdq   xmm3, xmm8              ; 06 16 26 36 46 56 66 76
+
+        movdqa      xmm8, xmm1
+        punpckldq   xmm1, xmm5              ; 08 18 28 38 48 58 68 78
+        punpckhdq   xmm8, xmm5              ; 0a 1a 2a 3a 4a 5a 6a 7a
+
+        movdqa      xmm5, xmm2
+        punpckldq   xmm2, xmm6              ; 0c 1c 2c 3c 4c 5c 6c 7c
+        punpckhdq   xmm5, xmm6              ; 0e 1e 2e 3e 4e 5e 6e 7e
+        ; final combination
+
+        movdqa      xmm6, xmm0
+        punpcklqdq  xmm0, i8
+        punpckhqdq  xmm6, i8
+
+        movdqa      xmm9, xmm7
+        punpcklqdq  xmm7, i9
+        punpckhqdq  xmm9, i9
+
+        movdqa      xmm10, xmm4
+        punpcklqdq  xmm4, i10
+        punpckhqdq  xmm10, i10
+
+        movdqa      xmm11, xmm3
+        punpcklqdq  xmm3, i11
+        punpckhqdq  xmm11, i11
+
+        movdqa      xmm12, xmm1
+        punpcklqdq  xmm1, i12
+        punpckhqdq  xmm12, i12
+
+        movdqa      xmm13, xmm8
+        punpcklqdq  xmm8, i13
+        punpckhqdq  xmm13, i13
+
+        movdqa      xmm14, xmm2
+        punpcklqdq  xmm2, i14
+        punpckhqdq  xmm14, i14
+
+        movdqa      xmm15, xmm5
+        punpcklqdq  xmm5, i15
+        punpckhqdq  xmm15, i15
+
+        movdqa      s0, xmm0
+        movdqa      s1, xmm6
+        movdqa      s2, xmm7
+        movdqa      s3, xmm9
+        movdqa      s4, xmm4
+        movdqa      s5, xmm10
+        movdqa      s6, xmm3
+        movdqa      s7, xmm11
+        movdqa      s8, xmm1
+        movdqa      s9, xmm12
+        movdqa      s10, xmm8
+        movdqa      s11, xmm13
+        movdqa      s12, xmm2
+        movdqa      s13, xmm14
+        movdqa      s14, xmm5
+        movdqa      s15, xmm15
+
+    ; free stack space
+    add          rsp, stack_size
+
+    ; un-ALIGN_STACK
+    pop          rsp
+
+%ifidn __OUTPUT_FORMAT__,x64
+    pop    r13
+    pop    r12
+    RESTORE_XMM
+    pop    rbp
+%endif
+
+    ret
+
+SECTION_RODATA
+align 16
+te0:
+    times 16 db 0xe0
+align 16
+t7f:
+    times 16 db 0x7f
+align 16
+tfe:
+    times 16 db 0xfe
+align 16
+t1f:
+    times 16 db 0x1f
+align 16
+t80:
+    times 16 db 0x80
+align 16
+t1:
+    times 16 db 0x01
+align 16
+t3:
+    times 16 db 0x03
+align 16
+t4:
+    times 16 db 0x04
diff --git a/media/libvpx/vp8/common/x86/loopfilter_mmx.asm b/media/libvpx/vp8/common/x86/loopfilter_mmx.asm
index ad47284cf9b..697a5dee600 100644
--- a/media/libvpx/vp8/common/x86/loopfilter_mmx.asm
+++ b/media/libvpx/vp8/common/x86/loopfilter_mmx.asm
@@ -40,7 +40,7 @@ sym(vp8_loop_filter_horizontal_edge_mmx):
         movsxd      rax, dword ptr arg(1) ;src_pixel_step     ; destination pitch?
 
         movsxd      rcx, dword ptr arg(5) ;count
-next8_h:
+.next8_h:
         mov         rdx, arg(3) ;limit
         movq        mm7, [rdx]
         mov         rdi, rsi              ; rdi points to row +1 for indirect addressing
@@ -211,7 +211,7 @@ next8_h:
         add         rsi,8
         neg         rax
         dec         rcx
-        jnz         next8_h
+        jnz         .next8_h
 
     add rsp, 32
     pop rsp
@@ -255,7 +255,7 @@ sym(vp8_loop_filter_vertical_edge_mmx):
         lea         rsi,        [rsi + rax*4 - 4]
 
         movsxd      rcx,        dword ptr arg(5) ;count
-next8_v:
+.next8_v:
         mov         rdi,        rsi           ; rdi points to row +1 for indirect addressing
         add         rdi,        rax
 
@@ -581,7 +581,7 @@ next8_v:
 
         lea         rsi,        [rsi+rax*8]
         dec         rcx
-        jnz         next8_v
+        jnz         .next8_v
 
     add rsp, 64
     pop rsp
@@ -622,7 +622,7 @@ sym(vp8_mbloop_filter_horizontal_edge_mmx):
         movsxd      rax, dword ptr arg(1) ;src_pixel_step     ; destination pitch?
 
         movsxd      rcx, dword ptr arg(5) ;count
-next8_mbh:
+.next8_mbh:
         mov         rdx, arg(3) ;limit
         movq        mm7, [rdx]
         mov         rdi, rsi              ; rdi points to row +1 for indirect addressing
@@ -898,7 +898,7 @@ next8_mbh:
         neg         rax
         add         rsi,8
         dec         rcx
-        jnz         next8_mbh
+        jnz         .next8_mbh
 
     add rsp, 32
     pop rsp
@@ -942,7 +942,7 @@ sym(vp8_mbloop_filter_vertical_edge_mmx):
         lea         rsi,        [rsi + rax*4 - 4]
 
         movsxd      rcx,        dword ptr arg(5) ;count
-next8_mbv:
+.next8_mbv:
         lea         rdi,        [rsi + rax]  ; rdi points to row +1 for indirect addressing
 
         ;transpose
@@ -1365,7 +1365,7 @@ next8_mbv:
         lea         rsi,        [rsi+rax*8]
         dec         rcx
 
-        jnz         next8_mbv
+        jnz         .next8_mbv
 
     add rsp, 96
     pop rsp
@@ -1398,7 +1398,7 @@ sym(vp8_loop_filter_simple_horizontal_edge_mmx):
         movsxd      rax, dword ptr arg(1) ;src_pixel_step     ; destination pitch?
 
         mov         rcx, 2                ; count
-nexts8_h:
+.nexts8_h:
         mov         rdx, arg(2) ;blimit           ; get blimit
         movq        mm3, [rdx]            ;
 
@@ -1483,7 +1483,7 @@ nexts8_h:
         add         rsi,8
         neg         rax
         dec         rcx
-        jnz         nexts8_h
+        jnz         .nexts8_h
 
     ; begin epilog
     pop rdi
@@ -1520,7 +1520,7 @@ sym(vp8_loop_filter_simple_vertical_edge_mmx):
 
         lea         rsi, [rsi + rax*4- 2];  ;
         mov         rcx, 2                                      ; count
-nexts8_v:
+.nexts8_v:
 
         lea         rdi,        [rsi + rax];
         movd        mm0,        [rdi + rax * 2]                 ; xx xx xx xx 73 72 71 70
@@ -1695,7 +1695,7 @@ nexts8_v:
         lea         rsi,        [rsi+rax*8]                 ; next 8
 
         dec         rcx
-        jnz         nexts8_v
+        jnz         .nexts8_v
 
     add rsp, 32
     pop rsp
diff --git a/media/libvpx/vp8/common/x86/loopfilter_sse2.asm b/media/libvpx/vp8/common/x86/loopfilter_sse2.asm
index 4efff7eb584..2ad010adb18 100644
--- a/media/libvpx/vp8/common/x86/loopfilter_sse2.asm
+++ b/media/libvpx/vp8/common/x86/loopfilter_sse2.asm
@@ -271,6 +271,7 @@
 
 %endmacro
 
+%if ABI_IS_32BIT
 
 ;void vp8_loop_filter_horizontal_edge_sse2
 ;(
@@ -321,6 +322,7 @@ sym(vp8_loop_filter_horizontal_edge_sse2):
     pop         rbp
     ret
 
+%endif
 
 ;void vp8_loop_filter_horizontal_edge_uv_sse2
 ;(
@@ -1005,6 +1007,7 @@ sym(vp8_mbloop_filter_horizontal_edge_uv_sse2):
         movd        [rdi+2*rcx+2],      %2
 %endmacro
 
+%if ABI_IS_32BIT
 
 ;void vp8_loop_filter_vertical_edge_sse2
 ;(
@@ -1072,6 +1075,7 @@ sym(vp8_loop_filter_vertical_edge_sse2):
     pop         rbp
     ret
 
+%endif
 
 ;void vp8_loop_filter_vertical_edge_uv_sse2
 ;(
@@ -1381,52 +1385,54 @@ sym(vp8_loop_filter_simple_horizontal_edge_sse2):
     SHADOW_ARGS_TO_STACK 3
     SAVE_XMM 7
     GET_GOT     rbx
-    push        rsi
-    push        rdi
     ; end prolog
 
-        mov         rsi, arg(0)             ;src_ptr
+        mov         rcx, arg(0)             ;src_ptr
         movsxd      rax, dword ptr arg(1)   ;src_pixel_step     ; destination pitch?
-        mov         rdx, arg(2)             ;blimit
-        movdqa      xmm3, XMMWORD PTR [rdx]
 
-        mov         rdi, rsi                ; rdi points to row +1 for indirect addressing
-        add         rdi, rax
+        lea         rdx, [rcx + rax]
         neg         rax
 
         ; calculate mask
-        movdqu      xmm1, [rsi+2*rax]       ; p1
-        movdqu      xmm0, [rdi]             ; q1
+        movdqa      xmm0, [rdx]             ; q1
+        mov         rdx, arg(2)             ;blimit
+        movdqa      xmm1, [rcx+2*rax]       ; p1
+
         movdqa      xmm2, xmm1
         movdqa      xmm7, xmm0
-        movdqa      xmm4, xmm0
+
         psubusb     xmm0, xmm1              ; q1-=p1
-        psubusb     xmm1, xmm4              ; p1-=q1
+        psubusb     xmm1, xmm7              ; p1-=q1
         por         xmm1, xmm0              ; abs(p1-q1)
         pand        xmm1, [GLOBAL(tfe)]     ; set lsb of each byte to zero
         psrlw       xmm1, 1                 ; abs(p1-q1)/2
 
-        movdqu      xmm5, [rsi+rax]         ; p0
-        movdqu      xmm4, [rsi]             ; q0
+        movdqa      xmm3, XMMWORD PTR [rdx]
+
+        movdqa      xmm5, [rcx+rax]         ; p0
+        movdqa      xmm4, [rcx]             ; q0
         movdqa      xmm0, xmm4              ; q0
         movdqa      xmm6, xmm5              ; p0
         psubusb     xmm5, xmm4              ; p0-=q0
         psubusb     xmm4, xmm6              ; q0-=p0
         por         xmm5, xmm4              ; abs(p0 - q0)
+
+        movdqa      xmm4, [GLOBAL(t80)]
+
         paddusb     xmm5, xmm5              ; abs(p0-q0)*2
         paddusb     xmm5, xmm1              ; abs (p0 - q0) *2 + abs(p1-q1)/2
-
         psubusb     xmm5, xmm3              ; abs(p0 - q0) *2 + abs(p1-q1)/2  > blimit
         pxor        xmm3, xmm3
         pcmpeqb     xmm5, xmm3
 
+
         ; start work on filters
-        pxor        xmm2, [GLOBAL(t80)]     ; p1 offset to convert to signed values
-        pxor        xmm7, [GLOBAL(t80)]     ; q1 offset to convert to signed values
+        pxor        xmm2, xmm4     ; p1 offset to convert to signed values
+        pxor        xmm7, xmm4     ; q1 offset to convert to signed values
         psubsb      xmm2, xmm7              ; p1 - q1
 
-        pxor        xmm6, [GLOBAL(t80)]     ; offset to convert to signed values
-        pxor        xmm0, [GLOBAL(t80)]     ; offset to convert to signed values
+        pxor        xmm6, xmm4     ; offset to convert to signed values
+        pxor        xmm0, xmm4     ; offset to convert to signed values
         movdqa      xmm3, xmm0              ; q0
         psubsb      xmm0, xmm6              ; q0 - p0
         paddsb      xmm2, xmm0              ; p1 - q1 + 1 * (q0 - p0)
@@ -1434,42 +1440,36 @@ sym(vp8_loop_filter_simple_horizontal_edge_sse2):
         paddsb      xmm2, xmm0              ; p1 - q1 + 3 * (q0 - p0)
         pand        xmm5, xmm2              ; mask filter values we don't care about
 
-        ; do + 4 side
-        paddsb      xmm5, [GLOBAL(t4)]      ; 3* (q0 - p0) + (p1 - q1) + 4
-
-        movdqa      xmm0, xmm5              ; get a copy of filters
-        psllw       xmm0, 8                 ; shift left 8
-        psraw       xmm0, 3                 ; arithmetic shift right 11
-        psrlw       xmm0, 8
-        movdqa      xmm1, xmm5              ; get a copy of filters
-        psraw       xmm1, 11                ; arithmetic shift right 11
-        psllw       xmm1, 8                 ; shift left 8 to put it back
-
-        por         xmm0, xmm1              ; put the two together to get result
-
-        psubsb      xmm3, xmm0              ; q0-= q0 add
-        pxor        xmm3, [GLOBAL(t80)]     ; unoffset
-        movdqu      [rsi], xmm3             ; write back
-
-        ; now do +3 side
+        paddsb      xmm5, [GLOBAL(t4)]      ;  3* (q0 - p0) + (p1 - q1) + 4
+        movdqa      xmm0, xmm5
         psubsb      xmm5, [GLOBAL(t1s)]     ; +3 instead of +4
 
-        movdqa      xmm0, xmm5              ; get a copy of filters
-        psllw       xmm0, 8                 ; shift left 8
-        psraw       xmm0, 3                 ; arithmetic shift right 11
-        psrlw       xmm0, 8
-        psraw       xmm5, 11                ; arithmetic shift right 11
-        psllw       xmm5, 8                 ; shift left 8 to put it back
-        por         xmm0, xmm5              ; put the two together to get result
+        movdqa      xmm1, [GLOBAL(te0)]
+        movdqa      xmm2, [GLOBAL(t1f)]
 
+        pxor        xmm7, xmm7
+        pcmpgtb     xmm7, xmm0              ;save sign
+        pand        xmm7, xmm1              ;preserve the upper 3 bits
+        psrlw       xmm0, 3
+        pand        xmm0, xmm2              ;clear out upper 3 bits
+        por         xmm0, xmm7              ;add sign
+        psubsb      xmm3, xmm0              ; q0-= q0sz add
 
-        paddsb      xmm6, xmm0              ; p0+= p0 add
-        pxor        xmm6, [GLOBAL(t80)]     ; unoffset
-        movdqu      [rsi+rax], xmm6         ; write back
+        pxor        xmm7, xmm7
+        pcmpgtb     xmm7, xmm5              ;save sign
+        pand        xmm7, xmm1              ;preserve the upper 3 bits
+        psrlw       xmm5, 3
+        pand        xmm5, xmm2              ;clear out upper 3 bits
+        por         xmm5, xmm7              ;add sign
+        paddsb      xmm6, xmm5              ; p0+= p0 add
+
+        pxor        xmm3, xmm4     ; unoffset
+        movdqa      [rcx], xmm3             ; write back
+
+        pxor        xmm6, xmm4     ; unoffset
+        movdqa      [rcx+rax], xmm6         ; write back
 
     ; begin epilog
-    pop rdi
-    pop rsi
     RESTORE_GOT
     RESTORE_XMM
     UNSHADOW_ARGS
@@ -1507,17 +1507,17 @@ sym(vp8_loop_filter_simple_vertical_edge_sse2):
         lea         rdx,        [rsi + rax*4]
         lea         rcx,        [rdx + rax]
 
-        movdqu      xmm0,       [rsi]                   ; (high 96 bits unused) 03 02 01 00
-        movdqu      xmm1,       [rdx]                   ; (high 96 bits unused) 43 42 41 40
-        movdqu      xmm2,       [rdi]                   ; 13 12 11 10
-        movdqu      xmm3,       [rcx]                   ; 53 52 51 50
+        movd        xmm0,       [rsi]                   ; (high 96 bits unused) 03 02 01 00
+        movd        xmm1,       [rdx]                   ; (high 96 bits unused) 43 42 41 40
+        movd        xmm2,       [rdi]                   ; 13 12 11 10
+        movd        xmm3,       [rcx]                   ; 53 52 51 50
         punpckldq   xmm0,       xmm1                    ; (high 64 bits unused) 43 42 41 40 03 02 01 00
         punpckldq   xmm2,       xmm3                    ; 53 52 51 50 13 12 11 10
 
-        movdqu      xmm4,       [rsi + rax*2]           ; 23 22 21 20
-        movdqu      xmm5,       [rdx + rax*2]           ; 63 62 61 60
-        movdqu      xmm6,       [rdi + rax*2]           ; 33 32 31 30
-        movdqu      xmm7,       [rcx + rax*2]           ; 73 72 71 70
+        movd        xmm4,       [rsi + rax*2]           ; 23 22 21 20
+        movd        xmm5,       [rdx + rax*2]           ; 63 62 61 60
+        movd        xmm6,       [rdi + rax*2]           ; 33 32 31 30
+        movd        xmm7,       [rcx + rax*2]           ; 73 72 71 70
         punpckldq   xmm4,       xmm5                    ; 63 62 61 60 23 22 21 20
         punpckldq   xmm6,       xmm7                    ; 73 72 71 70 33 32 31 30
 
@@ -1532,41 +1532,36 @@ sym(vp8_loop_filter_simple_vertical_edge_sse2):
         punpckldq   xmm0,       xmm1                    ; 71 61 51 41 31 21 11 01 70 60 50 40 30 20 10 00
         punpckhdq   xmm2,       xmm1                    ; 73 63 53 43 33 23 13 03 72 62 52 42 32 22 12 02
 
-        movdqa      t0,         xmm0                    ; save to t0
-        movdqa      t1,         xmm2                    ; save to t1
-
         lea         rsi,        [rsi + rax*8]
         lea         rdi,        [rsi + rax]
         lea         rdx,        [rsi + rax*4]
         lea         rcx,        [rdx + rax]
 
-        movdqu      xmm4,       [rsi]                   ; 83 82 81 80
-        movdqu      xmm1,       [rdx]                   ; c3 c2 c1 c0
-        movdqu      xmm6,       [rdi]                   ; 93 92 91 90
-        movdqu      xmm3,       [rcx]                   ; d3 d2 d1 d0
+        movd        xmm4,       [rsi]                   ; 83 82 81 80
+        movd        xmm1,       [rdx]                   ; c3 c2 c1 c0
+        movd        xmm6,       [rdi]                   ; 93 92 91 90
+        movd        xmm3,       [rcx]                   ; d3 d2 d1 d0
         punpckldq   xmm4,       xmm1                    ; c3 c2 c1 c0 83 82 81 80
         punpckldq   xmm6,       xmm3                    ; d3 d2 d1 d0 93 92 91 90
 
-        movdqu      xmm0,       [rsi + rax*2]           ; a3 a2 a1 a0
-        movdqu      xmm5,       [rdx + rax*2]           ; e3 e2 e1 e0
-        movdqu      xmm2,       [rdi + rax*2]           ; b3 b2 b1 b0
-        movdqu      xmm7,       [rcx + rax*2]           ; f3 f2 f1 f0
-        punpckldq   xmm0,       xmm5                    ; e3 e2 e1 e0 a3 a2 a1 a0
-        punpckldq   xmm2,       xmm7                    ; f3 f2 f1 f0 b3 b2 b1 b0
+        movd        xmm1,       [rsi + rax*2]           ; a3 a2 a1 a0
+        movd        xmm5,       [rdx + rax*2]           ; e3 e2 e1 e0
+        movd        xmm3,       [rdi + rax*2]           ; b3 b2 b1 b0
+        movd        xmm7,       [rcx + rax*2]           ; f3 f2 f1 f0
+        punpckldq   xmm1,       xmm5                    ; e3 e2 e1 e0 a3 a2 a1 a0
+        punpckldq   xmm3,       xmm7                    ; f3 f2 f1 f0 b3 b2 b1 b0
 
         punpcklbw   xmm4,       xmm6                    ; d3 c3 d2 c2 d1 c1 d0 c0 93 83 92 82 91 81 90 80
-        punpcklbw   xmm0,       xmm2                    ; f3 e3 f2 e2 f1 e1 f0 e0 b3 a3 b2 a2 b1 a1 b0 a0
+        punpcklbw   xmm1,       xmm3                    ; f3 e3 f2 e2 f1 e1 f0 e0 b3 a3 b2 a2 b1 a1 b0 a0
 
-        movdqa      xmm1,       xmm4
-        punpcklwd   xmm4,       xmm0                    ; b3 a3 93 83 b2 a2 92 82 b1 a1 91 81 b0 a0 90 80
-        punpckhwd   xmm1,       xmm0                    ; f3 e3 d3 c3 f2 e2 d2 c2 f1 e1 d1 c1 f0 e0 d0 c0
+        movdqa      xmm7,       xmm4
+        punpcklwd   xmm4,       xmm1                    ; b3 a3 93 83 b2 a2 92 82 b1 a1 91 81 b0 a0 90 80
+        punpckhwd   xmm7,       xmm1                    ; f3 e3 d3 c3 f2 e2 d2 c2 f1 e1 d1 c1 f0 e0 d0 c0
 
         movdqa      xmm6,       xmm4
-        punpckldq   xmm4,       xmm1                    ; f1 e1 d1 c1 b1 a1 91 81 f0 e0 d0 c0 b0 a0 90 80
-        punpckhdq   xmm6,       xmm1                    ; f3 e3 d3 c3 b3 a3 93 83 f2 e2 d2 c2 b2 a2 92 82
+        punpckldq   xmm4,       xmm7                    ; f1 e1 d1 c1 b1 a1 91 81 f0 e0 d0 c0 b0 a0 90 80
+        punpckhdq   xmm6,       xmm7                    ; f3 e3 d3 c3 b3 a3 93 83 f2 e2 d2 c2 b2 a2 92 82
 
-        movdqa      xmm0,       t0                      ; 71 61 51 41 31 21 11 01 70 60 50 40 30 20 10 00
-        movdqa      xmm2,       t1                      ; 73 63 53 43 33 23 13 03 72 62 52 42 32 22 12 02
         movdqa      xmm1,       xmm0
         movdqa      xmm3,       xmm2
 
@@ -1575,6 +1570,8 @@ sym(vp8_loop_filter_simple_vertical_edge_sse2):
         punpcklqdq  xmm2,       xmm6                    ; q0  f2 e2 d2 c2 b2 a2 92 82 72 62 52 42 32 22 12 02
         punpckhqdq  xmm3,       xmm6                    ; q1  f3 e3 d3 c3 b3 a3 93 83 73 63 53 43 33 23 13 03
 
+        mov         rdx,        arg(2)                          ;blimit
+
         ; calculate mask
         movdqa      xmm6,       xmm0                            ; p1
         movdqa      xmm7,       xmm3                            ; q1
@@ -1584,6 +1581,8 @@ sym(vp8_loop_filter_simple_vertical_edge_sse2):
         pand        xmm6,       [GLOBAL(tfe)]                   ; set lsb of each byte to zero
         psrlw       xmm6,       1                               ; abs(p1-q1)/2
 
+        movdqa      xmm7, [rdx]
+
         movdqa      xmm5,       xmm1                            ; p0
         movdqa      xmm4,       xmm2                            ; q0
         psubusb     xmm5,       xmm2                            ; p0-=q0
@@ -1592,8 +1591,7 @@ sym(vp8_loop_filter_simple_vertical_edge_sse2):
         paddusb     xmm5,       xmm5                            ; abs(p0-q0)*2
         paddusb     xmm5,       xmm6                            ; abs (p0 - q0) *2 + abs(p1-q1)/2
 
-        mov         rdx,        arg(2)                          ;blimit
-        movdqa      xmm7, XMMWORD PTR [rdx]
+        movdqa      xmm4, [GLOBAL(t80)]
 
         psubusb     xmm5,        xmm7                           ; abs(p0 - q0) *2 + abs(p1-q1)/2  > blimit
         pxor        xmm7,        xmm7
@@ -1603,59 +1601,48 @@ sym(vp8_loop_filter_simple_vertical_edge_sse2):
         movdqa        t0,        xmm0
         movdqa        t1,        xmm3
 
-        pxor        xmm0,        [GLOBAL(t80)]                  ; p1 offset to convert to signed values
-        pxor        xmm3,        [GLOBAL(t80)]                  ; q1 offset to convert to signed values
-
+        pxor        xmm0,        xmm4                  ; p1 offset to convert to signed values
+        pxor        xmm3,        xmm4                  ; q1 offset to convert to signed values
         psubsb      xmm0,        xmm3                           ; p1 - q1
+
         movdqa      xmm6,        xmm1                           ; p0
+;        movdqa      xmm7,        xmm2                           ; q0
 
-        movdqa      xmm7,        xmm2                           ; q0
-        pxor        xmm6,        [GLOBAL(t80)]                  ; offset to convert to signed values
-
-        pxor        xmm7,        [GLOBAL(t80)]                  ; offset to convert to signed values
-        movdqa      xmm3,        xmm7                           ; offseted ; q0
-
-        psubsb      xmm7,        xmm6                           ; q0 - p0
-        paddsb      xmm0,        xmm7                           ; p1 - q1 + 1 * (q0 - p0)
-
-        paddsb      xmm0,        xmm7                           ; p1 - q1 + 2 * (q0 - p0)
-        paddsb      xmm0,        xmm7                           ; p1 - q1 + 3 * (q0 - p0)
+        pxor        xmm6,        xmm4                  ; offset to convert to signed values
+        pxor        xmm2,        xmm4                  ; offset to convert to signed values
 
+        movdqa      xmm3,        xmm2                           ; offseted ; q0
+        psubsb      xmm2,        xmm6                           ; q0 - p0
+        paddsb      xmm0,        xmm2                           ; p1 - q1 + 1 * (q0 - p0)
+        paddsb      xmm0,        xmm2                           ; p1 - q1 + 2 * (q0 - p0)
+        paddsb      xmm0,        xmm2                           ; p1 - q1 + 3 * (q0 - p0)
         pand        xmm5,        xmm0                           ; mask filter values we don't care about
 
-
         paddsb      xmm5,        [GLOBAL(t4)]                   ;  3* (q0 - p0) + (p1 - q1) + 4
-
-        movdqa      xmm0,        xmm5                           ; get a copy of filters
-        psllw       xmm0,        8                              ; shift left 8
-
-        psraw       xmm0,        3                              ; arithmetic shift right 11
-        psrlw       xmm0,        8
-
-        movdqa      xmm7,        xmm5                           ; get a copy of filters
-        psraw       xmm7,        11                             ; arithmetic shift right 11
-
-        psllw       xmm7,        8                              ; shift left 8 to put it back
-        por         xmm0,        xmm7                           ; put the two together to get result
-
-        psubsb      xmm3,        xmm0                           ; q0-= q0sz add
-        pxor        xmm3,        [GLOBAL(t80)]                  ; unoffset   q0
-
-        ; now do +3 side
+        movdqa      xmm0, xmm5
         psubsb      xmm5,        [GLOBAL(t1s)]                  ; +3 instead of +4
-        movdqa      xmm0,        xmm5                           ; get a copy of filters
 
-        psllw       xmm0,        8                              ; shift left 8
-        psraw       xmm0,        3                              ; arithmetic shift right 11
+        movdqa  xmm1, [GLOBAL(te0)]
+        movdqa  xmm2, [GLOBAL(t1f)]
 
-        psrlw       xmm0,        8
-        psraw       xmm5,        11                             ; arithmetic shift right 11
+        pxor        xmm7, xmm7
+        pcmpgtb     xmm7, xmm0              ;save sign
+        pand        xmm7, xmm1              ;preserve the upper 3 bits
+        psrlw       xmm0, 3
+        pand        xmm0, xmm2              ;clear out upper 3 bits
+        por         xmm0, xmm7              ;add sign
+        psubsb      xmm3, xmm0              ; q0-= q0sz add
 
-        psllw       xmm5,        8                              ; shift left 8 to put it back
-        por         xmm0,        xmm5                           ; put the two together to get result
+        pxor        xmm7, xmm7
+        pcmpgtb     xmm7, xmm5              ;save sign
+        pand        xmm7, xmm1              ;preserve the upper 3 bits
+        psrlw       xmm5, 3
+        pand        xmm5, xmm2              ;clear out upper 3 bits
+        por         xmm5, xmm7              ;add sign
+        paddsb      xmm6, xmm5              ; p0+= p0 add
 
-        paddsb      xmm6,        xmm0                           ; p0+= p0 add
-        pxor        xmm6,        [GLOBAL(t80)]                  ; unoffset   p0
+        pxor        xmm3,        xmm4                  ; unoffset   q0
+        pxor        xmm6,        xmm4                  ; unoffset   p0
 
         movdqa      xmm0,        t0                             ; p1
         movdqa      xmm4,        t1                             ; q1
@@ -1759,3 +1746,9 @@ s9:
 align 16
 s63:
     times 8 dw 0x003f
+align 16
+te0:
+    times 16 db 0xe0
+align 16
+t1f:
+    times 16 db 0x1f
diff --git a/media/libvpx/vp8/common/x86/loopfilter_x86.c b/media/libvpx/vp8/common/x86/loopfilter_x86.c
index 9360ac17c01..6d0a07ae4d7 100644
--- a/media/libvpx/vp8/common/x86/loopfilter_x86.c
+++ b/media/libvpx/vp8/common/x86/loopfilter_x86.c
@@ -17,8 +17,13 @@ prototype_loopfilter(vp8_mbloop_filter_horizontal_edge_mmx);
 prototype_loopfilter(vp8_loop_filter_vertical_edge_mmx);
 prototype_loopfilter(vp8_loop_filter_horizontal_edge_mmx);
 
+#if HAVE_SSE2 && ARCH_X86_64
+prototype_loopfilter(vp8_loop_filter_bv_y_sse2);
+prototype_loopfilter(vp8_loop_filter_bh_y_sse2);
+#else
 prototype_loopfilter(vp8_loop_filter_vertical_edge_sse2);
 prototype_loopfilter(vp8_loop_filter_horizontal_edge_sse2);
+#endif
 prototype_loopfilter(vp8_mbloop_filter_vertical_edge_sse2);
 prototype_loopfilter(vp8_mbloop_filter_horizontal_edge_sse2);
 
@@ -132,9 +137,13 @@ void vp8_loop_filter_mbv_sse2(unsigned char *y_ptr, unsigned char *u_ptr, unsign
 void vp8_loop_filter_bh_sse2(unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr,
                              int y_stride, int uv_stride, loop_filter_info *lfi)
 {
+#if ARCH_X86_64
+    vp8_loop_filter_bh_y_sse2(y_ptr, y_stride, lfi->blim, lfi->lim, lfi->hev_thr, 2);
+#else
     vp8_loop_filter_horizontal_edge_sse2(y_ptr + 4 * y_stride, y_stride, lfi->blim, lfi->lim, lfi->hev_thr, 2);
     vp8_loop_filter_horizontal_edge_sse2(y_ptr + 8 * y_stride, y_stride, lfi->blim, lfi->lim, lfi->hev_thr, 2);
     vp8_loop_filter_horizontal_edge_sse2(y_ptr + 12 * y_stride, y_stride, lfi->blim, lfi->lim, lfi->hev_thr, 2);
+#endif
 
     if (u_ptr)
         vp8_loop_filter_horizontal_edge_uv_sse2(u_ptr + 4 * uv_stride, uv_stride, lfi->blim, lfi->lim, lfi->hev_thr, v_ptr + 4 * uv_stride);
@@ -153,9 +162,13 @@ void vp8_loop_filter_bhs_sse2(unsigned char *y_ptr, int y_stride, const unsigned
 void vp8_loop_filter_bv_sse2(unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr,
                              int y_stride, int uv_stride, loop_filter_info *lfi)
 {
+#if ARCH_X86_64
+    vp8_loop_filter_bv_y_sse2(y_ptr, y_stride, lfi->blim, lfi->lim, lfi->hev_thr, 2);
+#else
     vp8_loop_filter_vertical_edge_sse2(y_ptr + 4, y_stride, lfi->blim, lfi->lim, lfi->hev_thr, 2);
     vp8_loop_filter_vertical_edge_sse2(y_ptr + 8, y_stride, lfi->blim, lfi->lim, lfi->hev_thr, 2);
     vp8_loop_filter_vertical_edge_sse2(y_ptr + 12, y_stride, lfi->blim, lfi->lim, lfi->hev_thr, 2);
+#endif
 
     if (u_ptr)
         vp8_loop_filter_vertical_edge_uv_sse2(u_ptr + 4, uv_stride, lfi->blim, lfi->lim, lfi->hev_thr, v_ptr + 4);
diff --git a/media/libvpx/vp8/common/x86/postproc_mmx.asm b/media/libvpx/vp8/common/x86/postproc_mmx.asm
index 787e832687b..d24f74087b7 100644
--- a/media/libvpx/vp8/common/x86/postproc_mmx.asm
+++ b/media/libvpx/vp8/common/x86/postproc_mmx.asm
@@ -58,10 +58,10 @@ sym(vp8_post_proc_down_and_across_mmx):
         movsxd      rax, DWORD PTR arg(2) ;src_pixels_per_line ; destination pitch?
         pxor        mm0, mm0              ; mm0 = 00000000
 
-nextrow:
+.nextrow:
 
         xor         rdx,        rdx       ; clear out rdx for use as loop counter
-nextcol:
+.nextcol:
 
         pxor        mm7, mm7              ; mm7 = 00000000
         movq        mm6, [rbx + 32 ]      ; mm6 = kernel 2 taps
@@ -146,17 +146,34 @@ nextcol:
         add         rdx, 4
 
         cmp         edx, dword ptr arg(5) ;cols
-        jl          nextcol
+        jl          .nextcol
         ; done with the all cols, start the across filtering in place
         sub         rsi, rdx
         sub         rdi, rdx
 
+        ; dup the first byte into the left border 8 times
+        movq        mm1,   [rdi]
+        punpcklbw   mm1,   mm1
+        punpcklwd   mm1,   mm1
+        punpckldq   mm1,   mm1
+
+        mov         rdx,    -8
+        movq        [rdi+rdx], mm1
+
+        ; dup the last byte into the right border
+        movsxd      rdx,    dword arg(5)
+        movq        mm1,   [rdi + rdx + -1]
+        punpcklbw   mm1,   mm1
+        punpcklwd   mm1,   mm1
+        punpckldq   mm1,   mm1
+        movq        [rdi+rdx], mm1
+
 
         push        rax
         xor         rdx,    rdx
         mov         rax,    [rdi-4];
 
-acrossnextcol:
+.acrossnextcol:
         pxor        mm7, mm7              ; mm7 = 00000000
         movq        mm6, [rbx + 32 ]      ;
         movq        mm4, [rdi+rdx]        ; mm4 = p0..p7
@@ -237,7 +254,7 @@ acrossnextcol:
 
         add         rdx, 4
         cmp         edx, dword ptr arg(5) ;cols
-        jl          acrossnextcol;
+        jl          .acrossnextcol;
 
         mov         DWORD PTR [rdi+rdx-4],  eax
         pop         rax
@@ -249,7 +266,7 @@ acrossnextcol:
         movsxd      rax, dword ptr arg(2) ;src_pixels_per_line ; destination pitch?
 
         dec         rcx                   ; decrement count
-        jnz         nextrow               ; next row
+        jnz         .nextrow               ; next row
         pop         rbx
 
     ; begin epilog
@@ -293,13 +310,41 @@ sym(vp8_mbpost_proc_down_mmx):
     add         dword ptr arg(2), 8
 
     ;for(c=0; c<cols; c+=4)
-loop_col:
+.loop_col:
             mov         rsi,        arg(0)  ;s
             pxor        mm0,        mm0     ;
 
             movsxd      rax,        dword ptr arg(1) ;pitch       ;
+
+            ; this copies the last row down into the border 8 rows
+            mov         rdi,        rsi
+            mov         rdx,        arg(2)
+            sub         rdx,        9
+            imul        rdx,        rax
+            lea         rdi,        [rdi+rdx]
+            movq        mm1,        QWORD ptr[rdi]              ; first row
+            mov         rcx,        8
+.init_borderd                                                    ; initialize borders
+            lea         rdi,        [rdi + rax]
+            movq        [rdi],      xmm1
+
+            dec         rcx
+            jne         .init_borderd
+
             neg         rax                                     ; rax = -pitch
 
+            ; this copies the first row up into the border 8 rows
+            mov         rdi,        rsi
+            movq        mm1,        QWORD ptr[rdi]              ; first row
+            mov         rcx,        8
+.init_border                                                    ; initialize borders
+            lea         rdi,        [rdi + rax]
+            movq        [rdi],      mm1
+
+            dec         rcx
+            jne         .init_border
+
+
             lea         rsi,        [rsi + rax*8];              ; rdi = s[-pitch*8]
             neg         rax
 
@@ -312,7 +357,7 @@ loop_col:
 
             mov         rcx,        15          ;
 
-loop_initvar:
+.loop_initvar:
             movd        mm1,        DWORD PTR [rdi];
             punpcklbw   mm1,        mm0     ;
 
@@ -329,10 +374,10 @@ loop_initvar:
             lea         rdi,        [rdi+rax]   ;
 
             dec         rcx
-            jne         loop_initvar
+            jne         .loop_initvar
             ;save the var and sum
             xor         rdx,        rdx
-loop_row:
+.loop_row:
             movd        mm1,        DWORD PTR [rsi]     ; [s-pitch*8]
             movd        mm2,        DWORD PTR [rdi]     ; [s+pitch*7]
 
@@ -438,13 +483,13 @@ loop_row:
             add         rdx,        1
 
             cmp         edx,        dword arg(2) ;rows
-            jl          loop_row
+            jl          .loop_row
 
 
         add         dword arg(0), 4 ; s += 4
         sub         dword arg(3), 4 ; cols -= 4
         cmp         dword arg(3), 0
-        jg          loop_col
+        jg          .loop_col
 
     add         rsp, 136
     pop         rsp
@@ -475,7 +520,7 @@ sym(vp8_plane_add_noise_mmx):
     push        rdi
     ; end prolog
 
-addnoise_loop:
+.addnoise_loop:
     call sym(rand) WRT_PLT
     mov     rcx, arg(1) ;noise
     and     rax, 0xff
@@ -492,7 +537,7 @@ addnoise_loop:
             mov     rsi, arg(0) ;Pos
             xor         rax,rax
 
-addnoise_nextset:
+.addnoise_nextset:
             movq        mm1,[rsi+rax]         ; get the source
 
             psubusb     mm1, [rdx]    ;blackclamp        ; clamp both sides so we don't outrange adding noise
@@ -506,12 +551,12 @@ addnoise_nextset:
             add         rax,8                 ; move to the next line
 
             cmp         rax, rcx
-            jl          addnoise_nextset
+            jl          .addnoise_nextset
 
     movsxd  rax, dword arg(7) ; Pitch
     add     arg(0), rax ; Start += Pitch
     sub     dword arg(6), 1   ; Height -= 1
-    jg      addnoise_loop
+    jg      .addnoise_loop
 
     ; begin epilog
     pop rdi
diff --git a/media/libvpx/vp8/common/x86/postproc_sse2.asm b/media/libvpx/vp8/common/x86/postproc_sse2.asm
index 06d51ec6fe0..966aafd26a0 100644
--- a/media/libvpx/vp8/common/x86/postproc_sse2.asm
+++ b/media/libvpx/vp8/common/x86/postproc_sse2.asm
@@ -57,10 +57,10 @@ sym(vp8_post_proc_down_and_across_xmm):
         movsxd      rax,        DWORD PTR arg(2) ;src_pixels_per_line ; destination pitch?
         pxor        xmm0,       xmm0              ; mm0 = 00000000
 
-nextrow:
+.nextrow:
 
         xor         rdx,        rdx       ; clear out rdx for use as loop counter
-nextcol:
+.nextcol:
         movq        xmm3,       QWORD PTR [rsi]         ; mm4 = r0 p0..p7
         punpcklbw   xmm3,       xmm0                    ; mm3 = p0..p3
         movdqa      xmm1,       xmm3                    ; mm1 = p0..p3
@@ -133,16 +133,34 @@ nextcol:
         add         rdx,        8
         cmp         edx,        dword arg(5) ;cols
 
-        jl          nextcol
+        jl          .nextcol
 
         ; done with the all cols, start the across filtering in place
         sub         rsi,        rdx
         sub         rdi,        rdx
 
+
+        ; dup the first byte into the left border 8 times
+        movq        mm1,   [rdi]
+        punpcklbw   mm1,   mm1
+        punpcklwd   mm1,   mm1
+        punpckldq   mm1,   mm1
+
+        mov         rdx,    -8
+        movq        [rdi+rdx], mm1
+
+        ; dup the last byte into the right border
+        movsxd      rdx,    dword arg(5)
+        movq        mm1,   [rdi + rdx + -1]
+        punpcklbw   mm1,   mm1
+        punpcklwd   mm1,   mm1
+        punpckldq   mm1,   mm1
+        movq        [rdi+rdx], mm1
+
         xor         rdx,        rdx
         movq        mm0,        QWORD PTR [rdi-8];
 
-acrossnextcol:
+.acrossnextcol:
         movq        xmm7,       QWORD PTR [rdi +rdx -2]
         movd        xmm4,       DWORD PTR [rdi +rdx +6]
 
@@ -219,7 +237,7 @@ acrossnextcol:
 
         add         rdx,        8
         cmp         edx,        dword arg(5) ;cols
-        jl          acrossnextcol;
+        jl          .acrossnextcol;
 
         ; last 8 pixels
         movq        QWORD PTR [rdi+rdx-8],  mm0
@@ -231,7 +249,7 @@ acrossnextcol:
         mov         eax, dword arg(2) ;src_pixels_per_line ; destination pitch?
 
         dec         rcx                   ; decrement count
-        jnz         nextrow               ; next row
+        jnz         .nextrow              ; next row
 
 %if ABI_IS_32BIT=1 && CONFIG_PIC=1
     add rsp,16
@@ -282,17 +300,45 @@ sym(vp8_mbpost_proc_down_xmm):
     add         dword arg(2), 8
 
     ;for(c=0; c<cols; c+=8)
-loop_col:
+.loop_col:
             mov         rsi,        arg(0) ; s
             pxor        xmm0,       xmm0        ;
 
             movsxd      rax,        dword ptr arg(1) ;pitch       ;
+
+            ; this copies the last row down into the border 8 rows
+            mov         rdi,        rsi
+            mov         rdx,        arg(2)
+            sub         rdx,        9
+            imul        rdx,        rax
+            lea         rdi,        [rdi+rdx]
+            movq        xmm1,       QWORD ptr[rdi]              ; first row
+            mov         rcx,        8
+.init_borderd                                                    ; initialize borders
+            lea         rdi,        [rdi + rax]
+            movq        [rdi],      xmm1
+
+            dec         rcx
+            jne         .init_borderd
+
             neg         rax                                     ; rax = -pitch
 
+            ; this copies the first row up into the border 8 rows
+            mov         rdi,        rsi
+            movq        xmm1,       QWORD ptr[rdi]              ; first row
+            mov         rcx,        8
+.init_border                                                    ; initialize borders
+            lea         rdi,        [rdi + rax]
+            movq        [rdi],      xmm1
+
+            dec         rcx
+            jne         .init_border
+
+
+
             lea         rsi,        [rsi + rax*8];              ; rdi = s[-pitch*8]
             neg         rax
 
-
             pxor        xmm5,       xmm5
             pxor        xmm6,       xmm6        ;
 
@@ -301,7 +347,7 @@ loop_col:
 
             mov         rcx,        15          ;
 
-loop_initvar:
+.loop_initvar:
             movq        xmm1,       QWORD PTR [rdi];
             punpcklbw   xmm1,       xmm0        ;
 
@@ -318,10 +364,10 @@ loop_initvar:
             lea         rdi,        [rdi+rax]   ;
 
             dec         rcx
-            jne         loop_initvar
+            jne         .loop_initvar
             ;save the var and sum
             xor         rdx,        rdx
-loop_row:
+.loop_row:
             movq        xmm1,       QWORD PTR [rsi]     ; [s-pitch*8]
             movq        xmm2,       QWORD PTR [rdi]     ; [s+pitch*7]
 
@@ -428,12 +474,12 @@ loop_row:
             add         rdx,        1
 
             cmp         edx,        dword arg(2) ;rows
-            jl          loop_row
+            jl          .loop_row
 
         add         dword arg(0), 8 ; s += 8
         sub         dword arg(3), 8 ; cols -= 8
         cmp         dword arg(3), 0
-        jg          loop_col
+        jg          .loop_col
 
     add         rsp, 128+16
     pop         rsp
@@ -475,13 +521,31 @@ sym(vp8_mbpost_proc_across_ip_xmm):
 
 
     ;for(r=0;r<rows;r++)
-ip_row_loop:
+.ip_row_loop:
 
         xor         rdx,    rdx ;sumsq=0;
         xor         rcx,    rcx ;sum=0;
         mov         rsi,    arg(0); s
+
+
+        ; dup the first byte into the left border 8 times
+        movq        mm1,   [rsi]
+        punpcklbw   mm1,   mm1
+        punpcklwd   mm1,   mm1
+        punpckldq   mm1,   mm1
+
         mov         rdi,    -8
-ip_var_loop:
+        movq        [rsi+rdi], mm1
+
+        ; dup the last byte into the right border
+        movsxd      rdx,    dword arg(3)
+        movq        mm1,   [rsi + rdx + -1]
+        punpcklbw   mm1,   mm1
+        punpcklwd   mm1,   mm1
+        punpckldq   mm1,   mm1
+        movq        [rsi+rdx], mm1
+
+.ip_var_loop:
         ;for(i=-8;i<=6;i++)
         ;{
         ;    sumsq += s[i]*s[i];
@@ -493,7 +557,7 @@ ip_var_loop:
         add         edx, eax
         add         rdi, 1
         cmp         rdi, 6
-        jle         ip_var_loop
+        jle         .ip_var_loop
 
 
             ;mov         rax,    sumsq
@@ -513,7 +577,7 @@ ip_var_loop:
             pxor        mm1,    mm1
 
             pxor        xmm0,   xmm0
-nextcol4:
+.nextcol4:
 
             movd        xmm1,   DWORD PTR [rsi+rcx-8]   ; -8 -7 -6 -5
             movd        xmm2,   DWORD PTR [rsi+rcx+7]   ; +7 +8 +9 +10
@@ -600,7 +664,7 @@ nextcol4:
             add         rcx,    4
 
             cmp         rcx,    rdx
-            jl          nextcol4
+            jl          .nextcol4
 
         ;s+=pitch;
         movsxd rax, dword arg(1)
@@ -608,7 +672,7 @@ nextcol4:
 
         sub dword arg(2), 1 ;rows-=1
         cmp dword arg(2), 0
-        jg ip_row_loop
+        jg .ip_row_loop
 
     add         rsp, 16
     pop         rsp
@@ -640,7 +704,7 @@ sym(vp8_plane_add_noise_wmt):
     push        rdi
     ; end prolog
 
-addnoise_loop:
+.addnoise_loop:
     call sym(rand) WRT_PLT
     mov     rcx, arg(1) ;noise
     and     rax, 0xff
@@ -657,7 +721,7 @@ addnoise_loop:
             mov     rsi, arg(0) ;Pos
             xor         rax,rax
 
-addnoise_nextset:
+.addnoise_nextset:
             movdqu      xmm1,[rsi+rax]         ; get the source
 
             psubusb     xmm1, [rdx]    ;blackclamp        ; clamp both sides so we don't outrange adding noise
@@ -671,12 +735,12 @@ addnoise_nextset:
             add         rax,16                 ; move to the next line
 
             cmp         rax, rcx
-            jl          addnoise_nextset
+            jl          .addnoise_nextset
 
     movsxd  rax, dword arg(7) ; Pitch
     add     arg(0), rax ; Start += Pitch
     sub     dword arg(6), 1   ; Height -= 1
-    jg      addnoise_loop
+    jg      .addnoise_loop
 
     ; begin epilog
     pop rdi
diff --git a/media/libvpx/vp8/common/common_types.h b/media/libvpx/vp8/common/x86/postproc_x86.c
similarity index 57%
rename from media/libvpx/vp8/common/common_types.h
rename to media/libvpx/vp8/common/x86/postproc_x86.c
index 4e62486972f..a25921bee70 100644
--- a/media/libvpx/vp8/common/common_types.h
+++ b/media/libvpx/vp8/common/x86/postproc_x86.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -8,11 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+/* On Android NDK, rand is inlined function, but postproc needs rand symbol */
+#if defined(__ANDROID__)
+#define rand __rand
+#include <stdlib.h>
+#undef rand
 
-#ifndef __INC_COMMON_TYPES
-#define __INC_COMMON_TYPES
-
-#define TRUE    1
-#define FALSE   0
-
+extern int rand(void)
+{
+  return __rand();
+}
 #endif
diff --git a/media/libvpx/vp8/common/x86/recon_mmx.asm b/media/libvpx/vp8/common/x86/recon_mmx.asm
index e7211fccb50..19c0faf3fcf 100644
--- a/media/libvpx/vp8/common/x86/recon_mmx.asm
+++ b/media/libvpx/vp8/common/x86/recon_mmx.asm
@@ -10,53 +10,6 @@
 
 
 %include "vpx_ports/x86_abi_support.asm"
-;void vp8_recon_b_mmx(unsigned char *s, short *q, unsigned char *d, int stride)
-global sym(vp8_recon_b_mmx)
-sym(vp8_recon_b_mmx):
-    push        rbp
-    mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 4
-    push        rsi
-    push        rdi
-    ; end prolog
-
-        mov       rsi, arg(0) ;s
-        mov       rdi, arg(2) ;d
-        mov       rdx, arg(1) ;q
-        movsxd    rax, dword ptr arg(3) ;stride
-        pxor      mm0, mm0
-
-        movd      mm1, [rsi]
-        punpcklbw mm1, mm0
-        paddsw    mm1, [rdx]
-        packuswb  mm1,  mm0              ; pack and unpack to saturate
-        movd      [rdi], mm1
-
-        movd      mm2, [rsi+16]
-        punpcklbw mm2, mm0
-        paddsw    mm2, [rdx+32]
-        packuswb  mm2, mm0              ; pack and unpack to saturate
-        movd      [rdi+rax], mm2
-
-        movd      mm3, [rsi+32]
-        punpcklbw mm3, mm0
-        paddsw    mm3, [rdx+64]
-        packuswb  mm3,  mm0              ; pack and unpack to saturate
-        movd      [rdi+2*rax], mm3
-
-        add       rdi, rax
-        movd      mm4, [rsi+48]
-        punpcklbw mm4, mm0
-        paddsw    mm4, [rdx+96]
-        packuswb  mm4, mm0              ; pack and unpack to saturate
-        movd      [rdi+2*rax], mm4
-
-    ; begin epilog
-    pop rdi
-    pop rsi
-    UNSHADOW_ARGS
-    pop         rbp
-    ret
 
 
 ;void copy_mem8x8_mmx(
diff --git a/media/libvpx/vp8/common/x86/recon_sse2.asm b/media/libvpx/vp8/common/x86/recon_sse2.asm
index 0e23116ce6a..4b68ef5f210 100644
--- a/media/libvpx/vp8/common/x86/recon_sse2.asm
+++ b/media/libvpx/vp8/common/x86/recon_sse2.asm
@@ -10,121 +10,6 @@
 
 
 %include "vpx_ports/x86_abi_support.asm"
-;void vp8_recon2b_sse2(unsigned char *s, short *q, unsigned char *d, int stride)
-global sym(vp8_recon2b_sse2)
-sym(vp8_recon2b_sse2):
-    push        rbp
-    mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 4
-    push        rsi
-    push        rdi
-    ; end prolog
-
-        mov         rsi,        arg(0) ;s
-        mov         rdi,        arg(2) ;d
-        mov         rdx,        arg(1) ;q
-        movsxd      rax,        dword ptr arg(3) ;stride
-        pxor        xmm0,       xmm0
-
-        movq        xmm1,       MMWORD PTR [rsi]
-        punpcklbw   xmm1,       xmm0
-        paddsw      xmm1,       XMMWORD PTR [rdx]
-        packuswb    xmm1,       xmm0              ; pack and unpack to saturate
-        movq        MMWORD PTR [rdi],   xmm1
-
-
-        movq        xmm2,       MMWORD PTR [rsi+8]
-        punpcklbw   xmm2,       xmm0
-        paddsw      xmm2,       XMMWORD PTR [rdx+16]
-        packuswb    xmm2,       xmm0              ; pack and unpack to saturate
-        movq        MMWORD PTR [rdi+rax],   xmm2
-
-
-        movq        xmm3,       MMWORD PTR [rsi+16]
-        punpcklbw   xmm3,       xmm0
-        paddsw      xmm3,       XMMWORD PTR [rdx+32]
-        packuswb    xmm3,       xmm0              ; pack and unpack to saturate
-        movq        MMWORD PTR [rdi+rax*2], xmm3
-
-        add         rdi, rax
-        movq        xmm4,       MMWORD PTR [rsi+24]
-        punpcklbw   xmm4,       xmm0
-        paddsw      xmm4,       XMMWORD PTR [rdx+48]
-        packuswb    xmm4,       xmm0              ; pack and unpack to saturate
-        movq        MMWORD PTR [rdi+rax*2], xmm4
-
-    ; begin epilog
-    pop rdi
-    pop rsi
-    UNSHADOW_ARGS
-    pop         rbp
-    ret
-
-
-;void vp8_recon4b_sse2(unsigned char *s, short *q, unsigned char *d, int stride)
-global sym(vp8_recon4b_sse2)
-sym(vp8_recon4b_sse2):
-    push        rbp
-    mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 4
-    SAVE_XMM 7
-    push        rsi
-    push        rdi
-    ; end prolog
-
-        mov         rsi,        arg(0) ;s
-        mov         rdi,        arg(2) ;d
-        mov         rdx,        arg(1) ;q
-        movsxd      rax,        dword ptr arg(3) ;stride
-        pxor        xmm0,       xmm0
-
-        movdqa      xmm1,       XMMWORD PTR [rsi]
-        movdqa      xmm5,       xmm1
-        punpcklbw   xmm1,       xmm0
-        punpckhbw   xmm5,       xmm0
-        paddsw      xmm1,       XMMWORD PTR [rdx]
-        paddsw      xmm5,       XMMWORD PTR [rdx+16]
-        packuswb    xmm1,       xmm5              ; pack and unpack to saturate
-        movdqa      XMMWORD PTR [rdi],  xmm1
-
-
-        movdqa      xmm2,       XMMWORD PTR [rsi+16]
-        movdqa      xmm6,       xmm2
-        punpcklbw   xmm2,       xmm0
-        punpckhbw   xmm6,       xmm0
-        paddsw      xmm2,       XMMWORD PTR [rdx+32]
-        paddsw      xmm6,       XMMWORD PTR [rdx+48]
-        packuswb    xmm2,       xmm6              ; pack and unpack to saturate
-        movdqa      XMMWORD PTR [rdi+rax],  xmm2
-
-
-        movdqa      xmm3,       XMMWORD PTR [rsi+32]
-        movdqa      xmm7,       xmm3
-        punpcklbw   xmm3,       xmm0
-        punpckhbw   xmm7,       xmm0
-        paddsw      xmm3,       XMMWORD PTR [rdx+64]
-        paddsw      xmm7,       XMMWORD PTR [rdx+80]
-        packuswb    xmm3,       xmm7              ; pack and unpack to saturate
-        movdqa      XMMWORD PTR [rdi+rax*2],    xmm3
-
-        add       rdi, rax
-        movdqa      xmm4,       XMMWORD PTR [rsi+48]
-        movdqa      xmm5,       xmm4
-        punpcklbw   xmm4,       xmm0
-        punpckhbw   xmm5,       xmm0
-        paddsw      xmm4,       XMMWORD PTR [rdx+96]
-        paddsw      xmm5,       XMMWORD PTR [rdx+112]
-        packuswb    xmm4,       xmm5              ; pack and unpack to saturate
-        movdqa      XMMWORD PTR [rdi+rax*2],    xmm4
-
-    ; begin epilog
-    pop rdi
-    pop rsi
-    RESTORE_XMM
-    UNSHADOW_ARGS
-    pop         rbp
-    ret
-
 
 ;void copy_mem16x16_sse2(
 ;    unsigned char *src,
@@ -503,7 +388,7 @@ sym(vp8_intra_pred_uv_tm_%1):
     mov         rdi,        arg(0) ;dst;
     movsxd      rcx,        dword ptr arg(1) ;dst_stride
 
-vp8_intra_pred_uv_tm_%1_loop:
+.vp8_intra_pred_uv_tm_%1_loop:
     movd        xmm3,       [rsi]
     movd        xmm5,       [rsi+rax]
 %ifidn %1, sse2
@@ -525,7 +410,7 @@ vp8_intra_pred_uv_tm_%1_loop:
     lea         rsi,        [rsi+rax*2]
     lea         rdi,        [rdi+rcx*2]
     dec         edx
-    jnz vp8_intra_pred_uv_tm_%1_loop
+    jnz .vp8_intra_pred_uv_tm_%1_loop
 
     ; begin epilog
     pop         rdi
@@ -615,7 +500,7 @@ sym(vp8_intra_pred_uv_ho_%1):
 %endif
     dec         rsi
 %ifidn %1, mmx2
-vp8_intra_pred_uv_ho_%1_loop:
+.vp8_intra_pred_uv_ho_%1_loop:
     movd        mm0,        [rsi]
     movd        mm1,        [rsi+rax]
     punpcklbw   mm0,        mm0
@@ -627,7 +512,7 @@ vp8_intra_pred_uv_ho_%1_loop:
     lea         rsi,        [rsi+rax*2]
     lea         rdi,        [rdi+rcx*2]
     dec         edx
-    jnz vp8_intra_pred_uv_ho_%1_loop
+    jnz .vp8_intra_pred_uv_ho_%1_loop
 %else
     movd        xmm0,       [rsi]
     movd        xmm3,       [rsi+rax]
@@ -674,12 +559,492 @@ vp8_intra_pred_uv_ho_%1_loop:
 vp8_intra_pred_uv_ho mmx2
 vp8_intra_pred_uv_ho ssse3
 
+;void vp8_intra_pred_y_dc_sse2(
+;    unsigned char *dst,
+;    int dst_stride
+;    unsigned char *src,
+;    int src_stride,
+;    )
+global sym(vp8_intra_pred_y_dc_sse2)
+sym(vp8_intra_pred_y_dc_sse2):
+    push        rbp
+    mov         rbp, rsp
+    SHADOW_ARGS_TO_STACK 4
+    push        rsi
+    push        rdi
+    ; end prolog
+
+    ; from top
+    mov         rsi,        arg(2) ;src;
+    movsxd      rax,        dword ptr arg(3) ;src_stride;
+    sub         rsi,        rax
+    pxor        xmm0,       xmm0
+    movdqa      xmm1,       [rsi]
+    psadbw      xmm1,       xmm0
+    movq        xmm2,       xmm1
+    punpckhqdq  xmm1,       xmm1
+    paddw       xmm1,       xmm2
+
+    ; from left
+    dec         rsi
+    lea         rdi,        [rax*3]
+    movzx       ecx,        byte [rsi+rax]
+    movzx       edx,        byte [rsi+rax*2]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rdi]
+    add         ecx,        edx
+    lea         rsi,        [rsi+rax*4]
+    movzx       edx,        byte [rsi]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax*2]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rdi]
+    add         ecx,        edx
+    lea         rsi,        [rsi+rax*4]
+    movzx       edx,        byte [rsi]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax*2]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rdi]
+    add         ecx,        edx
+    lea         rsi,        [rsi+rax*4]
+    movzx       edx,        byte [rsi]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax*2]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rdi]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax*4]
+    add         ecx,        edx
+
+    ; add up
+    pextrw      edx,        xmm1, 0x0
+    lea         edx,        [edx+ecx+16]
+    sar         edx,        5
+    movd        xmm1,       edx
+    ; FIXME use pshufb for ssse3 version
+    pshuflw     xmm1,       xmm1, 0x0
+    punpcklqdq  xmm1,       xmm1
+    packuswb    xmm1,       xmm1
+
+    ; write out
+    mov         rsi,        2
+    mov         rdi,        arg(0) ;dst;
+    movsxd      rcx,        dword ptr arg(1) ;dst_stride
+    lea         rax,        [rcx*3]
+
+.label
+    movdqa [rdi      ],     xmm1
+    movdqa [rdi+rcx  ],     xmm1
+    movdqa [rdi+rcx*2],     xmm1
+    movdqa [rdi+rax  ],     xmm1
+    lea         rdi,        [rdi+rcx*4]
+    movdqa [rdi      ],     xmm1
+    movdqa [rdi+rcx  ],     xmm1
+    movdqa [rdi+rcx*2],     xmm1
+    movdqa [rdi+rax  ],     xmm1
+    lea         rdi,        [rdi+rcx*4]
+    dec         rsi
+    jnz .label
+
+    ; begin epilog
+    pop         rdi
+    pop         rsi
+    UNSHADOW_ARGS
+    pop         rbp
+    ret
+
+;void vp8_intra_pred_y_dctop_sse2(
+;    unsigned char *dst,
+;    int dst_stride
+;    unsigned char *src,
+;    int src_stride,
+;    )
+global sym(vp8_intra_pred_y_dctop_sse2)
+sym(vp8_intra_pred_y_dctop_sse2):
+    push        rbp
+    mov         rbp, rsp
+    SHADOW_ARGS_TO_STACK 4
+    push        rsi
+    GET_GOT     rbx
+    ; end prolog
+
+    ; from top
+    mov         rcx,        arg(2) ;src;
+    movsxd      rax,        dword ptr arg(3) ;src_stride;
+    sub         rcx,        rax
+    pxor        xmm0,       xmm0
+    movdqa      xmm1,       [rcx]
+    psadbw      xmm1,       xmm0
+    movdqa      xmm2,       xmm1
+    punpckhqdq  xmm1,       xmm1
+    paddw       xmm1,       xmm2
+
+    ; add up
+    paddw       xmm1,       [GLOBAL(dc_8)]
+    psraw       xmm1,       4
+    ; FIXME use pshufb for ssse3 version
+    pshuflw     xmm1,       xmm1, 0x0
+    punpcklqdq  xmm1,       xmm1
+    packuswb    xmm1,       xmm1
+
+    ; write out
+    mov         rsi,        2
+    mov         rdx,        arg(0) ;dst;
+    movsxd      rcx,        dword ptr arg(1) ;dst_stride
+    lea         rax,        [rcx*3]
+
+.label
+    movdqa [rdx      ],     xmm1
+    movdqa [rdx+rcx  ],     xmm1
+    movdqa [rdx+rcx*2],     xmm1
+    movdqa [rdx+rax  ],     xmm1
+    lea         rdx,        [rdx+rcx*4]
+    movdqa [rdx      ],     xmm1
+    movdqa [rdx+rcx  ],     xmm1
+    movdqa [rdx+rcx*2],     xmm1
+    movdqa [rdx+rax  ],     xmm1
+    lea         rdx,        [rdx+rcx*4]
+    dec         rsi
+    jnz .label
+
+    ; begin epilog
+    RESTORE_GOT
+    pop         rsi
+    UNSHADOW_ARGS
+    pop         rbp
+    ret
+
+;void vp8_intra_pred_y_dcleft_sse2(
+;    unsigned char *dst,
+;    int dst_stride
+;    unsigned char *src,
+;    int src_stride,
+;    )
+global sym(vp8_intra_pred_y_dcleft_sse2)
+sym(vp8_intra_pred_y_dcleft_sse2):
+    push        rbp
+    mov         rbp, rsp
+    SHADOW_ARGS_TO_STACK 4
+    push        rsi
+    push        rdi
+    ; end prolog
+
+    ; from left
+    mov         rsi,        arg(2) ;src;
+    movsxd      rax,        dword ptr arg(3) ;src_stride;
+    dec         rsi
+    lea         rdi,        [rax*3]
+    movzx       ecx,        byte [rsi]
+    movzx       edx,        byte [rsi+rax]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax*2]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rdi]
+    add         ecx,        edx
+    lea         rsi,        [rsi+rax*4]
+    movzx       edx,        byte [rsi]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax*2]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rdi]
+    add         ecx,        edx
+    lea         rsi,        [rsi+rax*4]
+    movzx       edx,        byte [rsi]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax*2]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rdi]
+    add         ecx,        edx
+    lea         rsi,        [rsi+rax*4]
+    movzx       edx,        byte [rsi]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rax*2]
+    add         ecx,        edx
+    movzx       edx,        byte [rsi+rdi]
+    lea         edx,        [ecx+edx+8]
+
+    ; add up
+    shr         edx,        4
+    movd        xmm1,       edx
+    ; FIXME use pshufb for ssse3 version
+    pshuflw     xmm1,       xmm1, 0x0
+    punpcklqdq  xmm1,       xmm1
+    packuswb    xmm1,       xmm1
+
+    ; write out
+    mov         rsi,        2
+    mov         rdi,        arg(0) ;dst;
+    movsxd      rcx,        dword ptr arg(1) ;dst_stride
+    lea         rax,        [rcx*3]
+
+.label
+    movdqa [rdi      ],     xmm1
+    movdqa [rdi+rcx  ],     xmm1
+    movdqa [rdi+rcx*2],     xmm1
+    movdqa [rdi+rax  ],     xmm1
+    lea         rdi,        [rdi+rcx*4]
+    movdqa [rdi      ],     xmm1
+    movdqa [rdi+rcx  ],     xmm1
+    movdqa [rdi+rcx*2],     xmm1
+    movdqa [rdi+rax  ],     xmm1
+    lea         rdi,        [rdi+rcx*4]
+    dec         rsi
+    jnz .label
+
+    ; begin epilog
+    pop         rdi
+    pop         rsi
+    UNSHADOW_ARGS
+    pop         rbp
+    ret
+
+;void vp8_intra_pred_y_dc128_sse2(
+;    unsigned char *dst,
+;    int dst_stride
+;    unsigned char *src,
+;    int src_stride,
+;    )
+global sym(vp8_intra_pred_y_dc128_sse2)
+sym(vp8_intra_pred_y_dc128_sse2):
+    push        rbp
+    mov         rbp, rsp
+    SHADOW_ARGS_TO_STACK 4
+    push        rsi
+    GET_GOT     rbx
+    ; end prolog
+
+    ; write out
+    mov         rsi,        2
+    movdqa      xmm1,       [GLOBAL(dc_128)]
+    mov         rax,        arg(0) ;dst;
+    movsxd      rdx,        dword ptr arg(1) ;dst_stride
+    lea         rcx,        [rdx*3]
+
+.label
+    movdqa [rax      ],     xmm1
+    movdqa [rax+rdx  ],     xmm1
+    movdqa [rax+rdx*2],     xmm1
+    movdqa [rax+rcx  ],     xmm1
+    lea         rax,        [rax+rdx*4]
+    movdqa [rax      ],     xmm1
+    movdqa [rax+rdx  ],     xmm1
+    movdqa [rax+rdx*2],     xmm1
+    movdqa [rax+rcx  ],     xmm1
+    lea         rax,        [rax+rdx*4]
+    dec         rsi
+    jnz .label
+
+    ; begin epilog
+    RESTORE_GOT
+    pop         rsi
+    UNSHADOW_ARGS
+    pop         rbp
+    ret
+
+;void vp8_intra_pred_y_tm_sse2(
+;    unsigned char *dst,
+;    int dst_stride
+;    unsigned char *src,
+;    int src_stride,
+;    )
+%macro vp8_intra_pred_y_tm 1
+global sym(vp8_intra_pred_y_tm_%1)
+sym(vp8_intra_pred_y_tm_%1):
+    push        rbp
+    mov         rbp, rsp
+    SHADOW_ARGS_TO_STACK 4
+    push        rsi
+    push        rdi
+    GET_GOT     rbx
+    ; end prolog
+
+    ; read top row
+    mov         edx,        8
+    mov         rsi,        arg(2) ;src;
+    movsxd      rax,        dword ptr arg(3) ;src_stride;
+    sub         rsi,        rax
+    pxor        xmm0,       xmm0
+%ifidn %1, ssse3
+    movdqa      xmm3,       [GLOBAL(dc_1024)]
+%endif
+    movdqa      xmm1,       [rsi]
+    movdqa      xmm2,       xmm1
+    punpcklbw   xmm1,       xmm0
+    punpckhbw   xmm2,       xmm0
+
+    ; set up left ptrs ans subtract topleft
+    movd        xmm4,       [rsi-1]
+    lea         rsi,        [rsi+rax-1]
+%ifidn %1, sse2
+    punpcklbw   xmm4,       xmm0
+    pshuflw     xmm4,       xmm4, 0x0
+    punpcklqdq  xmm4,       xmm4
+%else
+    pshufb      xmm4,       xmm3
+%endif
+    psubw       xmm1,       xmm4
+    psubw       xmm2,       xmm4
+
+    ; set up dest ptrs
+    mov         rdi,        arg(0) ;dst;
+    movsxd      rcx,        dword ptr arg(1) ;dst_stride
+vp8_intra_pred_y_tm_%1_loop:
+    movd        xmm4,       [rsi]
+    movd        xmm5,       [rsi+rax]
+%ifidn %1, sse2
+    punpcklbw   xmm4,       xmm0
+    punpcklbw   xmm5,       xmm0
+    pshuflw     xmm4,       xmm4, 0x0
+    pshuflw     xmm5,       xmm5, 0x0
+    punpcklqdq  xmm4,       xmm4
+    punpcklqdq  xmm5,       xmm5
+%else
+    pshufb      xmm4,       xmm3
+    pshufb      xmm5,       xmm3
+%endif
+    movdqa      xmm6,       xmm4
+    movdqa      xmm7,       xmm5
+    paddw       xmm4,       xmm1
+    paddw       xmm6,       xmm2
+    paddw       xmm5,       xmm1
+    paddw       xmm7,       xmm2
+    packuswb    xmm4,       xmm6
+    packuswb    xmm5,       xmm7
+    movdqa [rdi    ],       xmm4
+    movdqa [rdi+rcx],       xmm5
+    lea         rsi,        [rsi+rax*2]
+    lea         rdi,        [rdi+rcx*2]
+    dec         edx
+    jnz vp8_intra_pred_y_tm_%1_loop
+
+    ; begin epilog
+    RESTORE_GOT
+    pop         rdi
+    pop         rsi
+    UNSHADOW_ARGS
+    pop         rbp
+    ret
+%endmacro
+
+vp8_intra_pred_y_tm sse2
+vp8_intra_pred_y_tm ssse3
+
+;void vp8_intra_pred_y_ve_sse2(
+;    unsigned char *dst,
+;    int dst_stride
+;    unsigned char *src,
+;    int src_stride,
+;    )
+global sym(vp8_intra_pred_y_ve_sse2)
+sym(vp8_intra_pred_y_ve_sse2):
+    push        rbp
+    mov         rbp, rsp
+    SHADOW_ARGS_TO_STACK 4
+    push        rsi
+    ; end prolog
+
+    ; read from top
+    mov         rax,        arg(2) ;src;
+    movsxd      rdx,        dword ptr arg(3) ;src_stride;
+    sub         rax,        rdx
+    movdqa      xmm1,       [rax]
+
+    ; write out
+    mov         rsi,        2
+    mov         rax,        arg(0) ;dst;
+    movsxd      rdx,        dword ptr arg(1) ;dst_stride
+    lea         rcx,        [rdx*3]
+
+.label
+    movdqa [rax      ],     xmm1
+    movdqa [rax+rdx  ],     xmm1
+    movdqa [rax+rdx*2],     xmm1
+    movdqa [rax+rcx  ],     xmm1
+    lea         rax,        [rax+rdx*4]
+    movdqa [rax      ],     xmm1
+    movdqa [rax+rdx  ],     xmm1
+    movdqa [rax+rdx*2],     xmm1
+    movdqa [rax+rcx  ],     xmm1
+    lea         rax,        [rax+rdx*4]
+    dec         rsi
+    jnz .label
+
+    ; begin epilog
+    pop         rsi
+    UNSHADOW_ARGS
+    pop         rbp
+    ret
+
+;void vp8_intra_pred_y_ho_sse2(
+;    unsigned char *dst,
+;    int dst_stride
+;    unsigned char *src,
+;    int src_stride,
+;    )
+global sym(vp8_intra_pred_y_ho_sse2)
+sym(vp8_intra_pred_y_ho_sse2):
+    push        rbp
+    mov         rbp, rsp
+    SHADOW_ARGS_TO_STACK 4
+    push        rsi
+    push        rdi
+    ; end prolog
+
+    ; read from left and write out
+    mov         edx,        8
+    mov         rsi,        arg(2) ;src;
+    movsxd      rax,        dword ptr arg(3) ;src_stride;
+    mov         rdi,        arg(0) ;dst;
+    movsxd      rcx,        dword ptr arg(1) ;dst_stride
+    dec         rsi
+
+vp8_intra_pred_y_ho_sse2_loop:
+    movd        xmm0,       [rsi]
+    movd        xmm1,       [rsi+rax]
+    ; FIXME use pshufb for ssse3 version
+    punpcklbw   xmm0,       xmm0
+    punpcklbw   xmm1,       xmm1
+    pshuflw     xmm0,       xmm0, 0x0
+    pshuflw     xmm1,       xmm1, 0x0
+    punpcklqdq  xmm0,       xmm0
+    punpcklqdq  xmm1,       xmm1
+    movdqa [rdi    ],       xmm0
+    movdqa [rdi+rcx],       xmm1
+    lea         rsi,        [rsi+rax*2]
+    lea         rdi,        [rdi+rcx*2]
+    dec         edx
+    jnz vp8_intra_pred_y_ho_sse2_loop
+
+    ; begin epilog
+    pop         rdi
+    pop         rsi
+    UNSHADOW_ARGS
+    pop         rbp
+    ret
+
 SECTION_RODATA
+align 16
 dc_128:
-    times 8 db 128
+    times 16 db 128
 dc_4:
     times 4 dw 4
 align 16
+dc_8:
+    times 8 dw 8
+align 16
 dc_1024:
     times 8 dw 0x400
 align 16
diff --git a/media/libvpx/vp8/common/x86/recon_wrapper_sse2.c b/media/libvpx/vp8/common/x86/recon_wrapper_sse2.c
index cb7b69c08d6..44221cd0b31 100644
--- a/media/libvpx/vp8/common/x86/recon_wrapper_sse2.c
+++ b/media/libvpx/vp8/common/x86/recon_wrapper_sse2.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/recon.h"
 #include "recon_x86.h"
 #include "vpx_mem/vpx_mem.h"
@@ -94,3 +94,69 @@ void vp8_build_intra_predictors_mbuv_s_ssse3(MACROBLOCKD *x)
                                         vp8_intra_pred_uv_tm_ssse3,
                                         vp8_intra_pred_uv_ho_ssse3);
 }
+
+extern build_intra_predictors_mbuv_prototype(vp8_intra_pred_y_dc_sse2);
+extern build_intra_predictors_mbuv_prototype(vp8_intra_pred_y_dctop_sse2);
+extern build_intra_predictors_mbuv_prototype(vp8_intra_pred_y_dcleft_sse2);
+extern build_intra_predictors_mbuv_prototype(vp8_intra_pred_y_dc128_sse2);
+extern build_intra_predictors_mbuv_prototype(vp8_intra_pred_y_ho_sse2);
+extern build_intra_predictors_mbuv_prototype(vp8_intra_pred_y_ve_sse2);
+extern build_intra_predictors_mbuv_prototype(vp8_intra_pred_y_tm_sse2);
+extern build_intra_predictors_mbuv_prototype(vp8_intra_pred_y_tm_ssse3);
+
+static void vp8_build_intra_predictors_mby_x86(MACROBLOCKD *x,
+                                               unsigned char *dst_y,
+                                               int dst_stride,
+                                               build_intra_predictors_mbuv_fn_t tm_func)
+{
+    int mode = x->mode_info_context->mbmi.mode;
+    build_intra_predictors_mbuv_fn_t fn;
+    int src_stride = x->dst.y_stride;
+    switch (mode) {
+        case  V_PRED: fn = vp8_intra_pred_y_ve_sse2; break;
+        case  H_PRED: fn = vp8_intra_pred_y_ho_sse2; break;
+        case TM_PRED: fn = tm_func; break;
+        case DC_PRED:
+            if (x->up_available) {
+                if (x->left_available) {
+                    fn = vp8_intra_pred_y_dc_sse2; break;
+                } else {
+                    fn = vp8_intra_pred_y_dctop_sse2; break;
+                }
+            } else if (x->left_available) {
+                fn = vp8_intra_pred_y_dcleft_sse2; break;
+            } else {
+                fn = vp8_intra_pred_y_dc128_sse2; break;
+            }
+            break;
+        default: return;
+    }
+
+    fn(dst_y, dst_stride, x->dst.y_buffer, src_stride);
+    return;
+}
+
+void vp8_build_intra_predictors_mby_sse2(MACROBLOCKD *x)
+{
+    vp8_build_intra_predictors_mby_x86(x, x->predictor, 16,
+                                       vp8_intra_pred_y_tm_sse2);
+}
+
+void vp8_build_intra_predictors_mby_ssse3(MACROBLOCKD *x)
+{
+    vp8_build_intra_predictors_mby_x86(x, x->predictor, 16,
+                                       vp8_intra_pred_y_tm_ssse3);
+}
+
+void vp8_build_intra_predictors_mby_s_sse2(MACROBLOCKD *x)
+{
+    vp8_build_intra_predictors_mby_x86(x, x->dst.y_buffer, x->dst.y_stride,
+                                       vp8_intra_pred_y_tm_sse2);
+}
+
+void vp8_build_intra_predictors_mby_s_ssse3(MACROBLOCKD *x)
+{
+    vp8_build_intra_predictors_mby_x86(x, x->dst.y_buffer, x->dst.y_stride,
+                                       vp8_intra_pred_y_tm_ssse3);
+
+}
diff --git a/media/libvpx/vp8/common/x86/recon_x86.h b/media/libvpx/vp8/common/x86/recon_x86.h
index fe0f8f0bc79..afacc60d1ee 100644
--- a/media/libvpx/vp8/common/x86/recon_x86.h
+++ b/media/libvpx/vp8/common/x86/recon_x86.h
@@ -20,16 +20,12 @@
  */
 
 #if HAVE_MMX
-extern prototype_recon_block(vp8_recon_b_mmx);
 extern prototype_copy_block(vp8_copy_mem8x8_mmx);
 extern prototype_copy_block(vp8_copy_mem8x4_mmx);
 extern prototype_copy_block(vp8_copy_mem16x16_mmx);
 
 
 #if !CONFIG_RUNTIME_CPU_DETECT
-#undef  vp8_recon_recon
-#define vp8_recon_recon vp8_recon_b_mmx
-
 #undef  vp8_recon_copy8x8
 #define vp8_recon_copy8x8 vp8_copy_mem8x8_mmx
 
@@ -43,19 +39,13 @@ extern prototype_copy_block(vp8_copy_mem16x16_mmx);
 #endif
 
 #if HAVE_SSE2
-extern prototype_recon_block(vp8_recon2b_sse2);
-extern prototype_recon_block(vp8_recon4b_sse2);
 extern prototype_copy_block(vp8_copy_mem16x16_sse2);
 extern prototype_build_intra_predictors(vp8_build_intra_predictors_mbuv_sse2);
 extern prototype_build_intra_predictors(vp8_build_intra_predictors_mbuv_s_sse2);
+extern prototype_build_intra_predictors(vp8_build_intra_predictors_mby_sse2);
+extern prototype_build_intra_predictors(vp8_build_intra_predictors_mby_s_sse2);
 
 #if !CONFIG_RUNTIME_CPU_DETECT
-#undef  vp8_recon_recon2
-#define vp8_recon_recon2 vp8_recon2b_sse2
-
-#undef  vp8_recon_recon4
-#define vp8_recon_recon4 vp8_recon4b_sse2
-
 #undef  vp8_recon_copy16x16
 #define vp8_recon_copy16x16 vp8_copy_mem16x16_sse2
 
@@ -65,12 +55,20 @@ extern prototype_build_intra_predictors(vp8_build_intra_predictors_mbuv_s_sse2);
 #undef  vp8_recon_build_intra_predictors_mbuv_s
 #define vp8_recon_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_sse2
 
+#undef  vp8_recon_build_intra_predictors_mby
+#define vp8_recon_build_intra_predictors_mby vp8_build_intra_predictors_mby_sse2
+
+#undef  vp8_recon_build_intra_predictors_mby_s
+#define vp8_recon_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_sse2
+
 #endif
 #endif
 
 #if HAVE_SSSE3
 extern prototype_build_intra_predictors(vp8_build_intra_predictors_mbuv_ssse3);
 extern prototype_build_intra_predictors(vp8_build_intra_predictors_mbuv_s_ssse3);
+extern prototype_build_intra_predictors(vp8_build_intra_predictors_mby_ssse3);
+extern prototype_build_intra_predictors(vp8_build_intra_predictors_mby_s_ssse3);
 
 #if !CONFIG_RUNTIME_CPU_DETECT
 #undef  vp8_recon_build_intra_predictors_mbuv
@@ -79,6 +77,12 @@ extern prototype_build_intra_predictors(vp8_build_intra_predictors_mbuv_s_ssse3)
 #undef  vp8_recon_build_intra_predictors_mbuv_s
 #define vp8_recon_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_ssse3
 
+#undef  vp8_recon_build_intra_predictors_mby
+#define vp8_recon_build_intra_predictors_mby vp8_build_intra_predictors_mby_ssse3
+
+#undef  vp8_recon_build_intra_predictors_mby_s
+#define vp8_recon_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_ssse3
+
 #endif
 #endif
 #endif
diff --git a/media/libvpx/vp8/encoder/x86/sad_mmx.asm b/media/libvpx/vp8/common/x86/sad_mmx.asm
similarity index 97%
rename from media/libvpx/vp8/encoder/x86/sad_mmx.asm
rename to media/libvpx/vp8/common/x86/sad_mmx.asm
index 85cb023a487..407b3997907 100644
--- a/media/libvpx/vp8/encoder/x86/sad_mmx.asm
+++ b/media/libvpx/vp8/common/x86/sad_mmx.asm
@@ -43,7 +43,7 @@ sym(vp8_sad16x16_mmx):
 
         pxor            mm6,        mm6
 
-x16x16sad_mmx_loop:
+.x16x16sad_mmx_loop:
 
         movq            mm0,        QWORD PTR [rsi]
         movq            mm2,        QWORD PTR [rsi+8]
@@ -83,7 +83,7 @@ x16x16sad_mmx_loop:
         paddw           mm7,        mm1
 
         cmp             rsi,        rcx
-        jne             x16x16sad_mmx_loop
+        jne             .x16x16sad_mmx_loop
 
 
         movq            mm0,        mm7
@@ -135,7 +135,7 @@ sym(vp8_sad8x16_mmx):
 
         pxor            mm6,        mm6
 
-x8x16sad_mmx_loop:
+.x8x16sad_mmx_loop:
 
         movq            mm0,        QWORD PTR [rsi]
         movq            mm1,        QWORD PTR [rdi]
@@ -158,7 +158,7 @@ x8x16sad_mmx_loop:
         paddw           mm7,        mm2
         cmp             rsi,        rcx
 
-        jne             x8x16sad_mmx_loop
+        jne             .x8x16sad_mmx_loop
 
         movq            mm0,        mm7
         punpcklwd       mm0,        mm6
@@ -205,7 +205,7 @@ sym(vp8_sad8x8_mmx):
 
         pxor            mm6,        mm6
 
-x8x8sad_mmx_loop:
+.x8x8sad_mmx_loop:
 
         movq            mm0,        QWORD PTR [rsi]
         movq            mm1,        QWORD PTR [rdi]
@@ -228,7 +228,7 @@ x8x8sad_mmx_loop:
         paddw           mm7,       mm0
         cmp             rsi,        rcx
 
-        jne             x8x8sad_mmx_loop
+        jne             .x8x8sad_mmx_loop
 
         movq            mm0,        mm7
         punpcklwd       mm0,        mm6
@@ -364,7 +364,7 @@ sym(vp8_sad16x8_mmx):
 
         pxor            mm6,        mm6
 
-x16x8sad_mmx_loop:
+.x16x8sad_mmx_loop:
 
         movq            mm0,       [rsi]
         movq            mm1,       [rdi]
@@ -404,7 +404,7 @@ x16x8sad_mmx_loop:
         paddw           mm7,        mm0
 
         cmp             rsi,        rcx
-        jne             x16x8sad_mmx_loop
+        jne             .x16x8sad_mmx_loop
 
         movq            mm0,        mm7
         punpcklwd       mm0,        mm6
diff --git a/media/libvpx/vp8/encoder/x86/sad_sse2.asm b/media/libvpx/vp8/common/x86/sad_sse2.asm
similarity index 94%
rename from media/libvpx/vp8/encoder/x86/sad_sse2.asm
rename to media/libvpx/vp8/common/x86/sad_sse2.asm
index 1011c95538d..fa8e3e3f8c3 100644
--- a/media/libvpx/vp8/encoder/x86/sad_sse2.asm
+++ b/media/libvpx/vp8/common/x86/sad_sse2.asm
@@ -37,7 +37,7 @@ sym(vp8_sad16x16_wmt):
         lea             rcx,        [rcx+rax*8]
         pxor            xmm6,       xmm6
 
-x16x16sad_wmt_loop:
+.x16x16sad_wmt_loop:
 
         movq            xmm0,       QWORD PTR [rsi]
         movq            xmm2,       QWORD PTR [rsi+8]
@@ -68,7 +68,7 @@ x16x16sad_wmt_loop:
         paddw           xmm6,       xmm4
 
         cmp             rsi,        rcx
-        jne             x16x16sad_wmt_loop
+        jne             .x16x16sad_wmt_loop
 
         movq            xmm0,       xmm6
         psrldq          xmm6,       8
@@ -111,11 +111,11 @@ sym(vp8_sad8x16_wmt):
         lea             rcx,        [rcx+rbx*8]
         pxor            mm7,        mm7
 
-x8x16sad_wmt_loop:
+.x8x16sad_wmt_loop:
 
         movq            rax,        mm7
         cmp             eax,        arg(4)
-        jg              x8x16sad_wmt_early_exit
+        jg              .x8x16sad_wmt_early_exit
 
         movq            mm0,        QWORD PTR [rsi]
         movq            mm1,        QWORD PTR [rdi]
@@ -133,11 +133,11 @@ x8x16sad_wmt_loop:
         paddw           mm7,        mm2
 
         cmp             rsi,        rcx
-        jne             x8x16sad_wmt_loop
+        jne             .x8x16sad_wmt_loop
 
         movq            rax,        mm7
 
-x8x16sad_wmt_early_exit:
+.x8x16sad_wmt_early_exit:
 
     ; begin epilog
     pop         rdi
@@ -172,11 +172,11 @@ sym(vp8_sad8x8_wmt):
         lea             rcx,        [rsi+rbx*8]
         pxor            mm7,        mm7
 
-x8x8sad_wmt_loop:
+.x8x8sad_wmt_loop:
 
         movq            rax,        mm7
         cmp             eax,        arg(4)
-        jg              x8x8sad_wmt_early_exit
+        jg              .x8x8sad_wmt_early_exit
 
         movq            mm0,        QWORD PTR [rsi]
         movq            mm1,        QWORD PTR [rdi]
@@ -188,10 +188,10 @@ x8x8sad_wmt_loop:
         paddw           mm7,        mm0
 
         cmp             rsi,        rcx
-        jne             x8x8sad_wmt_loop
+        jne             .x8x8sad_wmt_loop
 
         movq            rax,        mm7
-x8x8sad_wmt_early_exit:
+.x8x8sad_wmt_early_exit:
 
     ; begin epilog
     pop         rdi
@@ -281,11 +281,11 @@ sym(vp8_sad16x8_wmt):
         lea             rcx,        [rsi+rbx*8]
         pxor            mm7,        mm7
 
-x16x8sad_wmt_loop:
+.x16x8sad_wmt_loop:
 
         movq            rax,        mm7
         cmp             eax,        arg(4)
-        jg              x16x8sad_wmt_early_exit
+        jg              .x16x8sad_wmt_early_exit
 
         movq            mm0,        QWORD PTR [rsi]
         movq            mm2,        QWORD PTR [rsi+8]
@@ -315,11 +315,11 @@ x16x8sad_wmt_loop:
         paddw           mm7,        mm4
 
         cmp             rsi,        rcx
-        jne             x16x8sad_wmt_loop
+        jne             .x16x8sad_wmt_loop
 
         movq            rax,        mm7
 
-x16x8sad_wmt_early_exit:
+.x16x8sad_wmt_early_exit:
 
     ; begin epilog
     pop         rdi
@@ -352,7 +352,7 @@ sym(vp8_copy32xn_sse2):
         movsxd          rdx,        dword ptr arg(3) ;dst_stride
         movsxd          rcx,        dword ptr arg(4) ;height
 
-block_copy_sse2_loopx4:
+.block_copy_sse2_loopx4:
         movdqu          xmm0,       XMMWORD PTR [rsi]
         movdqu          xmm1,       XMMWORD PTR [rsi + 16]
         movdqu          xmm2,       XMMWORD PTR [rsi + rax]
@@ -383,12 +383,12 @@ block_copy_sse2_loopx4:
 
         sub             rcx,     4
         cmp             rcx,     4
-        jge             block_copy_sse2_loopx4
+        jge             .block_copy_sse2_loopx4
 
         cmp             rcx, 0
-        je              copy_is_done
+        je              .copy_is_done
 
-block_copy_sse2_loop:
+.block_copy_sse2_loop:
         movdqu          xmm0,       XMMWORD PTR [rsi]
         movdqu          xmm1,       XMMWORD PTR [rsi + 16]
         lea             rsi,    [rsi+rax]
@@ -398,9 +398,9 @@ block_copy_sse2_loop:
         lea             rdi,    [rdi+rdx]
 
         sub             rcx,     1
-        jne             block_copy_sse2_loop
+        jne             .block_copy_sse2_loop
 
-copy_is_done:
+.copy_is_done:
     ; begin epilog
     pop rdi
     pop rsi
diff --git a/media/libvpx/vp8/encoder/x86/sad_sse3.asm b/media/libvpx/vp8/common/x86/sad_sse3.asm
similarity index 99%
rename from media/libvpx/vp8/encoder/x86/sad_sse3.asm
rename to media/libvpx/vp8/common/x86/sad_sse3.asm
index 9e05521664e..a2550974cf2 100644
--- a/media/libvpx/vp8/encoder/x86/sad_sse3.asm
+++ b/media/libvpx/vp8/common/x86/sad_sse3.asm
@@ -647,7 +647,7 @@ sym(vp8_copy32xn_sse3):
 
     STACK_FRAME_CREATE_X3
 
-block_copy_sse3_loopx4:
+.block_copy_sse3_loopx4:
         lea             end_ptr,    [src_ptr+src_stride*2]
 
         movdqu          xmm0,       XMMWORD PTR [src_ptr]
@@ -676,13 +676,13 @@ block_copy_sse3_loopx4:
 
         sub             height,     4
         cmp             height,     4
-        jge             block_copy_sse3_loopx4
+        jge             .block_copy_sse3_loopx4
 
         ;Check to see if there is more rows need to be copied.
         cmp             height, 0
-        je              copy_is_done
+        je              .copy_is_done
 
-block_copy_sse3_loop:
+.block_copy_sse3_loop:
         movdqu          xmm0,       XMMWORD PTR [src_ptr]
         movdqu          xmm1,       XMMWORD PTR [src_ptr + 16]
         lea             src_ptr,    [src_ptr+src_stride]
@@ -692,9 +692,9 @@ block_copy_sse3_loop:
         lea             ref_ptr,    [ref_ptr+ref_stride]
 
         sub             height,     1
-        jne             block_copy_sse3_loop
+        jne             .block_copy_sse3_loop
 
-copy_is_done:
+.copy_is_done:
     STACK_FRAME_DESTROY_X3
 
 ;void vp8_sad16x16x4d_sse3(
diff --git a/media/libvpx/vp8/encoder/x86/sad_sse4.asm b/media/libvpx/vp8/common/x86/sad_sse4.asm
similarity index 100%
rename from media/libvpx/vp8/encoder/x86/sad_sse4.asm
rename to media/libvpx/vp8/common/x86/sad_sse4.asm
diff --git a/media/libvpx/vp8/encoder/x86/sad_ssse3.asm b/media/libvpx/vp8/common/x86/sad_ssse3.asm
similarity index 64%
rename from media/libvpx/vp8/encoder/x86/sad_ssse3.asm
rename to media/libvpx/vp8/common/x86/sad_ssse3.asm
index 6ecf081843b..95b6c89e648 100644
--- a/media/libvpx/vp8/encoder/x86/sad_ssse3.asm
+++ b/media/libvpx/vp8/common/x86/sad_ssse3.asm
@@ -169,30 +169,30 @@ sym(vp8_sad16x16x3_ssse3):
         mov             rdx,        0xf
         and             rdx,        rdi
 
-        jmp vp8_sad16x16x3_ssse3_skiptable
-vp8_sad16x16x3_ssse3_jumptable:
-        dd vp8_sad16x16x3_ssse3_aligned_by_0  - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_1  - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_2  - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_3  - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_4  - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_5  - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_6  - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_7  - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_8  - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_9  - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_10 - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_11 - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_12 - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_13 - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_14 - vp8_sad16x16x3_ssse3_do_jump
-        dd vp8_sad16x16x3_ssse3_aligned_by_15 - vp8_sad16x16x3_ssse3_do_jump
-vp8_sad16x16x3_ssse3_skiptable:
+        jmp .vp8_sad16x16x3_ssse3_skiptable
+.vp8_sad16x16x3_ssse3_jumptable:
+        dd .vp8_sad16x16x3_ssse3_aligned_by_0  - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_1  - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_2  - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_3  - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_4  - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_5  - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_6  - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_7  - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_8  - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_9  - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_10 - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_11 - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_12 - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_13 - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_14 - .vp8_sad16x16x3_ssse3_do_jump
+        dd .vp8_sad16x16x3_ssse3_aligned_by_15 - .vp8_sad16x16x3_ssse3_do_jump
+.vp8_sad16x16x3_ssse3_skiptable:
 
-        call vp8_sad16x16x3_ssse3_do_jump
-vp8_sad16x16x3_ssse3_do_jump:
+        call .vp8_sad16x16x3_ssse3_do_jump
+.vp8_sad16x16x3_ssse3_do_jump:
         pop             rcx                         ; get the address of do_jump
-        mov             rax,  vp8_sad16x16x3_ssse3_jumptable - vp8_sad16x16x3_ssse3_do_jump
+        mov             rax,  .vp8_sad16x16x3_ssse3_jumptable - .vp8_sad16x16x3_ssse3_do_jump
         add             rax,  rcx  ; get the absolute address of vp8_sad16x16x3_ssse3_jumptable
 
         movsxd          rax,  dword [rax + 4*rdx]   ; get the 32 bit offset from the jumptable
@@ -203,23 +203,23 @@ vp8_sad16x16x3_ssse3_do_jump:
 
         jmp             rcx
 
-        PROCESS_16X16X3_OFFSET 0,  vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 1,  vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 2,  vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 3,  vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 4,  vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 5,  vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 6,  vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 7,  vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 8,  vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 9,  vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 10, vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 11, vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 12, vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 13, vp8_sad16x16x3_ssse3
-        PROCESS_16X16X3_OFFSET 14, vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 0,  .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 1,  .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 2,  .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 3,  .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 4,  .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 5,  .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 6,  .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 7,  .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 8,  .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 9,  .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 10, .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 11, .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 12, .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 13, .vp8_sad16x16x3_ssse3
+        PROCESS_16X16X3_OFFSET 14, .vp8_sad16x16x3_ssse3
 
-vp8_sad16x16x3_ssse3_aligned_by_15:
+.vp8_sad16x16x3_ssse3_aligned_by_15:
         PROCESS_16X2X3 1
         PROCESS_16X2X3 0
         PROCESS_16X2X3 0
@@ -229,7 +229,7 @@ vp8_sad16x16x3_ssse3_aligned_by_15:
         PROCESS_16X2X3 0
         PROCESS_16X2X3 0
 
-vp8_sad16x16x3_ssse3_store_off:
+.vp8_sad16x16x3_ssse3_store_off:
         mov             rdi,        arg(4) ;Results
 
         movq            xmm0,       xmm5
@@ -282,30 +282,30 @@ sym(vp8_sad16x8x3_ssse3):
         mov             rdx,        0xf
         and             rdx,        rdi
 
-        jmp vp8_sad16x8x3_ssse3_skiptable
-vp8_sad16x8x3_ssse3_jumptable:
-        dd vp8_sad16x8x3_ssse3_aligned_by_0  - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_1  - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_2  - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_3  - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_4  - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_5  - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_6  - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_7  - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_8  - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_9  - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_10 - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_11 - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_12 - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_13 - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_14 - vp8_sad16x8x3_ssse3_do_jump
-        dd vp8_sad16x8x3_ssse3_aligned_by_15 - vp8_sad16x8x3_ssse3_do_jump
-vp8_sad16x8x3_ssse3_skiptable:
+        jmp .vp8_sad16x8x3_ssse3_skiptable
+.vp8_sad16x8x3_ssse3_jumptable:
+        dd .vp8_sad16x8x3_ssse3_aligned_by_0  - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_1  - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_2  - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_3  - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_4  - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_5  - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_6  - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_7  - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_8  - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_9  - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_10 - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_11 - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_12 - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_13 - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_14 - .vp8_sad16x8x3_ssse3_do_jump
+        dd .vp8_sad16x8x3_ssse3_aligned_by_15 - .vp8_sad16x8x3_ssse3_do_jump
+.vp8_sad16x8x3_ssse3_skiptable:
 
-        call vp8_sad16x8x3_ssse3_do_jump
-vp8_sad16x8x3_ssse3_do_jump:
+        call .vp8_sad16x8x3_ssse3_do_jump
+.vp8_sad16x8x3_ssse3_do_jump:
         pop             rcx                         ; get the address of do_jump
-        mov             rax,  vp8_sad16x8x3_ssse3_jumptable - vp8_sad16x8x3_ssse3_do_jump
+        mov             rax,  .vp8_sad16x8x3_ssse3_jumptable - .vp8_sad16x8x3_ssse3_do_jump
         add             rax,  rcx  ; get the absolute address of vp8_sad16x8x3_ssse3_jumptable
 
         movsxd          rax,  dword [rax + 4*rdx]   ; get the 32 bit offset from the jumptable
@@ -316,30 +316,30 @@ vp8_sad16x8x3_ssse3_do_jump:
 
         jmp             rcx
 
-        PROCESS_16X8X3_OFFSET 0,  vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 1,  vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 2,  vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 3,  vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 4,  vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 5,  vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 6,  vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 7,  vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 8,  vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 9,  vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 10, vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 11, vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 12, vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 13, vp8_sad16x8x3_ssse3
-        PROCESS_16X8X3_OFFSET 14, vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 0,  .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 1,  .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 2,  .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 3,  .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 4,  .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 5,  .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 6,  .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 7,  .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 8,  .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 9,  .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 10, .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 11, .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 12, .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 13, .vp8_sad16x8x3_ssse3
+        PROCESS_16X8X3_OFFSET 14, .vp8_sad16x8x3_ssse3
 
-vp8_sad16x8x3_ssse3_aligned_by_15:
+.vp8_sad16x8x3_ssse3_aligned_by_15:
 
         PROCESS_16X2X3 1
         PROCESS_16X2X3 0
         PROCESS_16X2X3 0
         PROCESS_16X2X3 0
 
-vp8_sad16x8x3_ssse3_store_off:
+.vp8_sad16x8x3_ssse3_store_off:
         mov             rdi,        arg(4) ;Results
 
         movq            xmm0,       xmm5
diff --git a/media/libvpx/vp8/common/x86/subpixel_mmx.asm b/media/libvpx/vp8/common/x86/subpixel_mmx.asm
index 9004b525d96..5528fd0e650 100644
--- a/media/libvpx/vp8/common/x86/subpixel_mmx.asm
+++ b/media/libvpx/vp8/common/x86/subpixel_mmx.asm
@@ -10,6 +10,7 @@
 
 
 %include "vpx_ports/x86_abi_support.asm"
+extern sym(vp8_bilinear_filters_x86_8)
 
 
 %define BLOCK_HEIGHT_WIDTH 4
@@ -50,7 +51,7 @@ sym(vp8_filter_block1d_h6_mmx):
         movsxd      rax,    dword ptr arg(5) ;output_width      ; destination pitch?
         pxor        mm0,    mm0              ; mm0 = 00000000
 
-nextrow:
+.nextrow:
         movq        mm3,    [rsi-2]          ; mm3 = p-2..p5
         movq        mm4,    mm3              ; mm4 = p-2..p5
         psrlq       mm3,    8                ; mm3 = p-1..p5
@@ -102,7 +103,7 @@ nextrow:
 %endif
 
         dec         rcx                      ; decrement count
-        jnz         nextrow                  ; next row
+        jnz         .nextrow                 ; next row
 
     ; begin epilog
     pop rdi
@@ -152,7 +153,7 @@ sym(vp8_filter_block1dc_v6_mmx):
         pxor        mm0, mm0              ; mm0 = 00000000
 
 
-nextrow_cv:
+.nextrow_cv:
         movq        mm3, [rsi+rdx]        ; mm3 = p0..p8  = row -1
         pmullw      mm3, mm1              ; mm3 *= kernel 1 modifiers.
 
@@ -190,7 +191,7 @@ nextrow_cv:
         ; avoidable!!!.
         lea         rdi,  [rdi+rax] ;
         dec         rcx                   ; decrement count
-        jnz         nextrow_cv             ; next row
+        jnz         .nextrow_cv           ; next row
 
         pop         rbx
 
@@ -222,14 +223,14 @@ sym(vp8_bilinear_predict8x8_mmx):
     push        rdi
     ; end prolog
 
-    ;const short *HFilter = bilinear_filters_mmx[xoffset];
-    ;const short *VFilter = bilinear_filters_mmx[yoffset];
+    ;const short *HFilter = vp8_bilinear_filters_x86_8[xoffset];
+    ;const short *VFilter = vp8_bilinear_filters_x86_8[yoffset];
 
         movsxd      rax,        dword ptr arg(2) ;xoffset
         mov         rdi,        arg(4) ;dst_ptr           ;
 
         shl         rax,        5 ; offset * 32
-        lea         rcx,        [GLOBAL(sym(vp8_bilinear_filters_mmx))]
+        lea         rcx,        [GLOBAL(sym(vp8_bilinear_filters_x86_8))]
 
         add         rax,        rcx ; HFilter
         mov         rsi,        arg(0) ;src_ptr              ;
@@ -282,7 +283,7 @@ sym(vp8_bilinear_predict8x8_mmx):
         packuswb    mm7,        mm4                 ;
 
         add         rsi,        rdx                 ; next line
-next_row_8x8:
+.next_row_8x8:
         movq        mm3,        [rsi]               ; xx 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14
         movq        mm4,        mm3                 ; make a copy of current line
 
@@ -349,7 +350,7 @@ next_row_8x8:
         add         rdi,        r8                  ;dst_pitch
 %endif
         cmp         rdi,        rcx                 ;
-        jne         next_row_8x8
+        jne         .next_row_8x8
 
     ; begin epilog
     pop rdi
@@ -379,13 +380,13 @@ sym(vp8_bilinear_predict8x4_mmx):
     push        rdi
     ; end prolog
 
-    ;const short *HFilter = bilinear_filters_mmx[xoffset];
-    ;const short *VFilter = bilinear_filters_mmx[yoffset];
+    ;const short *HFilter = vp8_bilinear_filters_x86_8[xoffset];
+    ;const short *VFilter = vp8_bilinear_filters_x86_8[yoffset];
 
         movsxd      rax,        dword ptr arg(2) ;xoffset
         mov         rdi,        arg(4) ;dst_ptr           ;
 
-        lea         rcx,        [GLOBAL(sym(vp8_bilinear_filters_mmx))]
+        lea         rcx,        [GLOBAL(sym(vp8_bilinear_filters_x86_8))]
         shl         rax,        5
 
         mov         rsi,        arg(0) ;src_ptr              ;
@@ -437,7 +438,7 @@ sym(vp8_bilinear_predict8x4_mmx):
         packuswb    mm7,        mm4                 ;
 
         add         rsi,        rdx                 ; next line
-next_row_8x4:
+.next_row_8x4:
         movq        mm3,        [rsi]               ; xx 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14
         movq        mm4,        mm3                 ; make a copy of current line
 
@@ -504,7 +505,7 @@ next_row_8x4:
         add         rdi,        r8
 %endif
         cmp         rdi,        rcx                 ;
-        jne         next_row_8x4
+        jne         .next_row_8x4
 
     ; begin epilog
     pop rdi
@@ -534,13 +535,13 @@ sym(vp8_bilinear_predict4x4_mmx):
     push        rdi
     ; end prolog
 
-    ;const short *HFilter = bilinear_filters_mmx[xoffset];
-    ;const short *VFilter = bilinear_filters_mmx[yoffset];
+    ;const short *HFilter = vp8_bilinear_filters_x86_8[xoffset];
+    ;const short *VFilter = vp8_bilinear_filters_x86_8[yoffset];
 
         movsxd      rax,        dword ptr arg(2) ;xoffset
         mov         rdi,        arg(4) ;dst_ptr           ;
 
-        lea         rcx,        [GLOBAL(sym(vp8_bilinear_filters_mmx))]
+        lea         rcx,        [GLOBAL(sym(vp8_bilinear_filters_x86_8))]
         shl         rax,        5
 
         add         rax,        rcx ; HFilter
@@ -579,7 +580,7 @@ sym(vp8_bilinear_predict4x4_mmx):
         packuswb    mm7,        mm0                 ;
 
         add         rsi,        rdx                 ; next line
-next_row_4x4:
+.next_row_4x4:
         movd        mm3,        [rsi]               ; xx 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14
         punpcklbw   mm3,        mm0                 ; xx 00 01 02 03 04 05 06
 
@@ -622,7 +623,7 @@ next_row_4x4:
 %endif
 
         cmp         rdi,        rcx                 ;
-        jne         next_row_4x4
+        jne         .next_row_4x4
 
     ; begin epilog
     pop rdi
@@ -699,29 +700,3 @@ sym(vp8_six_tap_mmx):
     times 8 dw 0
 
 
-align 16
-global HIDDEN_DATA(sym(vp8_bilinear_filters_mmx))
-sym(vp8_bilinear_filters_mmx):
-    times 8 dw 128
-    times 8 dw 0
-
-    times 8 dw 112
-    times 8 dw 16
-
-    times 8 dw 96
-    times 8 dw 32
-
-    times 8 dw 80
-    times 8 dw 48
-
-    times 8 dw 64
-    times 8 dw 64
-
-    times 8 dw 48
-    times 8 dw 80
-
-    times 8 dw 32
-    times 8 dw 96
-
-    times 8 dw 16
-    times 8 dw 112
diff --git a/media/libvpx/vp8/common/x86/subpixel_sse2.asm b/media/libvpx/vp8/common/x86/subpixel_sse2.asm
index 83e3b1479b4..cb550af594d 100644
--- a/media/libvpx/vp8/common/x86/subpixel_sse2.asm
+++ b/media/libvpx/vp8/common/x86/subpixel_sse2.asm
@@ -10,6 +10,7 @@
 
 
 %include "vpx_ports/x86_abi_support.asm"
+extern sym(vp8_bilinear_filters_x86_8)
 
 %define BLOCK_HEIGHT_WIDTH 4
 %define VP8_FILTER_WEIGHT 128
@@ -55,7 +56,7 @@ sym(vp8_filter_block1d8_h6_sse2):
 %endif
         pxor        xmm0,       xmm0                        ; clear xmm0 for unpack
 
-filter_block1d8_h6_rowloop:
+.filter_block1d8_h6_rowloop:
         movq        xmm3,       MMWORD PTR [rsi - 2]
         movq        xmm1,       MMWORD PTR [rsi + 6]
 
@@ -124,7 +125,7 @@ filter_block1d8_h6_rowloop:
 %endif
         dec         rcx
 
-        jnz         filter_block1d8_h6_rowloop                ; next row
+        jnz         .filter_block1d8_h6_rowloop                ; next row
 
     ; begin epilog
     pop rdi
@@ -176,7 +177,7 @@ sym(vp8_filter_block1d16_h6_sse2):
 
         pxor        xmm0,       xmm0                        ; clear xmm0 for unpack
 
-filter_block1d16_h6_sse2_rowloop:
+.filter_block1d16_h6_sse2_rowloop:
         movq        xmm3,       MMWORD PTR [rsi - 2]
         movq        xmm1,       MMWORD PTR [rsi + 6]
 
@@ -301,7 +302,7 @@ filter_block1d16_h6_sse2_rowloop:
 %endif
 
         dec         rcx
-        jnz         filter_block1d16_h6_sse2_rowloop                ; next row
+        jnz         .filter_block1d16_h6_sse2_rowloop                ; next row
 
     ; begin epilog
     pop rdi
@@ -356,7 +357,7 @@ sym(vp8_filter_block1d8_v6_sse2):
         movsxd      r8,         dword ptr arg(2) ; dst_ptich
 %endif
 
-vp8_filter_block1d8_v6_sse2_loop:
+.vp8_filter_block1d8_v6_sse2_loop:
         movdqa      xmm1,       XMMWORD PTR [rsi]
         pmullw      xmm1,       [rax]
 
@@ -396,7 +397,7 @@ vp8_filter_block1d8_v6_sse2_loop:
         add         rdi,        r8
 %endif
         dec         rcx         ; decrement count
-        jnz         vp8_filter_block1d8_v6_sse2_loop               ; next row
+        jnz         .vp8_filter_block1d8_v6_sse2_loop               ; next row
 
     ; begin epilog
     pop rdi
@@ -448,7 +449,7 @@ sym(vp8_filter_block1d16_v6_sse2):
         movsxd      r8,         dword ptr arg(2) ; dst_ptich
 %endif
 
-vp8_filter_block1d16_v6_sse2_loop:
+.vp8_filter_block1d16_v6_sse2_loop:
 ; The order for adding 6-tap is 2 5 3 1 4 6. Read in data in that order.
         movdqa      xmm1,       XMMWORD PTR [rsi + rdx]       ; line 2
         movdqa      xmm2,       XMMWORD PTR [rsi + rdx + 16]
@@ -511,7 +512,7 @@ vp8_filter_block1d16_v6_sse2_loop:
         add         rdi,        r8
 %endif
         dec         rcx         ; decrement count
-        jnz         vp8_filter_block1d16_v6_sse2_loop               ; next row
+        jnz         .vp8_filter_block1d16_v6_sse2_loop              ; next row
 
     ; begin epilog
     pop rdi
@@ -556,7 +557,7 @@ sym(vp8_filter_block1d8_h6_only_sse2):
 %endif
         pxor        xmm0,       xmm0                        ; clear xmm0 for unpack
 
-filter_block1d8_h6_only_rowloop:
+.filter_block1d8_h6_only_rowloop:
         movq        xmm3,       MMWORD PTR [rsi - 2]
         movq        xmm1,       MMWORD PTR [rsi + 6]
 
@@ -624,7 +625,7 @@ filter_block1d8_h6_only_rowloop:
 %endif
         dec         rcx
 
-        jnz         filter_block1d8_h6_only_rowloop                ; next row
+        jnz         .filter_block1d8_h6_only_rowloop               ; next row
 
     ; begin epilog
     pop rdi
@@ -670,7 +671,7 @@ sym(vp8_filter_block1d16_h6_only_sse2):
 
         pxor        xmm0,       xmm0                        ; clear xmm0 for unpack
 
-filter_block1d16_h6_only_sse2_rowloop:
+.filter_block1d16_h6_only_sse2_rowloop:
         movq        xmm3,       MMWORD PTR [rsi - 2]
         movq        xmm1,       MMWORD PTR [rsi + 6]
 
@@ -789,7 +790,7 @@ filter_block1d16_h6_only_sse2_rowloop:
 %endif
 
         dec         rcx
-        jnz         filter_block1d16_h6_only_sse2_rowloop                ; next row
+        jnz         .filter_block1d16_h6_only_sse2_rowloop               ; next row
 
     ; begin epilog
     pop rdi
@@ -837,7 +838,7 @@ sym(vp8_filter_block1d8_v6_only_sse2):
         movsxd      r8,         dword ptr arg(3) ; dst_ptich
 %endif
 
-vp8_filter_block1d8_v6_only_sse2_loop:
+.vp8_filter_block1d8_v6_only_sse2_loop:
         movq        xmm1,       MMWORD PTR [rsi]
         movq        xmm2,       MMWORD PTR [rsi + rdx]
         movq        xmm3,       MMWORD PTR [rsi + rdx * 2]
@@ -883,7 +884,7 @@ vp8_filter_block1d8_v6_only_sse2_loop:
         add         rdi,        r8
 %endif
         dec         rcx         ; decrement count
-        jnz         vp8_filter_block1d8_v6_only_sse2_loop               ; next row
+        jnz         .vp8_filter_block1d8_v6_only_sse2_loop              ; next row
 
     ; begin epilog
     pop rdi
@@ -924,7 +925,7 @@ sym(vp8_unpack_block1d16_h6_sse2):
         movsxd      r8,         dword ptr arg(4) ;output_width            ; Pitch for Source
 %endif
 
-unpack_block1d16_h6_sse2_rowloop:
+.unpack_block1d16_h6_sse2_rowloop:
         movq        xmm1,       MMWORD PTR [rsi]            ; 0d 0c 0b 0a 09 08 07 06 05 04 03 02 01 00 -1 -2
         movq        xmm3,       MMWORD PTR [rsi+8]          ; make copy of xmm1
 
@@ -941,7 +942,7 @@ unpack_block1d16_h6_sse2_rowloop:
         add         rdi,        r8
 %endif
         dec         rcx
-        jnz         unpack_block1d16_h6_sse2_rowloop                ; next row
+        jnz         .unpack_block1d16_h6_sse2_rowloop               ; next row
 
     ; begin epilog
     pop rdi
@@ -961,7 +962,7 @@ unpack_block1d16_h6_sse2_rowloop:
 ;    unsigned char *dst_ptr,
 ;    int dst_pitch
 ;)
-extern sym(vp8_bilinear_filters_mmx)
+extern sym(vp8_bilinear_filters_x86_8)
 global sym(vp8_bilinear_predict16x16_sse2)
 sym(vp8_bilinear_predict16x16_sse2):
     push        rbp
@@ -973,14 +974,14 @@ sym(vp8_bilinear_predict16x16_sse2):
     push        rdi
     ; end prolog
 
-    ;const short *HFilter = bilinear_filters_mmx[xoffset]
-    ;const short *VFilter = bilinear_filters_mmx[yoffset]
+    ;const short *HFilter = vp8_bilinear_filters_x86_8[xoffset]
+    ;const short *VFilter = vp8_bilinear_filters_x86_8[yoffset]
 
-        lea         rcx,        [GLOBAL(sym(vp8_bilinear_filters_mmx))]
+        lea         rcx,        [GLOBAL(sym(vp8_bilinear_filters_x86_8))]
         movsxd      rax,        dword ptr arg(2) ;xoffset
 
         cmp         rax,        0      ;skip first_pass filter if xoffset=0
-        je          b16x16_sp_only
+        je          .b16x16_sp_only
 
         shl         rax,        5
         add         rax,        rcx    ;HFilter
@@ -995,7 +996,7 @@ sym(vp8_bilinear_predict16x16_sse2):
         movsxd      rax,        dword ptr arg(3) ;yoffset
 
         cmp         rax,        0      ;skip second_pass filter if yoffset=0
-        je          b16x16_fp_only
+        je          .b16x16_fp_only
 
         shl         rax,        5
         add         rax,        rcx    ;VFilter
@@ -1041,7 +1042,7 @@ sym(vp8_bilinear_predict16x16_sse2):
         packuswb    xmm7,       xmm4
 
         add         rsi,        rdx                 ; next line
-next_row:
+.next_row:
         movdqu      xmm3,       [rsi]               ; xx 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14
         movdqa      xmm4,       xmm3                 ; make a copy of current line
 
@@ -1104,11 +1105,11 @@ next_row:
 %endif
 
         cmp         rdi,        rcx
-        jne         next_row
+        jne         .next_row
 
-        jmp         done
+        jmp         .done
 
-b16x16_sp_only:
+.b16x16_sp_only:
         movsxd      rax,        dword ptr arg(3) ;yoffset
         shl         rax,        5
         add         rax,        rcx    ;VFilter
@@ -1130,7 +1131,7 @@ b16x16_sp_only:
         movdqu      xmm7,       [rsi]               ; xx 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14
 
         add         rsi,        rax                 ; next line
-next_row_spo:
+.next_row_spo:
         movdqu      xmm3,       [rsi]               ; xx 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14
 
         movdqa      xmm5,       xmm7
@@ -1164,17 +1165,17 @@ next_row_spo:
         add         rsi,        rax                 ; next line
         add         rdi,        rdx                 ;dst_pitch
         cmp         rdi,        rcx
-        jne         next_row_spo
+        jne         .next_row_spo
 
-        jmp         done
+        jmp         .done
 
-b16x16_fp_only:
+.b16x16_fp_only:
         lea         rcx,        [rdi+rdx*8]
         lea         rcx,        [rcx+rdx*8]
         movsxd      rax,        dword ptr arg(1) ;src_pixels_per_line
         pxor        xmm0,       xmm0
 
-next_row_fpo:
+.next_row_fpo:
         movdqu      xmm3,       [rsi]               ; xx 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14
         movdqa      xmm4,       xmm3                 ; make a copy of current line
 
@@ -1208,9 +1209,9 @@ next_row_fpo:
         add         rsi,        rax                 ; next line
         add         rdi,        rdx                 ; dst_pitch
         cmp         rdi,        rcx
-        jne         next_row_fpo
+        jne         .next_row_fpo
 
-done:
+.done:
     ; begin epilog
     pop rdi
     pop rsi
@@ -1230,7 +1231,6 @@ done:
 ;    unsigned char *dst_ptr,
 ;    int dst_pitch
 ;)
-extern sym(vp8_bilinear_filters_mmx)
 global sym(vp8_bilinear_predict8x8_sse2)
 sym(vp8_bilinear_predict8x8_sse2):
     push        rbp
@@ -1245,9 +1245,9 @@ sym(vp8_bilinear_predict8x8_sse2):
     ALIGN_STACK 16, rax
     sub         rsp, 144                         ; reserve 144 bytes
 
-    ;const short *HFilter = bilinear_filters_mmx[xoffset]
-    ;const short *VFilter = bilinear_filters_mmx[yoffset]
-        lea         rcx,        [GLOBAL(sym(vp8_bilinear_filters_mmx))]
+    ;const short *HFilter = vp8_bilinear_filters_x86_8[xoffset]
+    ;const short *VFilter = vp8_bilinear_filters_x86_8[yoffset]
+        lea         rcx,        [GLOBAL(sym(vp8_bilinear_filters_x86_8))]
 
         mov         rsi,        arg(0) ;src_ptr
         movsxd      rdx,        dword ptr arg(1) ;src_pixels_per_line
@@ -1318,7 +1318,7 @@ sym(vp8_bilinear_predict8x8_sse2):
 
         movdqa      xmm7,       xmm3
         add         rsp,        16                 ; next line
-next_row8x8:
+.next_row8x8:
         movdqa      xmm3,       XMMWORD PTR [rsp]               ; 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15
         movdqa      xmm4,       xmm3                 ; make a copy of current line
         psrldq      xmm4,       1
@@ -1352,7 +1352,7 @@ next_row8x8:
         add         rdi,        rdx
 
         cmp         rdi,        rcx
-        jne         next_row8x8
+        jne         .next_row8x8
 
     ;add rsp, 144
     pop rsp
diff --git a/media/libvpx/vp8/common/x86/subpixel_ssse3.asm b/media/libvpx/vp8/common/x86/subpixel_ssse3.asm
index 1ddbc54bd6a..6bca82bfb38 100644
--- a/media/libvpx/vp8/common/x86/subpixel_ssse3.asm
+++ b/media/libvpx/vp8/common/x86/subpixel_ssse3.asm
@@ -70,7 +70,7 @@ sym(vp8_filter_block1d8_h6_ssse3):
 
     sub         rdi, rdx
 ;xmm3 free
-filter_block1d8_h6_rowloop_ssse3:
+.filter_block1d8_h6_rowloop_ssse3:
     movq        xmm0,   MMWORD PTR [rsi - 2]    ; -2 -1  0  1  2  3  4  5
 
     movq        xmm2,   MMWORD PTR [rsi + 3]    ;  3  4  5  6  7  8  9 10
@@ -102,7 +102,7 @@ filter_block1d8_h6_rowloop_ssse3:
     packuswb    xmm0,   xmm0
 
     movq        MMWORD Ptr [rdi], xmm0
-    jnz         filter_block1d8_h6_rowloop_ssse3
+    jnz         .filter_block1d8_h6_rowloop_ssse3
 
     ; begin epilog
     pop rdi
@@ -129,7 +129,7 @@ vp8_filter_block1d8_h4_ssse3:
 
     sub         rdi, rdx
 
-filter_block1d8_h4_rowloop_ssse3:
+.filter_block1d8_h4_rowloop_ssse3:
     movq        xmm0,   MMWORD PTR [rsi - 2]    ; -2 -1  0  1  2  3  4  5
 
     movq        xmm1,   MMWORD PTR [rsi + 3]    ;  3  4  5  6  7  8  9 10
@@ -158,7 +158,7 @@ filter_block1d8_h4_rowloop_ssse3:
 
     movq        MMWORD Ptr [rdi], xmm0
 
-    jnz         filter_block1d8_h4_rowloop_ssse3
+    jnz         .filter_block1d8_h4_rowloop_ssse3
 
     ; begin epilog
     pop rdi
@@ -207,7 +207,7 @@ sym(vp8_filter_block1d16_h6_ssse3):
     movsxd      rcx, dword ptr arg(4)           ;output_height
     movsxd      rdx, dword ptr arg(3)           ;output_pitch
 
-filter_block1d16_h6_rowloop_ssse3:
+.filter_block1d16_h6_rowloop_ssse3:
     movq        xmm0,   MMWORD PTR [rsi - 2]    ; -2 -1  0  1  2  3  4  5
 
     movq        xmm3,   MMWORD PTR [rsi + 3]    ;  3  4  5  6  7  8  9 10
@@ -264,7 +264,7 @@ filter_block1d16_h6_rowloop_ssse3:
 
     lea         rdi,    [rdi + rdx]
     dec         rcx
-    jnz         filter_block1d16_h6_rowloop_ssse3
+    jnz         .filter_block1d16_h6_rowloop_ssse3
 
     ; begin epilog
     pop rdi
@@ -304,7 +304,7 @@ sym(vp8_filter_block1d4_h6_ssse3):
     movdqa      xmm7, [GLOBAL(rd)]
 
     cmp         esi, DWORD PTR [rax]
-    je          vp8_filter_block1d4_h4_ssse3
+    je          .vp8_filter_block1d4_h4_ssse3
 
     movdqa      xmm4, XMMWORD PTR [rax]         ;k0_k5
     movdqa      xmm5, XMMWORD PTR [rax+256]     ;k2_k4
@@ -318,7 +318,7 @@ sym(vp8_filter_block1d4_h6_ssse3):
     movsxd      rdx, dword ptr arg(3)   ;output_pitch
 
 ;xmm3 free
-filter_block1d4_h6_rowloop_ssse3:
+.filter_block1d4_h6_rowloop_ssse3:
     movdqu      xmm0,   XMMWORD PTR [rsi - 2]
 
     movdqa      xmm1, xmm0
@@ -346,7 +346,7 @@ filter_block1d4_h6_rowloop_ssse3:
 
     add         rdi, rdx
     dec         rcx
-    jnz         filter_block1d4_h6_rowloop_ssse3
+    jnz         .filter_block1d4_h6_rowloop_ssse3
 
     ; begin epilog
     pop rdi
@@ -356,7 +356,7 @@ filter_block1d4_h6_rowloop_ssse3:
     pop         rbp
     ret
 
-vp8_filter_block1d4_h4_ssse3:
+.vp8_filter_block1d4_h4_ssse3:
     movdqa      xmm5, XMMWORD PTR [rax+256]     ;k2_k4
     movdqa      xmm6, XMMWORD PTR [rax+128]     ;k1_k3
     movdqa      xmm0, XMMWORD PTR [GLOBAL(shuf2b)]
@@ -369,7 +369,7 @@ vp8_filter_block1d4_h4_ssse3:
 
     movsxd      rdx, dword ptr arg(3)   ;output_pitch
 
-filter_block1d4_h4_rowloop_ssse3:
+.filter_block1d4_h4_rowloop_ssse3:
     movdqu      xmm1,   XMMWORD PTR [rsi - 2]
 
     movdqa      xmm2, xmm1
@@ -391,7 +391,7 @@ filter_block1d4_h4_rowloop_ssse3:
 
     add         rdi, rdx
     dec         rcx
-    jnz         filter_block1d4_h4_rowloop_ssse3
+    jnz         .filter_block1d4_h4_rowloop_ssse3
 
     ; begin epilog
     pop rdi
@@ -432,7 +432,7 @@ sym(vp8_filter_block1d16_v6_ssse3):
     add         rax, rdx
 
     cmp         esi, DWORD PTR [rax]
-    je          vp8_filter_block1d16_v4_ssse3
+    je          .vp8_filter_block1d16_v4_ssse3
 
     movdqa      xmm5, XMMWORD PTR [rax]         ;k0_k5
     movdqa      xmm6, XMMWORD PTR [rax+256]     ;k2_k4
@@ -450,7 +450,7 @@ sym(vp8_filter_block1d16_v6_ssse3):
     add         rax, rdx
 
 
-vp8_filter_block1d16_v6_ssse3_loop:
+.vp8_filter_block1d16_v6_ssse3_loop:
     movq        xmm1, MMWORD PTR [rsi]                  ;A
     movq        xmm2, MMWORD PTR [rsi + rdx]            ;B
     movq        xmm3, MMWORD PTR [rsi + rdx * 2]        ;C
@@ -508,7 +508,7 @@ vp8_filter_block1d16_v6_ssse3_loop:
     add         rdi,        r8
 %endif
     dec         rcx
-    jnz         vp8_filter_block1d16_v6_ssse3_loop
+    jnz         .vp8_filter_block1d16_v6_ssse3_loop
 
     ; begin epilog
     pop rdi
@@ -519,7 +519,7 @@ vp8_filter_block1d16_v6_ssse3_loop:
     pop         rbp
     ret
 
-vp8_filter_block1d16_v4_ssse3:
+.vp8_filter_block1d16_v4_ssse3:
     movdqa      xmm6, XMMWORD PTR [rax+256]     ;k2_k4
     movdqa      xmm7, XMMWORD PTR [rax+128]     ;k1_k3
 
@@ -534,7 +534,7 @@ vp8_filter_block1d16_v4_ssse3:
     movsxd      rcx, DWORD PTR arg(4)   ;output_height
     add         rax, rdx
 
-vp8_filter_block1d16_v4_ssse3_loop:
+.vp8_filter_block1d16_v4_ssse3_loop:
     movq        xmm2, MMWORD PTR [rsi + rdx]            ;B
     movq        xmm3, MMWORD PTR [rsi + rdx * 2]        ;C
     movq        xmm4, MMWORD PTR [rax + rdx * 2]        ;D
@@ -581,7 +581,7 @@ vp8_filter_block1d16_v4_ssse3_loop:
     add         rdi,        r8
 %endif
     dec         rcx
-    jnz         vp8_filter_block1d16_v4_ssse3_loop
+    jnz         .vp8_filter_block1d16_v4_ssse3_loop
 
     ; begin epilog
     pop rdi
@@ -627,7 +627,7 @@ sym(vp8_filter_block1d8_v6_ssse3):
     movsxd      rcx, DWORD PTR arg(4)   ;[output_height]
 
     cmp         esi, DWORD PTR [rax]
-    je          vp8_filter_block1d8_v4_ssse3
+    je          .vp8_filter_block1d8_v4_ssse3
 
     movdqa      xmm5, XMMWORD PTR [rax]         ;k0_k5
     movdqa      xmm6, XMMWORD PTR [rax+256]     ;k2_k4
@@ -638,7 +638,7 @@ sym(vp8_filter_block1d8_v6_ssse3):
     mov         rax, rsi
     add         rax, rdx
 
-vp8_filter_block1d8_v6_ssse3_loop:
+.vp8_filter_block1d8_v6_ssse3_loop:
     movq        xmm1, MMWORD PTR [rsi]                  ;A
     movq        xmm2, MMWORD PTR [rsi + rdx]            ;B
     movq        xmm3, MMWORD PTR [rsi + rdx * 2]        ;C
@@ -673,7 +673,7 @@ vp8_filter_block1d8_v6_ssse3_loop:
     add         rdi,        r8
 %endif
     dec         rcx
-    jnz         vp8_filter_block1d8_v6_ssse3_loop
+    jnz         .vp8_filter_block1d8_v6_ssse3_loop
 
     ; begin epilog
     pop rdi
@@ -684,7 +684,7 @@ vp8_filter_block1d8_v6_ssse3_loop:
     pop         rbp
     ret
 
-vp8_filter_block1d8_v4_ssse3:
+.vp8_filter_block1d8_v4_ssse3:
     movdqa      xmm6, XMMWORD PTR [rax+256]     ;k2_k4
     movdqa      xmm7, XMMWORD PTR [rax+128]     ;k1_k3
     movdqa      xmm5, [GLOBAL(rd)]
@@ -694,7 +694,7 @@ vp8_filter_block1d8_v4_ssse3:
     mov         rax, rsi
     add         rax, rdx
 
-vp8_filter_block1d8_v4_ssse3_loop:
+.vp8_filter_block1d8_v4_ssse3_loop:
     movq        xmm2, MMWORD PTR [rsi + rdx]            ;B
     movq        xmm3, MMWORD PTR [rsi + rdx * 2]        ;C
     movq        xmm4, MMWORD PTR [rax + rdx * 2]        ;D
@@ -722,7 +722,7 @@ vp8_filter_block1d8_v4_ssse3_loop:
     add         rdi,        r8
 %endif
     dec         rcx
-    jnz         vp8_filter_block1d8_v4_ssse3_loop
+    jnz         .vp8_filter_block1d8_v4_ssse3_loop
 
     ; begin epilog
     pop rdi
@@ -766,7 +766,7 @@ sym(vp8_filter_block1d4_v6_ssse3):
     movsxd      rcx, DWORD PTR arg(4)   ;[output_height]
 
     cmp         esi, DWORD PTR [rax]
-    je          vp8_filter_block1d4_v4_ssse3
+    je          .vp8_filter_block1d4_v4_ssse3
 
     movq        mm5, MMWORD PTR [rax]         ;k0_k5
     movq        mm6, MMWORD PTR [rax+256]     ;k2_k4
@@ -777,7 +777,7 @@ sym(vp8_filter_block1d4_v6_ssse3):
     mov         rax, rsi
     add         rax, rdx
 
-vp8_filter_block1d4_v6_ssse3_loop:
+.vp8_filter_block1d4_v6_ssse3_loop:
     movd        mm1, DWORD PTR [rsi]                  ;A
     movd        mm2, DWORD PTR [rsi + rdx]            ;B
     movd        mm3, DWORD PTR [rsi + rdx * 2]        ;C
@@ -813,7 +813,7 @@ vp8_filter_block1d4_v6_ssse3_loop:
     add         rdi,        r8
 %endif
     dec         rcx
-    jnz         vp8_filter_block1d4_v6_ssse3_loop
+    jnz         .vp8_filter_block1d4_v6_ssse3_loop
 
     ; begin epilog
     pop rdi
@@ -823,7 +823,7 @@ vp8_filter_block1d4_v6_ssse3_loop:
     pop         rbp
     ret
 
-vp8_filter_block1d4_v4_ssse3:
+.vp8_filter_block1d4_v4_ssse3:
     movq        mm6, MMWORD PTR [rax+256]     ;k2_k4
     movq        mm7, MMWORD PTR [rax+128]     ;k1_k3
     movq        mm5, MMWORD PTR [GLOBAL(rd)]
@@ -833,7 +833,7 @@ vp8_filter_block1d4_v4_ssse3:
     mov         rax, rsi
     add         rax, rdx
 
-vp8_filter_block1d4_v4_ssse3_loop:
+.vp8_filter_block1d4_v4_ssse3_loop:
     movd        mm2, DWORD PTR [rsi + rdx]            ;B
     movd        mm3, DWORD PTR [rsi + rdx * 2]        ;C
     movd        mm4, DWORD PTR [rax + rdx * 2]        ;D
@@ -861,7 +861,7 @@ vp8_filter_block1d4_v4_ssse3_loop:
     add         rdi,        r8
 %endif
     dec         rcx
-    jnz         vp8_filter_block1d4_v4_ssse3_loop
+    jnz         .vp8_filter_block1d4_v4_ssse3_loop
 
     ; begin epilog
     pop rdi
@@ -895,7 +895,7 @@ sym(vp8_bilinear_predict16x16_ssse3):
         movsxd      rax,        dword ptr arg(2)    ; xoffset
 
         cmp         rax,        0                   ; skip first_pass filter if xoffset=0
-        je          b16x16_sp_only
+        je          .b16x16_sp_only
 
         shl         rax,        4
         lea         rax,        [rax + rcx]         ; HFilter
@@ -909,7 +909,7 @@ sym(vp8_bilinear_predict16x16_ssse3):
         movsxd      rax,        dword ptr arg(3)    ; yoffset
 
         cmp         rax,        0                   ; skip second_pass filter if yoffset=0
-        je          b16x16_fp_only
+        je          .b16x16_fp_only
 
         shl         rax,        4
         lea         rax,        [rax + rcx]         ; VFilter
@@ -996,9 +996,9 @@ sym(vp8_bilinear_predict16x16_ssse3):
         cmp         rdi,        rcx
         jne         .next_row
 
-        jmp         done
+        jmp         .done
 
-b16x16_sp_only:
+.b16x16_sp_only:
         movsxd      rax,        dword ptr arg(3)    ; yoffset
         shl         rax,        4
         lea         rax,        [rax + rcx]         ; VFilter
@@ -1018,7 +1018,7 @@ b16x16_sp_only:
         movq        xmm2,       [rsi + 8]           ; load row 0
 
         lea         rsi,        [rsi + rax]         ; next line
-.next_row:
+.next_row_sp:
         movq        xmm3,       [rsi]               ; load row + 1
         movq        xmm5,       [rsi + 8]           ; load row + 1
 
@@ -1062,16 +1062,16 @@ b16x16_sp_only:
         lea         rdi,        [rdi + 2*rdx]
 
         cmp         rdi,        rcx
-        jne         .next_row
+        jne         .next_row_sp
 
-        jmp         done
+        jmp         .done
 
-b16x16_fp_only:
+.b16x16_fp_only:
         lea         rcx,        [rdi+rdx*8]
         lea         rcx,        [rcx+rdx*8]
         movsxd      rax,        dword ptr arg(1)    ; src_pixels_per_line
 
-.next_row:
+.next_row_fp:
         movq        xmm2,       [rsi]               ; 00 01 02 03 04 05 06 07
         movq        xmm4,       [rsi+1]             ; 01 02 03 04 05 06 07 08
 
@@ -1122,9 +1122,9 @@ b16x16_fp_only:
 
         cmp         rdi,        rcx
 
-        jne         .next_row
+        jne         .next_row_fp
 
-done:
+.done:
     ; begin epilog
     pop         rdi
     pop         rsi
@@ -1191,7 +1191,7 @@ sym(vp8_bilinear_predict8x8_ssse3):
 
         movsxd      rax,        dword ptr arg(2)    ; xoffset
         cmp         rax,        0                   ; skip first_pass filter if xoffset=0
-        je          b8x8_sp_only
+        je          .b8x8_sp_only
 
         shl         rax,        4
         add         rax,        rcx                 ; HFilter
@@ -1203,7 +1203,7 @@ sym(vp8_bilinear_predict8x8_ssse3):
 
         movsxd      rax,        dword ptr arg(3)    ; yoffset
         cmp         rax,        0                   ; skip second_pass filter if yoffset=0
-        je          b8x8_fp_only
+        je          .b8x8_fp_only
 
         shl         rax,        4
         lea         rax,        [rax + rcx]         ; VFilter
@@ -1260,9 +1260,9 @@ sym(vp8_bilinear_predict8x8_ssse3):
         cmp         rdi,        rcx
         jne         .next_row
 
-        jmp         done8x8
+        jmp         .done8x8
 
-b8x8_sp_only:
+.b8x8_sp_only:
         movsxd      rax,        dword ptr arg(3)    ; yoffset
         shl         rax,        4
         lea         rax,        [rax + rcx]         ; VFilter
@@ -1364,12 +1364,12 @@ b8x8_sp_only:
         movq        [rdi+rdx],  xmm1
         lea         rsp,        [rsp + 144]
 
-        jmp         done8x8
+        jmp         .done8x8
 
-b8x8_fp_only:
+.b8x8_fp_only:
         lea         rcx,        [rdi+rdx*8]
 
-.next_row:
+.next_row_fp:
         movdqa      xmm1,       XMMWORD PTR [rsp]
         movdqa      xmm3,       XMMWORD PTR [rsp+16]
 
@@ -1430,11 +1430,11 @@ b8x8_fp_only:
         lea         rdi,        [rdi + 2*rdx]
         cmp         rdi,        rcx
 
-        jne         .next_row
+        jne         .next_row_fp
 
         lea         rsp,        [rsp + 16]
 
-done8x8:
+.done8x8:
     ;add rsp, 144
     pop         rsp
     ; begin epilog
diff --git a/media/libvpx/vp8/common/x86/subpixel_x86.h b/media/libvpx/vp8/common/x86/subpixel_x86.h
index 75991cc4f14..01ec9e210ab 100644
--- a/media/libvpx/vp8/common/x86/subpixel_x86.h
+++ b/media/libvpx/vp8/common/x86/subpixel_x86.h
@@ -12,6 +12,8 @@
 #ifndef SUBPIXEL_X86_H
 #define SUBPIXEL_X86_H
 
+#include "filter_x86.h"
+
 /* Note:
  *
  * This platform is commonly built for runtime CPU detection. If you modify
diff --git a/media/libvpx/vp8/encoder/x86/variance_impl_mmx.asm b/media/libvpx/vp8/common/x86/variance_impl_mmx.asm
similarity index 99%
rename from media/libvpx/vp8/encoder/x86/variance_impl_mmx.asm
rename to media/libvpx/vp8/common/x86/variance_impl_mmx.asm
index 13b76ea91fd..2be8bbeb3dc 100644
--- a/media/libvpx/vp8/encoder/x86/variance_impl_mmx.asm
+++ b/media/libvpx/vp8/common/x86/variance_impl_mmx.asm
@@ -27,7 +27,7 @@ sym(vp8_get_mb_ss_mmx):
         mov         rcx, 16
         pxor        mm4, mm4
 
-NEXTROW:
+.NEXTROW:
         movq        mm0, [rax]
         movq        mm1, [rax+8]
         movq        mm2, [rax+16]
@@ -44,7 +44,7 @@ NEXTROW:
 
         add         rax, 32
         dec         rcx
-        ja          NEXTROW
+        ja          .NEXTROW
         movq        QWORD PTR [rsp], mm4
 
         ;return sum[0]+sum[1];
@@ -568,7 +568,7 @@ sym(vp8_filter_block2d_bil4x4_var_mmx):
         add             rsi, r8
 %endif
 
-filter_block2d_bil4x4_var_mmx_loop:
+.filter_block2d_bil4x4_var_mmx_loop:
 
         movd            mm1,            [rsi]               ;
         movd            mm3,            [rsi+1]             ;
@@ -614,7 +614,7 @@ filter_block2d_bil4x4_var_mmx_loop:
         add             rdi,            r9
 %endif
         sub             rcx,            1                   ;
-        jnz             filter_block2d_bil4x4_var_mmx_loop       ;
+        jnz             .filter_block2d_bil4x4_var_mmx_loop       ;
 
 
         pxor            mm3,            mm3                 ;
@@ -726,7 +726,7 @@ sym(vp8_filter_block2d_bil_var_mmx):
         add             rsi,            r8
 %endif
 
-filter_block2d_bil_var_mmx_loop:
+.filter_block2d_bil_var_mmx_loop:
 
         movq            mm1,            [rsi]               ;
         movq            mm3,            [rsi+1]             ;
@@ -807,7 +807,7 @@ filter_block2d_bil_var_mmx_loop:
         add             rdi,            r9
 %endif
         sub             rcx,            1                   ;
-        jnz             filter_block2d_bil_var_mmx_loop       ;
+        jnz             .filter_block2d_bil_var_mmx_loop       ;
 
 
         pxor            mm3,            mm3                 ;
diff --git a/media/libvpx/vp8/encoder/x86/variance_impl_sse2.asm b/media/libvpx/vp8/common/x86/variance_impl_sse2.asm
similarity index 99%
rename from media/libvpx/vp8/encoder/x86/variance_impl_sse2.asm
rename to media/libvpx/vp8/common/x86/variance_impl_sse2.asm
index b7a6b3286c1..762922091e7 100644
--- a/media/libvpx/vp8/encoder/x86/variance_impl_sse2.asm
+++ b/media/libvpx/vp8/common/x86/variance_impl_sse2.asm
@@ -33,7 +33,7 @@ sym(vp8_get_mb_ss_sse2):
         mov         rcx, 8
         pxor        xmm4, xmm4
 
-NEXTROW:
+.NEXTROW:
         movdqa      xmm0, [rax]
         movdqa      xmm1, [rax+16]
         movdqa      xmm2, [rax+32]
@@ -50,7 +50,7 @@ NEXTROW:
 
         add         rax, 0x40
         dec         rcx
-        ja          NEXTROW
+        ja          .NEXTROW
 
         movdqa      xmm3,xmm4
         psrldq      xmm4,8
@@ -126,7 +126,7 @@ sym(vp8_get16x16var_sse2):
         pxor        xmm6,           xmm6                        ; clear xmm6 for accumulating sse
         mov         rcx,            16
 
-var16loop:
+.var16loop:
         movdqu      xmm1,           XMMWORD PTR [rsi]
         movdqu      xmm2,           XMMWORD PTR [rdi]
 
@@ -160,7 +160,7 @@ var16loop:
         add         rdi,            rdx
 
         sub         rcx,            1
-        jnz         var16loop
+        jnz         .var16loop
 
 
         movdqa      xmm1,           xmm6
diff --git a/media/libvpx/vp8/encoder/x86/variance_impl_ssse3.asm b/media/libvpx/vp8/common/x86/variance_impl_ssse3.asm
similarity index 93%
rename from media/libvpx/vp8/encoder/x86/variance_impl_ssse3.asm
rename to media/libvpx/vp8/common/x86/variance_impl_ssse3.asm
index a582f8dc5f5..97e8b0e2e12 100644
--- a/media/libvpx/vp8/encoder/x86/variance_impl_ssse3.asm
+++ b/media/libvpx/vp8/common/x86/variance_impl_ssse3.asm
@@ -47,7 +47,7 @@ sym(vp8_filter_block2d_bil_var_ssse3):
         movsxd          rax,            dword ptr arg(5)     ; xoffset
 
         cmp             rax,            0                    ; skip first_pass filter if xoffset=0
-        je              filter_block2d_bil_var_ssse3_sp_only
+        je              .filter_block2d_bil_var_ssse3_sp_only
 
         shl             rax,            4                    ; point to filter coeff with xoffset
         lea             rax,            [rax + rcx]          ; HFilter
@@ -55,7 +55,7 @@ sym(vp8_filter_block2d_bil_var_ssse3):
         movsxd          rdx,            dword ptr arg(6)     ; yoffset
 
         cmp             rdx,            0                    ; skip second_pass filter if yoffset=0
-        je              filter_block2d_bil_var_ssse3_fp_only
+        je              .filter_block2d_bil_var_ssse3_fp_only
 
         shl             rdx,            4
         lea             rdx,            [rdx + rcx]          ; VFilter
@@ -88,7 +88,7 @@ sym(vp8_filter_block2d_bil_var_ssse3):
         lea             rsi,            [rsi + r8]
 %endif
 
-filter_block2d_bil_var_ssse3_loop:
+.filter_block2d_bil_var_ssse3_loop:
         movdqu          xmm1,           XMMWORD PTR [rsi]
         movdqu          xmm2,           XMMWORD PTR [rsi+1]
         movdqa          xmm3,           xmm1
@@ -142,15 +142,15 @@ filter_block2d_bil_var_ssse3_loop:
 %endif
 
         sub             rcx,            1
-        jnz             filter_block2d_bil_var_ssse3_loop
+        jnz             .filter_block2d_bil_var_ssse3_loop
 
-        jmp             filter_block2d_bil_variance
+        jmp             .filter_block2d_bil_variance
 
-filter_block2d_bil_var_ssse3_sp_only:
+.filter_block2d_bil_var_ssse3_sp_only:
         movsxd          rdx,            dword ptr arg(6)     ; yoffset
 
         cmp             rdx,            0                    ; Both xoffset =0 and yoffset=0
-        je              filter_block2d_bil_var_ssse3_full_pixel
+        je              .filter_block2d_bil_var_ssse3_full_pixel
 
         shl             rdx,            4
         lea             rdx,            [rdx + rcx]          ; VFilter
@@ -169,7 +169,7 @@ filter_block2d_bil_var_ssse3_sp_only:
 
         lea             rsi,            [rsi + rax]
 
-filter_block2d_bil_sp_only_loop:
+.filter_block2d_bil_sp_only_loop:
         movdqu          xmm3,           XMMWORD PTR [rsi]
         movdqa          xmm2,           xmm1
         movdqa          xmm0,           xmm3
@@ -209,11 +209,11 @@ filter_block2d_bil_sp_only_loop:
 %endif
 
         sub             rcx,            1
-        jnz             filter_block2d_bil_sp_only_loop
+        jnz             .filter_block2d_bil_sp_only_loop
 
-        jmp             filter_block2d_bil_variance
+        jmp             .filter_block2d_bil_variance
 
-filter_block2d_bil_var_ssse3_full_pixel:
+.filter_block2d_bil_var_ssse3_full_pixel:
         mov             rsi,            arg(0)               ;ref_ptr
         mov             rdi,            arg(2)               ;src_ptr
         movsxd          rcx,            dword ptr arg(4)     ;Height
@@ -221,7 +221,7 @@ filter_block2d_bil_var_ssse3_full_pixel:
         movsxd          rdx,            dword ptr arg(3)     ;src_pixels_per_line
         pxor            xmm0,           xmm0
 
-filter_block2d_bil_full_pixel_loop:
+.filter_block2d_bil_full_pixel_loop:
         movq            xmm1,           QWORD PTR [rsi]
         punpcklbw       xmm1,           xmm0
         movq            xmm2,           QWORD PTR [rsi+8]
@@ -244,11 +244,11 @@ filter_block2d_bil_full_pixel_loop:
         lea             rsi,            [rsi + rax]          ;ref_pixels_per_line
         lea             rdi,            [rdi + rdx]          ;src_pixels_per_line
         sub             rcx,            1
-        jnz             filter_block2d_bil_full_pixel_loop
+        jnz             .filter_block2d_bil_full_pixel_loop
 
-        jmp             filter_block2d_bil_variance
+        jmp             .filter_block2d_bil_variance
 
-filter_block2d_bil_var_ssse3_fp_only:
+.filter_block2d_bil_var_ssse3_fp_only:
         mov             rsi,            arg(0)               ;ref_ptr
         mov             rdi,            arg(2)               ;src_ptr
         movsxd          rcx,            dword ptr arg(4)     ;Height
@@ -260,7 +260,7 @@ filter_block2d_bil_var_ssse3_fp_only:
         movsxd          r9,             dword ptr arg(3) ;src_pixels_per_line
 %endif
 
-filter_block2d_bil_fp_only_loop:
+.filter_block2d_bil_fp_only_loop:
         movdqu          xmm1,           XMMWORD PTR [rsi]
         movdqu          xmm2,           XMMWORD PTR [rsi+1]
         movdqa          xmm3,           xmm1
@@ -298,11 +298,11 @@ filter_block2d_bil_fp_only_loop:
 %endif
 
         sub             rcx,            1
-        jnz             filter_block2d_bil_fp_only_loop
+        jnz             .filter_block2d_bil_fp_only_loop
 
-        jmp             filter_block2d_bil_variance
+        jmp             .filter_block2d_bil_variance
 
-filter_block2d_bil_variance:
+.filter_block2d_bil_variance:
         pxor        xmm0,           xmm0
         pxor        xmm1,           xmm1
         pxor        xmm5,           xmm5
diff --git a/media/libvpx/vp8/encoder/x86/variance_mmx.c b/media/libvpx/vp8/common/x86/variance_mmx.c
similarity index 85%
rename from media/libvpx/vp8/encoder/x86/variance_mmx.c
rename to media/libvpx/vp8/common/x86/variance_mmx.c
index 92b695f1750..faf59e4b996 100644
--- a/media/libvpx/vp8/encoder/x86/variance_mmx.c
+++ b/media/libvpx/vp8/common/x86/variance_mmx.c
@@ -9,9 +9,10 @@
  */
 
 #include "vpx_config.h"
-#include "vp8/encoder/variance.h"
+#include "vp8/common/variance.h"
 #include "vp8/common/pragmas.h"
 #include "vpx_ports/mem.h"
+#include "vp8/common/x86/filter_x86.h"
 
 extern void filter_block1d_h6_mmx
 (
@@ -21,7 +22,7 @@ extern void filter_block1d_h6_mmx
     unsigned int pixel_step,
     unsigned int output_height,
     unsigned int output_width,
-    short *vp7_filter
+    short *filter
 );
 extern void filter_block1d_v6_mmx
 (
@@ -31,7 +32,7 @@ extern void filter_block1d_v6_mmx
     unsigned int pixel_step,
     unsigned int output_height,
     unsigned int output_width,
-    short *vp7_filter
+    short *filter
 );
 
 extern unsigned int vp8_get_mb_ss_mmx(const short *src_ptr);
@@ -90,7 +91,7 @@ unsigned int vp8_variance4x4_mmx(
 
     vp8_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
     *sse = var;
-    return (var - ((avg * avg) >> 4));
+    return (var - ((unsigned int)(avg * avg) >> 4));
 
 }
 
@@ -107,7 +108,7 @@ unsigned int vp8_variance8x8_mmx(
     vp8_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
     *sse = var;
 
-    return (var - ((avg * avg) >> 6));
+    return (var - ((unsigned int)(avg * avg) >> 6));
 
 }
 
@@ -152,7 +153,7 @@ unsigned int vp8_variance16x16_mmx(
     var = sse0 + sse1 + sse2 + sse3;
     avg = sum0 + sum1 + sum2 + sum3;
     *sse = var;
-    return (var - ((avg * avg) >> 8));
+    return (var - ((unsigned int)(avg * avg) >> 8));
 }
 
 unsigned int vp8_variance16x8_mmx(
@@ -171,7 +172,7 @@ unsigned int vp8_variance16x8_mmx(
     var = sse0 + sse1;
     avg = sum0 + sum1;
     *sse = var;
-    return (var - ((avg * avg) >> 7));
+    return (var - ((unsigned int)(avg * avg) >> 7));
 
 }
 
@@ -193,29 +194,11 @@ unsigned int vp8_variance8x16_mmx(
     avg = sum0 + sum1;
     *sse = var;
 
-    return (var - ((avg * avg) >> 7));
+    return (var - ((unsigned int)(avg * avg) >> 7));
 
 }
 
 
-
-
-///////////////////////////////////////////////////////////////////////////
-// the mmx function that does the bilinear filtering and var calculation //
-// int one pass                                                          //
-///////////////////////////////////////////////////////////////////////////
-DECLARE_ALIGNED(16, const short, vp8_vp7_bilinear_filters_mmx[8][8]) =
-{
-    { 128, 128, 128, 128,  0,  0,  0,  0 },
-    { 112, 112, 112, 112, 16, 16, 16, 16 },
-    {  96, 96, 96, 96, 32, 32, 32, 32 },
-    {  80, 80, 80, 80, 48, 48, 48, 48 },
-    {  64, 64, 64, 64, 64, 64, 64, 64 },
-    {  48, 48, 48, 48, 80, 80, 80, 80 },
-    {  32, 32, 32, 32, 96, 96, 96, 96 },
-    {  16, 16, 16, 16, 112, 112, 112, 112 }
-};
-
 unsigned int vp8_sub_pixel_variance4x4_mmx
 (
     const unsigned char  *src_ptr,
@@ -232,7 +215,7 @@ unsigned int vp8_sub_pixel_variance4x4_mmx
     vp8_filter_block2d_bil4x4_var_mmx(
         src_ptr, src_pixels_per_line,
         dst_ptr, dst_pixels_per_line,
-        vp8_vp7_bilinear_filters_mmx[xoffset], vp8_vp7_bilinear_filters_mmx[yoffset],
+        vp8_bilinear_filters_x86_4[xoffset], vp8_bilinear_filters_x86_4[yoffset],
         &xsum, &xxsum
     );
     *sse = xxsum;
@@ -257,7 +240,7 @@ unsigned int vp8_sub_pixel_variance8x8_mmx
     vp8_filter_block2d_bil_var_mmx(
         src_ptr, src_pixels_per_line,
         dst_ptr, dst_pixels_per_line, 8,
-        vp8_vp7_bilinear_filters_mmx[xoffset], vp8_vp7_bilinear_filters_mmx[yoffset],
+        vp8_bilinear_filters_x86_4[xoffset], vp8_bilinear_filters_x86_4[yoffset],
         &xsum, &xxsum
     );
     *sse = xxsum;
@@ -283,7 +266,7 @@ unsigned int vp8_sub_pixel_variance16x16_mmx
     vp8_filter_block2d_bil_var_mmx(
         src_ptr, src_pixels_per_line,
         dst_ptr, dst_pixels_per_line, 16,
-        vp8_vp7_bilinear_filters_mmx[xoffset], vp8_vp7_bilinear_filters_mmx[yoffset],
+        vp8_bilinear_filters_x86_4[xoffset], vp8_bilinear_filters_x86_4[yoffset],
         &xsum0, &xxsum0
     );
 
@@ -291,7 +274,7 @@ unsigned int vp8_sub_pixel_variance16x16_mmx
     vp8_filter_block2d_bil_var_mmx(
         src_ptr + 8, src_pixels_per_line,
         dst_ptr + 8, dst_pixels_per_line, 16,
-        vp8_vp7_bilinear_filters_mmx[xoffset], vp8_vp7_bilinear_filters_mmx[yoffset],
+        vp8_bilinear_filters_x86_4[xoffset], vp8_bilinear_filters_x86_4[yoffset],
         &xsum1, &xxsum1
     );
 
@@ -336,7 +319,7 @@ unsigned int vp8_sub_pixel_variance16x8_mmx
     vp8_filter_block2d_bil_var_mmx(
         src_ptr, src_pixels_per_line,
         dst_ptr, dst_pixels_per_line, 8,
-        vp8_vp7_bilinear_filters_mmx[xoffset], vp8_vp7_bilinear_filters_mmx[yoffset],
+        vp8_bilinear_filters_x86_4[xoffset], vp8_bilinear_filters_x86_4[yoffset],
         &xsum0, &xxsum0
     );
 
@@ -344,7 +327,7 @@ unsigned int vp8_sub_pixel_variance16x8_mmx
     vp8_filter_block2d_bil_var_mmx(
         src_ptr + 8, src_pixels_per_line,
         dst_ptr + 8, dst_pixels_per_line, 8,
-        vp8_vp7_bilinear_filters_mmx[xoffset], vp8_vp7_bilinear_filters_mmx[yoffset],
+        vp8_bilinear_filters_x86_4[xoffset], vp8_bilinear_filters_x86_4[yoffset],
         &xsum1, &xxsum1
     );
 
@@ -371,7 +354,7 @@ unsigned int vp8_sub_pixel_variance8x16_mmx
     vp8_filter_block2d_bil_var_mmx(
         src_ptr, src_pixels_per_line,
         dst_ptr, dst_pixels_per_line, 16,
-        vp8_vp7_bilinear_filters_mmx[xoffset], vp8_vp7_bilinear_filters_mmx[yoffset],
+        vp8_bilinear_filters_x86_4[xoffset], vp8_bilinear_filters_x86_4[yoffset],
         &xsum, &xxsum
     );
     *sse = xxsum;
diff --git a/media/libvpx/vp8/encoder/x86/variance_sse2.c b/media/libvpx/vp8/common/x86/variance_sse2.c
similarity index 96%
rename from media/libvpx/vp8/encoder/x86/variance_sse2.c
rename to media/libvpx/vp8/common/x86/variance_sse2.c
index 24062eb9be0..1028d74dbb1 100644
--- a/media/libvpx/vp8/encoder/x86/variance_sse2.c
+++ b/media/libvpx/vp8/common/x86/variance_sse2.c
@@ -9,14 +9,15 @@
  */
 
 #include "vpx_config.h"
-#include "vp8/encoder/variance.h"
+#include "vp8/common/variance.h"
 #include "vp8/common/pragmas.h"
 #include "vpx_ports/mem.h"
+#include "vp8/common/x86/filter_x86.h"
 
-extern void filter_block1d_h6_mmx(const unsigned char *src_ptr, unsigned short *output_ptr, unsigned int src_pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *vp7_filter);
-extern void filter_block1d_v6_mmx(const short *src_ptr, unsigned char *output_ptr, unsigned int pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *vp7_filter);
-extern void filter_block1d8_h6_sse2(const unsigned char *src_ptr, unsigned short *output_ptr, unsigned int src_pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *vp7_filter);
-extern void filter_block1d8_v6_sse2(const short *src_ptr, unsigned char *output_ptr, unsigned int pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *vp7_filter);
+extern void filter_block1d_h6_mmx(const unsigned char *src_ptr, unsigned short *output_ptr, unsigned int src_pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *filter);
+extern void filter_block1d_v6_mmx(const short *src_ptr, unsigned char *output_ptr, unsigned int pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *filter);
+extern void filter_block1d8_h6_sse2(const unsigned char *src_ptr, unsigned short *output_ptr, unsigned int src_pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *filter);
+extern void filter_block1d8_v6_sse2(const short *src_ptr, unsigned char *output_ptr, unsigned int pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *filter);
 
 extern void vp8_filter_block2d_bil4x4_var_mmx
 (
@@ -135,8 +136,6 @@ void vp8_half_vert_variance16x_h_sse2
     unsigned int *sumsquared
 );
 
-DECLARE_ALIGNED(16, extern short, vp8_vp7_bilinear_filters_mmx[8][8]);
-
 unsigned int vp8_variance4x4_wmt(
     const unsigned char *src_ptr,
     int  source_stride,
@@ -149,7 +148,7 @@ unsigned int vp8_variance4x4_wmt(
 
     vp8_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
     *sse = var;
-    return (var - ((avg * avg) >> 4));
+    return (var - ((unsigned int)(avg * avg) >> 4));
 
 }
 
@@ -166,7 +165,7 @@ unsigned int vp8_variance8x8_wmt
 
     vp8_get8x8var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
     *sse = var;
-    return (var - ((avg * avg) >> 6));
+    return (var - ((unsigned int)(avg * avg) >> 6));
 
 }
 
@@ -221,7 +220,7 @@ unsigned int vp8_variance16x8_wmt
     var = sse0 + sse1;
     avg = sum0 + sum1;
     *sse = var;
-    return (var - ((avg * avg) >> 7));
+    return (var - ((unsigned int)(avg * avg) >> 7));
 
 }
 
@@ -242,7 +241,7 @@ unsigned int vp8_variance8x16_wmt
     var = sse0 + sse1;
     avg = sum0 + sum1;
     *sse = var;
-    return (var - ((avg * avg) >> 7));
+    return (var - ((unsigned int)(avg * avg) >> 7));
 
 }
 
@@ -262,7 +261,7 @@ unsigned int vp8_sub_pixel_variance4x4_wmt
     vp8_filter_block2d_bil4x4_var_mmx(
         src_ptr, src_pixels_per_line,
         dst_ptr, dst_pixels_per_line,
-        vp8_vp7_bilinear_filters_mmx[xoffset], vp8_vp7_bilinear_filters_mmx[yoffset],
+        vp8_bilinear_filters_x86_4[xoffset], vp8_bilinear_filters_x86_4[yoffset],
         &xsum, &xxsum
     );
     *sse = xxsum;
diff --git a/media/libvpx/vp8/encoder/x86/variance_ssse3.c b/media/libvpx/vp8/common/x86/variance_ssse3.c
similarity index 96%
rename from media/libvpx/vp8/encoder/x86/variance_ssse3.c
rename to media/libvpx/vp8/common/x86/variance_ssse3.c
index 73f2e01a291..1be0d929dde 100644
--- a/media/libvpx/vp8/encoder/x86/variance_ssse3.c
+++ b/media/libvpx/vp8/common/x86/variance_ssse3.c
@@ -9,7 +9,7 @@
  */
 
 #include "vpx_config.h"
-#include "vp8/encoder/variance.h"
+#include "vp8/common/variance.h"
 #include "vp8/common/pragmas.h"
 #include "vpx_ports/mem.h"
 
@@ -112,7 +112,7 @@ unsigned int vp8_sub_pixel_variance16x16_ssse3
     }
 
     *sse = xxsum0;
-    return (xxsum0 - ((xsum0 * xsum0) >> 8));
+    return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8));
 }
 
 unsigned int vp8_sub_pixel_variance16x8_ssse3
@@ -161,5 +161,5 @@ unsigned int vp8_sub_pixel_variance16x8_ssse3
     }
 
     *sse = xxsum0;
-    return (xxsum0 - ((xsum0 * xsum0) >> 7));
+    return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 7));
 }
diff --git a/media/libvpx/vp8/encoder/x86/variance_x86.h b/media/libvpx/vp8/common/x86/variance_x86.h
similarity index 97%
rename from media/libvpx/vp8/encoder/x86/variance_x86.h
rename to media/libvpx/vp8/common/x86/variance_x86.h
index af6c4d27ed6..ad396b4e75a 100644
--- a/media/libvpx/vp8/encoder/x86/variance_x86.h
+++ b/media/libvpx/vp8/common/x86/variance_x86.h
@@ -140,6 +140,8 @@ extern prototype_getmbss(vp8_get_mb_ss_sse2);
 extern prototype_variance(vp8_mse16x16_wmt);
 extern prototype_variance2(vp8_get8x8var_sse2);
 extern prototype_variance2(vp8_get16x16var_sse2);
+extern prototype_ssimpf(vp8_ssim_parms_8x8_sse2);
+extern prototype_ssimpf(vp8_ssim_parms_16x16_sse2);
 
 #if !CONFIG_RUNTIME_CPU_DETECT
 #undef  vp8_variance_sad4x4
@@ -208,6 +210,14 @@ extern prototype_variance2(vp8_get16x16var_sse2);
 #undef  vp8_variance_mse16x16
 #define vp8_variance_mse16x16 vp8_mse16x16_wmt
 
+#if ARCH_X86_64
+#undef  vp8_ssimpf_8x8
+#define vp8_ssimpf_8x8 vp8_ssim_parms_8x8_sse2
+
+#undef  vp8_ssimpf_16x16
+#define vp8_ssimpf_16x16 vp8_ssim_parms_16x16_sse2
+#endif
+
 #endif
 #endif
 
diff --git a/media/libvpx/vp8/common/x86/vp8_asm_stubs.c b/media/libvpx/vp8/common/x86/vp8_asm_stubs.c
index 79040060937..a623c69b459 100644
--- a/media/libvpx/vp8/common/x86/vp8_asm_stubs.c
+++ b/media/libvpx/vp8/common/x86/vp8_asm_stubs.c
@@ -9,12 +9,12 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/mem.h"
 #include "vp8/common/subpixel.h"
+#include "filter_x86.h"
 
 extern const short vp8_six_tap_mmx[8][6*8];
-extern const short vp8_bilinear_filters_mmx[8][2*8];
 
 extern void vp8_filter_block1d_h6_mmx
 (
diff --git a/media/libvpx/vp8/common/x86/x86_systemdependent.c b/media/libvpx/vp8/common/x86/x86_systemdependent.c
index 33a984b7921..d485ea39505 100644
--- a/media/libvpx/vp8/common/x86/x86_systemdependent.c
+++ b/media/libvpx/vp8/common/x86/x86_systemdependent.c
@@ -11,11 +11,11 @@
 
 #include "vpx_config.h"
 #include "vpx_ports/x86.h"
-#include "vp8/common/g_common.h"
 #include "vp8/common/subpixel.h"
 #include "vp8/common/loopfilter.h"
 #include "vp8/common/recon.h"
 #include "vp8/common/idct.h"
+#include "vp8/common/variance.h"
 #include "vp8/common/pragmas.h"
 #include "vp8/common/onyxc_int.h"
 
@@ -37,15 +37,15 @@ void vp8_arch_x86_common_init(VP8_COMMON *ctx)
 
     if (flags & HAS_MMX)
     {
-        rtcd->idct.idct1        = vp8_short_idct4x4llm_1_mmx;
+        rtcd->dequant.block               = vp8_dequantize_b_mmx;
+        rtcd->dequant.idct_add            = vp8_dequant_idct_add_mmx;
+        rtcd->dequant.idct_add_y_block    = vp8_dequant_idct_add_y_block_mmx;
+        rtcd->dequant.idct_add_uv_block   = vp8_dequant_idct_add_uv_block_mmx;
+
         rtcd->idct.idct16       = vp8_short_idct4x4llm_mmx;
         rtcd->idct.idct1_scalar_add = vp8_dc_only_idct_add_mmx;
         rtcd->idct.iwalsh16     = vp8_short_inv_walsh4x4_mmx;
-        rtcd->idct.iwalsh1     = vp8_short_inv_walsh4x4_1_mmx;
 
-
-
-        rtcd->recon.recon       = vp8_recon_b_mmx;
         rtcd->recon.copy8x8     = vp8_copy_mem8x8_mmx;
         rtcd->recon.copy8x4     = vp8_copy_mem8x4_mmx;
         rtcd->recon.copy16x16   = vp8_copy_mem16x16_mmx;
@@ -68,6 +68,33 @@ void vp8_arch_x86_common_init(VP8_COMMON *ctx)
         rtcd->loopfilter.simple_mb_h = vp8_loop_filter_simple_horizontal_edge_mmx;
         rtcd->loopfilter.simple_b_h  = vp8_loop_filter_bhs_mmx;
 
+        rtcd->variance.sad16x16              = vp8_sad16x16_mmx;
+        rtcd->variance.sad16x8               = vp8_sad16x8_mmx;
+        rtcd->variance.sad8x16               = vp8_sad8x16_mmx;
+        rtcd->variance.sad8x8                = vp8_sad8x8_mmx;
+        rtcd->variance.sad4x4                = vp8_sad4x4_mmx;
+
+        rtcd->variance.var4x4                = vp8_variance4x4_mmx;
+        rtcd->variance.var8x8                = vp8_variance8x8_mmx;
+        rtcd->variance.var8x16               = vp8_variance8x16_mmx;
+        rtcd->variance.var16x8               = vp8_variance16x8_mmx;
+        rtcd->variance.var16x16              = vp8_variance16x16_mmx;
+
+        rtcd->variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_mmx;
+        rtcd->variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_mmx;
+        rtcd->variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_mmx;
+        rtcd->variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_mmx;
+        rtcd->variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_mmx;
+        rtcd->variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_mmx;
+        rtcd->variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_mmx;
+        rtcd->variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_mmx;
+        rtcd->variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_mmx;
+
+        rtcd->variance.mse16x16              = vp8_mse16x16_mmx;
+        rtcd->variance.getmbss               = vp8_get_mb_ss_mmx;
+
+        rtcd->variance.get4x4sse_cs          = vp8_get4x4sse_cs_mmx;
+
 #if CONFIG_POSTPROC
         rtcd->postproc.down        = vp8_mbpost_proc_down_mmx;
         /*rtcd->postproc.across      = vp8_mbpost_proc_across_ip_c;*/
@@ -81,13 +108,18 @@ void vp8_arch_x86_common_init(VP8_COMMON *ctx)
 
     if (flags & HAS_SSE2)
     {
-        rtcd->recon.recon2      = vp8_recon2b_sse2;
-        rtcd->recon.recon4      = vp8_recon4b_sse2;
         rtcd->recon.copy16x16   = vp8_copy_mem16x16_sse2;
         rtcd->recon.build_intra_predictors_mbuv =
             vp8_build_intra_predictors_mbuv_sse2;
         rtcd->recon.build_intra_predictors_mbuv_s =
             vp8_build_intra_predictors_mbuv_s_sse2;
+        rtcd->recon.build_intra_predictors_mby =
+            vp8_build_intra_predictors_mby_sse2;
+        rtcd->recon.build_intra_predictors_mby_s =
+            vp8_build_intra_predictors_mby_s_sse2;
+
+        rtcd->dequant.idct_add_y_block    = vp8_dequant_idct_add_y_block_sse2;
+        rtcd->dequant.idct_add_uv_block   = vp8_dequant_idct_add_uv_block_sse2;
 
         rtcd->idct.iwalsh16     = vp8_short_inv_walsh4x4_sse2;
 
@@ -106,6 +138,41 @@ void vp8_arch_x86_common_init(VP8_COMMON *ctx)
         rtcd->loopfilter.simple_mb_h = vp8_loop_filter_simple_horizontal_edge_sse2;
         rtcd->loopfilter.simple_b_h  = vp8_loop_filter_bhs_sse2;
 
+        rtcd->variance.sad16x16              = vp8_sad16x16_wmt;
+        rtcd->variance.sad16x8               = vp8_sad16x8_wmt;
+        rtcd->variance.sad8x16               = vp8_sad8x16_wmt;
+        rtcd->variance.sad8x8                = vp8_sad8x8_wmt;
+        rtcd->variance.sad4x4                = vp8_sad4x4_wmt;
+        rtcd->variance.copy32xn              = vp8_copy32xn_sse2;
+
+        rtcd->variance.var4x4                = vp8_variance4x4_wmt;
+        rtcd->variance.var8x8                = vp8_variance8x8_wmt;
+        rtcd->variance.var8x16               = vp8_variance8x16_wmt;
+        rtcd->variance.var16x8               = vp8_variance16x8_wmt;
+        rtcd->variance.var16x16              = vp8_variance16x16_wmt;
+
+        rtcd->variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_wmt;
+        rtcd->variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_wmt;
+        rtcd->variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_wmt;
+        rtcd->variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_wmt;
+        rtcd->variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_wmt;
+        rtcd->variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_wmt;
+        rtcd->variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_wmt;
+        rtcd->variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_wmt;
+        rtcd->variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_wmt;
+
+        rtcd->variance.mse16x16              = vp8_mse16x16_wmt;
+        rtcd->variance.getmbss               = vp8_get_mb_ss_sse2;
+
+        /* rtcd->variance.get4x4sse_cs  not implemented for wmt */;
+
+#if CONFIG_INTERNAL_STATS
+#if ARCH_X86_64
+        rtcd->variance.ssimpf_8x8            = vp8_ssim_parms_8x8_sse2;
+        rtcd->variance.ssimpf_16x16          = vp8_ssim_parms_16x16_sse2;
+#endif
+#endif
+
 #if CONFIG_POSTPROC
         rtcd->postproc.down        = vp8_mbpost_proc_down_xmm;
         rtcd->postproc.across      = vp8_mbpost_proc_across_ip_xmm;
@@ -116,6 +183,26 @@ void vp8_arch_x86_common_init(VP8_COMMON *ctx)
 
 #endif
 
+#if HAVE_SSE3
+
+    if (flags & HAS_SSE3)
+    {
+        rtcd->variance.sad16x16              = vp8_sad16x16_sse3;
+        rtcd->variance.sad16x16x3            = vp8_sad16x16x3_sse3;
+        rtcd->variance.sad16x8x3             = vp8_sad16x8x3_sse3;
+        rtcd->variance.sad8x16x3             = vp8_sad8x16x3_sse3;
+        rtcd->variance.sad8x8x3              = vp8_sad8x8x3_sse3;
+        rtcd->variance.sad4x4x3              = vp8_sad4x4x3_sse3;
+        rtcd->variance.sad16x16x4d           = vp8_sad16x16x4d_sse3;
+        rtcd->variance.sad16x8x4d            = vp8_sad16x8x4d_sse3;
+        rtcd->variance.sad8x16x4d            = vp8_sad8x16x4d_sse3;
+        rtcd->variance.sad8x8x4d             = vp8_sad8x8x4d_sse3;
+        rtcd->variance.sad4x4x4d             = vp8_sad4x4x4d_sse3;
+        rtcd->variance.copy32xn              = vp8_copy32xn_sse3;
+
+    }
+#endif
+
 #if HAVE_SSSE3
 
     if (flags & HAS_SSSE3)
@@ -131,6 +218,27 @@ void vp8_arch_x86_common_init(VP8_COMMON *ctx)
             vp8_build_intra_predictors_mbuv_ssse3;
         rtcd->recon.build_intra_predictors_mbuv_s =
             vp8_build_intra_predictors_mbuv_s_ssse3;
+        rtcd->recon.build_intra_predictors_mby =
+            vp8_build_intra_predictors_mby_ssse3;
+        rtcd->recon.build_intra_predictors_mby_s =
+            vp8_build_intra_predictors_mby_s_ssse3;
+
+        rtcd->variance.sad16x16x3            = vp8_sad16x16x3_ssse3;
+        rtcd->variance.sad16x8x3             = vp8_sad16x8x3_ssse3;
+
+        rtcd->variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_ssse3;
+        rtcd->variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_ssse3;
+    }
+#endif
+
+#if HAVE_SSE4_1
+    if (flags & HAS_SSE4_1)
+    {
+        rtcd->variance.sad16x16x8            = vp8_sad16x16x8_sse4;
+        rtcd->variance.sad16x8x8             = vp8_sad16x8x8_sse4;
+        rtcd->variance.sad8x16x8             = vp8_sad8x16x8_sse4;
+        rtcd->variance.sad8x8x8              = vp8_sad8x8x8_sse4;
+        rtcd->variance.sad4x4x8              = vp8_sad4x4x8_sse4;
     }
 #endif
 
diff --git a/media/libvpx/vp8/decoder/arm/arm_dsystemdependent.c b/media/libvpx/vp8/decoder/arm/arm_dsystemdependent.c
index 6ce471217d3..bf0a3481a3b 100644
--- a/media/libvpx/vp8/decoder/arm/arm_dsystemdependent.c
+++ b/media/libvpx/vp8/decoder/arm/arm_dsystemdependent.c
@@ -9,11 +9,8 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/arm.h"
-#include "vp8/common/blockd.h"
-#include "vp8/common/pragmas.h"
-#include "vp8/decoder/dequantize.h"
 #include "vp8/decoder/onyxd_int.h"
 
 void vp8_arch_arm_decode_init(VP8D_COMP *pbi)
@@ -30,25 +27,12 @@ void vp8_arch_arm_decode_init(VP8D_COMP *pbi)
 #if HAVE_ARMV6
     if (flags & HAS_MEDIA)
     {
-        pbi->dequant.block               = vp8_dequantize_b_v6;
-        pbi->dequant.idct_add            = vp8_dequant_idct_add_v6;
-        pbi->dequant.dc_idct_add         = vp8_dequant_dc_idct_add_v6;
-        pbi->dequant.dc_idct_add_y_block = vp8_dequant_dc_idct_add_y_block_v6;
-        pbi->dequant.idct_add_y_block    = vp8_dequant_idct_add_y_block_v6;
-        pbi->dequant.idct_add_uv_block   = vp8_dequant_idct_add_uv_block_v6;
     }
 #endif
 
 #if HAVE_ARMV7
     if (flags & HAS_NEON)
     {
-        pbi->dequant.block               = vp8_dequantize_b_neon;
-        pbi->dequant.idct_add            = vp8_dequant_idct_add_neon;
-        /*This is not used: NEON always dequants two blocks at once.
-        pbi->dequant.dc_idct_add         = vp8_dequant_dc_idct_add_neon;*/
-        pbi->dequant.dc_idct_add_y_block = vp8_dequant_dc_idct_add_y_block_neon;
-        pbi->dequant.idct_add_y_block    = vp8_dequant_idct_add_y_block_neon;
-        pbi->dequant.idct_add_uv_block   = vp8_dequant_idct_add_uv_block_neon;
     }
 #endif
 #endif
diff --git a/media/libvpx/vp8/decoder/arm/armv6/dequant_dc_idct_v6.asm b/media/libvpx/vp8/decoder/arm/armv6/dequant_dc_idct_v6.asm
deleted file mode 100644
index 6bebda24f92..00000000000
--- a/media/libvpx/vp8/decoder/arm/armv6/dequant_dc_idct_v6.asm
+++ /dev/null
@@ -1,218 +0,0 @@
-;
-;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-;
-;  Use of this source code is governed by a BSD-style license and patent
-;  grant that can be found in the LICENSE file in the root of the source
-;  tree. All contributing project authors may be found in the AUTHORS
-;  file in the root of the source tree.
-;
-
-
-    EXPORT |vp8_dequant_dc_idct_add_v6|
-
-    AREA |.text|, CODE, READONLY
-
-;void vp8_dequant_dc_idct_v6(short *input, short *dq, unsigned char *pred,
-; unsigned char *dest, int pitch, int stride, int Dc)
-; r0 = input
-; r1 = dq
-; r2 = pred
-; r3 = dest
-; sp + 36 = pitch  ; +4 = 40
-; sp + 40 = stride  ; +4 = 44
-; sp + 44 = Dc  ; +4 = 48
-
-
-|vp8_dequant_dc_idct_add_v6| PROC
-    stmdb   sp!, {r4-r11, lr}
-
-    ldr     r6, [sp, #44]
-
-    ldr     r4, [r0]                ;input
-    ldr     r5, [r1], #4            ;dq
-
-    sub     sp, sp, #4
-    str     r3, [sp]
-
-    smultt  r7, r4, r5
-
-    ldr     r4, [r0, #4]            ;input
-    ldr     r5, [r1], #4            ;dq
-
-    strh    r6, [r0], #2
-    strh    r7, [r0], #2
-
-    smulbb  r6, r4, r5
-    smultt  r7, r4, r5
-
-    ldr     r4, [r0, #4]            ;input
-    ldr     r5, [r1], #4            ;dq
-
-    strh    r6, [r0], #2
-    strh    r7, [r0], #2
-
-    mov     r12, #3
-
-vp8_dequant_dc_add_loop
-    smulbb  r6, r4, r5
-    smultt  r7, r4, r5
-
-    ldr     r4, [r0, #4]            ;input
-    ldr     r5, [r1], #4            ;dq
-
-    strh    r6, [r0], #2
-    strh    r7, [r0], #2
-
-    smulbb  r6, r4, r5
-    smultt  r7, r4, r5
-
-    subs    r12, r12, #1
-
-    ldrne   r4, [r0, #4]
-    ldrne   r5, [r1], #4
-
-    strh    r6, [r0], #2
-    strh    r7, [r0], #2
-
-    bne     vp8_dequant_dc_add_loop
-
-    sub     r0, r0, #32
-    mov     r1, r0
-
-; short_idct4x4llm_v6_dual
-    ldr     r3, cospi8sqrt2minus1
-    ldr     r4, sinpi8sqrt2
-    ldr     r6, [r0, #8]
-    mov     r5, #2
-vp8_dequant_dc_idct_loop1_v6
-    ldr     r12, [r0, #24]
-    ldr     r14, [r0, #16]
-    smulwt  r9, r3, r6
-    smulwb  r7, r3, r6
-    smulwt  r10, r4, r6
-    smulwb  r8, r4, r6
-    pkhbt   r7, r7, r9, lsl #16
-    smulwt  r11, r3, r12
-    pkhbt   r8, r8, r10, lsl #16
-    uadd16  r6, r6, r7
-    smulwt  r7, r4, r12
-    smulwb  r9, r3, r12
-    smulwb  r10, r4, r12
-    subs    r5, r5, #1
-    pkhbt   r9, r9, r11, lsl #16
-    ldr     r11, [r0], #4
-    pkhbt   r10, r10, r7, lsl #16
-    uadd16  r7, r12, r9
-    usub16  r7, r8, r7
-    uadd16  r6, r6, r10
-    uadd16  r10, r11, r14
-    usub16  r8, r11, r14
-    uadd16  r9, r10, r6
-    usub16  r10, r10, r6
-    uadd16  r6, r8, r7
-    usub16  r7, r8, r7
-    str     r6, [r1, #8]
-    ldrne   r6, [r0, #8]
-    str     r7, [r1, #16]
-    str     r10, [r1, #24]
-    str     r9, [r1], #4
-    bne     vp8_dequant_dc_idct_loop1_v6
-
-    mov     r5, #2
-    sub     r0, r1, #8
-vp8_dequant_dc_idct_loop2_v6
-    ldr     r6, [r0], #4
-    ldr     r7, [r0], #4
-    ldr     r8, [r0], #4
-    ldr     r9, [r0], #4
-    smulwt  r1, r3, r6
-    smulwt  r12, r4, r6
-    smulwt  lr, r3, r8
-    smulwt  r10, r4, r8
-    pkhbt   r11, r8, r6, lsl #16
-    pkhbt   r1, lr, r1, lsl #16
-    pkhbt   r12, r10, r12, lsl #16
-    pkhtb   r6, r6, r8, asr #16
-    uadd16  r6, r1, r6
-    pkhbt   lr, r9, r7, lsl #16
-    uadd16  r10, r11, lr
-    usub16  lr, r11, lr
-    pkhtb   r8, r7, r9, asr #16
-    subs    r5, r5, #1
-    smulwt  r1, r3, r8
-    smulwb  r7, r3, r8
-    smulwt  r11, r4, r8
-    smulwb  r9, r4, r8
-    pkhbt   r1, r7, r1, lsl #16
-    uadd16  r8, r1, r8
-    pkhbt   r11, r9, r11, lsl #16
-    usub16  r1, r12, r8
-    uadd16  r8, r11, r6
-    ldr     r9, c0x00040004
-    ldr     r12, [sp, #40]
-    uadd16  r6, r10, r8
-    usub16  r7, r10, r8
-    uadd16  r7, r7, r9
-    uadd16  r6, r6, r9
-    uadd16  r10, r14, r1
-    usub16  r1, r14, r1
-    uadd16  r10, r10, r9
-    uadd16  r1, r1, r9
-    ldr     r11, [r2], r12
-    mov     r8, r7, asr #3
-    pkhtb   r9, r8, r10, asr #19
-    mov     r8, r1, asr #3
-    pkhtb   r8, r8, r6, asr #19
-    uxtb16  lr, r11, ror #8
-    qadd16  r9, r9, lr
-    uxtb16  lr, r11
-    qadd16  r8, r8, lr
-    usat16  r9, #8, r9
-    usat16  r8, #8, r8
-    orr     r9, r8, r9, lsl #8
-    ldr     r11, [r2], r12
-    ldr     lr, [sp]
-    ldr     r12, [sp, #44]
-    mov     r7, r7, lsl #16
-    mov     r1, r1, lsl #16
-    mov     r10, r10, lsl #16
-    mov     r6, r6, lsl #16
-    mov     r7, r7, asr #3
-    pkhtb   r7, r7, r10, asr #19
-    mov     r1, r1, asr #3
-    pkhtb   r1, r1, r6, asr #19
-    uxtb16  r8, r11, ror #8
-    qadd16  r7, r7, r8
-    uxtb16  r8, r11
-    qadd16  r1, r1, r8
-    usat16  r7, #8, r7
-    usat16  r1, #8, r1
-    orr     r1, r1, r7, lsl #8
-    str     r9, [lr], r12
-    str     r1, [lr], r12
-    str     lr, [sp]
-    bne     vp8_dequant_dc_idct_loop2_v6
-
-; vpx_memset
-    sub     r0, r0, #32
-    add     sp, sp, #4
-
-    mov     r12, #0
-    str     r12, [r0]
-    str     r12, [r0, #4]
-    str     r12, [r0, #8]
-    str     r12, [r0, #12]
-    str     r12, [r0, #16]
-    str     r12, [r0, #20]
-    str     r12, [r0, #24]
-    str     r12, [r0, #28]
-
-    ldmia   sp!, {r4 - r11, pc}
-    ENDP    ; |vp8_dequant_dc_idct_add_v6|
-
-; Constant Pool
-cospi8sqrt2minus1 DCD 0x00004E7B
-sinpi8sqrt2       DCD 0x00008A8C
-c0x00040004       DCD 0x00040004
-
-    END
diff --git a/media/libvpx/vp8/decoder/arm/armv6/idct_blk_v6.c b/media/libvpx/vp8/decoder/arm/armv6/idct_blk_v6.c
deleted file mode 100644
index 57c34469888..00000000000
--- a/media/libvpx/vp8/decoder/arm/armv6/idct_blk_v6.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "vpx_ports/config.h"
-#include "vp8/common/idct.h"
-#include "vp8/decoder/dequantize.h"
-
-void vp8_dequant_dc_idct_add_y_block_v6
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dst, int stride, char *eobs, short *dc)
-{
-    int i;
-
-    for (i = 0; i < 4; i++)
-    {
-        if (eobs[0] > 1)
-            vp8_dequant_dc_idct_add_v6 (q, dq, pre, dst, 16, stride, dc[0]);
-        else
-            vp8_dc_only_idct_add_v6 (dc[0], pre, dst, 16, stride);
-
-        if (eobs[1] > 1)
-            vp8_dequant_dc_idct_add_v6 (q+16, dq, pre+4, dst+4, 16, stride, dc[1]);
-        else
-            vp8_dc_only_idct_add_v6 (dc[1], pre+4, dst+4, 16, stride);
-
-        if (eobs[2] > 1)
-            vp8_dequant_dc_idct_add_v6 (q+32, dq, pre+8, dst+8, 16, stride, dc[2]);
-        else
-            vp8_dc_only_idct_add_v6 (dc[2], pre+8, dst+8, 16, stride);
-
-        if (eobs[3] > 1)
-            vp8_dequant_dc_idct_add_v6 (q+48, dq, pre+12, dst+12, 16, stride, dc[3]);
-        else
-            vp8_dc_only_idct_add_v6 (dc[3], pre+12, dst+12, 16, stride);
-
-        q    += 64;
-        dc   += 4;
-        pre  += 64;
-        dst  += 4*stride;
-        eobs += 4;
-    }
-}
-
-void vp8_dequant_idct_add_y_block_v6
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dst, int stride, char *eobs)
-{
-    int i;
-
-    for (i = 0; i < 4; i++)
-    {
-        if (eobs[0] > 1)
-            vp8_dequant_idct_add_v6 (q, dq, pre, dst, 16, stride);
-        else
-        {
-            vp8_dc_only_idct_add_v6 (q[0]*dq[0], pre, dst, 16, stride);
-            ((int *)q)[0] = 0;
-        }
-
-        if (eobs[1] > 1)
-            vp8_dequant_idct_add_v6 (q+16, dq, pre+4, dst+4, 16, stride);
-        else
-        {
-            vp8_dc_only_idct_add_v6 (q[16]*dq[0], pre+4, dst+4, 16, stride);
-            ((int *)(q+16))[0] = 0;
-        }
-
-        if (eobs[2] > 1)
-            vp8_dequant_idct_add_v6 (q+32, dq, pre+8, dst+8, 16, stride);
-        else
-        {
-            vp8_dc_only_idct_add_v6 (q[32]*dq[0], pre+8, dst+8, 16, stride);
-            ((int *)(q+32))[0] = 0;
-        }
-
-        if (eobs[3] > 1)
-            vp8_dequant_idct_add_v6 (q+48, dq, pre+12, dst+12, 16, stride);
-        else
-        {
-            vp8_dc_only_idct_add_v6 (q[48]*dq[0], pre+12, dst+12, 16, stride);
-            ((int *)(q+48))[0] = 0;
-        }
-
-        q    += 64;
-        pre  += 64;
-        dst  += 4*stride;
-        eobs += 4;
-    }
-}
-
-void vp8_dequant_idct_add_uv_block_v6
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dstu, unsigned char *dstv, int stride, char *eobs)
-{
-    int i;
-
-    for (i = 0; i < 2; i++)
-    {
-        if (eobs[0] > 1)
-            vp8_dequant_idct_add_v6 (q, dq, pre, dstu, 8, stride);
-        else
-        {
-            vp8_dc_only_idct_add_v6 (q[0]*dq[0], pre, dstu, 8, stride);
-            ((int *)q)[0] = 0;
-        }
-
-        if (eobs[1] > 1)
-            vp8_dequant_idct_add_v6 (q+16, dq, pre+4, dstu+4, 8, stride);
-        else
-        {
-            vp8_dc_only_idct_add_v6 (q[16]*dq[0], pre+4, dstu+4, 8, stride);
-            ((int *)(q+16))[0] = 0;
-        }
-
-        q    += 32;
-        pre  += 32;
-        dstu += 4*stride;
-        eobs += 2;
-    }
-
-    for (i = 0; i < 2; i++)
-    {
-        if (eobs[0] > 1)
-            vp8_dequant_idct_add_v6 (q, dq, pre, dstv, 8, stride);
-        else
-        {
-            vp8_dc_only_idct_add_v6 (q[0]*dq[0], pre, dstv, 8, stride);
-            ((int *)q)[0] = 0;
-        }
-
-        if (eobs[1] > 1)
-            vp8_dequant_idct_add_v6 (q+16, dq, pre+4, dstv+4, 8, stride);
-        else
-        {
-            vp8_dc_only_idct_add_v6 (q[16]*dq[0], pre+4, dstv+4, 8, stride);
-            ((int *)(q+16))[0] = 0;
-        }
-
-        q    += 32;
-        pre  += 32;
-        dstv += 4*stride;
-        eobs += 2;
-    }
-}
diff --git a/media/libvpx/vp8/decoder/arm/neon/idct_blk_neon.c b/media/libvpx/vp8/decoder/arm/neon/idct_blk_neon.c
deleted file mode 100644
index ee35004254a..00000000000
--- a/media/libvpx/vp8/decoder/arm/neon/idct_blk_neon.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "vpx_ports/config.h"
-#include "vp8/common/idct.h"
-#include "vp8/decoder/dequantize.h"
-
-/* place these declarations here because we don't want to maintain them
- * outside of this scope
- */
-void idct_dequant_dc_full_2x_neon
-            (short *input, short *dq, unsigned char *pre, unsigned char *dst,
-             int stride, short *dc);
-void idct_dequant_dc_0_2x_neon
-            (short *dc, unsigned char *pre, unsigned char *dst, int stride);
-void idct_dequant_full_2x_neon
-            (short *q, short *dq, unsigned char *pre, unsigned char *dst,
-             int pitch, int stride);
-void idct_dequant_0_2x_neon
-            (short *q, short dq, unsigned char *pre, int pitch,
-             unsigned char *dst, int stride);
-
-void vp8_dequant_dc_idct_add_y_block_neon
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dst, int stride, char *eobs, short *dc)
-{
-    int i;
-
-    for (i = 0; i < 4; i++)
-    {
-        if (((short *)eobs)[0] & 0xfefe)
-            idct_dequant_dc_full_2x_neon (q, dq, pre, dst, stride, dc);
-        else
-            idct_dequant_dc_0_2x_neon(dc, pre, dst, stride);
-
-        if (((short *)eobs)[1] & 0xfefe)
-            idct_dequant_dc_full_2x_neon (q+32, dq, pre+8, dst+8, stride, dc+2);
-        else
-            idct_dequant_dc_0_2x_neon(dc+2, pre+8, dst+8, stride);
-
-        q    += 64;
-        dc   += 4;
-        pre  += 64;
-        dst  += 4*stride;
-        eobs += 4;
-    }
-}
-
-void vp8_dequant_idct_add_y_block_neon
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dst, int stride, char *eobs)
-{
-    int i;
-
-    for (i = 0; i < 4; i++)
-    {
-        if (((short *)eobs)[0] & 0xfefe)
-            idct_dequant_full_2x_neon (q, dq, pre, dst, 16, stride);
-        else
-            idct_dequant_0_2x_neon (q, dq[0], pre, 16, dst, stride);
-
-        if (((short *)eobs)[1] & 0xfefe)
-            idct_dequant_full_2x_neon (q+32, dq, pre+8, dst+8, 16, stride);
-        else
-            idct_dequant_0_2x_neon (q+32, dq[0], pre+8, 16, dst+8, stride);
-
-        q    += 64;
-        pre  += 64;
-        dst  += 4*stride;
-        eobs += 4;
-    }
-}
-
-void vp8_dequant_idct_add_uv_block_neon
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dstu, unsigned char *dstv, int stride, char *eobs)
-{
-    if (((short *)eobs)[0] & 0xfefe)
-        idct_dequant_full_2x_neon (q, dq, pre, dstu, 8, stride);
-    else
-        idct_dequant_0_2x_neon (q, dq[0], pre, 8, dstu, stride);
-
-    q    += 32;
-    pre  += 32;
-    dstu += 4*stride;
-
-    if (((short *)eobs)[1] & 0xfefe)
-        idct_dequant_full_2x_neon (q, dq, pre, dstu, 8, stride);
-    else
-        idct_dequant_0_2x_neon (q, dq[0], pre, 8, dstu, stride);
-
-    q += 32;
-    pre += 32;
-
-    if (((short *)eobs)[2] & 0xfefe)
-        idct_dequant_full_2x_neon (q, dq, pre, dstv, 8, stride);
-    else
-        idct_dequant_0_2x_neon (q, dq[0], pre, 8, dstv, stride);
-
-    q    += 32;
-    pre  += 32;
-    dstv += 4*stride;
-
-    if (((short *)eobs)[3] & 0xfefe)
-        idct_dequant_full_2x_neon (q, dq, pre, dstv, 8, stride);
-    else
-        idct_dequant_0_2x_neon (q, dq[0], pre, 8, dstv, stride);
-}
diff --git a/media/libvpx/vp8/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm b/media/libvpx/vp8/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm
deleted file mode 100644
index 0dc036acbf5..00000000000
--- a/media/libvpx/vp8/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm
+++ /dev/null
@@ -1,69 +0,0 @@
-;
-;  Copyright (c) 2010 The Webm project authors. All Rights Reserved.
-;
-;  Use of this source code is governed by a BSD-style license and patent
-;  grant that can be found in the LICENSE file in the root of the source
-;  tree. All contributing project authors may be found in the AUTHORS
-;  file in the root of the source tree.
-;
-
-
-    EXPORT  |idct_dequant_dc_0_2x_neon|
-    ARM
-    REQUIRE8
-    PRESERVE8
-
-    AREA ||.text||, CODE, READONLY, ALIGN=2
-;void idct_dequant_dc_0_2x_neon(short *dc, unsigned char *pre,
-;                               unsigned char *dst, int stride);
-; r0  *dc
-; r1  *pre
-; r2  *dst
-; r3  stride
-|idct_dequant_dc_0_2x_neon| PROC
-    ldr             r0, [r0]                ; *dc
-    mov             r12, #16
-
-    vld1.32         {d2[0]}, [r1], r12      ; lo
-    vld1.32         {d2[1]}, [r1], r12
-    vld1.32         {d4[0]}, [r1], r12
-    vld1.32         {d4[1]}, [r1]
-    sub             r1, r1, #44
-    vld1.32         {d8[0]}, [r1], r12      ; hi
-    vld1.32         {d8[1]}, [r1], r12
-    vld1.32         {d10[0]}, [r1], r12
-    vld1.32         {d10[1]}, [r1]
-
-    sxth            r1, r0                  ; lo *dc
-    add             r1, r1, #4
-    asr             r1, r1, #3
-    vdup.16         q0, r1
-    sxth            r0, r0, ror #16         ; hi *dc
-    add             r0, r0, #4
-    asr             r0, r0, #3
-    vdup.16         q3, r0
-
-    vaddw.u8        q1, q0, d2              ; lo
-    vaddw.u8        q2, q0, d4
-    vaddw.u8        q4, q3, d8              ; hi
-    vaddw.u8        q5, q3, d10
-
-    vqmovun.s16     d2, q1                  ; lo
-    vqmovun.s16     d4, q2
-    vqmovun.s16     d8, q4                  ; hi
-    vqmovun.s16     d10, q5
-
-    add             r0, r2, #4
-    vst1.32         {d2[0]}, [r2], r3       ; lo
-    vst1.32         {d2[1]}, [r2], r3
-    vst1.32         {d4[0]}, [r2], r3
-    vst1.32         {d4[1]}, [r2]
-    vst1.32         {d8[0]}, [r0], r3       ; hi
-    vst1.32         {d8[1]}, [r0], r3
-    vst1.32         {d10[0]}, [r0], r3
-    vst1.32         {d10[1]}, [r0]
-
-    bx             lr
-
-    ENDP           ;|idct_dequant_dc_0_2x_neon|
-    END
diff --git a/media/libvpx/vp8/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm b/media/libvpx/vp8/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm
deleted file mode 100644
index 61fa6607538..00000000000
--- a/media/libvpx/vp8/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm
+++ /dev/null
@@ -1,205 +0,0 @@
-;
-;  Copyright (c) 2010 The Webm project authors. All Rights Reserved.
-;
-;  Use of this source code is governed by a BSD-style license
-;  that can be found in the LICENSE file in the root of the source
-;  tree. An additional intellectual property rights grant can be found
-;  in the file PATENTS.  All contributing project authors may
-;  be found in the AUTHORS file in the root of the source tree.
-;
-
-
-    EXPORT  |idct_dequant_dc_full_2x_neon|
-    ARM
-    REQUIRE8
-    PRESERVE8
-
-    AREA ||.text||, CODE, READONLY, ALIGN=2
-;void idct_dequant_dc_full_2x_neon(short *q, short *dq, unsigned char *pre,
-;                                  unsigned char *dst, int stride, short *dc);
-; r0    *q,
-; r1    *dq,
-; r2    *pre
-; r3    *dst
-; sp    stride
-; sp+4  *dc
-|idct_dequant_dc_full_2x_neon| PROC
-    vld1.16         {q0, q1}, [r1]          ; dq (same l/r)
-    vld1.16         {q2, q3}, [r0]          ; l q
-    mov             r1, #16                 ; pitch
-    add             r0, r0, #32
-    vld1.16         {q4, q5}, [r0]          ; r q
-    add             r12, r2, #4
-    ; interleave the predictors
-    vld1.32         {d28[0]}, [r2], r1      ; l pre
-    vld1.32         {d28[1]}, [r12], r1     ; r pre
-    vld1.32         {d29[0]}, [r2], r1
-    vld1.32         {d29[1]}, [r12], r1
-    vld1.32         {d30[0]}, [r2], r1
-    vld1.32         {d30[1]}, [r12], r1
-    vld1.32         {d31[0]}, [r2]
-    ldr             r1, [sp, #4]
-    vld1.32         {d31[1]}, [r12]
-
-    adr             r2, cospi8sqrt2minus1   ; pointer to the first constant
-
-    ldrh            r12, [r1], #2           ; lo *dc
-    ldrh            r1, [r1]                ; hi *dc
-
-    ; dequant: q[i] = q[i] * dq[i]
-    vmul.i16        q2, q2, q0
-    vmul.i16        q3, q3, q1
-    vmul.i16        q4, q4, q0
-    vmul.i16        q5, q5, q1
-
-    ; move dc up to neon and overwrite first element
-    vmov.16         d4[0], r12
-    vmov.16         d8[0], r1
-
-    vld1.16         {d0}, [r2]
-
-    ; q2: l0r0  q3: l8r8
-    ; q4: l4r4  q5: l12r12
-    vswp            d5, d8
-    vswp            d7, d10
-
-    ; _CONSTANTS_ * 4,12 >> 16
-    ; q6:  4 * sinpi : c1/temp1
-    ; q7: 12 * sinpi : d1/temp2
-    ; q8:  4 * cospi
-    ; q9: 12 * cospi
-    vqdmulh.s16     q6, q4, d0[2]           ; sinpi8sqrt2
-    vqdmulh.s16     q7, q5, d0[2]
-    vqdmulh.s16     q8, q4, d0[0]           ; cospi8sqrt2minus1
-    vqdmulh.s16     q9, q5, d0[0]
-
-    vqadd.s16       q10, q2, q3             ; a1 = 0 + 8
-    vqsub.s16       q11, q2, q3             ; b1 = 0 - 8
-
-    ; vqdmulh only accepts signed values. this was a problem because
-    ; our constant had the high bit set, and was treated as a negative value.
-    ; vqdmulh also doubles the value before it shifts by 16. we need to
-    ; compensate for this. in the case of sinpi8sqrt2, the lowest bit is 0,
-    ; so we can shift the constant without losing precision. this avoids
-    ; shift again afterward, but also avoids the sign issue. win win!
-    ; for cospi8sqrt2minus1 the lowest bit is 1, so we lose precision if we
-    ; pre-shift it
-    vshr.s16        q8, q8, #1
-    vshr.s16        q9, q9, #1
-
-    ; q4:  4 +  4 * cospi : d1/temp1
-    ; q5: 12 + 12 * cospi : c1/temp2
-    vqadd.s16       q4, q4, q8
-    vqadd.s16       q5, q5, q9
-
-    ; c1 = temp1 - temp2
-    ; d1 = temp1 + temp2
-    vqsub.s16       q2, q6, q5
-    vqadd.s16       q3, q4, q7
-
-    ; [0]: a1+d1
-    ; [1]: b1+c1
-    ; [2]: b1-c1
-    ; [3]: a1-d1
-    vqadd.s16       q4, q10, q3
-    vqadd.s16       q5, q11, q2
-    vqsub.s16       q6, q11, q2
-    vqsub.s16       q7, q10, q3
-
-    ; rotate
-    vtrn.32         q4, q6
-    vtrn.32         q5, q7
-    vtrn.16         q4, q5
-    vtrn.16         q6, q7
-    ; idct loop 2
-    ; q4: l 0, 4, 8,12 r 0, 4, 8,12
-    ; q5: l 1, 5, 9,13 r 1, 5, 9,13
-    ; q6: l 2, 6,10,14 r 2, 6,10,14
-    ; q7: l 3, 7,11,15 r 3, 7,11,15
-
-    ; q8:  1 * sinpi : c1/temp1
-    ; q9:  3 * sinpi : d1/temp2
-    ; q10: 1 * cospi
-    ; q11: 3 * cospi
-    vqdmulh.s16     q8, q5, d0[2]           ; sinpi8sqrt2
-    vqdmulh.s16     q9, q7, d0[2]
-    vqdmulh.s16     q10, q5, d0[0]          ; cospi8sqrt2minus1
-    vqdmulh.s16     q11, q7, d0[0]
-
-    vqadd.s16       q2, q4, q6             ; a1 = 0 + 2
-    vqsub.s16       q3, q4, q6             ; b1 = 0 - 2
-
-    ; see note on shifting above
-    vshr.s16        q10, q10, #1
-    vshr.s16        q11, q11, #1
-
-    ; q10: 1 + 1 * cospi : d1/temp1
-    ; q11: 3 + 3 * cospi : c1/temp2
-    vqadd.s16       q10, q5, q10
-    vqadd.s16       q11, q7, q11
-
-    ; q8: c1 = temp1 - temp2
-    ; q9: d1 = temp1 + temp2
-    vqsub.s16       q8, q8, q11
-    vqadd.s16       q9, q10, q9
-
-    ; a1+d1
-    ; b1+c1
-    ; b1-c1
-    ; a1-d1
-    vqadd.s16       q4, q2, q9
-    vqadd.s16       q5, q3, q8
-    vqsub.s16       q6, q3, q8
-    vqsub.s16       q7, q2, q9
-
-    ; +4 >> 3 (rounding)
-    vrshr.s16       q4, q4, #3              ; lo
-    vrshr.s16       q5, q5, #3
-    vrshr.s16       q6, q6, #3              ; hi
-    vrshr.s16       q7, q7, #3
-
-    vtrn.32         q4, q6
-    vtrn.32         q5, q7
-    vtrn.16         q4, q5
-    vtrn.16         q6, q7
-
-    ; adding pre
-    ; input is still packed. pre was read interleaved
-    vaddw.u8        q4, q4, d28
-    vaddw.u8        q5, q5, d29
-    vaddw.u8        q6, q6, d30
-    vaddw.u8        q7, q7, d31
-
-    vmov.i16        q14, #0
-    vmov            q15, q14
-    vst1.16         {q14, q15}, [r0]        ; write over high input
-    sub             r0, r0, #32
-    vst1.16         {q14, q15}, [r0]        ; write over low input
-
-    ;saturate and narrow
-    vqmovun.s16     d0, q4                  ; lo
-    vqmovun.s16     d1, q5
-    vqmovun.s16     d2, q6                  ; hi
-    vqmovun.s16     d3, q7
-
-    ldr             r1, [sp]                ; stride
-    add             r2, r3, #4              ; hi
-    vst1.32         {d0[0]}, [r3], r1       ; lo
-    vst1.32         {d0[1]}, [r2], r1       ; hi
-    vst1.32         {d1[0]}, [r3], r1
-    vst1.32         {d1[1]}, [r2], r1
-    vst1.32         {d2[0]}, [r3], r1
-    vst1.32         {d2[1]}, [r2], r1
-    vst1.32         {d3[0]}, [r3]
-    vst1.32         {d3[1]}, [r2]
-
-    bx             lr
-
-    ENDP           ; |idct_dequant_dc_full_2x_neon|
-
-; Constant Pool
-cospi8sqrt2minus1 DCD 0x4e7b
-; because the lowest bit in 0x8a8c is 0, we can pre-shift this
-sinpi8sqrt2       DCD 0x4546
-
-    END
diff --git a/media/libvpx/vp8/decoder/asm_dec_offsets.c b/media/libvpx/vp8/decoder/asm_dec_offsets.c
new file mode 100644
index 00000000000..842a0d57400
--- /dev/null
+++ b/media/libvpx/vp8/decoder/asm_dec_offsets.c
@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2011 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+
+#include "vpx_ports/asm_offsets.h"
+#include "onyxd_int.h"
+
+BEGIN
+
+DEFINE(bool_decoder_user_buffer_end,            offsetof(BOOL_DECODER, user_buffer_end));
+DEFINE(bool_decoder_user_buffer,                offsetof(BOOL_DECODER, user_buffer));
+DEFINE(bool_decoder_value,                      offsetof(BOOL_DECODER, value));
+DEFINE(bool_decoder_count,                      offsetof(BOOL_DECODER, count));
+DEFINE(bool_decoder_range,                      offsetof(BOOL_DECODER, range));
+
+END
+
+/* add asserts for any offset that is not supported by assembly code */
+/* add asserts for any size that is not supported by assembly code */
diff --git a/media/libvpx/vp8/decoder/dboolhuff.h b/media/libvpx/vp8/decoder/dboolhuff.h
index 853c10f1452..880c1852242 100644
--- a/media/libvpx/vp8/decoder/dboolhuff.h
+++ b/media/libvpx/vp8/decoder/dboolhuff.h
@@ -13,7 +13,7 @@
 #define DBOOLHUFF_H
 #include <stddef.h>
 #include <limits.h>
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/mem.h"
 #include "vpx/vpx_integer.h"
 
diff --git a/media/libvpx/vp8/decoder/decodemv.c b/media/libvpx/vp8/decoder/decodemv.c
index 31cad5b6290..5b913ae6bbd 100644
--- a/media/libvpx/vp8/decoder/decodemv.c
+++ b/media/libvpx/vp8/decoder/decodemv.c
@@ -18,92 +18,58 @@
 #if CONFIG_DEBUG
 #include <assert.h>
 #endif
-static int vp8_read_bmode(vp8_reader *bc, const vp8_prob *p)
+static B_PREDICTION_MODE read_bmode(vp8_reader *bc, const vp8_prob *p)
 {
     const int i = vp8_treed_read(bc, vp8_bmode_tree, p);
 
-    return i;
+    return (B_PREDICTION_MODE)i;
 }
 
-
-static int vp8_read_ymode(vp8_reader *bc, const vp8_prob *p)
+static MB_PREDICTION_MODE read_ymode(vp8_reader *bc, const vp8_prob *p)
 {
     const int i = vp8_treed_read(bc, vp8_ymode_tree, p);
 
-    return i;
+    return (MB_PREDICTION_MODE)i;
 }
 
-static int vp8_kfread_ymode(vp8_reader *bc, const vp8_prob *p)
+static MB_PREDICTION_MODE read_kf_ymode(vp8_reader *bc, const vp8_prob *p)
 {
     const int i = vp8_treed_read(bc, vp8_kf_ymode_tree, p);
 
-    return i;
+    return (MB_PREDICTION_MODE)i;
 }
 
-
-
-static int vp8_read_uv_mode(vp8_reader *bc, const vp8_prob *p)
+static MB_PREDICTION_MODE read_uv_mode(vp8_reader *bc, const vp8_prob *p)
 {
     const int i = vp8_treed_read(bc, vp8_uv_mode_tree, p);
 
-    return i;
+    return (MB_PREDICTION_MODE)i;
 }
 
-static void vp8_read_mb_features(vp8_reader *r, MB_MODE_INFO *mi, MACROBLOCKD *x)
-{
-    /* Is segmentation enabled */
-    if (x->segmentation_enabled && x->update_mb_segmentation_map)
-    {
-        /* If so then read the segment id. */
-        if (vp8_read(r, x->mb_segment_tree_probs[0]))
-            mi->segment_id = (unsigned char)(2 + vp8_read(r, x->mb_segment_tree_probs[2]));
-        else
-            mi->segment_id = (unsigned char)(vp8_read(r, x->mb_segment_tree_probs[1]));
-    }
-}
-
-static void vp8_kfread_modes(VP8D_COMP *pbi, MODE_INFO *m, int mb_row, int mb_col)
+static void read_kf_modes(VP8D_COMP *pbi, MODE_INFO *mi)
 {
     vp8_reader *const bc = & pbi->bc;
     const int mis = pbi->common.mode_info_stride;
 
+    mi->mbmi.ref_frame = INTRA_FRAME;
+    mi->mbmi.mode = read_kf_ymode(bc, pbi->common.kf_ymode_prob);
+
+    if (mi->mbmi.mode == B_PRED)
+    {
+        int i = 0;
+
+        do
         {
-            MB_PREDICTION_MODE y_mode;
+            const B_PREDICTION_MODE A = above_block_mode(mi, i, mis);
+            const B_PREDICTION_MODE L = left_block_mode(mi, i);
 
-            /* Read the Macroblock segmentation map if it is being updated explicitly this frame (reset to 0 above by default)
-             * By default on a key frame reset all MBs to segment 0
-             */
-            m->mbmi.segment_id = 0;
-
-            if (pbi->mb.update_mb_segmentation_map)
-                vp8_read_mb_features(bc, &m->mbmi, &pbi->mb);
-
-            /* Read the macroblock coeff skip flag if this feature is in use, else default to 0 */
-            if (pbi->common.mb_no_coeff_skip)
-                m->mbmi.mb_skip_coeff = vp8_read(bc, pbi->prob_skip_false);
-            else
-                m->mbmi.mb_skip_coeff = 0;
-
-            y_mode = (MB_PREDICTION_MODE) vp8_kfread_ymode(bc, pbi->common.kf_ymode_prob);
-
-            m->mbmi.ref_frame = INTRA_FRAME;
-
-            if ((m->mbmi.mode = y_mode) == B_PRED)
-            {
-                int i = 0;
-
-                do
-                {
-                    const B_PREDICTION_MODE A = above_block_mode(m, i, mis);
-                    const B_PREDICTION_MODE L = left_block_mode(m, i);
-
-                    m->bmi[i].as_mode = (B_PREDICTION_MODE) vp8_read_bmode(bc, pbi->common.kf_bmode_prob [A] [L]);
-                }
-                while (++i < 16);
-            }
-
-            m->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, pbi->common.kf_uv_mode_prob);
+            mi->bmi[i].as_mode =
+                read_bmode(bc, pbi->common.kf_bmode_prob [A] [L]);
         }
+        while (++i < 16);
+    }
+
+    mi->mbmi.uv_mode = read_uv_mode(bc, pbi->common.kf_uv_mode_prob);
 }
 
 static int read_mvcomponent(vp8_reader *r, const MV_CONTEXT *mvc)
@@ -172,32 +138,30 @@ static void read_mvcontexts(vp8_reader *bc, MV_CONTEXT *mvc)
     while (++i < 2);
 }
 
-
-static MB_PREDICTION_MODE read_mv_ref(vp8_reader *bc, const vp8_prob *p)
+static int_mv sub_mv_ref(vp8_reader *bc, const vp8_prob *p, int_mv abovemv,
+                         int_mv leftmv, int_mv best_mv, const MV_CONTEXT * mvc)
 {
-    const int i = vp8_treed_read(bc, vp8_mv_ref_tree, p);
-
-    return (MB_PREDICTION_MODE)i;
+    int_mv blockmv;
+    blockmv.as_int = 0;
+    if( vp8_read(bc, p[0]) )
+    {
+        if( vp8_read(bc, p[1]) )
+        {
+            if( vp8_read(bc, p[2]) )
+            {
+                read_mv(bc, &blockmv.as_mv, (const MV_CONTEXT *) mvc);
+                blockmv.as_mv.row += best_mv.as_mv.row;
+                blockmv.as_mv.col += best_mv.as_mv.col;
+            }
+            return blockmv;
+        }
+        else
+            return abovemv;
+    }
+    else
+        return leftmv;
 }
 
-static B_PREDICTION_MODE sub_mv_ref(vp8_reader *bc, const vp8_prob *p)
-{
-    const int i = vp8_treed_read(bc, vp8_sub_mv_ref_tree, p);
-
-    return (B_PREDICTION_MODE)i;
-}
-
-#ifdef VPX_MODE_COUNT
-unsigned int vp8_mv_cont_count[5][4] =
-{
-    { 0, 0, 0, 0 },
-    { 0, 0, 0, 0 },
-    { 0, 0, 0, 0 },
-    { 0, 0, 0, 0 },
-    { 0, 0, 0, 0 }
-};
-#endif
-
 static const unsigned char mbsplit_fill_count[4] = {8, 8, 4, 1};
 static const unsigned char mbsplit_fill_offset[4][16] = {
     { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15},
@@ -236,7 +200,8 @@ static void mb_mode_mv_init(VP8D_COMP *pbi)
 
             do
             {
-                pbi->common.fc.ymode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8);
+                pbi->common.fc.ymode_prob[i] =
+                    (vp8_prob) vp8_read_literal(bc, 8);
             }
             while (++i < 4);
         }
@@ -247,7 +212,8 @@ static void mb_mode_mv_init(VP8D_COMP *pbi)
 
             do
             {
-                pbi->common.fc.uv_mode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8);
+                pbi->common.fc.uv_mode_prob[i] =
+                    (vp8_prob) vp8_read_literal(bc, 8);
             }
             while (++i < 3);
         }
@@ -256,207 +222,340 @@ static void mb_mode_mv_init(VP8D_COMP *pbi)
     }
 }
 
+const vp8_prob vp8_sub_mv_ref_prob3 [8][VP8_SUBMVREFS-1] =
+{
+    { 147, 136, 18 },   /* SUBMVREF_NORMAL          */
+    { 223, 1  , 34 },   /* SUBMVREF_LEFT_ABOVE_SAME */
+    { 106, 145, 1  },   /* SUBMVREF_LEFT_ZED        */
+    { 208, 1  , 1  },   /* SUBMVREF_LEFT_ABOVE_ZED  */
+    { 179, 121, 1  },   /* SUBMVREF_ABOVE_ZED       */
+    { 223, 1  , 34 },   /* SUBMVREF_LEFT_ABOVE_SAME */
+    { 179, 121, 1  },   /* SUBMVREF_ABOVE_ZED       */
+    { 208, 1  , 1  }    /* SUBMVREF_LEFT_ABOVE_ZED  */
+};
+
+static
+const vp8_prob * get_sub_mv_ref_prob(const int_mv *l, const int_mv *a)
+{
+    int lez = (l->as_int == 0);
+    int aez = (a->as_int == 0);
+    int lea = (l->as_int == a->as_int);
+    const vp8_prob * prob;
+
+    prob = vp8_sub_mv_ref_prob3[(aez << 2) |
+                                (lez << 1) |
+                                (lea)];
+
+    return prob;
+}
+
+static void decode_split_mv(vp8_reader *const bc, MODE_INFO *mi,
+                        MB_MODE_INFO *mbmi, int mis, int_mv best_mv,
+                        MV_CONTEXT *const mvc, int mb_to_left_edge,
+                        int mb_to_right_edge, int mb_to_top_edge,
+                        int mb_to_bottom_edge)
+{
+    int s;      /* split configuration (16x8, 8x16, 8x8, 4x4) */
+    int num_p;  /* number of partitions in the split configuration
+                  (see vp8_mbsplit_count) */
+    int j = 0;
+
+    s = 3;
+    num_p = 16;
+    if( vp8_read(bc, 110) )
+    {
+        s = 2;
+        num_p = 4;
+        if( vp8_read(bc, 111) )
+        {
+            s = vp8_read(bc, 150);
+            num_p = 2;
+        }
+    }
+
+    mbmi->need_to_clamp_mvs = 0;
+    do  /* for each subset j */
+    {
+        int_mv leftmv, abovemv;
+        int_mv blockmv;
+        int k;  /* first block in subset j */
+
+        const vp8_prob *prob;
+        k = vp8_mbsplit_offset[s][j];
+
+        leftmv.as_int = left_block_mv(mi, k);
+        abovemv.as_int = above_block_mv(mi, k, mis);
+
+        prob = get_sub_mv_ref_prob(&leftmv, &abovemv);
+
+        blockmv = sub_mv_ref(bc, prob, abovemv, leftmv, best_mv, mvc);
+
+        mbmi->need_to_clamp_mvs |= vp8_check_mv_bounds(&blockmv,
+                                                  mb_to_left_edge,
+                                                  mb_to_right_edge,
+                                                  mb_to_top_edge,
+                                                  mb_to_bottom_edge);
+
+        {
+            /* Fill (uniform) modes, mvs of jth subset.
+             Must do it here because ensuing subsets can
+             refer back to us via "left" or "above". */
+            const unsigned char *fill_offset;
+            unsigned int fill_count = mbsplit_fill_count[s];
+
+            fill_offset = &mbsplit_fill_offset[s]
+                             [(unsigned char)j * mbsplit_fill_count[s]];
+
+            do {
+                mi->bmi[ *fill_offset].mv.as_int = blockmv.as_int;
+                fill_offset++;
+            }while (--fill_count);
+        }
+
+    }
+    while (++j < num_p);
+
+    mbmi->partitioning = s;
+}
 
 static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
                             int mb_row, int mb_col)
 {
     vp8_reader *const bc = & pbi->bc;
-    MV_CONTEXT *const mvc = pbi->common.fc.mvc;
-    const int mis = pbi->common.mode_info_stride;
-
-    int_mv *const mv = & mbmi->mv;
-    int mb_to_left_edge;
-    int mb_to_right_edge;
-    int mb_to_top_edge;
-    int mb_to_bottom_edge;
-
-    mb_to_top_edge = pbi->mb.mb_to_top_edge;
-    mb_to_bottom_edge = pbi->mb.mb_to_bottom_edge;
-    mb_to_top_edge -= LEFT_TOP_MARGIN;
-    mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN;
-
-    mbmi->need_to_clamp_mvs = 0;
-    /* Distance of Mb to the various image edges.
-     * These specified to 8th pel as they are always compared to MV values that are in 1/8th pel units
-     */
-    pbi->mb.mb_to_left_edge =
-    mb_to_left_edge = -((mb_col * 16) << 3);
-    mb_to_left_edge -= LEFT_TOP_MARGIN;
-
-    pbi->mb.mb_to_right_edge =
-    mb_to_right_edge = ((pbi->common.mb_cols - 1 - mb_col) * 16) << 3;
-    mb_to_right_edge += RIGHT_BOTTOM_MARGIN;
-
-    /* If required read in new segmentation data for this MB */
-    if (pbi->mb.update_mb_segmentation_map)
-        vp8_read_mb_features(bc, mbmi, &pbi->mb);
-
-    /* Read the macroblock coeff skip flag if this feature is in use, else default to 0 */
-    if (pbi->common.mb_no_coeff_skip)
-        mbmi->mb_skip_coeff = vp8_read(bc, pbi->prob_skip_false);
-    else
-        mbmi->mb_skip_coeff = 0;
-
-    if ((mbmi->ref_frame = (MV_REFERENCE_FRAME) vp8_read(bc, pbi->prob_intra)))    /* inter MB */
+    mbmi->ref_frame = (MV_REFERENCE_FRAME) vp8_read(bc, pbi->prob_intra);
+    if (mbmi->ref_frame)    /* inter MB */
     {
-        int rct[4];
+        enum {CNT_INTRA, CNT_NEAREST, CNT_NEAR, CNT_SPLITMV};
         vp8_prob mv_ref_p [VP8_MVREFS-1];
-        int_mv nearest, nearby, best_mv;
+        int cnt[4];
+        int *cntx = cnt;
+        int_mv near_mvs[4];
+        int_mv *nmv = near_mvs;
+        const int mis = pbi->mb.mode_info_stride;
+        const MODE_INFO *above = mi - mis;
+        const MODE_INFO *left = mi - 1;
+        const MODE_INFO *aboveleft = above - 1;
+        MV_CONTEXT *const mvc = pbi->common.fc.mvc;
+        int *ref_frame_sign_bias = pbi->common.ref_frame_sign_bias;
+        int propogate_mv_for_ec = 0;
+
+        mbmi->need_to_clamp_mvs = 0;
 
         if (vp8_read(bc, pbi->prob_last))
         {
-            mbmi->ref_frame = (MV_REFERENCE_FRAME)((int)mbmi->ref_frame + (int)(1 + vp8_read(bc, pbi->prob_gf)));
+            mbmi->ref_frame =
+                (MV_REFERENCE_FRAME)((int)(2 + vp8_read(bc, pbi->prob_gf)));
         }
 
-        vp8_find_near_mvs(&pbi->mb, mi, &nearest, &nearby, &best_mv, rct, mbmi->ref_frame, pbi->common.ref_frame_sign_bias);
+        /* Zero accumulators */
+        nmv[0].as_int = nmv[1].as_int = nmv[2].as_int = 0;
+        cnt[0] = cnt[1] = cnt[2] = cnt[3] = 0;
 
-        vp8_mv_ref_probs(mv_ref_p, rct);
+        /* Process above */
+        if (above->mbmi.ref_frame != INTRA_FRAME)
+        {
+            if (above->mbmi.mv.as_int)
+            {
+                (++nmv)->as_int = above->mbmi.mv.as_int;
+                mv_bias(ref_frame_sign_bias[above->mbmi.ref_frame],
+                        mbmi->ref_frame, nmv, ref_frame_sign_bias);
+                ++cntx;
+            }
+
+            *cntx += 2;
+        }
+
+        /* Process left */
+        if (left->mbmi.ref_frame != INTRA_FRAME)
+        {
+            if (left->mbmi.mv.as_int)
+            {
+                int_mv this_mv;
+
+                this_mv.as_int = left->mbmi.mv.as_int;
+                mv_bias(ref_frame_sign_bias[left->mbmi.ref_frame],
+                        mbmi->ref_frame, &this_mv, ref_frame_sign_bias);
+
+                if (this_mv.as_int != nmv->as_int)
+                {
+                    (++nmv)->as_int = this_mv.as_int;
+                    ++cntx;
+                }
+
+                *cntx += 2;
+            }
+            else
+                cnt[CNT_INTRA] += 2;
+        }
+
+        /* Process above left */
+        if (aboveleft->mbmi.ref_frame != INTRA_FRAME)
+        {
+            if (aboveleft->mbmi.mv.as_int)
+            {
+                int_mv this_mv;
+
+                this_mv.as_int = aboveleft->mbmi.mv.as_int;
+                mv_bias(ref_frame_sign_bias[aboveleft->mbmi.ref_frame],
+                        mbmi->ref_frame, &this_mv, ref_frame_sign_bias);
+
+                if (this_mv.as_int != nmv->as_int)
+                {
+                    (++nmv)->as_int = this_mv.as_int;
+                    ++cntx;
+                }
+
+                *cntx += 1;
+            }
+            else
+                cnt[CNT_INTRA] += 1;
+        }
+
+        mv_ref_p[0] = vp8_mode_contexts [cnt[CNT_INTRA]] [0];
+
+        if( vp8_read(bc, mv_ref_p[0]) )
+        {
+            int mb_to_left_edge;
+            int mb_to_right_edge;
+
+            /* Distance of Mb to the various image edges.
+             * These specified to 8th pel as they are always compared to MV
+             * values that are in 1/8th pel units
+             */
+            pbi->mb.mb_to_left_edge =
+            mb_to_left_edge = -((mb_col * 16) << 3);
+            mb_to_left_edge -= LEFT_TOP_MARGIN;
+
+            pbi->mb.mb_to_right_edge =
+            mb_to_right_edge = ((pbi->common.mb_cols - 1 - mb_col) * 16) << 3;
+            mb_to_right_edge += RIGHT_BOTTOM_MARGIN;
+
+            /* If we have three distinct MV's ... */
+            if (cnt[CNT_SPLITMV])
+            {
+                /* See if above-left MV can be merged with NEAREST */
+                if (nmv->as_int == near_mvs[CNT_NEAREST].as_int)
+                    cnt[CNT_NEAREST] += 1;
+            }
+
+            cnt[CNT_SPLITMV] = ((above->mbmi.mode == SPLITMV)
+                                + (left->mbmi.mode == SPLITMV)) * 2
+                               + (aboveleft->mbmi.mode == SPLITMV);
+
+            /* Swap near and nearest if necessary */
+            if (cnt[CNT_NEAR] > cnt[CNT_NEAREST])
+            {
+                int tmp;
+                tmp = cnt[CNT_NEAREST];
+                cnt[CNT_NEAREST] = cnt[CNT_NEAR];
+                cnt[CNT_NEAR] = tmp;
+                tmp = near_mvs[CNT_NEAREST].as_int;
+                near_mvs[CNT_NEAREST].as_int = near_mvs[CNT_NEAR].as_int;
+                near_mvs[CNT_NEAR].as_int = tmp;
+            }
+
+            mv_ref_p[1] = vp8_mode_contexts [cnt[CNT_NEAREST]] [1];
+
+            if( vp8_read(bc, mv_ref_p[1]) )
+            {
+                mv_ref_p[2] = vp8_mode_contexts [cnt[CNT_NEAR]] [2];
+
+                if( vp8_read(bc, mv_ref_p[2]) )
+                {
+                    int mb_to_top_edge;
+                    int mb_to_bottom_edge;
+
+                    mb_to_top_edge = pbi->mb.mb_to_top_edge;
+                    mb_to_bottom_edge = pbi->mb.mb_to_bottom_edge;
+                    mb_to_top_edge -= LEFT_TOP_MARGIN;
+                    mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN;
+
+                    /* Use near_mvs[0] to store the "best" MV */
+                    if (cnt[CNT_NEAREST] >= cnt[CNT_INTRA])
+                        near_mvs[CNT_INTRA] = near_mvs[CNT_NEAREST];
+
+                    mv_ref_p[3] = vp8_mode_contexts [cnt[CNT_SPLITMV]] [3];
+
+                    vp8_clamp_mv2(&near_mvs[CNT_INTRA], &pbi->mb);
+
+                    if( vp8_read(bc, mv_ref_p[3]) )
+                    {
+                        decode_split_mv(bc, mi,
+                                                    mbmi, mis,
+                                                    near_mvs[CNT_INTRA],
+                                                    mvc, mb_to_left_edge,
+                                                    mb_to_right_edge,
+                                                    mb_to_top_edge,
+                                                    mb_to_bottom_edge);
+                        mbmi->mv.as_int = mi->bmi[15].mv.as_int;
+                        mbmi->mode =  SPLITMV;
+                    }
+                    else
+                    {
+                        int_mv *const mbmi_mv = & mbmi->mv;
+                        read_mv(bc, &mbmi_mv->as_mv, (const MV_CONTEXT *) mvc);
+                        mbmi_mv->as_mv.row += near_mvs[CNT_INTRA].as_mv.row;
+                        mbmi_mv->as_mv.col += near_mvs[CNT_INTRA].as_mv.col;
+
+                        /* Don't need to check this on NEARMV and NEARESTMV
+                         * modes since those modes clamp the MV. The NEWMV mode
+                         * does not, so signal to the prediction stage whether
+                         * special handling may be required.
+                         */
+                        mbmi->need_to_clamp_mvs =
+                            vp8_check_mv_bounds(mbmi_mv, mb_to_left_edge,
+                                                mb_to_right_edge,
+                                                mb_to_top_edge,
+                                                mb_to_bottom_edge);
+                        mbmi->mode =  NEWMV;
+                        propogate_mv_for_ec = 1;
+                    }
+                }
+                else
+                {
+                    mbmi->mode =  NEARMV;
+                    vp8_clamp_mv2(&near_mvs[CNT_NEAR], &pbi->mb);
+                    mbmi->mv.as_int = near_mvs[CNT_NEAR].as_int;
+                    propogate_mv_for_ec = 1;
+                }
+            }
+            else
+            {
+                mbmi->mode =  NEARESTMV;
+                vp8_clamp_mv2(&near_mvs[CNT_NEAREST], &pbi->mb);
+                mbmi->mv.as_int = near_mvs[CNT_NEAREST].as_int;
+                propogate_mv_for_ec = 1;
+            }
+        }
+        else {
+            mbmi->mode =  ZEROMV;
+            mbmi->mv.as_int = 0;
+            propogate_mv_for_ec = 1;
+        }
 
         mbmi->uv_mode = DC_PRED;
-        switch (mbmi->mode = read_mv_ref(bc, mv_ref_p))
-        {
-        case SPLITMV:
-        {
-            const int s = mbmi->partitioning =
-                      vp8_treed_read(bc, vp8_mbsplit_tree, vp8_mbsplit_probs);
-            const int num_p = vp8_mbsplit_count [s];
-            int j = 0;
 
-            do  /* for each subset j */
-            {
-                int_mv leftmv, abovemv;
-                int_mv blockmv;
-                int k;  /* first block in subset j */
-                int mv_contz;
-                k = vp8_mbsplit_offset[s][j];
-
-                leftmv.as_int = left_block_mv(mi, k);
-                abovemv.as_int = above_block_mv(mi, k, mis);
-                mv_contz = vp8_mv_cont(&leftmv, &abovemv);
-
-                switch (sub_mv_ref(bc, vp8_sub_mv_ref_prob2 [mv_contz])) /*pc->fc.sub_mv_ref_prob))*/
-                {
-                case NEW4X4:
-                    read_mv(bc, &blockmv.as_mv, (const MV_CONTEXT *) mvc);
-                    blockmv.as_mv.row += best_mv.as_mv.row;
-                    blockmv.as_mv.col += best_mv.as_mv.col;
-  #ifdef VPX_MODE_COUNT
-                    vp8_mv_cont_count[mv_contz][3]++;
-  #endif
-                    break;
-                case LEFT4X4:
-                    blockmv.as_int = leftmv.as_int;
-  #ifdef VPX_MODE_COUNT
-                    vp8_mv_cont_count[mv_contz][0]++;
-  #endif
-                    break;
-                case ABOVE4X4:
-                    blockmv.as_int = abovemv.as_int;
-  #ifdef VPX_MODE_COUNT
-                    vp8_mv_cont_count[mv_contz][1]++;
-  #endif
-                    break;
-                case ZERO4X4:
-                    blockmv.as_int = 0;
-  #ifdef VPX_MODE_COUNT
-                    vp8_mv_cont_count[mv_contz][2]++;
-  #endif
-                    break;
-                default:
-                    break;
-                }
-
-                mbmi->need_to_clamp_mvs |= vp8_check_mv_bounds(&blockmv,
-                                                          mb_to_left_edge,
-                                                          mb_to_right_edge,
-                                                          mb_to_top_edge,
-                                                          mb_to_bottom_edge);
-
-                {
-                    /* Fill (uniform) modes, mvs of jth subset.
-                     Must do it here because ensuing subsets can
-                     refer back to us via "left" or "above". */
-                    const unsigned char *fill_offset;
-                    unsigned int fill_count = mbsplit_fill_count[s];
-
-                    fill_offset = &mbsplit_fill_offset[s][(unsigned char)j * mbsplit_fill_count[s]];
-
-                    do {
-                        mi->bmi[ *fill_offset].mv.as_int = blockmv.as_int;
-                        fill_offset++;
-                    }while (--fill_count);
-                }
-
-            }
-            while (++j < num_p);
-        }
-
-        mv->as_int = mi->bmi[15].mv.as_int;
-
-        break;  /* done with SPLITMV */
-
-        case NEARMV:
-            mv->as_int = nearby.as_int;
-            /* Clip "next_nearest" so that it does not extend to far out of image */
-            vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge,
-                         mb_to_top_edge, mb_to_bottom_edge);
-            goto propagate_mv;
-
-        case NEARESTMV:
-            mv->as_int = nearest.as_int;
-            /* Clip "next_nearest" so that it does not extend to far out of image */
-            vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge,
-                         mb_to_top_edge, mb_to_bottom_edge);
-            goto propagate_mv;
-
-        case ZEROMV:
-            mv->as_int = 0;
-            goto propagate_mv;
-
-        case NEWMV:
-            read_mv(bc, &mv->as_mv, (const MV_CONTEXT *) mvc);
-            mv->as_mv.row += best_mv.as_mv.row;
-            mv->as_mv.col += best_mv.as_mv.col;
-
-            /* Don't need to check this on NEARMV and NEARESTMV modes
-             * since those modes clamp the MV. The NEWMV mode does not,
-             * so signal to the prediction stage whether special
-             * handling may be required.
-             */
-            mbmi->need_to_clamp_mvs = vp8_check_mv_bounds(mv,
-                                                      mb_to_left_edge,
-                                                      mb_to_right_edge,
-                                                      mb_to_top_edge,
-                                                      mb_to_bottom_edge);
-
-        propagate_mv:  /* same MV throughout */
 #if CONFIG_ERROR_CONCEALMENT
-            if(pbi->ec_enabled)
-            {
-                mi->bmi[ 0].mv.as_int =
-                mi->bmi[ 1].mv.as_int =
-                mi->bmi[ 2].mv.as_int =
-                mi->bmi[ 3].mv.as_int =
-                mi->bmi[ 4].mv.as_int =
-                mi->bmi[ 5].mv.as_int =
-                mi->bmi[ 6].mv.as_int =
-                mi->bmi[ 7].mv.as_int =
-                mi->bmi[ 8].mv.as_int =
-                mi->bmi[ 9].mv.as_int =
-                mi->bmi[10].mv.as_int =
-                mi->bmi[11].mv.as_int =
-                mi->bmi[12].mv.as_int =
-                mi->bmi[13].mv.as_int =
-                mi->bmi[14].mv.as_int =
-                mi->bmi[15].mv.as_int = mv->as_int;
-            }
-#endif
-            break;
-        default:;
-  #if CONFIG_DEBUG
-            assert(0);
-  #endif
+        if(pbi->ec_enabled && propogate_mv_for_ec)
+        {
+            mi->bmi[ 0].mv.as_int =
+            mi->bmi[ 1].mv.as_int =
+            mi->bmi[ 2].mv.as_int =
+            mi->bmi[ 3].mv.as_int =
+            mi->bmi[ 4].mv.as_int =
+            mi->bmi[ 5].mv.as_int =
+            mi->bmi[ 6].mv.as_int =
+            mi->bmi[ 7].mv.as_int =
+            mi->bmi[ 8].mv.as_int =
+            mi->bmi[ 9].mv.as_int =
+            mi->bmi[10].mv.as_int =
+            mi->bmi[11].mv.as_int =
+            mi->bmi[12].mv.as_int =
+            mi->bmi[13].mv.as_int =
+            mi->bmi[14].mv.as_int =
+            mi->bmi[15].mv.as_int = mbmi->mv.as_int;
         }
+#endif
     }
     else
     {
@@ -464,21 +563,62 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
         mbmi->mv.as_int = 0;
 
         /* MB is intra coded */
-        if ((mbmi->mode = (MB_PREDICTION_MODE) vp8_read_ymode(bc, pbi->common.fc.ymode_prob)) == B_PRED)
+        if ((mbmi->mode = read_ymode(bc, pbi->common.fc.ymode_prob)) == B_PRED)
         {
             int j = 0;
             do
             {
-                mi->bmi[j].as_mode = (B_PREDICTION_MODE)vp8_read_bmode(bc, pbi->common.fc.bmode_prob);
+                mi->bmi[j].as_mode = read_bmode(bc, pbi->common.fc.bmode_prob);
             }
             while (++j < 16);
         }
 
-        mbmi->uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, pbi->common.fc.uv_mode_prob);
+        mbmi->uv_mode = read_uv_mode(bc, pbi->common.fc.uv_mode_prob);
     }
 
 }
 
+static void read_mb_features(vp8_reader *r, MB_MODE_INFO *mi, MACROBLOCKD *x)
+{
+    /* Is segmentation enabled */
+    if (x->segmentation_enabled && x->update_mb_segmentation_map)
+    {
+        /* If so then read the segment id. */
+        if (vp8_read(r, x->mb_segment_tree_probs[0]))
+            mi->segment_id =
+                (unsigned char)(2 + vp8_read(r, x->mb_segment_tree_probs[2]));
+        else
+            mi->segment_id =
+                (unsigned char)(vp8_read(r, x->mb_segment_tree_probs[1]));
+    }
+}
+
+static void decode_mb_mode_mvs(VP8D_COMP *pbi, MODE_INFO *mi,
+                               MB_MODE_INFO *mbmi, int mb_row, int mb_col)
+{
+    /* Read the Macroblock segmentation map if it is being updated explicitly
+     * this frame (reset to 0 above by default)
+     * By default on a key frame reset all MBs to segment 0
+     */
+    if (pbi->mb.update_mb_segmentation_map)
+        read_mb_features(&pbi->bc, &mi->mbmi, &pbi->mb);
+    else if(pbi->common.frame_type == KEY_FRAME)
+        mi->mbmi.segment_id = 0;
+
+    /* Read the macroblock coeff skip flag if this feature is in use,
+     * else default to 0 */
+    if (pbi->common.mb_no_coeff_skip)
+        mi->mbmi.mb_skip_coeff = vp8_read(&pbi->bc, pbi->prob_skip_false);
+    else
+        mi->mbmi.mb_skip_coeff = 0;
+
+    if(pbi->common.frame_type == KEY_FRAME)
+        read_kf_modes(pbi, mi);
+    else
+        read_mb_modes_mv(pbi, mi, &mi->mbmi, mb_row, mb_col);
+
+}
+
 void vp8_decode_mode_mvs(VP8D_COMP *pbi)
 {
     MODE_INFO *mi = pbi->common.mi;
@@ -489,27 +629,18 @@ void vp8_decode_mode_mvs(VP8D_COMP *pbi)
     while (++mb_row < pbi->common.mb_rows)
     {
         int mb_col = -1;
-        int mb_to_top_edge;
-        int mb_to_bottom_edge;
-
-        pbi->mb.mb_to_top_edge =
-        mb_to_top_edge = -((mb_row * 16)) << 3;
-        mb_to_top_edge -= LEFT_TOP_MARGIN;
 
+        pbi->mb.mb_to_top_edge =  -((mb_row * 16)) << 3;
         pbi->mb.mb_to_bottom_edge =
-        mb_to_bottom_edge = ((pbi->common.mb_rows - 1 - mb_row) * 16) << 3;
-        mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN;
+            ((pbi->common.mb_rows - 1 - mb_row) * 16) << 3;
 
         while (++mb_col < pbi->common.mb_cols)
         {
 #if CONFIG_ERROR_CONCEALMENT
             int mb_num = mb_row * pbi->common.mb_cols + mb_col;
 #endif
-            /*read_mb_modes_mv(pbi, xd->mode_info_context, &xd->mode_info_context->mbmi, mb_row, mb_col);*/
-            if(pbi->common.frame_type == KEY_FRAME)
-                vp8_kfread_modes(pbi, mi, mb_row, mb_col);
-            else
-                read_mb_modes_mv(pbi, mi, &mi->mbmi, mb_row, mb_col);
+
+            decode_mb_mode_mvs(pbi, mi, &mi->mbmi, mb_row, mb_col);
 
 #if CONFIG_ERROR_CONCEALMENT
             /* look for corruption. set mvs_corrupt_from_mb to the current
diff --git a/media/libvpx/vp8/decoder/decodframe.c b/media/libvpx/vp8/decoder/decodframe.c
index ddb09703b14..6f21145aac9 100644
--- a/media/libvpx/vp8/decoder/decodframe.c
+++ b/media/libvpx/vp8/decoder/decodframe.c
@@ -15,7 +15,7 @@
 #include "vp8/common/reconintra4x4.h"
 #include "vp8/common/recon.h"
 #include "vp8/common/reconinter.h"
-#include "dequantize.h"
+#include "vp8/common/dequantize.h"
 #include "detokenize.h"
 #include "vp8/common/invtrans.h"
 #include "vp8/common/alloccommon.h"
@@ -32,7 +32,7 @@
 #endif
 #include "vpx_mem/vpx_mem.h"
 #include "vp8/common/idct.h"
-#include "dequantize.h"
+
 #include "vp8/common/threading.h"
 #include "decoderthreading.h"
 #include "dboolhuff.h"
@@ -42,7 +42,6 @@
 
 void vp8cx_init_de_quantizer(VP8D_COMP *pbi)
 {
-    int i;
     int Q;
     VP8_COMMON *const pc = & pbi->common;
 
@@ -52,15 +51,9 @@ void vp8cx_init_de_quantizer(VP8D_COMP *pbi)
         pc->Y2dequant[Q][0] = (short)vp8_dc2quant(Q, pc->y2dc_delta_q);
         pc->UVdequant[Q][0] = (short)vp8_dc_uv_quant(Q, pc->uvdc_delta_q);
 
-        /* all the ac values = ; */
-        for (i = 1; i < 16; i++)
-        {
-            int rc = vp8_default_zig_zag1d[i];
-
-            pc->Y1dequant[Q][rc] = (short)vp8_ac_yquant(Q);
-            pc->Y2dequant[Q][rc] = (short)vp8_ac2quant(Q, pc->y2ac_delta_q);
-            pc->UVdequant[Q][rc] = (short)vp8_ac_uv_quant(Q, pc->uvac_delta_q);
-        }
+        pc->Y1dequant[Q][1] = (short)vp8_ac_yquant(Q);
+        pc->Y2dequant[Q][1] = (short)vp8_ac2quant(Q, pc->y2ac_delta_q);
+        pc->UVdequant[Q][1] = (short)vp8_ac_uv_quant(Q, pc->uvac_delta_q);
     }
 }
 
@@ -88,19 +81,19 @@ void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd)
     else
         QIndex = pc->base_qindex;
 
-    /* Set up the block level dequant pointers */
-    for (i = 0; i < 16; i++)
+    /* Set up the macroblock dequant constants */
+    xd->dequant_y1_dc[0] = 1;
+    xd->dequant_y1[0] = pc->Y1dequant[QIndex][0];
+    xd->dequant_y2[0] = pc->Y2dequant[QIndex][0];
+    xd->dequant_uv[0] = pc->UVdequant[QIndex][0];
+
+    for (i = 1; i < 16; i++)
     {
-        xd->block[i].dequant = pc->Y1dequant[QIndex];
+        xd->dequant_y1_dc[i] =
+        xd->dequant_y1[i] = pc->Y1dequant[QIndex][1];
+        xd->dequant_y2[i] = pc->Y2dequant[QIndex][1];
+        xd->dequant_uv[i] = pc->UVdequant[QIndex][1];
     }
-
-    for (i = 16; i < 24; i++)
-    {
-        xd->block[i].dequant = pc->UVdequant[QIndex];
-    }
-
-    xd->block[24].dequant = pc->Y2dequant[QIndex];
-
 }
 
 #if CONFIG_RUNTIME_CPU_DETECT
@@ -109,127 +102,112 @@ void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd)
 #define RTCD_VTABLE(x) NULL
 #endif
 
-/* skip_recon_mb() is Modified: Instead of writing the result to predictor buffer and then copying it
- *  to dst buffer, we can write the result directly to dst buffer. This eliminates unnecessary copy.
- */
-static void skip_recon_mb(VP8D_COMP *pbi, MACROBLOCKD *xd)
-{
-    if (xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME)
-    {
-        RECON_INVOKE(&pbi->common.rtcd.recon, build_intra_predictors_mbuv_s)(xd);
-        RECON_INVOKE(&pbi->common.rtcd.recon,
-                     build_intra_predictors_mby_s)(xd);
-    }
-    else
-    {
-        vp8_build_inter16x16_predictors_mb(xd, xd->dst.y_buffer,
-                                           xd->dst.u_buffer, xd->dst.v_buffer,
-                                           xd->dst.y_stride, xd->dst.uv_stride);
-    }
-}
-
-static void clamp_mv_to_umv_border(MV *mv, const MACROBLOCKD *xd)
-{
-    /* If the MV points so far into the UMV border that no visible pixels
-     * are used for reconstruction, the subpel part of the MV can be
-     * discarded and the MV limited to 16 pixels with equivalent results.
-     *
-     * This limit kicks in at 19 pixels for the top and left edges, for
-     * the 16 pixels plus 3 taps right of the central pixel when subpel
-     * filtering. The bottom and right edges use 16 pixels plus 2 pixels
-     * left of the central pixel when filtering.
-     */
-    if (mv->col < (xd->mb_to_left_edge - (19 << 3)))
-        mv->col = xd->mb_to_left_edge - (16 << 3);
-    else if (mv->col > xd->mb_to_right_edge + (18 << 3))
-        mv->col = xd->mb_to_right_edge + (16 << 3);
-
-    if (mv->row < (xd->mb_to_top_edge - (19 << 3)))
-        mv->row = xd->mb_to_top_edge - (16 << 3);
-    else if (mv->row > xd->mb_to_bottom_edge + (18 << 3))
-        mv->row = xd->mb_to_bottom_edge + (16 << 3);
-}
-
-/* A version of the above function for chroma block MVs.*/
-static void clamp_uvmv_to_umv_border(MV *mv, const MACROBLOCKD *xd)
-{
-    mv->col = (2*mv->col < (xd->mb_to_left_edge - (19 << 3))) ? (xd->mb_to_left_edge - (16 << 3)) >> 1 : mv->col;
-    mv->col = (2*mv->col > xd->mb_to_right_edge + (18 << 3)) ? (xd->mb_to_right_edge + (16 << 3)) >> 1 : mv->col;
-
-    mv->row = (2*mv->row < (xd->mb_to_top_edge - (19 << 3))) ? (xd->mb_to_top_edge - (16 << 3)) >> 1 : mv->row;
-    mv->row = (2*mv->row > xd->mb_to_bottom_edge + (18 << 3)) ? (xd->mb_to_bottom_edge + (16 << 3)) >> 1 : mv->row;
-}
-
-void clamp_mvs(MACROBLOCKD *xd)
-{
-    if (xd->mode_info_context->mbmi.mode == SPLITMV)
-    {
-        int i;
-
-        for (i=0; i<16; i++)
-            clamp_mv_to_umv_border(&xd->block[i].bmi.mv.as_mv, xd);
-        for (i=16; i<24; i++)
-            clamp_uvmv_to_umv_border(&xd->block[i].bmi.mv.as_mv, xd);
-    }
-    else
-    {
-        clamp_mv_to_umv_border(&xd->mode_info_context->mbmi.mv.as_mv, xd);
-        clamp_uvmv_to_umv_border(&xd->block[16].bmi.mv.as_mv, xd);
-    }
-
-}
-
 static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
                               unsigned int mb_idx)
 {
-    int eobtotal = 0;
-    int throw_residual = 0;
     MB_PREDICTION_MODE mode;
     int i;
+    int corruption_detected = 0;
 
     if (xd->mode_info_context->mbmi.mb_skip_coeff)
     {
         vp8_reset_mb_tokens_context(xd);
     }
-    else
+    else if (!vp8dx_bool_error(xd->current_bc))
     {
+        int eobtotal;
         eobtotal = vp8_decode_mb_tokens(pbi, xd);
-    }
 
-    /* Perform temporary clamping of the MV to be used for prediction */
-    if (xd->mode_info_context->mbmi.need_to_clamp_mvs)
-    {
-        clamp_mvs(xd);
+        /* Special case:  Force the loopfilter to skip when eobtotal is zero */
+        xd->mode_info_context->mbmi.mb_skip_coeff = (eobtotal==0);
     }
 
     mode = xd->mode_info_context->mbmi.mode;
 
-    if (eobtotal == 0 && mode != B_PRED && mode != SPLITMV &&
-            !vp8dx_bool_error(xd->current_bc))
-    {
-        /* Special case:  Force the loopfilter to skip when eobtotal and
-         * mb_skip_coeff are zero.
-         * */
-        xd->mode_info_context->mbmi.mb_skip_coeff = 1;
-
-        skip_recon_mb(pbi, xd);
-        return;
-    }
-
     if (xd->segmentation_enabled)
         mb_init_dequantizer(pbi, xd);
 
+
+#if CONFIG_ERROR_CONCEALMENT
+
+    if(pbi->ec_active)
+    {
+        int throw_residual;
+        /* When we have independent partitions we can apply residual even
+         * though other partitions within the frame are corrupt.
+         */
+        throw_residual = (!pbi->independent_partitions &&
+                          pbi->frame_corrupt_residual);
+        throw_residual = (throw_residual || vp8dx_bool_error(xd->current_bc));
+
+        if ((mb_idx >= pbi->mvs_corrupt_from_mb || throw_residual))
+        {
+            /* MB with corrupt residuals or corrupt mode/motion vectors.
+             * Better to use the predictor as reconstruction.
+             */
+            pbi->frame_corrupt_residual = 1;
+            vpx_memset(xd->qcoeff, 0, sizeof(xd->qcoeff));
+            vp8_conceal_corrupt_mb(xd);
+
+
+            corruption_detected = 1;
+
+            /* force idct to be skipped for B_PRED and use the
+             * prediction only for reconstruction
+             * */
+            vpx_memset(xd->eobs, 0, 25);
+        }
+    }
+#endif
+
+
     /* do prediction */
     if (xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME)
     {
-        RECON_INVOKE(&pbi->common.rtcd.recon, build_intra_predictors_mbuv)(xd);
+        RECON_INVOKE(&pbi->common.rtcd.recon, build_intra_predictors_mbuv_s)(xd);
 
         if (mode != B_PRED)
         {
             RECON_INVOKE(&pbi->common.rtcd.recon,
-                         build_intra_predictors_mby)(xd);
-        } else {
+                         build_intra_predictors_mby_s)(xd);
+        }
+        else
+        {
+            short *DQC = xd->dequant_y1;
+
+            /* clear out residual eob info */
+            if(xd->mode_info_context->mbmi.mb_skip_coeff)
+                vpx_memset(xd->eobs, 0, 25);
+
             vp8_intra_prediction_down_copy(xd);
+
+            for (i = 0; i < 16; i++)
+            {
+                BLOCKD *b = &xd->block[i];
+                int b_mode = xd->mode_info_context->bmi[i].as_mode;
+
+                RECON_INVOKE(RTCD_VTABLE(recon), intra4x4_predict)
+                              ( *(b->base_dst) + b->dst, b->dst_stride, b_mode,
+                                *(b->base_dst) + b->dst, b->dst_stride );
+
+                if (xd->eobs[i])
+                {
+                    if (xd->eobs[i] > 1)
+                    {
+                        DEQUANT_INVOKE(&pbi->common.rtcd.dequant, idct_add)
+                            (b->qcoeff, DQC,
+                            *(b->base_dst) + b->dst, b->dst_stride);
+                    }
+                    else
+                    {
+                        IDCT_INVOKE(RTCD_VTABLE(idct), idct1_scalar_add)
+                            (b->qcoeff[0] * DQC[0],
+                            *(b->base_dst) + b->dst, b->dst_stride,
+                            *(b->base_dst) + b->dst, b->dst_stride);
+                        ((int *)b->qcoeff)[0] = 0;
+                    }
+                }
+            }
         }
     }
     else
@@ -237,97 +215,69 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
         vp8_build_inter_predictors_mb(xd);
     }
 
-    /* When we have independent partitions we can apply residual even
-     * though other partitions within the frame are corrupt.
-     */
-    throw_residual = (!pbi->independent_partitions &&
-                      pbi->frame_corrupt_residual);
-    throw_residual = (throw_residual || vp8dx_bool_error(xd->current_bc));
 
 #if CONFIG_ERROR_CONCEALMENT
-    if (pbi->ec_active &&
-        (mb_idx >= pbi->mvs_corrupt_from_mb || throw_residual))
+    if (corruption_detected)
     {
-        /* MB with corrupt residuals or corrupt mode/motion vectors.
-         * Better to use the predictor as reconstruction.
-         */
-        pbi->frame_corrupt_residual = 1;
-        vpx_memset(xd->qcoeff, 0, sizeof(xd->qcoeff));
-        vp8_conceal_corrupt_mb(xd);
         return;
     }
 #endif
 
-    /* dequantization and idct */
-    if (mode == B_PRED)
+    if(!xd->mode_info_context->mbmi.mb_skip_coeff)
     {
-        for (i = 0; i < 16; i++)
+        /* dequantization and idct */
+        if (mode != B_PRED)
         {
-            BLOCKD *b = &xd->block[i];
-            RECON_INVOKE(RTCD_VTABLE(recon), intra4x4_predict)
-                          (b, b->bmi.as_mode, b->predictor);
+            short *DQC = xd->dequant_y1;
 
-            if (xd->eobs[i] > 1)
+            if (mode != SPLITMV)
             {
-                DEQUANT_INVOKE(&pbi->dequant, idct_add)
-                    (b->qcoeff, b->dequant,  b->predictor,
-                    *(b->base_dst) + b->dst, 16, b->dst_stride);
-            }
-            else
-            {
-                IDCT_INVOKE(RTCD_VTABLE(idct), idct1_scalar_add)
-                    (b->qcoeff[0] * b->dequant[0], b->predictor,
-                    *(b->base_dst) + b->dst, 16, b->dst_stride);
-                ((int *)b->qcoeff)[0] = 0;
+                BLOCKD *b = &xd->block[24];
+
+                /* do 2nd order transform on the dc block */
+                if (xd->eobs[24] > 1)
+                {
+                    DEQUANT_INVOKE(&pbi->common.rtcd.dequant, block)(b,
+                        xd->dequant_y2);
+
+                    IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh16)(&b->dqcoeff[0],
+                        xd->qcoeff);
+                    ((int *)b->qcoeff)[0] = 0;
+                    ((int *)b->qcoeff)[1] = 0;
+                    ((int *)b->qcoeff)[2] = 0;
+                    ((int *)b->qcoeff)[3] = 0;
+                    ((int *)b->qcoeff)[4] = 0;
+                    ((int *)b->qcoeff)[5] = 0;
+                    ((int *)b->qcoeff)[6] = 0;
+                    ((int *)b->qcoeff)[7] = 0;
+                }
+                else
+                {
+                    b->dqcoeff[0] = b->qcoeff[0] * xd->dequant_y2[0];
+                    IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh1)(&b->dqcoeff[0],
+                        xd->qcoeff);
+                    ((int *)b->qcoeff)[0] = 0;
+                }
+
+                /* override the dc dequant constant in order to preserve the
+                 * dc components
+                 */
+                DQC = xd->dequant_y1_dc;
             }
+
+            DEQUANT_INVOKE (&pbi->common.rtcd.dequant, idct_add_y_block)
+                            (xd->qcoeff, DQC,
+                             xd->dst.y_buffer,
+                             xd->dst.y_stride, xd->eobs);
         }
 
+        DEQUANT_INVOKE (&pbi->common.rtcd.dequant, idct_add_uv_block)
+                        (xd->qcoeff+16*16, xd->dequant_uv,
+                         xd->dst.u_buffer, xd->dst.v_buffer,
+                         xd->dst.uv_stride, xd->eobs+16);
     }
-    else if (mode == SPLITMV)
-    {
-        DEQUANT_INVOKE (&pbi->dequant, idct_add_y_block)
-                        (xd->qcoeff, xd->block[0].dequant,
-                         xd->predictor, xd->dst.y_buffer,
-                         xd->dst.y_stride, xd->eobs);
-    }
-    else
-    {
-        BLOCKD *b = &xd->block[24];
-
-        DEQUANT_INVOKE(&pbi->dequant, block)(b);
-
-        /* do 2nd order transform on the dc block */
-        if (xd->eobs[24] > 1)
-        {
-            IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh16)(&b->dqcoeff[0], b->diff);
-            ((int *)b->qcoeff)[0] = 0;
-            ((int *)b->qcoeff)[1] = 0;
-            ((int *)b->qcoeff)[2] = 0;
-            ((int *)b->qcoeff)[3] = 0;
-            ((int *)b->qcoeff)[4] = 0;
-            ((int *)b->qcoeff)[5] = 0;
-            ((int *)b->qcoeff)[6] = 0;
-            ((int *)b->qcoeff)[7] = 0;
-        }
-        else
-        {
-            IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh1)(&b->dqcoeff[0], b->diff);
-            ((int *)b->qcoeff)[0] = 0;
-        }
-
-        DEQUANT_INVOKE (&pbi->dequant, dc_idct_add_y_block)
-                        (xd->qcoeff, xd->block[0].dequant,
-                         xd->predictor, xd->dst.y_buffer,
-                         xd->dst.y_stride, xd->eobs, xd->block[24].diff);
-    }
-
-    DEQUANT_INVOKE (&pbi->dequant, idct_add_uv_block)
-                    (xd->qcoeff+16*16, xd->block[16].dequant,
-                     xd->predictor+16*16, xd->dst.u_buffer, xd->dst.v_buffer,
-                     xd->dst.uv_stride, xd->eobs+16);
 }
 
-
 static int get_delta_q(vp8_reader *bc, int prev, int *q_update)
 {
     int ret_val = 0;
@@ -410,8 +360,6 @@ decode_mb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mb_row, MACROBLOCKD *xd)
         }
 #endif
 
-        update_blockd_bmi(xd);
-
         xd->dst.y_buffer = pc->yv12_fb[dst_fb_idx].y_buffer + recon_yoffset;
         xd->dst.u_buffer = pc->yv12_fb[dst_fb_idx].u_buffer + recon_uvoffset;
         xd->dst.v_buffer = pc->yv12_fb[dst_fb_idx].v_buffer + recon_uvoffset;
@@ -436,14 +384,6 @@ decode_mb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mb_row, MACROBLOCKD *xd)
             xd->corrupted |= pc->yv12_fb[ref_fb_idx].corrupted;
         }
 
-        vp8_build_uvmvs(xd, pc->full_pixel);
-
-        /*
-        if(pc->current_video_frame==0 &&mb_col==1 && mb_row==0)
-        pbi->debugoutput =1;
-        else
-        pbi->debugoutput =0;
-        */
         decode_macroblock(pbi, xd, mb_row * pc->mb_cols  + mb_col);
 
         /* check if the boolean decoder has suffered an error */
@@ -475,42 +415,6 @@ static unsigned int read_partition_size(const unsigned char *cx_size)
     return size;
 }
 
-static void setup_token_decoder_partition_input(VP8D_COMP *pbi)
-{
-    vp8_reader *bool_decoder = &pbi->bc2;
-    int part_idx = 1;
-
-    TOKEN_PARTITION multi_token_partition =
-            (TOKEN_PARTITION)vp8_read_literal(&pbi->bc, 2);
-    assert(vp8dx_bool_error(&pbi->bc) ||
-           multi_token_partition == pbi->common.multi_token_partition);
-    if (pbi->num_partitions > 2)
-    {
-        CHECK_MEM_ERROR(pbi->mbc, vpx_malloc((pbi->num_partitions - 1) *
-                                             sizeof(vp8_reader)));
-        bool_decoder = pbi->mbc;
-    }
-
-    for (; part_idx < pbi->num_partitions; ++part_idx)
-    {
-        if (vp8dx_start_decode(bool_decoder,
-                               pbi->partitions[part_idx],
-                               pbi->partition_sizes[part_idx]))
-            vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,
-                               "Failed to allocate bool decoder %d",
-                               part_idx);
-
-        bool_decoder++;
-    }
-
-#if CONFIG_MULTITHREAD
-    /* Clamp number of decoder threads */
-    if (pbi->decoding_thread_count > pbi->num_partitions - 1)
-        pbi->decoding_thread_count = pbi->num_partitions - 1;
-#endif
-}
-
-
 static int read_is_valid(const unsigned char *start,
                          size_t               len,
                          const unsigned char *end)
@@ -518,94 +422,147 @@ static int read_is_valid(const unsigned char *start,
     return (start + len > start && start + len <= end);
 }
 
+static unsigned int read_available_partition_size(
+                                       VP8D_COMP *pbi,
+                                       const unsigned char *token_part_sizes,
+                                       const unsigned char *fragment_start,
+                                       const unsigned char *first_fragment_end,
+                                       const unsigned char *fragment_end,
+                                       int i,
+                                       int num_part)
+{
+    VP8_COMMON* pc = &pbi->common;
+    const unsigned char *partition_size_ptr = token_part_sizes + i * 3;
+    unsigned int partition_size;
+    ptrdiff_t bytes_left = fragment_end - fragment_start;
+    /* Calculate the length of this partition. The last partition
+     * size is implicit. If the partition size can't be read, then
+     * either use the remaining data in the buffer (for EC mode)
+     * or throw an error.
+     */
+    if (i < num_part - 1)
+    {
+        if (read_is_valid(partition_size_ptr, 3, first_fragment_end))
+            partition_size = read_partition_size(partition_size_ptr);
+        else if (pbi->ec_active)
+            partition_size = bytes_left;
+        else
+            vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
+                               "Truncated partition size data");
+    }
+    else
+        partition_size = bytes_left;
+
+    /* Validate the calculated partition length. If the buffer
+     * described by the partition can't be fully read, then restrict
+     * it to the portion that can be (for EC mode) or throw an error.
+     */
+    if (!read_is_valid(fragment_start, partition_size, fragment_end))
+    {
+        if (pbi->ec_active)
+            partition_size = bytes_left;
+        else
+            vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
+                               "Truncated packet or corrupt partition "
+                               "%d length", i + 1);
+    }
+    return partition_size;
+}
+
 
 static void setup_token_decoder(VP8D_COMP *pbi,
-                                const unsigned char *cx_data)
+                                const unsigned char* token_part_sizes)
 {
-    int num_part;
-    int i;
-    VP8_COMMON          *pc = &pbi->common;
-    const unsigned char *user_data_end = pbi->Source + pbi->source_sz;
-    vp8_reader          *bool_decoder;
-    const unsigned char *partition;
+    vp8_reader *bool_decoder = &pbi->bc2;
+    unsigned int partition_idx;
+    int fragment_idx;
+    int num_token_partitions;
+    const unsigned char *first_fragment_end = pbi->fragments[0] +
+                                          pbi->fragment_sizes[0];
 
-    /* Parse number of token partitions to use */
-    const TOKEN_PARTITION multi_token_partition =
+    TOKEN_PARTITION multi_token_partition =
             (TOKEN_PARTITION)vp8_read_literal(&pbi->bc, 2);
-    /* Only update the multi_token_partition field if we are sure the value
-     * is correct. */
-    if (!pbi->ec_active || !vp8dx_bool_error(&pbi->bc))
-        pc->multi_token_partition = multi_token_partition;
-
-    num_part = 1 << pc->multi_token_partition;
-
-    /* Set up pointers to the first partition */
-    partition = cx_data;
-    bool_decoder = &pbi->bc2;
-
-    if (num_part > 1)
+    if (!vp8dx_bool_error(&pbi->bc))
+        pbi->common.multi_token_partition = multi_token_partition;
+    num_token_partitions = 1 << pbi->common.multi_token_partition;
+    if (num_token_partitions > 1)
     {
-        CHECK_MEM_ERROR(pbi->mbc, vpx_malloc(num_part * sizeof(vp8_reader)));
+        CHECK_MEM_ERROR(pbi->mbc, vpx_malloc(num_token_partitions *
+                                             sizeof(vp8_reader)));
         bool_decoder = pbi->mbc;
-        partition += 3 * (num_part - 1);
     }
 
-    for (i = 0; i < num_part; i++)
+    /* Check for partitions within the fragments and unpack the fragments
+     * so that each fragment pointer points to its corresponding partition. */
+    for (fragment_idx = 0; fragment_idx < pbi->num_fragments; ++fragment_idx)
     {
-        const unsigned char *partition_size_ptr = cx_data + i * 3;
-        ptrdiff_t            partition_size, bytes_left;
-
-        bytes_left = user_data_end - partition;
-
-        /* Calculate the length of this partition. The last partition
-         * size is implicit. If the partition size can't be read, then
-         * either use the remaining data in the buffer (for EC mode)
-         * or throw an error.
-         */
-        if (i < num_part - 1)
+        unsigned int fragment_size = pbi->fragment_sizes[fragment_idx];
+        const unsigned char *fragment_end = pbi->fragments[fragment_idx] +
+                                            fragment_size;
+        /* Special case for handling the first partition since we have already
+         * read its size. */
+        if (fragment_idx == 0)
         {
-            if (read_is_valid(partition_size_ptr, 3, user_data_end))
-                partition_size = read_partition_size(partition_size_ptr);
-            else if (pbi->ec_active)
-                partition_size = bytes_left;
-            else
-                vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
-                                   "Truncated partition size data");
+            /* Size of first partition + token partition sizes element */
+            ptrdiff_t ext_first_part_size = token_part_sizes -
+                pbi->fragments[0] + 3 * (num_token_partitions - 1);
+            fragment_size -= ext_first_part_size;
+            if (fragment_size > 0)
+            {
+                pbi->fragment_sizes[0] = ext_first_part_size;
+                /* The fragment contains an additional partition. Move to
+                 * next. */
+                fragment_idx++;
+                pbi->fragments[fragment_idx] = pbi->fragments[0] +
+                  pbi->fragment_sizes[0];
+            }
         }
-        else
-            partition_size = bytes_left;
-
-        /* Validate the calculated partition length. If the buffer
-         * described by the partition can't be fully read, then restrict
-         * it to the portion that can be (for EC mode) or throw an error.
-         */
-        if (!read_is_valid(partition, partition_size, user_data_end))
+        /* Split the chunk into partitions read from the bitstream */
+        while (fragment_size > 0)
         {
-            if (pbi->ec_active)
-                partition_size = bytes_left;
-            else
-                vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
-                                   "Truncated packet or corrupt partition "
-                                   "%d length", i + 1);
+            ptrdiff_t partition_size = read_available_partition_size(
+                                                 pbi,
+                                                 token_part_sizes,
+                                                 pbi->fragments[fragment_idx],
+                                                 first_fragment_end,
+                                                 fragment_end,
+                                                 fragment_idx - 1,
+                                                 num_token_partitions);
+            pbi->fragment_sizes[fragment_idx] = partition_size;
+            fragment_size -= partition_size;
+            assert(fragment_idx <= num_token_partitions);
+            if (fragment_size > 0)
+            {
+                /* The fragment contains an additional partition.
+                 * Move to next. */
+                fragment_idx++;
+                pbi->fragments[fragment_idx] =
+                    pbi->fragments[fragment_idx - 1] + partition_size;
+            }
         }
+    }
 
-        if (vp8dx_start_decode(bool_decoder, partition, partition_size))
-            vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR,
-                               "Failed to allocate bool decoder %d", i + 1);
+    pbi->num_fragments = num_token_partitions + 1;
+
+    for (partition_idx = 1; partition_idx < pbi->num_fragments; ++partition_idx)
+    {
+        if (vp8dx_start_decode(bool_decoder,
+                               pbi->fragments[partition_idx],
+                               pbi->fragment_sizes[partition_idx]))
+            vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,
+                               "Failed to allocate bool decoder %d",
+                               partition_idx);
 
-        /* Advance to the next partition */
-        partition += partition_size;
         bool_decoder++;
     }
 
 #if CONFIG_MULTITHREAD
     /* Clamp number of decoder threads */
-    if (pbi->decoding_thread_count > num_part - 1)
-        pbi->decoding_thread_count = num_part - 1;
+    if (pbi->decoding_thread_count > num_token_partitions - 1)
+        pbi->decoding_thread_count = num_token_partitions - 1;
 #endif
 }
 
-
 static void stop_token_decoder(VP8D_COMP *pbi)
 {
     VP8_COMMON *pc = &pbi->common;
@@ -685,6 +642,11 @@ static void init_frame(VP8D_COMP *pbi)
     xd->mode_info_context->mbmi.mode = DC_PRED;
     xd->mode_info_stride = pc->mode_info_stride;
     xd->corrupted = 0; /* init without corruption */
+
+    xd->fullpixel_mask = 0xffffffff;
+    if(pc->full_pixel)
+        xd->fullpixel_mask = 0xfffffff8;
+
 }
 
 int vp8_decode_frame(VP8D_COMP *pbi)
@@ -692,8 +654,8 @@ int vp8_decode_frame(VP8D_COMP *pbi)
     vp8_reader *const bc = & pbi->bc;
     VP8_COMMON *const pc = & pbi->common;
     MACROBLOCKD *const xd  = & pbi->mb;
-    const unsigned char *data = (const unsigned char *)pbi->Source;
-    const unsigned char *data_end = data + pbi->source_sz;
+    const unsigned char *data = pbi->fragments[0];
+    const unsigned char *data_end =  data + pbi->fragment_sizes[0];
     ptrdiff_t first_partition_length_in_bytes;
 
     int mb_row;
@@ -702,33 +664,25 @@ int vp8_decode_frame(VP8D_COMP *pbi)
     int corrupt_tokens = 0;
     int prev_independent_partitions = pbi->independent_partitions;
 
-    if (pbi->input_partition)
-    {
-        data = pbi->partitions[0];
-        data_end =  data + pbi->partition_sizes[0];
-    }
-
     /* start with no corruption of current frame */
     xd->corrupted = 0;
     pc->yv12_fb[pc->new_fb_idx].corrupted = 0;
 
     if (data_end - data < 3)
     {
-        if (pbi->ec_active)
-        {
-            /* Declare the missing frame as an inter frame since it will
-               be handled as an inter frame when we have estimated its
-               motion vectors. */
-            pc->frame_type = INTER_FRAME;
-            pc->version = 0;
-            pc->show_frame = 1;
-            first_partition_length_in_bytes = 0;
-        }
-        else
+        if (!pbi->ec_active)
         {
             vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                                "Truncated packet");
         }
+
+        /* Declare the missing frame as an inter frame since it will
+           be handled as an inter frame when we have estimated its
+           motion vectors. */
+        pc->frame_type = INTER_FRAME;
+        pc->version = 0;
+        pc->show_frame = 1;
+        first_partition_length_in_bytes = 0;
     }
     else
     {
@@ -737,12 +691,14 @@ int vp8_decode_frame(VP8D_COMP *pbi)
         pc->show_frame = (data[0] >> 4) & 1;
         first_partition_length_in_bytes =
             (data[0] | (data[1] << 8) | (data[2] << 16)) >> 5;
-        data += 3;
 
         if (!pbi->ec_active && (data + first_partition_length_in_bytes > data_end
             || data + first_partition_length_in_bytes < data))
             vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                                "Truncated packet or corrupt partition 0 length");
+
+        data += 3;
+
         vp8_setup_version(pc);
 
         if (pc->frame_type == KEY_FRAME)
@@ -815,7 +771,8 @@ int vp8_decode_frame(VP8D_COMP *pbi)
         }
     }
 
-    if (pc->Width == 0 || pc->Height == 0)
+    if ((!pbi->decoded_key_frame && pc->frame_type != KEY_FRAME) ||
+        pc->Width == 0 || pc->Height == 0)
     {
         return -1;
     }
@@ -878,6 +835,12 @@ int vp8_decode_frame(VP8D_COMP *pbi)
             }
         }
     }
+    else
+    {
+        /* No segmentation updates on this frame */
+        xd->update_mb_segmentation_map = 0;
+        xd->update_mb_segmentation_data = 0;
+    }
 
     /* Read the loop filter level and type */
     pc->filter_type = (LOOPFILTERTYPE) vp8_read_bit(bc);
@@ -923,14 +886,8 @@ int vp8_decode_frame(VP8D_COMP *pbi)
         }
     }
 
-    if (pbi->input_partition)
-    {
-        setup_token_decoder_partition_input(pbi);
-    }
-    else
-    {
-        setup_token_decoder(pbi, data + first_partition_length_in_bytes);
-    }
+    setup_token_decoder(pbi, data + first_partition_length_in_bytes);
+
     xd->current_bc = &pbi->bc2;
 
     /* Read the default quantizers. */
@@ -982,16 +939,38 @@ int vp8_decode_frame(VP8D_COMP *pbi)
         if (!pc->refresh_golden_frame)
             pc->copy_buffer_to_gf = vp8_read_literal(bc, 2);
 
+#if CONFIG_ERROR_CONCEALMENT
+        /* Assume we shouldn't copy to the golden if the bit is missing */
+        xd->corrupted |= vp8dx_bool_error(bc);
+        if (pbi->ec_active && xd->corrupted)
+            pc->copy_buffer_to_gf = 0;
+#endif
+
         pc->copy_buffer_to_arf = 0;
 
         if (!pc->refresh_alt_ref_frame)
             pc->copy_buffer_to_arf = vp8_read_literal(bc, 2);
 
+#if CONFIG_ERROR_CONCEALMENT
+        /* Assume we shouldn't copy to the alt-ref if the bit is missing */
+        xd->corrupted |= vp8dx_bool_error(bc);
+        if (pbi->ec_active && xd->corrupted)
+            pc->copy_buffer_to_arf = 0;
+#endif
+
+
         pc->ref_frame_sign_bias[GOLDEN_FRAME] = vp8_read_bit(bc);
         pc->ref_frame_sign_bias[ALTREF_FRAME] = vp8_read_bit(bc);
     }
 
     pc->refresh_entropy_probs = vp8_read_bit(bc);
+#if CONFIG_ERROR_CONCEALMENT
+    /* Assume we shouldn't refresh the probabilities if the bit is
+     * missing */
+    xd->corrupted |= vp8dx_bool_error(bc);
+    if (pbi->ec_active && xd->corrupted)
+        pc->refresh_entropy_probs = 0;
+#endif
     if (pc->refresh_entropy_probs == 0)
     {
         vpx_memcpy(&pc->lfc, &pc->fc, sizeof(pc->fc));
diff --git a/media/libvpx/vp8/decoder/dequantize.c b/media/libvpx/vp8/decoder/dequantize.c
deleted file mode 100644
index dd0c13b7dc1..00000000000
--- a/media/libvpx/vp8/decoder/dequantize.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-#include "vpx_ports/config.h"
-#include "dequantize.h"
-#include "vp8/common/idct.h"
-#include "vpx_mem/vpx_mem.h"
-
-extern void vp8_short_idct4x4llm_c(short *input, short *output, int pitch) ;
-extern void vp8_short_idct4x4llm_1_c(short *input, short *output, int pitch);
-
-
-void vp8_dequantize_b_c(BLOCKD *d)
-{
-    int i;
-    short *DQ  = d->dqcoeff;
-    short *Q   = d->qcoeff;
-    short *DQC = d->dequant;
-
-    for (i = 0; i < 16; i++)
-    {
-        DQ[i] = Q[i] * DQC[i];
-    }
-}
-
-void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *pred,
-                            unsigned char *dest, int pitch, int stride)
-{
-    short output[16];
-    short *diff_ptr = output;
-    int r, c;
-    int i;
-
-    for (i = 0; i < 16; i++)
-    {
-        input[i] = dq[i] * input[i];
-    }
-
-    /* the idct halves ( >> 1) the pitch */
-    vp8_short_idct4x4llm_c(input, output, 4 << 1);
-
-    vpx_memset(input, 0, 32);
-
-    for (r = 0; r < 4; r++)
-    {
-        for (c = 0; c < 4; c++)
-        {
-            int a = diff_ptr[c] + pred[c];
-
-            if (a < 0)
-                a = 0;
-
-            if (a > 255)
-                a = 255;
-
-            dest[c] = (unsigned char) a;
-        }
-
-        dest += stride;
-        diff_ptr += 4;
-        pred += pitch;
-    }
-}
-
-void vp8_dequant_dc_idct_add_c(short *input, short *dq, unsigned char *pred,
-                               unsigned char *dest, int pitch, int stride,
-                               int Dc)
-{
-    int i;
-    short output[16];
-    short *diff_ptr = output;
-    int r, c;
-
-    input[0] = (short)Dc;
-
-    for (i = 1; i < 16; i++)
-    {
-        input[i] = dq[i] * input[i];
-    }
-
-    /* the idct halves ( >> 1) the pitch */
-    vp8_short_idct4x4llm_c(input, output, 4 << 1);
-
-    vpx_memset(input, 0, 32);
-
-    for (r = 0; r < 4; r++)
-    {
-        for (c = 0; c < 4; c++)
-        {
-            int a = diff_ptr[c] + pred[c];
-
-            if (a < 0)
-                a = 0;
-
-            if (a > 255)
-                a = 255;
-
-            dest[c] = (unsigned char) a;
-        }
-
-        dest += stride;
-        diff_ptr += 4;
-        pred += pitch;
-    }
-}
diff --git a/media/libvpx/vp8/decoder/detokenize.c b/media/libvpx/vp8/decoder/detokenize.c
index 1a71948cbf3..ba94c58bbb8 100644
--- a/media/libvpx/vp8/decoder/detokenize.c
+++ b/media/libvpx/vp8/decoder/detokenize.c
@@ -9,14 +9,13 @@
  */
 
 
-#include "vp8/common/type_aliases.h"
 #include "vp8/common/blockd.h"
 #include "onyxd_int.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "detokenize.h"
 
-#define BOOL_DATA UINT8
+#define BOOL_DATA unsigned char
 
 #define OCB_X PREV_COEF_CONTEXTS * ENTROPY_NODES
 DECLARE_ALIGNED(16, static const unsigned char, coef_bands_x[16]) =
@@ -158,10 +157,10 @@ DECLARE_ALIGNED(16, extern const unsigned char, vp8_norm[256]);
     DECODE_AND_APPLYSIGN(val) \
     Prob = coef_probs + (ENTROPY_NODES*2); \
     if(c < 15){\
-        qcoeff_ptr [ scan[c] ] = (INT16) v; \
+        qcoeff_ptr [ scan[c] ] = (int16_t) v; \
         ++c; \
         goto DO_WHILE; }\
-    qcoeff_ptr [ 15 ] = (INT16) v; \
+    qcoeff_ptr [ 15 ] = (int16_t) v; \
     goto BLOCK_FINISHED;
 
 
@@ -173,7 +172,7 @@ DECLARE_ALIGNED(16, extern const unsigned char, vp8_norm[256]);
     {\
         range = range-split;\
         value = value-bigsplit;\
-        val += ((UINT16)1<<bits_count);\
+        val += ((uint16_t)1<<bits_count);\
     }\
     else\
     {\
@@ -205,33 +204,34 @@ int vp8_decode_mb_tokens(VP8D_COMP *dx, MACROBLOCKD *x)
     VP8_BD_VALUE value;
     const int *scan;
     register unsigned int shift;
-    UINT32 split;
+    unsigned int split;
     VP8_BD_VALUE bigsplit;
-    INT16 *qcoeff_ptr;
+    short *qcoeff_ptr;
 
     const vp8_prob *coef_probs;
-    int type;
     int stop;
-    INT16 val, bits_count;
-    INT16 c;
-    INT16 v;
+    int val, bits_count;
+    int c;
+    int v;
     const vp8_prob *Prob;
+    int start_coeff;
+
 
-    type = 3;
     i = 0;
     stop = 16;
 
     scan = vp8_default_zig_zag1d;
     qcoeff_ptr = &x->qcoeff[0];
+    coef_probs = fc->coef_probs [3] [ 0 ] [0];
 
     if (x->mode_info_context->mbmi.mode != B_PRED &&
         x->mode_info_context->mbmi.mode != SPLITMV)
     {
         i = 24;
         stop = 24;
-        type = 1;
         qcoeff_ptr += 24*16;
         eobtotal -= 16;
+        coef_probs = fc->coef_probs [1] [ 0 ] [0];
     }
 
     bufend  = bc->user_buffer_end;
@@ -240,23 +240,24 @@ int vp8_decode_mb_tokens(VP8D_COMP *dx, MACROBLOCKD *x)
     count   = bc->count;
     range   = bc->range;
 
-
-    coef_probs = fc->coef_probs [type] [ 0 ] [0];
+    start_coeff = 0;
 
 BLOCK_LOOP:
     a = A + vp8_block2above[i];
     l = L + vp8_block2left[i];
 
-    c = (INT16)(!type);
+    c = start_coeff;
 
-    /*Dest = ((A)!=0) + ((B)!=0);*/
     VP8_COMBINEENTROPYCONTEXTS(v, *a, *l);
+
     Prob = coef_probs;
     Prob += v * ENTROPY_NODES;
+    *a = *l = 0;
 
 DO_WHILE:
     Prob += coef_bands_x[c];
     DECODE_AND_BRANCH_IF_ZERO(Prob[EOB_CONTEXT_NODE], BLOCK_FINISHED);
+    *a = *l = 1;
 
 CHECK_0_:
     DECODE_AND_LOOP_IF_ZERO(Prob[ZERO_CONTEXT_NODE], CHECK_0_);
@@ -339,14 +340,14 @@ ONE_CONTEXT_NODE_0_:
 
     if (c < 15)
     {
-        qcoeff_ptr [ scan[c] ] = (INT16) v;
+        qcoeff_ptr [ scan[c] ] = (int16_t) v;
         ++c;
         goto DO_WHILE;
     }
 
-    qcoeff_ptr [ 15 ] = (INT16) v;
+    qcoeff_ptr [ 15 ] = (int16_t) v;
 BLOCK_FINISHED:
-    *a = *l = ((eobs[i] = c) != !type);   /* any nonzero data? */
+    eobs[i] = c;
     eobtotal += c;
     qcoeff_ptr += 16;
 
@@ -357,18 +358,18 @@ BLOCK_FINISHED:
 
     if (i == 25)
     {
-        type = 0;
+        start_coeff = 1;
         i = 0;
         stop = 16;
-        coef_probs = fc->coef_probs [type] [ 0 ] [0];
+        coef_probs = fc->coef_probs [0] [ 0 ] [0];
         qcoeff_ptr -= (24*16 + 16);
         goto BLOCK_LOOP;
     }
 
     if (i == 16)
     {
-        type = 2;
-        coef_probs = fc->coef_probs [type] [ 0 ] [0];
+        start_coeff = 0;
+        coef_probs = fc->coef_probs [2] [ 0 ] [0];
         stop = 24;
         goto BLOCK_LOOP;
     }
diff --git a/media/libvpx/vp8/decoder/error_concealment.c b/media/libvpx/vp8/decoder/error_concealment.c
index 7051bb9271e..b77d743f7fa 100644
--- a/media/libvpx/vp8/decoder/error_concealment.c
+++ b/media/libvpx/vp8/decoder/error_concealment.c
@@ -285,27 +285,37 @@ static void estimate_mb_mvs(const B_OVERLAP *block_overlaps,
                             int mb_to_top_edge,
                             int mb_to_bottom_edge)
 {
-    int i;
+    int row, col;
     int non_zero_count = 0;
     MV * const filtered_mv = &(mi->mbmi.mv.as_mv);
     union b_mode_info * const bmi = mi->bmi;
     filtered_mv->col = 0;
     filtered_mv->row = 0;
-    for (i = 0; i < 16; ++i)
+    mi->mbmi.need_to_clamp_mvs = 0;
+    for (row = 0; row < 4; ++row)
     {
-        /* Estimate vectors for all blocks which are overlapped by this type */
-        /* Interpolate/extrapolate the rest of the block's MVs */
-        estimate_mv(block_overlaps[i].overlaps, &(bmi[i]));
-        mi->mbmi.need_to_clamp_mvs = vp8_check_mv_bounds(&bmi[i].mv,
-                                                         mb_to_left_edge,
-                                                         mb_to_right_edge,
-                                                         mb_to_top_edge,
-                                                         mb_to_bottom_edge);
-        if (bmi[i].mv.as_int != 0)
+        int this_b_to_top_edge = mb_to_top_edge + ((row*4)<<3);
+        int this_b_to_bottom_edge = mb_to_bottom_edge - ((row*4)<<3);
+        for (col = 0; col < 4; ++col)
         {
-            ++non_zero_count;
-            filtered_mv->col += bmi[i].mv.as_mv.col;
-            filtered_mv->row += bmi[i].mv.as_mv.row;
+            int i = row * 4 + col;
+            int this_b_to_left_edge = mb_to_left_edge + ((col*4)<<3);
+            int this_b_to_right_edge = mb_to_right_edge - ((col*4)<<3);
+            /* Estimate vectors for all blocks which are overlapped by this */
+            /* type. Interpolate/extrapolate the rest of the block's MVs */
+            estimate_mv(block_overlaps[i].overlaps, &(bmi[i]));
+            mi->mbmi.need_to_clamp_mvs |= vp8_check_mv_bounds(
+                                                         &bmi[i].mv,
+                                                         this_b_to_left_edge,
+                                                         this_b_to_right_edge,
+                                                         this_b_to_top_edge,
+                                                         this_b_to_bottom_edge);
+            if (bmi[i].mv.as_int != 0)
+            {
+                ++non_zero_count;
+                filtered_mv->col += bmi[i].mv.as_mv.col;
+                filtered_mv->row += bmi[i].mv.as_mv.row;
+            }
         }
     }
     if (non_zero_count > 0)
@@ -384,11 +394,11 @@ static void estimate_missing_mvs(MB_OVERLAP *overlaps,
             mi->mbmi.partitioning = 3;
             mi->mbmi.segment_id = 0;
             estimate_mb_mvs(block_overlaps,
-                                mi,
-                                mb_to_left_edge,
-                                mb_to_right_edge,
-                                mb_to_top_edge,
-                                mb_to_bottom_edge);
+                            mi,
+                            mb_to_left_edge,
+                            mb_to_right_edge,
+                            mb_to_top_edge,
+                            mb_to_bottom_edge);
             ++mi;
         }
         mb_col = 0;
@@ -481,33 +491,6 @@ static void find_neighboring_blocks(MODE_INFO *mi,
     assert(i == 20);
 }
 
-/* Calculates which reference frame type is dominating among the neighbors */
-static MV_REFERENCE_FRAME dominant_ref_frame(EC_BLOCK *neighbors)
-{
-    /* Default to referring to "skip" */
-    MV_REFERENCE_FRAME dom_ref_frame = LAST_FRAME;
-    int max_ref_frame_cnt = 0;
-    int ref_frame_cnt[MAX_REF_FRAMES] = {0};
-    int i;
-    /* Count neighboring reference frames */
-    for (i = 0; i < NUM_NEIGHBORS; ++i)
-    {
-        if (neighbors[i].ref_frame < MAX_REF_FRAMES &&
-            neighbors[i].ref_frame != INTRA_FRAME)
-            ++ref_frame_cnt[neighbors[i].ref_frame];
-    }
-    /* Find maximum */
-    for (i = 0; i < MAX_REF_FRAMES; ++i)
-    {
-        if (ref_frame_cnt[i] > max_ref_frame_cnt)
-        {
-            dom_ref_frame = i;
-            max_ref_frame_cnt = ref_frame_cnt[i];
-        }
-    }
-    return dom_ref_frame;
-}
-
 /* Interpolates all motion vectors for a macroblock from the neighboring blocks'
  * motion vectors.
  */
@@ -527,14 +510,20 @@ static void interpolate_mvs(MACROBLOCKD *mb,
                                         {4,4}, {4,3}, {4,2}, {4,1}, {4,0},
                                         {4,-1}, {3,-1}, {2,-1}, {1,-1}, {0,-1}
                                       };
+    mi->mbmi.need_to_clamp_mvs = 0;
     for (row = 0; row < 4; ++row)
     {
+        int mb_to_top_edge = mb->mb_to_top_edge + ((row*4)<<3);
+        int mb_to_bottom_edge = mb->mb_to_bottom_edge - ((row*4)<<3);
         for (col = 0; col < 4; ++col)
         {
+            int mb_to_left_edge = mb->mb_to_left_edge + ((col*4)<<3);
+            int mb_to_right_edge = mb->mb_to_right_edge - ((col*4)<<3);
             int w_sum = 0;
             int mv_row_sum = 0;
             int mv_col_sum = 0;
             int_mv * const mv = &(mi->bmi[row*4 + col].mv);
+            mv->as_int = 0;
             for (i = 0; i < NUM_NEIGHBORS; ++i)
             {
                 /* Calculate the weighted sum of neighboring MVs referring
@@ -557,17 +546,12 @@ static void interpolate_mvs(MACROBLOCKD *mb,
                  */
                 mv->as_mv.row = mv_row_sum / w_sum;
                 mv->as_mv.col = mv_col_sum / w_sum;
-
-                mi->mbmi.need_to_clamp_mvs = vp8_check_mv_bounds(mv,
-                                                       mb->mb_to_left_edge,
-                                                       mb->mb_to_right_edge,
-                                                       mb->mb_to_top_edge,
-                                                       mb->mb_to_bottom_edge);
-            }
-            else
-            {
-                mv->as_int = 0;
-                mi->mbmi.need_to_clamp_mvs = 0;
+                mi->mbmi.need_to_clamp_mvs |= vp8_check_mv_bounds(
+                                                            mv,
+                                                            mb_to_left_edge,
+                                                            mb_to_right_edge,
+                                                            mb_to_top_edge,
+                                                            mb_to_bottom_edge);
             }
         }
     }
@@ -580,7 +564,6 @@ void vp8_interpolate_motion(MACROBLOCKD *mb,
 {
     /* Find relevant neighboring blocks */
     EC_BLOCK neighbors[NUM_NEIGHBORS];
-    MV_REFERENCE_FRAME dom_ref_frame;
     int i;
     /* Initialize the array. MAX_REF_FRAMES is interpreted as "doesn't exist" */
     for (i = 0; i < NUM_NEIGHBORS; ++i)
@@ -593,13 +576,11 @@ void vp8_interpolate_motion(MACROBLOCKD *mb,
                                 mb_row, mb_col,
                                 mb_rows, mb_cols,
                                 mb->mode_info_stride);
-    /* Determine the dominant block type */
-    dom_ref_frame = dominant_ref_frame(neighbors);
-    /* Interpolate MVs for the missing blocks
-     * from the dominating MVs */
-    interpolate_mvs(mb, neighbors, dom_ref_frame);
+    /* Interpolate MVs for the missing blocks from the surrounding
+     * blocks which refer to the last frame. */
+    interpolate_mvs(mb, neighbors, LAST_FRAME);
 
-    mb->mode_info_context->mbmi.ref_frame = dom_ref_frame;
+    mb->mode_info_context->mbmi.ref_frame = LAST_FRAME;
     mb->mode_info_context->mbmi.mode = SPLITMV;
     mb->mode_info_context->mbmi.uv_mode = DC_PRED;
     mb->mode_info_context->mbmi.partitioning = 3;
@@ -610,9 +591,8 @@ void vp8_conceal_corrupt_mb(MACROBLOCKD *xd)
 {
     /* This macroblock has corrupt residual, use the motion compensated
        image (predictor) for concealment */
-    vp8_recon_copy16x16(xd->predictor, 16, xd->dst.y_buffer, xd->dst.y_stride);
-    vp8_recon_copy8x8(xd->predictor + 256, 8,
-                      xd->dst.u_buffer, xd->dst.uv_stride);
-    vp8_recon_copy8x8(xd->predictor + 320, 8,
-                      xd->dst.v_buffer, xd->dst.uv_stride);
+
+    /* The build predictor functions now output directly into the dst buffer,
+     * so the copies are no longer necessary */
+
 }
diff --git a/media/libvpx/vp8/decoder/generic/dsystemdependent.c b/media/libvpx/vp8/decoder/generic/dsystemdependent.c
index 2406deaaf27..8a84e566a03 100644
--- a/media/libvpx/vp8/decoder/generic/dsystemdependent.c
+++ b/media/libvpx/vp8/decoder/generic/dsystemdependent.c
@@ -9,8 +9,8 @@
  */
 
 
-#include "vpx_ports/config.h"
-#include "vp8/decoder/dequantize.h"
+#include "vpx_config.h"
+#include "vp8/common/dequantize.h"
 #include "vp8/decoder/onyxd_int.h"
 
 extern void vp8_arch_x86_decode_init(VP8D_COMP *pbi);
@@ -20,13 +20,7 @@ void vp8_dmachine_specific_config(VP8D_COMP *pbi)
 {
     /* Pure C: */
 #if CONFIG_RUNTIME_CPU_DETECT
-    pbi->mb.rtcd                     = &pbi->common.rtcd;
-    pbi->dequant.block               = vp8_dequantize_b_c;
-    pbi->dequant.idct_add            = vp8_dequant_idct_add_c;
-    pbi->dequant.dc_idct_add         = vp8_dequant_dc_idct_add_c;
-    pbi->dequant.dc_idct_add_y_block = vp8_dequant_dc_idct_add_y_block_c;
-    pbi->dequant.idct_add_y_block    = vp8_dequant_idct_add_y_block_c;
-    pbi->dequant.idct_add_uv_block   = vp8_dequant_idct_add_uv_block_c;
+    pbi->mb.rtcd                               = &pbi->common.rtcd;
 #endif
 
 #if ARCH_X86 || ARCH_X86_64
diff --git a/media/libvpx/vp8/decoder/idct_blk.c b/media/libvpx/vp8/decoder/idct_blk.c
deleted file mode 100644
index df0192354c0..00000000000
--- a/media/libvpx/vp8/decoder/idct_blk.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "vpx_ports/config.h"
-#include "vp8/common/idct.h"
-#include "dequantize.h"
-
-void vp8_dequant_dc_idct_add_c(short *input, short *dq, unsigned char *pred,
-                               unsigned char *dest, int pitch, int stride,
-                               int Dc);
-void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *pred,
-                            unsigned char *dest, int pitch, int stride);
-void vp8_dc_only_idct_add_c(short input_dc, unsigned char *pred_ptr,
-                            unsigned char *dst_ptr, int pitch, int stride);
-
-void vp8_dequant_dc_idct_add_y_block_c
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dst, int stride, char *eobs, short *dc)
-{
-    int i, j;
-
-    for (i = 0; i < 4; i++)
-    {
-        for (j = 0; j < 4; j++)
-        {
-            if (*eobs++ > 1)
-                vp8_dequant_dc_idct_add_c (q, dq, pre, dst, 16, stride, dc[0]);
-            else
-                vp8_dc_only_idct_add_c (dc[0], pre, dst, 16, stride);
-
-            q   += 16;
-            pre += 4;
-            dst += 4;
-            dc  ++;
-        }
-
-        pre += 64 - 16;
-        dst += 4*stride - 16;
-    }
-}
-
-void vp8_dequant_idct_add_y_block_c
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dst, int stride, char *eobs)
-{
-    int i, j;
-
-    for (i = 0; i < 4; i++)
-    {
-        for (j = 0; j < 4; j++)
-        {
-            if (*eobs++ > 1)
-                vp8_dequant_idct_add_c (q, dq, pre, dst, 16, stride);
-            else
-            {
-                vp8_dc_only_idct_add_c (q[0]*dq[0], pre, dst, 16, stride);
-                ((int *)q)[0] = 0;
-            }
-
-            q   += 16;
-            pre += 4;
-            dst += 4;
-        }
-
-        pre += 64 - 16;
-        dst += 4*stride - 16;
-    }
-}
-
-void vp8_dequant_idct_add_uv_block_c
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dstu, unsigned char *dstv, int stride, char *eobs)
-{
-    int i, j;
-
-    for (i = 0; i < 2; i++)
-    {
-        for (j = 0; j < 2; j++)
-        {
-            if (*eobs++ > 1)
-                vp8_dequant_idct_add_c (q, dq, pre, dstu, 8, stride);
-            else
-            {
-                vp8_dc_only_idct_add_c (q[0]*dq[0], pre, dstu, 8, stride);
-                ((int *)q)[0] = 0;
-            }
-
-            q    += 16;
-            pre  += 4;
-            dstu += 4;
-        }
-
-        pre  += 32 - 8;
-        dstu += 4*stride - 8;
-    }
-
-    for (i = 0; i < 2; i++)
-    {
-        for (j = 0; j < 2; j++)
-        {
-            if (*eobs++ > 1)
-                vp8_dequant_idct_add_c (q, dq, pre, dstv, 8, stride);
-            else
-            {
-                vp8_dc_only_idct_add_c (q[0]*dq[0], pre, dstv, 8, stride);
-                ((int *)q)[0] = 0;
-            }
-
-            q    += 16;
-            pre  += 4;
-            dstv += 4;
-        }
-
-        pre  += 32 - 8;
-        dstv += 4*stride - 8;
-    }
-}
diff --git a/media/libvpx/vp8/decoder/onyxd_if.c b/media/libvpx/vp8/decoder/onyxd_if.c
index db6528c80d5..980b9237ed5 100644
--- a/media/libvpx/vp8/decoder/onyxd_if.c
+++ b/media/libvpx/vp8/decoder/onyxd_if.c
@@ -20,7 +20,6 @@
 #include "vpx_scale/yv12extend.h"
 #include "vp8/common/loopfilter.h"
 #include "vp8/common/swapyv12buffer.h"
-#include "vp8/common/g_common.h"
 #include "vp8/common/threading.h"
 #include "decoderthreading.h"
 #include <stdio.h>
@@ -57,7 +56,7 @@ void vp8dx_initialize()
 }
 
 
-VP8D_PTR vp8dx_create_decompressor(VP8D_CONFIG *oxcf)
+struct VP8D_COMP * vp8dx_create_decompressor(VP8D_CONFIG *oxcf)
 {
     VP8D_COMP *pbi = vpx_memalign(32, sizeof(VP8D_COMP));
 
@@ -108,7 +107,8 @@ VP8D_PTR vp8dx_create_decompressor(VP8D_CONFIG *oxcf)
 
     pbi->decoded_key_frame = 0;
 
-    pbi->input_partition = oxcf->input_partition;
+    pbi->input_fragments = oxcf->input_fragments;
+    pbi->num_fragments = 0;
 
     /* Independent partitions is activated when a frame updates the
      * token probability table to have equal probabilities over the
@@ -116,14 +116,12 @@ VP8D_PTR vp8dx_create_decompressor(VP8D_CONFIG *oxcf)
      */
     pbi->independent_partitions = 0;
 
-    return (VP8D_PTR) pbi;
+    return pbi;
 }
 
 
-void vp8dx_remove_decompressor(VP8D_PTR ptr)
+void vp8dx_remove_decompressor(VP8D_COMP *pbi)
 {
-    VP8D_COMP *pbi = (VP8D_COMP *) ptr;
-
     if (!pbi)
         return;
 
@@ -141,9 +139,8 @@ void vp8dx_remove_decompressor(VP8D_PTR ptr)
 }
 
 
-vpx_codec_err_t vp8dx_get_reference(VP8D_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd)
+vpx_codec_err_t vp8dx_get_reference(VP8D_COMP *pbi, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd)
 {
-    VP8D_COMP *pbi = (VP8D_COMP *) ptr;
     VP8_COMMON *cm = &pbi->common;
     int ref_fb_idx;
 
@@ -173,9 +170,8 @@ vpx_codec_err_t vp8dx_get_reference(VP8D_PTR ptr, VP8_REFFRAME ref_frame_flag, Y
 }
 
 
-vpx_codec_err_t vp8dx_set_reference(VP8D_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd)
+vpx_codec_err_t vp8dx_set_reference(VP8D_COMP *pbi, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd)
 {
-    VP8D_COMP *pbi = (VP8D_COMP *) ptr;
     VP8_COMMON *cm = &pbi->common;
     int *ref_fb_ptr = NULL;
     int free_fb;
@@ -300,119 +296,135 @@ static int swap_frame_buffers (VP8_COMMON *cm)
     return err;
 }
 
-int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsigned char *source, int64_t time_stamp)
+int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsigned char *source, int64_t time_stamp)
 {
 #if HAVE_ARMV7
     int64_t dx_store_reg[8];
 #endif
-    VP8D_COMP *pbi = (VP8D_COMP *) ptr;
     VP8_COMMON *cm = &pbi->common;
     int retcode = 0;
 
     /*if(pbi->ready_for_new_data == 0)
         return -1;*/
 
-    if (ptr == 0)
+    if (pbi == 0)
     {
         return -1;
     }
 
     pbi->common.error.error_code = VPX_CODEC_OK;
 
-    if (pbi->input_partition && !(source == NULL && size == 0))
+    if (pbi->num_fragments == 0)
     {
-        /* Store a pointer to this partition and return. We haven't
+        /* New frame, reset fragment pointers and sizes */
+        vpx_memset(pbi->fragments, 0, sizeof(pbi->fragments));
+        vpx_memset(pbi->fragment_sizes, 0, sizeof(pbi->fragment_sizes));
+    }
+    if (pbi->input_fragments && !(source == NULL && size == 0))
+    {
+        /* Store a pointer to this fragment and return. We haven't
          * received the complete frame yet, so we will wait with decoding.
          */
-        pbi->partitions[pbi->num_partitions] = source;
-        pbi->partition_sizes[pbi->num_partitions] = size;
-        pbi->source_sz += size;
-        pbi->num_partitions++;
-        if (pbi->num_partitions > (1<<pbi->common.multi_token_partition) + 1)
-            pbi->common.multi_token_partition++;
-        if (pbi->common.multi_token_partition > EIGHT_PARTITION)
+        assert(pbi->num_fragments < MAX_PARTITIONS);
+        pbi->fragments[pbi->num_fragments] = source;
+        pbi->fragment_sizes[pbi->num_fragments] = size;
+        pbi->num_fragments++;
+        if (pbi->num_fragments > (1 << EIGHT_PARTITION) + 1)
         {
             pbi->common.error.error_code = VPX_CODEC_UNSUP_BITSTREAM;
             pbi->common.error.setjmp = 0;
+            pbi->num_fragments = 0;
             return -1;
         }
         return 0;
     }
-    else
+
+    if (!pbi->input_fragments)
     {
-        if (!pbi->input_partition)
-        {
-            pbi->Source = source;
-            pbi->source_sz = size;
-        }
+        pbi->fragments[0] = source;
+        pbi->fragment_sizes[0] = size;
+        pbi->num_fragments = 1;
+    }
+    assert(pbi->common.multi_token_partition <= EIGHT_PARTITION);
+    if (pbi->num_fragments == 0)
+    {
+        pbi->num_fragments = 1;
+        pbi->fragments[0] = NULL;
+        pbi->fragment_sizes[0] = 0;
+    }
 
-        if (pbi->source_sz == 0)
+    if (!pbi->ec_active &&
+        pbi->num_fragments <= 1 && pbi->fragment_sizes[0] == 0)
+    {
+        /* If error concealment is disabled we won't signal missing frames
+         * to the decoder.
+         */
+        if (cm->fb_idx_ref_cnt[cm->lst_fb_idx] > 1)
         {
-           /* This is used to signal that we are missing frames.
-            * We do not know if the missing frame(s) was supposed to update
-            * any of the reference buffers, but we act conservative and
-            * mark only the last buffer as corrupted.
-            */
-            cm->yv12_fb[cm->lst_fb_idx].corrupted = 1;
-
-            /* If error concealment is disabled we won't signal missing frames to
-             * the decoder.
+            /* The last reference shares buffer with another reference
+             * buffer. Move it to its own buffer before setting it as
+             * corrupt, otherwise we will make multiple buffers corrupt.
              */
-            if (!pbi->ec_active)
-            {
-                /* Signal that we have no frame to show. */
-                cm->show_frame = 0;
-
-                pbi->num_partitions = 0;
-                if (pbi->input_partition)
-                    pbi->common.multi_token_partition = 0;
-
-                /* Nothing more to do. */
-                return 0;
-            }
+            const int prev_idx = cm->lst_fb_idx;
+            cm->fb_idx_ref_cnt[prev_idx]--;
+            cm->lst_fb_idx = get_free_fb(cm);
+            vp8_yv12_copy_frame_ptr(&cm->yv12_fb[prev_idx],
+                                    &cm->yv12_fb[cm->lst_fb_idx]);
         }
+        /* This is used to signal that we are missing frames.
+         * We do not know if the missing frame(s) was supposed to update
+         * any of the reference buffers, but we act conservative and
+         * mark only the last buffer as corrupted.
+         */
+        cm->yv12_fb[cm->lst_fb_idx].corrupted = 1;
 
+        /* Signal that we have no frame to show. */
+        cm->show_frame = 0;
+
+        pbi->num_fragments = 0;
+
+        /* Nothing more to do. */
+        return 0;
+    }
+
+#if HAVE_ARMV7
+#if CONFIG_RUNTIME_CPU_DETECT
+    if (cm->rtcd.flags & HAS_NEON)
+#endif
+    {
+        vp8_push_neon(dx_store_reg);
+    }
+#endif
+
+    cm->new_fb_idx = get_free_fb (cm);
+
+    if (setjmp(pbi->common.error.jmp))
+    {
 #if HAVE_ARMV7
 #if CONFIG_RUNTIME_CPU_DETECT
         if (cm->rtcd.flags & HAS_NEON)
 #endif
         {
-            vp8_push_neon(dx_store_reg);
+            vp8_pop_neon(dx_store_reg);
         }
 #endif
+        pbi->common.error.setjmp = 0;
 
-        cm->new_fb_idx = get_free_fb (cm);
+        pbi->num_fragments = 0;
 
-        if (setjmp(pbi->common.error.jmp))
-        {
-#if HAVE_ARMV7
-#if CONFIG_RUNTIME_CPU_DETECT
-            if (cm->rtcd.flags & HAS_NEON)
-#endif
-            {
-                vp8_pop_neon(dx_store_reg);
-            }
-#endif
-            pbi->common.error.setjmp = 0;
+       /* We do not know if the missing frame(s) was supposed to update
+        * any of the reference buffers, but we act conservative and
+        * mark only the last buffer as corrupted.
+        */
+        cm->yv12_fb[cm->lst_fb_idx].corrupted = 1;
 
-            pbi->num_partitions = 0;
-            if (pbi->input_partition)
-                pbi->common.multi_token_partition = 0;
-
-           /* We do not know if the missing frame(s) was supposed to update
-            * any of the reference buffers, but we act conservative and
-            * mark only the last buffer as corrupted.
-            */
-            cm->yv12_fb[cm->lst_fb_idx].corrupted = 1;
-
-            if (cm->fb_idx_ref_cnt[cm->new_fb_idx] > 0)
-              cm->fb_idx_ref_cnt[cm->new_fb_idx]--;
-            return -1;
-        }
-
-        pbi->common.error.setjmp = 1;
+        if (cm->fb_idx_ref_cnt[cm->new_fb_idx] > 0)
+          cm->fb_idx_ref_cnt[cm->new_fb_idx]--;
+        return -1;
     }
 
+    pbi->common.error.setjmp = 1;
+
     retcode = vp8_decode_frame(pbi);
 
     if (retcode < 0)
@@ -427,6 +439,7 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign
 #endif
         pbi->common.error.error_code = VPX_CODEC_ERROR;
         pbi->common.error.setjmp = 0;
+        pbi->num_fragments = 0;
         if (cm->fb_idx_ref_cnt[cm->new_fb_idx] > 0)
           cm->fb_idx_ref_cnt[cm->new_fb_idx]--;
         return retcode;
@@ -447,6 +460,7 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign
 #endif
             pbi->common.error.error_code = VPX_CODEC_ERROR;
             pbi->common.error.setjmp = 0;
+            pbi->num_fragments = 0;
             return -1;
         }
     } else
@@ -464,6 +478,7 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign
 #endif
             pbi->common.error.error_code = VPX_CODEC_ERROR;
             pbi->common.error.setjmp = 0;
+            pbi->num_fragments = 0;
             return -1;
         }
 
@@ -482,7 +497,7 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign
     /* swap the mode infos to storage for future error concealment */
     if (pbi->ec_enabled && pbi->common.prev_mi)
     {
-        const MODE_INFO* tmp = pbi->common.prev_mi;
+        MODE_INFO* tmp = pbi->common.prev_mi;
         int row, col;
         pbi->common.prev_mi = pbi->common.mi;
         pbi->common.mi = tmp;
@@ -507,10 +522,7 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign
 
     pbi->ready_for_new_data = 0;
     pbi->last_time_stamp = time_stamp;
-    pbi->num_partitions = 0;
-    if (pbi->input_partition)
-        pbi->common.multi_token_partition = 0;
-    pbi->source_sz = 0;
+    pbi->num_fragments = 0;
 
 #if 0
     {
@@ -557,10 +569,9 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign
     pbi->common.error.setjmp = 0;
     return retcode;
 }
-int vp8dx_get_raw_frame(VP8D_PTR ptr, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags)
+int vp8dx_get_raw_frame(VP8D_COMP *pbi, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags)
 {
     int ret = -1;
-    VP8D_COMP *pbi = (VP8D_COMP *) ptr;
 
     if (pbi->ready_for_new_data == 1)
         return ret;
@@ -595,3 +606,26 @@ int vp8dx_get_raw_frame(VP8D_PTR ptr, YV12_BUFFER_CONFIG *sd, int64_t *time_stam
     vp8_clear_system_state();
     return ret;
 }
+
+
+/* This function as written isn't decoder specific, but the encoder has
+ * much faster ways of computing this, so it's ok for it to live in a
+ * decode specific file.
+ */
+int vp8dx_references_buffer( VP8_COMMON *oci, int ref_frame )
+{
+    const MODE_INFO *mi = oci->mi;
+    int mb_row, mb_col;
+
+    for (mb_row = 0; mb_row < oci->mb_rows; mb_row++)
+    {
+        for (mb_col = 0; mb_col < oci->mb_cols; mb_col++,mi++)
+        {
+            if( mi->mbmi.ref_frame == ref_frame)
+              return 1;
+        }
+        mi++;
+    }
+    return 0;
+
+}
diff --git a/media/libvpx/vp8/decoder/onyxd_int.h b/media/libvpx/vp8/decoder/onyxd_int.h
index 4ece4312a0b..cb2593b2c75 100644
--- a/media/libvpx/vp8/decoder/onyxd_int.h
+++ b/media/libvpx/vp8/decoder/onyxd_int.h
@@ -11,12 +11,13 @@
 
 #ifndef __INC_VP8D_INT_H
 #define __INC_VP8D_INT_H
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/onyxd.h"
 #include "treereader.h"
 #include "vp8/common/onyxc_int.h"
 #include "vp8/common/threading.h"
-#include "dequantize.h"
+
+
 #if CONFIG_ERROR_CONCEALMENT
 #include "ec_types.h"
 #endif
@@ -42,27 +43,8 @@ typedef struct
     int size;
 } DATARATE;
 
-typedef struct
-{
-    int const *scan;
-    UINT8 const *ptr_block2leftabove;
-    vp8_tree_index const *vp8_coef_tree_ptr;
-    unsigned char *norm_ptr;
-    UINT8 *ptr_coef_bands_x;
 
-    ENTROPY_CONTEXT_PLANES *A;
-    ENTROPY_CONTEXT_PLANES *L;
-
-    INT16 *qcoeff_start_ptr;
-    BOOL_DECODER *current_bc;
-
-    vp8_prob const *coef_probs[4];
-
-    UINT8 eob[25];
-
-} DETOK;
-
-typedef struct VP8Decompressor
+typedef struct VP8D_COMP
 {
     DECLARE_ALIGNED(16, MACROBLOCKD, mb);
 
@@ -73,11 +55,9 @@ typedef struct VP8Decompressor
     VP8D_CONFIG oxcf;
 
 
-    const unsigned char *Source;
-    unsigned int   source_sz;
-    const unsigned char *partitions[MAX_PARTITIONS];
-    unsigned int   partition_sizes[MAX_PARTITIONS];
-    unsigned int   num_partitions;
+    const unsigned char *fragments[MAX_PARTITIONS];
+    unsigned int   fragment_sizes[MAX_PARTITIONS];
+    unsigned int   num_fragments;
 
 #if CONFIG_MULTITHREAD
     /* variable for threading */
@@ -114,13 +94,6 @@ typedef struct VP8Decompressor
 
     DATARATE dr[16];
 
-    DETOK detoken;
-
-#if CONFIG_RUNTIME_CPU_DETECT
-    vp8_dequant_rtcd_vtable_t        dequant;
-#endif
-
-
     vp8_prob prob_intra;
     vp8_prob prob_last;
     vp8_prob prob_gf;
@@ -133,7 +106,7 @@ typedef struct VP8Decompressor
 #endif
     int ec_enabled;
     int ec_active;
-    int input_partition;
+    int input_fragments;
     int decoded_key_frame;
     int independent_partitions;
     int frame_corrupt_residual;
diff --git a/media/libvpx/vp8/decoder/reconintra_mt.c b/media/libvpx/vp8/decoder/reconintra_mt.c
index b9d2b370364..bcb2636fdfd 100644
--- a/media/libvpx/vp8/decoder/reconintra_mt.c
+++ b/media/libvpx/vp8/decoder/reconintra_mt.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/recon.h"
 #include "vp8/common/reconintra.h"
 #include "vpx_mem/vpx_mem.h"
@@ -606,6 +606,7 @@ void vp8mt_predict_intra4x4(VP8D_COMP *pbi,
                           MACROBLOCKD *xd,
                           int b_mode,
                           unsigned char *predictor,
+                          int stride,
                           int mb_row,
                           int mb_col,
                           int num)
@@ -662,7 +663,7 @@ void vp8mt_predict_intra4x4(VP8D_COMP *pbi,
                 predictor[c] = expected_dc;
             }
 
-            predictor += 16;
+            predictor += stride;
         }
     }
     break;
@@ -684,7 +685,7 @@ void vp8mt_predict_intra4x4(VP8D_COMP *pbi,
                 predictor[c] = pred;
             }
 
-            predictor += 16;
+            predictor += stride;
         }
     }
     break;
@@ -706,7 +707,7 @@ void vp8mt_predict_intra4x4(VP8D_COMP *pbi,
                 predictor[c] = ap[c];
             }
 
-            predictor += 16;
+            predictor += stride;
         }
 
     }
@@ -729,29 +730,29 @@ void vp8mt_predict_intra4x4(VP8D_COMP *pbi,
                 predictor[c] = lp[r];
             }
 
-            predictor += 16;
+            predictor += stride;
         }
     }
     break;
     case B_LD_PRED:
     {
         unsigned char *ptr = Above;
-        predictor[0 * 16 + 0] = (ptr[0] + ptr[1] * 2 + ptr[2] + 2) >> 2;
-        predictor[0 * 16 + 1] =
-            predictor[1 * 16 + 0] = (ptr[1] + ptr[2] * 2 + ptr[3] + 2) >> 2;
-        predictor[0 * 16 + 2] =
-            predictor[1 * 16 + 1] =
-                predictor[2 * 16 + 0] = (ptr[2] + ptr[3] * 2 + ptr[4] + 2) >> 2;
-        predictor[0 * 16 + 3] =
-            predictor[1 * 16 + 2] =
-                predictor[2 * 16 + 1] =
-                    predictor[3 * 16 + 0] = (ptr[3] + ptr[4] * 2 + ptr[5] + 2) >> 2;
-        predictor[1 * 16 + 3] =
-            predictor[2 * 16 + 2] =
-                predictor[3 * 16 + 1] = (ptr[4] + ptr[5] * 2 + ptr[6] + 2) >> 2;
-        predictor[2 * 16 + 3] =
-            predictor[3 * 16 + 2] = (ptr[5] + ptr[6] * 2 + ptr[7] + 2) >> 2;
-        predictor[3 * 16 + 3] = (ptr[6] + ptr[7] * 2 + ptr[7] + 2) >> 2;
+        predictor[0 * stride + 0] = (ptr[0] + ptr[1] * 2 + ptr[2] + 2) >> 2;
+        predictor[0 * stride + 1] =
+            predictor[1 * stride + 0] = (ptr[1] + ptr[2] * 2 + ptr[3] + 2) >> 2;
+        predictor[0 * stride + 2] =
+            predictor[1 * stride + 1] =
+                predictor[2 * stride + 0] = (ptr[2] + ptr[3] * 2 + ptr[4] + 2) >> 2;
+        predictor[0 * stride + 3] =
+            predictor[1 * stride + 2] =
+                predictor[2 * stride + 1] =
+                    predictor[3 * stride + 0] = (ptr[3] + ptr[4] * 2 + ptr[5] + 2) >> 2;
+        predictor[1 * stride + 3] =
+            predictor[2 * stride + 2] =
+                predictor[3 * stride + 1] = (ptr[4] + ptr[5] * 2 + ptr[6] + 2) >> 2;
+        predictor[2 * stride + 3] =
+            predictor[3 * stride + 2] = (ptr[5] + ptr[6] * 2 + ptr[7] + 2) >> 2;
+        predictor[3 * stride + 3] = (ptr[6] + ptr[7] * 2 + ptr[7] + 2) >> 2;
 
     }
     break;
@@ -770,22 +771,22 @@ void vp8mt_predict_intra4x4(VP8D_COMP *pbi,
         pp[7] = Above[2];
         pp[8] = Above[3];
 
-        predictor[3 * 16 + 0] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
-        predictor[3 * 16 + 1] =
-            predictor[2 * 16 + 0] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
-        predictor[3 * 16 + 2] =
-            predictor[2 * 16 + 1] =
-                predictor[1 * 16 + 0] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
-        predictor[3 * 16 + 3] =
-            predictor[2 * 16 + 2] =
-                predictor[1 * 16 + 1] =
-                    predictor[0 * 16 + 0] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
-        predictor[2 * 16 + 3] =
-            predictor[1 * 16 + 2] =
-                predictor[0 * 16 + 1] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
-        predictor[1 * 16 + 3] =
-            predictor[0 * 16 + 2] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
-        predictor[0 * 16 + 3] = (pp[6] + pp[7] * 2 + pp[8] + 2) >> 2;
+        predictor[3 * stride + 0] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
+        predictor[3 * stride + 1] =
+            predictor[2 * stride + 0] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
+        predictor[3 * stride + 2] =
+            predictor[2 * stride + 1] =
+                predictor[1 * stride + 0] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
+        predictor[3 * stride + 3] =
+            predictor[2 * stride + 2] =
+                predictor[1 * stride + 1] =
+                    predictor[0 * stride + 0] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
+        predictor[2 * stride + 3] =
+            predictor[1 * stride + 2] =
+                predictor[0 * stride + 1] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
+        predictor[1 * stride + 3] =
+            predictor[0 * stride + 2] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
+        predictor[0 * stride + 3] = (pp[6] + pp[7] * 2 + pp[8] + 2) >> 2;
 
     }
     break;
@@ -805,22 +806,22 @@ void vp8mt_predict_intra4x4(VP8D_COMP *pbi,
         pp[8] = Above[3];
 
 
-        predictor[3 * 16 + 0] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
-        predictor[2 * 16 + 0] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
-        predictor[3 * 16 + 1] =
-            predictor[1 * 16 + 0] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
-        predictor[2 * 16 + 1] =
-            predictor[0 * 16 + 0] = (pp[4] + pp[5] + 1) >> 1;
-        predictor[3 * 16 + 2] =
-            predictor[1 * 16 + 1] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
-        predictor[2 * 16 + 2] =
-            predictor[0 * 16 + 1] = (pp[5] + pp[6] + 1) >> 1;
-        predictor[3 * 16 + 3] =
-            predictor[1 * 16 + 2] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
-        predictor[2 * 16 + 3] =
-            predictor[0 * 16 + 2] = (pp[6] + pp[7] + 1) >> 1;
-        predictor[1 * 16 + 3] = (pp[6] + pp[7] * 2 + pp[8] + 2) >> 2;
-        predictor[0 * 16 + 3] = (pp[7] + pp[8] + 1) >> 1;
+        predictor[3 * stride + 0] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
+        predictor[2 * stride + 0] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
+        predictor[3 * stride + 1] =
+            predictor[1 * stride + 0] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
+        predictor[2 * stride + 1] =
+            predictor[0 * stride + 0] = (pp[4] + pp[5] + 1) >> 1;
+        predictor[3 * stride + 2] =
+            predictor[1 * stride + 1] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
+        predictor[2 * stride + 2] =
+            predictor[0 * stride + 1] = (pp[5] + pp[6] + 1) >> 1;
+        predictor[3 * stride + 3] =
+            predictor[1 * stride + 2] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
+        predictor[2 * stride + 3] =
+            predictor[0 * stride + 2] = (pp[6] + pp[7] + 1) >> 1;
+        predictor[1 * stride + 3] = (pp[6] + pp[7] * 2 + pp[8] + 2) >> 2;
+        predictor[0 * stride + 3] = (pp[7] + pp[8] + 1) >> 1;
 
     }
     break;
@@ -829,22 +830,22 @@ void vp8mt_predict_intra4x4(VP8D_COMP *pbi,
 
         unsigned char *pp = Above;
 
-        predictor[0 * 16 + 0] = (pp[0] + pp[1] + 1) >> 1;
-        predictor[1 * 16 + 0] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
-        predictor[2 * 16 + 0] =
-            predictor[0 * 16 + 1] = (pp[1] + pp[2] + 1) >> 1;
-        predictor[1 * 16 + 1] =
-            predictor[3 * 16 + 0] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
-        predictor[2 * 16 + 1] =
-            predictor[0 * 16 + 2] = (pp[2] + pp[3] + 1) >> 1;
-        predictor[3 * 16 + 1] =
-            predictor[1 * 16 + 2] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
-        predictor[0 * 16 + 3] =
-            predictor[2 * 16 + 2] = (pp[3] + pp[4] + 1) >> 1;
-        predictor[1 * 16 + 3] =
-            predictor[3 * 16 + 2] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
-        predictor[2 * 16 + 3] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
-        predictor[3 * 16 + 3] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
+        predictor[0 * stride + 0] = (pp[0] + pp[1] + 1) >> 1;
+        predictor[1 * stride + 0] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
+        predictor[2 * stride + 0] =
+            predictor[0 * stride + 1] = (pp[1] + pp[2] + 1) >> 1;
+        predictor[1 * stride + 1] =
+            predictor[3 * stride + 0] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
+        predictor[2 * stride + 1] =
+            predictor[0 * stride + 2] = (pp[2] + pp[3] + 1) >> 1;
+        predictor[3 * stride + 1] =
+            predictor[1 * stride + 2] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
+        predictor[0 * stride + 3] =
+            predictor[2 * stride + 2] = (pp[3] + pp[4] + 1) >> 1;
+        predictor[1 * stride + 3] =
+            predictor[3 * stride + 2] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
+        predictor[2 * stride + 3] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
+        predictor[3 * stride + 3] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
     }
     break;
 
@@ -862,22 +863,22 @@ void vp8mt_predict_intra4x4(VP8D_COMP *pbi,
         pp[8] = Above[3];
 
 
-        predictor[3 * 16 + 0] = (pp[0] + pp[1] + 1) >> 1;
-        predictor[3 * 16 + 1] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
-        predictor[2 * 16 + 0] =
-            predictor[3 * 16 + 2] = (pp[1] + pp[2] + 1) >> 1;
-        predictor[2 * 16 + 1] =
-            predictor[3 * 16 + 3] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
-        predictor[2 * 16 + 2] =
-            predictor[1 * 16 + 0] = (pp[2] + pp[3] + 1) >> 1;
-        predictor[2 * 16 + 3] =
-            predictor[1 * 16 + 1] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
-        predictor[1 * 16 + 2] =
-            predictor[0 * 16 + 0] = (pp[3] + pp[4] + 1) >> 1;
-        predictor[1 * 16 + 3] =
-            predictor[0 * 16 + 1] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
-        predictor[0 * 16 + 2] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
-        predictor[0 * 16 + 3] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
+        predictor[3 * stride + 0] = (pp[0] + pp[1] + 1) >> 1;
+        predictor[3 * stride + 1] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
+        predictor[2 * stride + 0] =
+            predictor[3 * stride + 2] = (pp[1] + pp[2] + 1) >> 1;
+        predictor[2 * stride + 1] =
+            predictor[3 * stride + 3] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
+        predictor[2 * stride + 2] =
+            predictor[1 * stride + 0] = (pp[2] + pp[3] + 1) >> 1;
+        predictor[2 * stride + 3] =
+            predictor[1 * stride + 1] = (pp[2] + pp[3] * 2 + pp[4] + 2) >> 2;
+        predictor[1 * stride + 2] =
+            predictor[0 * stride + 0] = (pp[3] + pp[4] + 1) >> 1;
+        predictor[1 * stride + 3] =
+            predictor[0 * stride + 1] = (pp[3] + pp[4] * 2 + pp[5] + 2) >> 2;
+        predictor[0 * stride + 2] = (pp[4] + pp[5] * 2 + pp[6] + 2) >> 2;
+        predictor[0 * stride + 3] = (pp[5] + pp[6] * 2 + pp[7] + 2) >> 2;
     }
     break;
 
@@ -885,22 +886,22 @@ void vp8mt_predict_intra4x4(VP8D_COMP *pbi,
     case B_HU_PRED:
     {
         unsigned char *pp = Left;
-        predictor[0 * 16 + 0] = (pp[0] + pp[1] + 1) >> 1;
-        predictor[0 * 16 + 1] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
-        predictor[0 * 16 + 2] =
-            predictor[1 * 16 + 0] = (pp[1] + pp[2] + 1) >> 1;
-        predictor[0 * 16 + 3] =
-            predictor[1 * 16 + 1] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
-        predictor[1 * 16 + 2] =
-            predictor[2 * 16 + 0] = (pp[2] + pp[3] + 1) >> 1;
-        predictor[1 * 16 + 3] =
-            predictor[2 * 16 + 1] = (pp[2] + pp[3] * 2 + pp[3] + 2) >> 2;
-        predictor[2 * 16 + 2] =
-            predictor[2 * 16 + 3] =
-                predictor[3 * 16 + 0] =
-                    predictor[3 * 16 + 1] =
-                        predictor[3 * 16 + 2] =
-                            predictor[3 * 16 + 3] = pp[3];
+        predictor[0 * stride + 0] = (pp[0] + pp[1] + 1) >> 1;
+        predictor[0 * stride + 1] = (pp[0] + pp[1] * 2 + pp[2] + 2) >> 2;
+        predictor[0 * stride + 2] =
+            predictor[1 * stride + 0] = (pp[1] + pp[2] + 1) >> 1;
+        predictor[0 * stride + 3] =
+            predictor[1 * stride + 1] = (pp[1] + pp[2] * 2 + pp[3] + 2) >> 2;
+        predictor[1 * stride + 2] =
+            predictor[2 * stride + 0] = (pp[2] + pp[3] + 1) >> 1;
+        predictor[1 * stride + 3] =
+            predictor[2 * stride + 1] = (pp[2] + pp[3] * 2 + pp[3] + 2) >> 2;
+        predictor[2 * stride + 2] =
+            predictor[2 * stride + 3] =
+                predictor[3 * stride + 0] =
+                    predictor[3 * stride + 1] =
+                        predictor[3 * stride + 2] =
+                            predictor[3 * stride + 3] = pp[3];
     }
     break;
 
diff --git a/media/libvpx/vp8/decoder/reconintra_mt.h b/media/libvpx/vp8/decoder/reconintra_mt.h
index d401295b213..4576a806494 100644
--- a/media/libvpx/vp8/decoder/reconintra_mt.h
+++ b/media/libvpx/vp8/decoder/reconintra_mt.h
@@ -19,7 +19,7 @@ extern void vp8mt_build_intra_predictors_mby_s(VP8D_COMP *pbi, MACROBLOCKD *x, i
 extern void vp8mt_build_intra_predictors_mbuv(VP8D_COMP *pbi, MACROBLOCKD *x, int mb_row, int mb_col);
 extern void vp8mt_build_intra_predictors_mbuv_s(VP8D_COMP *pbi, MACROBLOCKD *x, int mb_row, int mb_col);
 
-extern void vp8mt_predict_intra4x4(VP8D_COMP *pbi, MACROBLOCKD *x, int b_mode, unsigned char *predictor, int mb_row, int mb_col, int num);
+extern void vp8mt_predict_intra4x4(VP8D_COMP *pbi, MACROBLOCKD *x, int b_mode, unsigned char *predictor, int stride, int mb_row, int mb_col, int num);
 extern void vp8mt_intra_prediction_down_copy(VP8D_COMP *pbi, MACROBLOCKD *x, int mb_row, int mb_col);
 #endif
 
diff --git a/media/libvpx/vp8/decoder/threading.c b/media/libvpx/vp8/decoder/threading.c
index fdde04a8809..2ce00f7051a 100644
--- a/media/libvpx/vp8/decoder/threading.c
+++ b/media/libvpx/vp8/decoder/threading.c
@@ -27,8 +27,6 @@
 #endif
 
 extern void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd);
-extern void clamp_mvs(MACROBLOCKD *xd);
-extern void vp8_build_uvmvs(MACROBLOCKD *x, int fullpixel);
 
 #if CONFIG_RUNTIME_CPU_DETECT
 #define RTCD_VTABLE(x) (&(pbi)->common.rtcd.x)
@@ -39,7 +37,7 @@ extern void vp8_build_uvmvs(MACROBLOCKD *x, int fullpixel);
 static void setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_DEC *mbrd, int count)
 {
     VP8_COMMON *const pc = & pbi->common;
-    int i, j;
+    int i;
 
     for (i = 0; i < count; i++)
     {
@@ -79,10 +77,15 @@ static void setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_D
 
         mbd->current_bc = &pbi->bc2;
 
-        for (j = 0; j < 25; j++)
-        {
-            mbd->block[j].dequant = xd->block[j].dequant;
-        }
+        vpx_memcpy(mbd->dequant_y1_dc, xd->dequant_y1_dc, sizeof(xd->dequant_y1_dc));
+        vpx_memcpy(mbd->dequant_y1, xd->dequant_y1, sizeof(xd->dequant_y1));
+        vpx_memcpy(mbd->dequant_y2, xd->dequant_y2, sizeof(xd->dequant_y2));
+        vpx_memcpy(mbd->dequant_uv, xd->dequant_uv, sizeof(xd->dequant_uv));
+
+        mbd->fullpixel_mask = 0xffffffff;
+        if(pc->full_pixel)
+            mbd->fullpixel_mask = 0xfffffff8;
+
     }
 
     for (i=0; i< pc->mb_rows; i++)
@@ -94,23 +97,17 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int m
 {
     int eobtotal = 0;
     int throw_residual = 0;
-    int i, do_clamp = xd->mode_info_context->mbmi.need_to_clamp_mvs;
+    int i;
 
     if (xd->mode_info_context->mbmi.mb_skip_coeff)
     {
         vp8_reset_mb_tokens_context(xd);
     }
-    else
+    else if (!vp8dx_bool_error(xd->current_bc))
     {
         eobtotal = vp8_decode_mb_tokens(pbi, xd);
     }
 
-    /* Perform temporary clamping of the MV to be used for prediction */
-    if (do_clamp)
-    {
-        clamp_mvs(xd);
-    }
-
     eobtotal |= (xd->mode_info_context->mbmi.mode == B_PRED ||
                   xd->mode_info_context->mbmi.mode == SPLITMV);
     if (!eobtotal && !vp8dx_bool_error(xd->current_bc))
@@ -141,11 +138,11 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int m
     /* do prediction */
     if (xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME)
     {
-        vp8mt_build_intra_predictors_mbuv(pbi, xd, mb_row, mb_col);
+        vp8mt_build_intra_predictors_mbuv_s(pbi, xd, mb_row, mb_col);
 
         if (xd->mode_info_context->mbmi.mode != B_PRED)
         {
-            vp8mt_build_intra_predictors_mby(pbi, xd, mb_row, mb_col);
+            vp8mt_build_intra_predictors_mby_s(pbi, xd, mb_row, mb_col);
         } else {
             vp8mt_intra_prediction_down_copy(pbi, xd, mb_row, mb_col);
         }
@@ -165,7 +162,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int m
 #if CONFIG_ERROR_CONCEALMENT
     if (pbi->ec_active &&
         (mb_row * pbi->common.mb_cols + mb_col >= pbi->mvs_corrupt_from_mb ||
-        throw_residual))
+         throw_residual))
     {
         /* MB with corrupt residuals or corrupt mode/motion vectors.
          * Better to use the predictor as reconstruction.
@@ -178,73 +175,84 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int m
 #endif
 
     /* dequantization and idct */
-    if (xd->mode_info_context->mbmi.mode != B_PRED && xd->mode_info_context->mbmi.mode != SPLITMV)
+    if (xd->mode_info_context->mbmi.mode == B_PRED)
     {
-        BLOCKD *b = &xd->block[24];
-        DEQUANT_INVOKE(&pbi->dequant, block)(b);
+        short *DQC = xd->dequant_y1;
 
-        /* do 2nd order transform on the dc block */
-        if (xd->eobs[24] > 1)
-        {
-            IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh16)(&b->dqcoeff[0], b->diff);
-            ((int *)b->qcoeff)[0] = 0;
-            ((int *)b->qcoeff)[1] = 0;
-            ((int *)b->qcoeff)[2] = 0;
-            ((int *)b->qcoeff)[3] = 0;
-            ((int *)b->qcoeff)[4] = 0;
-            ((int *)b->qcoeff)[5] = 0;
-            ((int *)b->qcoeff)[6] = 0;
-            ((int *)b->qcoeff)[7] = 0;
-        }
-        else
-        {
-            IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh1)(&b->dqcoeff[0], b->diff);
-            ((int *)b->qcoeff)[0] = 0;
-        }
-
-        DEQUANT_INVOKE (&pbi->dequant, dc_idct_add_y_block)
-                        (xd->qcoeff, xd->block[0].dequant,
-                         xd->predictor, xd->dst.y_buffer,
-                         xd->dst.y_stride, xd->eobs, xd->block[24].diff);
-    }
-    else if (xd->mode_info_context->mbmi.mode == B_PRED)
-    {
         for (i = 0; i < 16; i++)
         {
             BLOCKD *b = &xd->block[i];
+            int b_mode = xd->mode_info_context->bmi[i].as_mode;
 
-            vp8mt_predict_intra4x4(pbi, xd, b->bmi.as_mode, b->predictor, mb_row, mb_col, i);
+            vp8mt_predict_intra4x4(pbi, xd, b_mode, *(b->base_dst) + b->dst,
+                                   b->dst_stride, mb_row, mb_col, i);
 
-            if (xd->eobs[i] > 1)
+            if (xd->eobs[i] )
             {
-                DEQUANT_INVOKE(&pbi->dequant, idct_add)
-                    (b->qcoeff, b->dequant,  b->predictor,
-                    *(b->base_dst) + b->dst, 16, b->dst_stride);
-            }
-            else
-            {
-                IDCT_INVOKE(RTCD_VTABLE(idct), idct1_scalar_add)
-                    (b->qcoeff[0] * b->dequant[0], b->predictor,
-                    *(b->base_dst) + b->dst, 16, b->dst_stride);
-                ((int *)b->qcoeff)[0] = 0;
+                if (xd->eobs[i] > 1)
+                {
+                    DEQUANT_INVOKE(&pbi->common.rtcd.dequant, idct_add)
+                        (b->qcoeff, DQC,
+                        *(b->base_dst) + b->dst, b->dst_stride);
+                }
+                else
+                {
+                    IDCT_INVOKE(RTCD_VTABLE(idct), idct1_scalar_add)
+                        (b->qcoeff[0] * DQC[0],
+                        *(b->base_dst) + b->dst, b->dst_stride,
+                        *(b->base_dst) + b->dst, b->dst_stride);
+                    ((int *)b->qcoeff)[0] = 0;
+                }
             }
         }
     }
     else
     {
-        DEQUANT_INVOKE (&pbi->dequant, idct_add_y_block)
-                        (xd->qcoeff, xd->block[0].dequant,
-                         xd->predictor, xd->dst.y_buffer,
+        short *DQC = xd->dequant_y1;
+
+        if (xd->mode_info_context->mbmi.mode != SPLITMV)
+        {
+            BLOCKD *b = &xd->block[24];
+
+            /* do 2nd order transform on the dc block */
+            if (xd->eobs[24] > 1)
+            {
+                DEQUANT_INVOKE(&pbi->common.rtcd.dequant, block)(b, xd->dequant_y2);
+
+                IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh16)(&b->dqcoeff[0],
+                    xd->qcoeff);
+                ((int *)b->qcoeff)[0] = 0;
+                ((int *)b->qcoeff)[1] = 0;
+                ((int *)b->qcoeff)[2] = 0;
+                ((int *)b->qcoeff)[3] = 0;
+                ((int *)b->qcoeff)[4] = 0;
+                ((int *)b->qcoeff)[5] = 0;
+                ((int *)b->qcoeff)[6] = 0;
+                ((int *)b->qcoeff)[7] = 0;
+            }
+            else
+            {
+                b->dqcoeff[0] = b->qcoeff[0] * xd->dequant_y2[0];
+                IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh1)(&b->dqcoeff[0], xd->qcoeff);
+                ((int *)b->qcoeff)[0] = 0;
+            }
+
+            /* override the dc dequant constant */
+            DQC = xd->dequant_y1_dc;
+        }
+
+        DEQUANT_INVOKE (&pbi->common.rtcd.dequant, idct_add_y_block)
+                        (xd->qcoeff, DQC,
+                         xd->dst.y_buffer,
                          xd->dst.y_stride, xd->eobs);
     }
 
-    DEQUANT_INVOKE (&pbi->dequant, idct_add_uv_block)
-                    (xd->qcoeff+16*16, xd->block[16].dequant,
-                     xd->predictor+16*16, xd->dst.u_buffer, xd->dst.v_buffer,
+    DEQUANT_INVOKE (&pbi->common.rtcd.dequant, idct_add_uv_block)
+                    (xd->qcoeff+16*16, xd->dequant_uv,
+                     xd->dst.u_buffer, xd->dst.v_buffer,
                      xd->dst.uv_stride, xd->eobs+16);
 }
 
-
 static THREAD_FUNCTION thread_decoding_proc(void *p_data)
 {
     int ithread = ((DECODETHREAD_DATA *)p_data)->ithread;
@@ -313,8 +321,6 @@ static THREAD_FUNCTION thread_decoding_proc(void *p_data)
                             }
                         }
 
-                        update_blockd_bmi(xd);
-
                         /* Distance of MB to the various image edges.
                          * These are specified to 8th pel as they are always
                          * compared to values that are in 1/8th pel units.
@@ -378,7 +384,6 @@ static THREAD_FUNCTION thread_decoding_proc(void *p_data)
                             xd->corrupted |= pc->yv12_fb[ref_fb_idx].corrupted;
                         }
 
-                        vp8_build_uvmvs(xd, pc->full_pixel);
                         decode_macroblock(pbi, xd, mb_row, mb_col);
 
                         /* check if the boolean decoder has suffered an error */
@@ -819,8 +824,6 @@ void vp8mt_decode_mb_rows( VP8D_COMP *pbi, MACROBLOCKD *xd)
                     }
                 }
 
-                update_blockd_bmi(xd);
-
                 /* Distance of MB to the various image edges.
                  * These are specified to 8th pel as they are always compared to
                  * values that are in 1/8th pel units.
@@ -879,7 +882,6 @@ void vp8mt_decode_mb_rows( VP8D_COMP *pbi, MACROBLOCKD *xd)
                     xd->corrupted |= pc->yv12_fb[ref_fb_idx].corrupted;
                 }
 
-                vp8_build_uvmvs(xd, pc->full_pixel);
                 decode_macroblock(pbi, xd, mb_row, mb_col);
 
                 /* check if the boolean decoder has suffered an error */
diff --git a/media/libvpx/vp8/decoder/x86/idct_blk_mmx.c b/media/libvpx/vp8/decoder/x86/idct_blk_mmx.c
deleted file mode 100644
index 8f1a363cd78..00000000000
--- a/media/libvpx/vp8/decoder/x86/idct_blk_mmx.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "vpx_ports/config.h"
-#include "vp8/common/idct.h"
-#include "vp8/decoder/dequantize.h"
-
-void vp8_dequant_dc_idct_add_y_block_mmx
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dst, int stride, char *eobs, short *dc)
-{
-    int i;
-
-    for (i = 0; i < 4; i++)
-    {
-        if (eobs[0] > 1)
-            vp8_dequant_dc_idct_add_mmx (q, dq, pre, dst, 16, stride, dc[0]);
-        else
-            vp8_dc_only_idct_add_mmx (dc[0], pre, dst, 16, stride);
-
-        if (eobs[1] > 1)
-            vp8_dequant_dc_idct_add_mmx (q+16, dq, pre+4, dst+4, 16, stride, dc[1]);
-        else
-            vp8_dc_only_idct_add_mmx (dc[1], pre+4, dst+4, 16, stride);
-
-        if (eobs[2] > 1)
-            vp8_dequant_dc_idct_add_mmx (q+32, dq, pre+8, dst+8, 16, stride, dc[2]);
-        else
-            vp8_dc_only_idct_add_mmx (dc[2], pre+8, dst+8, 16, stride);
-
-        if (eobs[3] > 1)
-            vp8_dequant_dc_idct_add_mmx (q+48, dq, pre+12, dst+12, 16, stride, dc[3]);
-        else
-            vp8_dc_only_idct_add_mmx (dc[3], pre+12, dst+12, 16, stride);
-
-        q    += 64;
-        dc   += 4;
-        pre  += 64;
-        dst  += 4*stride;
-        eobs += 4;
-    }
-}
-
-void vp8_dequant_idct_add_y_block_mmx
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dst, int stride, char *eobs)
-{
-    int i;
-
-    for (i = 0; i < 4; i++)
-    {
-        if (eobs[0] > 1)
-            vp8_dequant_idct_add_mmx (q, dq, pre, dst, 16, stride);
-        else
-        {
-            vp8_dc_only_idct_add_mmx (q[0]*dq[0], pre, dst, 16, stride);
-            ((int *)q)[0] = 0;
-        }
-
-        if (eobs[1] > 1)
-            vp8_dequant_idct_add_mmx (q+16, dq, pre+4, dst+4, 16, stride);
-        else
-        {
-            vp8_dc_only_idct_add_mmx (q[16]*dq[0], pre+4, dst+4, 16, stride);
-            ((int *)(q+16))[0] = 0;
-        }
-
-        if (eobs[2] > 1)
-            vp8_dequant_idct_add_mmx (q+32, dq, pre+8, dst+8, 16, stride);
-        else
-        {
-            vp8_dc_only_idct_add_mmx (q[32]*dq[0], pre+8, dst+8, 16, stride);
-            ((int *)(q+32))[0] = 0;
-        }
-
-        if (eobs[3] > 1)
-            vp8_dequant_idct_add_mmx (q+48, dq, pre+12, dst+12, 16, stride);
-        else
-        {
-            vp8_dc_only_idct_add_mmx (q[48]*dq[0], pre+12, dst+12, 16, stride);
-            ((int *)(q+48))[0] = 0;
-        }
-
-        q    += 64;
-        pre  += 64;
-        dst  += 4*stride;
-        eobs += 4;
-    }
-}
-
-void vp8_dequant_idct_add_uv_block_mmx
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dstu, unsigned char *dstv, int stride, char *eobs)
-{
-    int i;
-
-    for (i = 0; i < 2; i++)
-    {
-        if (eobs[0] > 1)
-            vp8_dequant_idct_add_mmx (q, dq, pre, dstu, 8, stride);
-        else
-        {
-            vp8_dc_only_idct_add_mmx (q[0]*dq[0], pre, dstu, 8, stride);
-            ((int *)q)[0] = 0;
-        }
-
-        if (eobs[1] > 1)
-            vp8_dequant_idct_add_mmx (q+16, dq, pre+4, dstu+4, 8, stride);
-        else
-        {
-            vp8_dc_only_idct_add_mmx (q[16]*dq[0], pre+4, dstu+4, 8, stride);
-            ((int *)(q+16))[0] = 0;
-        }
-
-        q    += 32;
-        pre  += 32;
-        dstu += 4*stride;
-        eobs += 2;
-    }
-
-    for (i = 0; i < 2; i++)
-    {
-        if (eobs[0] > 1)
-            vp8_dequant_idct_add_mmx (q, dq, pre, dstv, 8, stride);
-        else
-        {
-            vp8_dc_only_idct_add_mmx (q[0]*dq[0], pre, dstv, 8, stride);
-            ((int *)q)[0] = 0;
-        }
-
-        if (eobs[1] > 1)
-            vp8_dequant_idct_add_mmx (q+16, dq, pre+4, dstv+4, 8, stride);
-        else
-        {
-            vp8_dc_only_idct_add_mmx (q[16]*dq[0], pre+4, dstv+4, 8, stride);
-            ((int *)(q+16))[0] = 0;
-        }
-
-        q    += 32;
-        pre  += 32;
-        dstv += 4*stride;
-        eobs += 2;
-    }
-}
diff --git a/media/libvpx/vp8/decoder/x86/idct_blk_sse2.c b/media/libvpx/vp8/decoder/x86/idct_blk_sse2.c
deleted file mode 100644
index 4c88db474b7..00000000000
--- a/media/libvpx/vp8/decoder/x86/idct_blk_sse2.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "vpx_ports/config.h"
-#include "vp8/common/idct.h"
-#include "vp8/decoder/dequantize.h"
-
-void idct_dequant_dc_0_2x_sse2
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dst, int dst_stride, short *dc);
-void idct_dequant_dc_full_2x_sse2
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dst, int dst_stride, short *dc);
-
-void idct_dequant_0_2x_sse2
-            (short *q, short *dq ,unsigned char *pre,
-             unsigned char *dst, int dst_stride, int blk_stride);
-void idct_dequant_full_2x_sse2
-            (short *q, short *dq ,unsigned char *pre,
-             unsigned char *dst, int dst_stride, int blk_stride);
-
-void vp8_dequant_dc_idct_add_y_block_sse2
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dst, int stride, char *eobs, short *dc)
-{
-    int i;
-
-    for (i = 0; i < 4; i++)
-    {
-        if (((short *)(eobs))[0] & 0xfefe)
-            idct_dequant_dc_full_2x_sse2 (q, dq, pre, dst, stride, dc);
-        else
-            idct_dequant_dc_0_2x_sse2 (q, dq, pre, dst, stride, dc);
-
-        if (((short *)(eobs))[1] & 0xfefe)
-            idct_dequant_dc_full_2x_sse2 (q+32, dq, pre+8, dst+8, stride, dc+2);
-        else
-            idct_dequant_dc_0_2x_sse2 (q+32, dq, pre+8, dst+8, stride, dc+2);
-
-        q    += 64;
-        dc   += 4;
-        pre  += 64;
-        dst  += stride*4;
-        eobs += 4;
-    }
-}
-
-void vp8_dequant_idct_add_y_block_sse2
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dst, int stride, char *eobs)
-{
-    int i;
-
-    for (i = 0; i < 4; i++)
-    {
-        if (((short *)(eobs))[0] & 0xfefe)
-            idct_dequant_full_2x_sse2 (q, dq, pre, dst, stride, 16);
-        else
-            idct_dequant_0_2x_sse2 (q, dq, pre, dst, stride, 16);
-
-        if (((short *)(eobs))[1] & 0xfefe)
-            idct_dequant_full_2x_sse2 (q+32, dq, pre+8, dst+8, stride, 16);
-        else
-            idct_dequant_0_2x_sse2 (q+32, dq, pre+8, dst+8, stride, 16);
-
-        q    += 64;
-        pre  += 64;
-        dst  += stride*4;
-        eobs += 4;
-    }
-}
-
-void vp8_dequant_idct_add_uv_block_sse2
-            (short *q, short *dq, unsigned char *pre,
-             unsigned char *dstu, unsigned char *dstv, int stride, char *eobs)
-{
-    if (((short *)(eobs))[0] & 0xfefe)
-        idct_dequant_full_2x_sse2 (q, dq, pre, dstu, stride, 8);
-    else
-        idct_dequant_0_2x_sse2 (q, dq, pre, dstu, stride, 8);
-
-    q    += 32;
-    pre  += 32;
-    dstu += stride*4;
-
-    if (((short *)(eobs))[1] & 0xfefe)
-        idct_dequant_full_2x_sse2 (q, dq, pre, dstu, stride, 8);
-    else
-        idct_dequant_0_2x_sse2 (q, dq, pre, dstu, stride, 8);
-
-    q    += 32;
-    pre  += 32;
-
-    if (((short *)(eobs))[2] & 0xfefe)
-        idct_dequant_full_2x_sse2 (q, dq, pre, dstv, stride, 8);
-    else
-        idct_dequant_0_2x_sse2 (q, dq, pre, dstv, stride, 8);
-
-    q    += 32;
-    pre  += 32;
-    dstv += stride*4;
-
-    if (((short *)(eobs))[3] & 0xfefe)
-        idct_dequant_full_2x_sse2 (q, dq, pre, dstv, stride, 8);
-    else
-        idct_dequant_0_2x_sse2 (q, dq, pre, dstv, stride, 8);
-}
diff --git a/media/libvpx/vp8/decoder/x86/x86_dsystemdependent.c b/media/libvpx/vp8/decoder/x86/x86_dsystemdependent.c
index a244a3a98b0..27bf5ddbd96 100644
--- a/media/libvpx/vp8/decoder/x86/x86_dsystemdependent.c
+++ b/media/libvpx/vp8/decoder/x86/x86_dsystemdependent.c
@@ -9,54 +9,11 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/x86.h"
 #include "vp8/decoder/onyxd_int.h"
 
-
-#if HAVE_MMX
-void vp8_dequantize_b_impl_mmx(short *sq, short *dq, short *q);
-
-void vp8_dequantize_b_mmx(BLOCKD *d)
-{
-    short *sq = (short *) d->qcoeff;
-    short *dq = (short *) d->dqcoeff;
-    short *q = (short *) d->dequant;
-    vp8_dequantize_b_impl_mmx(sq, dq, q);
-}
-#endif
-
 void vp8_arch_x86_decode_init(VP8D_COMP *pbi)
 {
-#if CONFIG_RUNTIME_CPU_DETECT
-    int flags = x86_simd_caps();
 
-    /* Note:
-     *
-     * This platform can be built without runtime CPU detection as well. If
-     * you modify any of the function mappings present in this file, be sure
-     * to also update them in static mapings (<arch>/filename_<arch>.h)
-     */
-    /* Override default functions with fastest ones for this CPU. */
-#if HAVE_MMX
-    if (flags & HAS_MMX)
-    {
-        pbi->dequant.block               = vp8_dequantize_b_mmx;
-        pbi->dequant.idct_add            = vp8_dequant_idct_add_mmx;
-        pbi->dequant.dc_idct_add         = vp8_dequant_dc_idct_add_mmx;
-        pbi->dequant.dc_idct_add_y_block = vp8_dequant_dc_idct_add_y_block_mmx;
-        pbi->dequant.idct_add_y_block    = vp8_dequant_idct_add_y_block_mmx;
-        pbi->dequant.idct_add_uv_block   = vp8_dequant_idct_add_uv_block_mmx;
-    }
-#endif
-#if HAVE_SSE2
-    if (flags & HAS_SSE2)
-    {
-        pbi->dequant.dc_idct_add_y_block = vp8_dequant_dc_idct_add_y_block_sse2;
-        pbi->dequant.idct_add_y_block    = vp8_dequant_idct_add_y_block_sse2;
-        pbi->dequant.idct_add_uv_block   = vp8_dequant_idct_add_uv_block_sse2;
-    }
-#endif
-
-#endif
 }
diff --git a/media/libvpx/vp8/encoder/arm/arm_csystemdependent.c b/media/libvpx/vp8/encoder/arm/arm_csystemdependent.c
index 89f8136fe9e..113a9827405 100644
--- a/media/libvpx/vp8/encoder/arm/arm_csystemdependent.c
+++ b/media/libvpx/vp8/encoder/arm/arm_csystemdependent.c
@@ -9,14 +9,13 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/arm.h"
-#include "vp8/encoder/variance.h"
 #include "vp8/encoder/onyx_int.h"
 
-extern void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction);
-extern void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction);
-extern void vpxyv12_copy_partial_frame_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction);
+extern void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
+extern void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
+extern void vp8_yv12_copy_partial_frame_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
 
 void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
 {
@@ -32,36 +31,10 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
 #if HAVE_ARMV6
     if (flags & HAS_MEDIA)
     {
-        cpi->rtcd.variance.sad16x16              = vp8_sad16x16_armv6;
-        /*cpi->rtcd.variance.sad16x8               = vp8_sad16x8_c;
-        cpi->rtcd.variance.sad8x16               = vp8_sad8x16_c;
-        cpi->rtcd.variance.sad8x8                = vp8_sad8x8_c;
-        cpi->rtcd.variance.sad4x4                = vp8_sad4x4_c;*/
-
-        /*cpi->rtcd.variance.var4x4                = vp8_variance4x4_c;*/
-        cpi->rtcd.variance.var8x8                = vp8_variance8x8_armv6;
-        /*cpi->rtcd.variance.var8x16               = vp8_variance8x16_c;
-        cpi->rtcd.variance.var16x8               = vp8_variance16x8_c;*/
-        cpi->rtcd.variance.var16x16              = vp8_variance16x16_armv6;
-
-        /*cpi->rtcd.variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;*/
-        cpi->rtcd.variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_armv6;
-        /*cpi->rtcd.variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
-        cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;*/
-        cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_armv6;
-        cpi->rtcd.variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_armv6;
-        cpi->rtcd.variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_armv6;
-        cpi->rtcd.variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_armv6;
-
-        cpi->rtcd.variance.mse16x16              = vp8_mse16x16_armv6;
-        /*cpi->rtcd.variance.getmbss               = vp8_get_mb_ss_c;*/
-
-        /*cpi->rtcd.variance.get4x4sse_cs          = vp8_get4x4sse_cs_c;*/
-
-        /*cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_c;
-        cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_c;*/
-        cpi->rtcd.fdct.fast4x4                   = vp8_fast_fdct4x4_armv6;
-        cpi->rtcd.fdct.fast8x4                   = vp8_fast_fdct8x4_armv6;
+        cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_armv6;
+        cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_armv6;
+        cpi->rtcd.fdct.fast4x4                   = vp8_short_fdct4x4_armv6;
+        cpi->rtcd.fdct.fast8x4                   = vp8_short_fdct8x4_armv6;
         cpi->rtcd.fdct.walsh_short4x4            = vp8_short_walsh4x4_armv6;
 
         /*cpi->rtcd.encodemb.berr                  = vp8_block_error_c;
@@ -79,36 +52,10 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
 #if HAVE_ARMV7
     if (flags & HAS_NEON)
     {
-        cpi->rtcd.variance.sad16x16              = vp8_sad16x16_neon;
-        cpi->rtcd.variance.sad16x8               = vp8_sad16x8_neon;
-        cpi->rtcd.variance.sad8x16               = vp8_sad8x16_neon;
-        cpi->rtcd.variance.sad8x8                = vp8_sad8x8_neon;
-        cpi->rtcd.variance.sad4x4                = vp8_sad4x4_neon;
-
-        /*cpi->rtcd.variance.var4x4                = vp8_variance4x4_c;*/
-        cpi->rtcd.variance.var8x8                = vp8_variance8x8_neon;
-        cpi->rtcd.variance.var8x16               = vp8_variance8x16_neon;
-        cpi->rtcd.variance.var16x8               = vp8_variance16x8_neon;
-        cpi->rtcd.variance.var16x16              = vp8_variance16x16_neon;
-
-        /*cpi->rtcd.variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;*/
-        cpi->rtcd.variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_neon;
-        /*cpi->rtcd.variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
-        cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;*/
-        cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_neon;
-        cpi->rtcd.variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_neon;
-        cpi->rtcd.variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_neon;
-        cpi->rtcd.variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_neon;
-
-        cpi->rtcd.variance.mse16x16              = vp8_mse16x16_neon;
-        /*cpi->rtcd.variance.getmbss               = vp8_get_mb_ss_c;*/
-
-        cpi->rtcd.variance.get4x4sse_cs          = vp8_get4x4sse_cs_neon;
-
         cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_neon;
         cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_neon;
-        cpi->rtcd.fdct.fast4x4                   = vp8_fast_fdct4x4_neon;
-        cpi->rtcd.fdct.fast8x4                   = vp8_fast_fdct8x4_neon;
+        cpi->rtcd.fdct.fast4x4                   = vp8_short_fdct4x4_neon;
+        cpi->rtcd.fdct.fast8x4                   = vp8_short_fdct8x4_neon;
         cpi->rtcd.fdct.walsh_short4x4            = vp8_short_walsh4x4_neon;
 
         /*cpi->rtcd.encodemb.berr                  = vp8_block_error_c;
@@ -123,15 +70,15 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
         cpi->rtcd.quantize.fastquantb            = vp8_fast_quantize_b_neon;
         cpi->rtcd.quantize.fastquantb_pair       = vp8_fast_quantize_b_pair_neon;
     }
-#endif
+#endif /* HAVE_ARMV7 */
+#endif /* CONFIG_RUNTIME_CPU_DETECT */
 
 #if HAVE_ARMV7
 #if CONFIG_RUNTIME_CPU_DETECT
     if (flags & HAS_NEON)
 #endif
     {
-        vp8_yv12_copy_partial_frame_ptr = vpxyv12_copy_partial_frame_neon;
+        vp8_yv12_copy_partial_frame_ptr = vp8_yv12_copy_partial_frame_neon;
     }
 #endif
-#endif
 }
diff --git a/media/libvpx/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm b/media/libvpx/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm
new file mode 100644
index 00000000000..5b7e8f66f2a
--- /dev/null
+++ b/media/libvpx/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm
@@ -0,0 +1,311 @@
+;
+;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+;
+;  Use of this source code is governed by a BSD-style license
+;  that can be found in the LICENSE file in the root of the source
+;  tree. An additional intellectual property rights grant can be found
+;  in the file PATENTS.  All contributing project authors may
+;  be found in the AUTHORS file in the root of the source tree.
+;
+
+
+    EXPORT |vp8_start_encode|
+    EXPORT |vp8_encode_bool|
+    EXPORT |vp8_stop_encode|
+    EXPORT |vp8_encode_value|
+    IMPORT |vp8_validate_buffer_arm|
+
+    INCLUDE asm_enc_offsets.asm
+
+    ARM
+    REQUIRE8
+    PRESERVE8
+
+    AREA    |.text|, CODE, READONLY
+
+    ; macro for validating write buffer position
+    ; needs vp8_writer in r0
+    ; start shall not be in r1
+    MACRO
+    VALIDATE_POS $start, $pos
+    push {r0-r3, r12, lr}        ; rest of regs are preserved by subroutine call
+    ldr  r2, [r0, #vp8_writer_buffer_end]
+    ldr  r3, [r0, #vp8_writer_error]
+    mov  r1, $pos
+    mov  r0, $start
+    bl   vp8_validate_buffer_arm
+    pop  {r0-r3, r12, lr}
+    MEND
+
+; r0 BOOL_CODER *br
+; r1 unsigned char *source
+; r2 unsigned char *source_end
+|vp8_start_encode| PROC
+    str     r2,  [r0, #vp8_writer_buffer_end]
+    mov     r12, #0
+    mov     r3,  #255
+    mvn     r2,  #23
+    str     r12, [r0, #vp8_writer_lowvalue]
+    str     r3,  [r0, #vp8_writer_range]
+    str     r12, [r0, #vp8_writer_value]
+    str     r2,  [r0, #vp8_writer_count]
+    str     r12, [r0, #vp8_writer_pos]
+    str     r1,  [r0, #vp8_writer_buffer]
+    bx      lr
+    ENDP
+
+; r0 BOOL_CODER *br
+; r1 int bit
+; r2 int probability
+|vp8_encode_bool| PROC
+    push    {r4-r10, lr}
+
+    mov     r4, r2
+
+    ldr     r2, [r0, #vp8_writer_lowvalue]
+    ldr     r5, [r0, #vp8_writer_range]
+    ldr     r3, [r0, #vp8_writer_count]
+
+    sub     r7, r5, #1                  ; range-1
+
+    cmp     r1, #0
+    mul     r6, r4, r7                  ; ((range-1) * probability)
+
+    mov     r7, #1
+    add     r4, r7, r6, lsr #8          ; 1 + (((range-1) * probability) >> 8)
+
+    addne   r2, r2, r4                  ; if  (bit) lowvalue += split
+    subne   r4, r5, r4                  ; if  (bit) range = range-split
+
+    ; Counting the leading zeros is used to normalize range.
+    clz     r6, r4
+    sub     r6, r6, #24                 ; shift
+
+    ; Flag is set on the sum of count.  This flag is used later
+    ; to determine if count >= 0
+    adds    r3, r3, r6                  ; count += shift
+    lsl     r5, r4, r6                  ; range <<= shift
+    bmi     token_count_lt_zero         ; if(count >= 0)
+
+    sub     r6, r6, r3                  ; offset = shift - count
+    sub     r4, r6, #1                  ; offset-1
+    lsls    r4, r2, r4                  ; if((lowvalue<<(offset-1)) & 0x80000000 )
+    bpl     token_high_bit_not_set
+
+    ldr     r4, [r0, #vp8_writer_pos]   ; x
+    sub     r4, r4, #1                  ; x = w->pos-1
+    b       token_zero_while_start
+token_zero_while_loop
+    mov     r9, #0
+    strb    r9, [r7, r4]                ; w->buffer[x] =(unsigned char)0
+    sub     r4, r4, #1                  ; x--
+token_zero_while_start
+    cmp     r4, #0
+    ldrge   r7, [r0, #vp8_writer_buffer]
+    ldrb    r1, [r7, r4]
+    cmpge   r1, #0xff
+    beq     token_zero_while_loop
+
+    ldr     r7, [r0, #vp8_writer_buffer]
+    ldrb    r9, [r7, r4]                ; w->buffer[x]
+    add     r9, r9, #1
+    strb    r9, [r7, r4]                ; w->buffer[x] + 1
+token_high_bit_not_set
+    rsb     r4, r6, #24                 ; 24-offset
+    ldr     r9, [r0, #vp8_writer_buffer]
+    lsr     r7, r2, r4                  ; lowvalue >> (24-offset)
+    ldr     r4, [r0, #vp8_writer_pos]   ; w->pos
+    lsl     r2, r2, r6                  ; lowvalue <<= offset
+    mov     r6, r3                      ; shift = count
+    add     r1, r4, #1                  ; w->pos++
+    bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
+    str     r1, [r0, #vp8_writer_pos]
+    sub     r3, r3, #8                  ; count -= 8
+
+    VALIDATE_POS r9, r1                 ; validate_buffer at pos
+
+    strb    r7, [r9, r4]                ; w->buffer[w->pos++]
+
+token_count_lt_zero
+    lsl     r2, r2, r6                  ; lowvalue <<= shift
+
+    str     r2, [r0, #vp8_writer_lowvalue]
+    str     r5, [r0, #vp8_writer_range]
+    str     r3, [r0, #vp8_writer_count]
+    pop     {r4-r10, pc}
+    ENDP
+
+; r0 BOOL_CODER *br
+|vp8_stop_encode| PROC
+    push    {r4-r10, lr}
+
+    ldr     r2, [r0, #vp8_writer_lowvalue]
+    ldr     r5, [r0, #vp8_writer_range]
+    ldr     r3, [r0, #vp8_writer_count]
+
+    mov     r10, #32
+
+stop_encode_loop
+    sub     r7, r5, #1                  ; range-1
+
+    mov     r4, r7, lsl #7              ; ((range-1) * 128)
+
+    mov     r7, #1
+    add     r4, r7, r4, lsr #8          ; 1 + (((range-1) * 128) >> 8)
+
+    ; Counting the leading zeros is used to normalize range.
+    clz     r6, r4
+    sub     r6, r6, #24                 ; shift
+
+    ; Flag is set on the sum of count.  This flag is used later
+    ; to determine if count >= 0
+    adds    r3, r3, r6                  ; count += shift
+    lsl     r5, r4, r6                  ; range <<= shift
+    bmi     token_count_lt_zero_se      ; if(count >= 0)
+
+    sub     r6, r6, r3                  ; offset = shift - count
+    sub     r4, r6, #1                  ; offset-1
+    lsls    r4, r2, r4                  ; if((lowvalue<<(offset-1)) & 0x80000000 )
+    bpl     token_high_bit_not_set_se
+
+    ldr     r4, [r0, #vp8_writer_pos]   ; x
+    sub     r4, r4, #1                  ; x = w->pos-1
+    b       token_zero_while_start_se
+token_zero_while_loop_se
+    mov     r9, #0
+    strb    r9, [r7, r4]                ; w->buffer[x] =(unsigned char)0
+    sub     r4, r4, #1                  ; x--
+token_zero_while_start_se
+    cmp     r4, #0
+    ldrge   r7, [r0, #vp8_writer_buffer]
+    ldrb    r1, [r7, r4]
+    cmpge   r1, #0xff
+    beq     token_zero_while_loop_se
+
+    ldr     r7, [r0, #vp8_writer_buffer]
+    ldrb    r9, [r7, r4]                ; w->buffer[x]
+    add     r9, r9, #1
+    strb    r9, [r7, r4]                ; w->buffer[x] + 1
+token_high_bit_not_set_se
+    rsb     r4, r6, #24                 ; 24-offset
+    ldr     r9, [r0, #vp8_writer_buffer]
+    lsr     r7, r2, r4                  ; lowvalue >> (24-offset)
+    ldr     r4, [r0, #vp8_writer_pos]   ; w->pos
+    lsl     r2, r2, r6                  ; lowvalue <<= offset
+    mov     r6, r3                      ; shift = count
+    add     r1, r4, #1                  ; w->pos++
+    bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
+    str     r1, [r0, #vp8_writer_pos]
+    sub     r3, r3, #8                  ; count -= 8
+
+    VALIDATE_POS r9, r1                 ; validate_buffer at pos
+
+    strb    r7, [r9, r4]                ; w->buffer[w->pos++]
+
+token_count_lt_zero_se
+    lsl     r2, r2, r6                  ; lowvalue <<= shift
+
+    subs    r10, r10, #1
+    bne     stop_encode_loop
+
+    str     r2, [r0, #vp8_writer_lowvalue]
+    str     r5, [r0, #vp8_writer_range]
+    str     r3, [r0, #vp8_writer_count]
+    pop     {r4-r10, pc}
+
+    ENDP
+
+; r0 BOOL_CODER *br
+; r1 int data
+; r2 int bits
+|vp8_encode_value| PROC
+    push    {r4-r12, lr}
+
+    mov     r10, r2
+
+    ldr     r2, [r0, #vp8_writer_lowvalue]
+    ldr     r5, [r0, #vp8_writer_range]
+    ldr     r3, [r0, #vp8_writer_count]
+
+    rsb     r4, r10, #32                 ; 32-n
+
+    ; v is kept in r1 during the token pack loop
+    lsl     r1, r1, r4                  ; r1 = v << 32 - n
+
+encode_value_loop
+    sub     r7, r5, #1                  ; range-1
+
+    ; Decisions are made based on the bit value shifted
+    ; off of v, so set a flag here based on this.
+    ; This value is refered to as "bb"
+    lsls    r1, r1, #1                  ; bit = v >> n
+    mov     r4, r7, lsl #7              ; ((range-1) * 128)
+
+    mov     r7, #1
+    add     r4, r7, r4, lsr #8          ; 1 + (((range-1) * 128) >> 8)
+
+    addcs   r2, r2, r4                  ; if  (bit) lowvalue += split
+    subcs   r4, r5, r4                  ; if  (bit) range = range-split
+
+    ; Counting the leading zeros is used to normalize range.
+    clz     r6, r4
+    sub     r6, r6, #24                 ; shift
+
+    ; Flag is set on the sum of count.  This flag is used later
+    ; to determine if count >= 0
+    adds    r3, r3, r6                  ; count += shift
+    lsl     r5, r4, r6                  ; range <<= shift
+    bmi     token_count_lt_zero_ev      ; if(count >= 0)
+
+    sub     r6, r6, r3                  ; offset = shift - count
+    sub     r4, r6, #1                  ; offset-1
+    lsls    r4, r2, r4                  ; if((lowvalue<<(offset-1)) & 0x80000000 )
+    bpl     token_high_bit_not_set_ev
+
+    ldr     r4, [r0, #vp8_writer_pos]   ; x
+    sub     r4, r4, #1                  ; x = w->pos-1
+    b       token_zero_while_start_ev
+token_zero_while_loop_ev
+    mov     r9, #0
+    strb    r9, [r7, r4]                ; w->buffer[x] =(unsigned char)0
+    sub     r4, r4, #1                  ; x--
+token_zero_while_start_ev
+    cmp     r4, #0
+    ldrge   r7, [r0, #vp8_writer_buffer]
+    ldrb    r11, [r7, r4]
+    cmpge   r11, #0xff
+    beq     token_zero_while_loop_ev
+
+    ldr     r7, [r0, #vp8_writer_buffer]
+    ldrb    r9, [r7, r4]                ; w->buffer[x]
+    add     r9, r9, #1
+    strb    r9, [r7, r4]                ; w->buffer[x] + 1
+token_high_bit_not_set_ev
+    rsb     r4, r6, #24                 ; 24-offset
+    ldr     r9, [r0, #vp8_writer_buffer]
+    lsr     r7, r2, r4                  ; lowvalue >> (24-offset)
+    ldr     r4, [r0, #vp8_writer_pos]   ; w->pos
+    lsl     r2, r2, r6                  ; lowvalue <<= offset
+    mov     r6, r3                      ; shift = count
+    add     r11, r4, #1                 ; w->pos++
+    bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
+    str     r11, [r0, #vp8_writer_pos]
+    sub     r3, r3, #8                  ; count -= 8
+
+    VALIDATE_POS r9, r11                ; validate_buffer at pos
+
+    strb    r7, [r9, r4]                ; w->buffer[w->pos++]
+
+token_count_lt_zero_ev
+    lsl     r2, r2, r6                  ; lowvalue <<= shift
+
+    subs    r10, r10, #1
+    bne     encode_value_loop
+
+    str     r2, [r0, #vp8_writer_lowvalue]
+    str     r5, [r0, #vp8_writer_range]
+    str     r3, [r0, #vp8_writer_count]
+    pop     {r4-r12, pc}
+    ENDP
+
+    END
diff --git a/media/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_armv5.asm b/media/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_armv5.asm
index d939287ff0b..a1cd4670462 100644
--- a/media/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_armv5.asm
+++ b/media/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_armv5.asm
@@ -10,6 +10,7 @@
 
 
     EXPORT |vp8cx_pack_tokens_armv5|
+    IMPORT |vp8_validate_buffer_arm|
 
     INCLUDE asm_enc_offsets.asm
 
@@ -19,6 +20,22 @@
 
     AREA    |.text|, CODE, READONLY
 
+
+    ; macro for validating write buffer position
+    ; needs vp8_writer in r0
+    ; start shall not be in r1
+    MACRO
+    VALIDATE_POS $start, $pos
+    push {r0-r3, r12, lr}        ; rest of regs are preserved by subroutine call
+    ldr  r2, [r0, #vp8_writer_buffer_end]
+    ldr  r3, [r0, #vp8_writer_error]
+    mov  r1, $pos
+    mov  r0, $start
+    bl   vp8_validate_buffer_arm
+    pop  {r0-r3, r12, lr}
+    MEND
+
+
 ; r0 vp8_writer *w
 ; r1 const TOKENEXTRA *p
 ; r2 int xcount
@@ -26,11 +43,11 @@
 ; s0 vp8_extra_bits
 ; s1 vp8_coef_tree
 |vp8cx_pack_tokens_armv5| PROC
-    push    {r4-r11, lr}
+    push    {r4-r12, lr}
+    sub     sp, sp, #16
 
     ; Add size of xcount * sizeof (TOKENEXTRA) to get stop
     ;  sizeof (TOKENEXTRA) is 8
-    sub     sp, sp, #12
     add     r2, r1, r2, lsl #3          ; stop = p + xcount*sizeof(TOKENEXTRA)
     str     r2, [sp, #0]
     str     r3, [sp, #8]                ; save vp8_coef_encodings
@@ -57,7 +74,7 @@ while_p_lt_stop
     subne   r8, r8, #1                  ; --n
 
     rsb     r4, r8, #32                 ; 32-n
-    ldr     r10, [sp, #52]              ; vp8_coef_tree
+    ldr     r10, [sp, #60]              ; vp8_coef_tree
 
     ; v is kept in r12 during the token pack loop
     lsl     r12, r6, r4                ; r12 = v << 32 - n
@@ -71,7 +88,7 @@ token_loop
     ; off of v, so set a flag here based on this.
     ; This value is refered to as "bb"
     lsls    r12, r12, #1                ; bb = v >> n
-    mul     r4, r4, r7                  ; ((range-1) * pp[i>>1]))
+    mul     r6, r4, r7                  ; ((range-1) * pp[i>>1]))
 
     ; bb can only be 0 or 1.  So only execute this statement
     ; if bb == 1, otherwise it will act like i + 0
@@ -79,7 +96,7 @@ token_loop
 
     mov     r7, #1
     ldrsb   lr, [r10, lr]               ; i = vp8_coef_tree[i+bb]
-    add     r4, r7, r4, lsr #8          ; 1 + (((range-1) * pp[i>>1]) >> 8)
+    add     r4, r7, r6, lsr #8          ; 1 + (((range-1) * pp[i>>1]) >> 8)
 
     addcs   r2, r2, r4                  ; if  (bb) lowvalue += split
     subcs   r4, r5, r4                  ; if  (bb) range = range-split
@@ -128,12 +145,15 @@ token_high_bit_not_set
     bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
     str     r11, [r0, #vp8_writer_pos]
     sub     r3, r3, #8                  ; count -= 8
+
+    VALIDATE_POS r10, r11               ; validate_buffer at pos
+
     strb    r7, [r10, r4]               ; w->buffer[w->pos++]
 
     ; r10 is used earlier in the loop, but r10 is used as
     ; temp variable here.  So after r10 is used, reload
     ; vp8_coef_tree_dcd into r10
-    ldr     r10, [sp, #52]              ; vp8_coef_tree
+    ldr     r10, [sp, #60]              ; vp8_coef_tree
 
 token_count_lt_zero
     lsl     r2, r2, r6                  ; lowvalue <<= shift
@@ -142,7 +162,7 @@ token_count_lt_zero
     bne     token_loop
 
     ldrb    r6, [r1, #tokenextra_token] ; t
-    ldr     r7, [sp, #48]               ; vp8_extra_bits
+    ldr     r7, [sp, #56]               ; vp8_extra_bits
     ; Add t * sizeof (vp8_extra_bit_struct) to get the desired
     ;  element.  Here vp8_extra_bit_struct == 16
     add     r12, r7, r6, lsl #4         ; b = vp8_extra_bits + t
@@ -172,12 +192,12 @@ extra_bits_loop
     ldrb    r4, [r9, lr, asr #1]            ; pp[i>>1]
     sub     r7, r5, #1                  ; range-1
     lsls    r12, r12, #1                ; v >> n
-    mul     r4, r4, r7                  ; (range-1) * pp[i>>1]
+    mul     r6, r4, r7                  ; (range-1) * pp[i>>1]
     addcs   lr, lr, #1                  ; i + bb
 
     mov     r7, #1
     ldrsb   lr, [r10, lr]               ; i = b->tree[i+bb]
-    add     r4, r7, r4, lsr #8          ; split = 1 +  (((range-1) * pp[i>>1]) >> 8)
+    add     r4, r7, r6, lsr #8          ; split = 1 +  (((range-1) * pp[i>>1]) >> 8)
 
     addcs   r2, r2, r4                  ; if  (bb) lowvalue += split
     subcs   r4, r5, r4                  ; if  (bb) range = range-split
@@ -223,6 +243,9 @@ extra_high_bit_not_set
     bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
     str     r11, [r0, #vp8_writer_pos]
     sub     r3, r3, #8                  ; count -= 8
+
+    VALIDATE_POS r10, r11               ; validate_buffer at pos
+
     strb    r7, [r10, r4]               ; w->buffer[w->pos++]=(lowvalue >> (24-offset))
     ldr     r10, [sp, #4]               ; b->tree
 extra_count_lt_zero
@@ -271,7 +294,10 @@ end_high_bit_not_set
     lsr     r6, r2, #24                 ; lowvalue >> 24
     add     r12, r4, #1                 ; w->pos++
     bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
-    str     r12, [r0, #0x10]
+    str     r12, [r0, #vp8_writer_pos]
+
+    VALIDATE_POS r7, r12               ; validate_buffer at pos
+
     strb    r6, [r7, r4]
 end_count_zero
 skip_extra_bits
@@ -284,8 +310,8 @@ check_p_lt_stop
     str     r2, [r0, #vp8_writer_lowvalue]
     str     r5, [r0, #vp8_writer_range]
     str     r3, [r0, #vp8_writer_count]
-    add     sp, sp, #12
-    pop     {r4-r11, pc}
+    add     sp, sp, #16
+    pop     {r4-r12, pc}
     ENDP
 
     END
diff --git a/media/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm b/media/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm
index ac2bba681a4..1fa5e6c227f 100644
--- a/media/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm
+++ b/media/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm
@@ -10,6 +10,7 @@
 
 
     EXPORT |vp8cx_pack_mb_row_tokens_armv5|
+    IMPORT |vp8_validate_buffer_arm|
 
     INCLUDE asm_enc_offsets.asm
 
@@ -19,6 +20,21 @@
 
     AREA    |.text|, CODE, READONLY
 
+
+    ; macro for validating write buffer position
+    ; needs vp8_writer in r0
+    ; start shall not be in r1
+    MACRO
+    VALIDATE_POS $start, $pos
+    push {r0-r3, r12, lr}        ; rest of regs are preserved by subroutine call
+    ldr  r2, [r0, #vp8_writer_buffer_end]
+    ldr  r3, [r0, #vp8_writer_error]
+    mov  r1, $pos
+    mov  r0, $start
+    bl   vp8_validate_buffer_arm
+    pop  {r0-r3, r12, lr}
+    MEND
+
 ; r0 VP8_COMP *cpi
 ; r1 vp8_writer *w
 ; r2 vp8_coef_encodings
@@ -26,7 +42,7 @@
 ; s0 vp8_coef_tree
 
 |vp8cx_pack_mb_row_tokens_armv5| PROC
-    push    {r4-r11, lr}
+    push    {r4-r12, lr}
     sub     sp, sp, #24
 
     ; Compute address of cpi->common.mb_rows
@@ -79,7 +95,7 @@ while_p_lt_stop
     subne   r8, r8, #1                  ; --n
 
     rsb     r4, r8, #32                 ; 32-n
-    ldr     r10, [sp, #60]              ; vp8_coef_tree
+    ldr     r10, [sp, #64]              ; vp8_coef_tree
 
     ; v is kept in r12 during the token pack loop
     lsl     r12, r6, r4                 ; r12 = v << 32 - n
@@ -93,7 +109,7 @@ token_loop
     ; off of v, so set a flag here based on this.
     ; This value is refered to as "bb"
     lsls    r12, r12, #1                ; bb = v >> n
-    mul     r4, r4, r7                  ; ((range-1) * pp[i>>1]))
+    mul     r6, r4, r7                  ; ((range-1) * pp[i>>1]))
 
     ; bb can only be 0 or 1.  So only execute this statement
     ; if bb == 1, otherwise it will act like i + 0
@@ -101,7 +117,7 @@ token_loop
 
     mov     r7, #1
     ldrsb   lr, [r10, lr]               ; i = vp8_coef_tree[i+bb]
-    add     r4, r7, r4, lsr #8          ; 1 + (((range-1) * pp[i>>1]) >> 8)
+    add     r4, r7, r6, lsr #8          ; 1 + (((range-1) * pp[i>>1]) >> 8)
 
     addcs   r2, r2, r4                  ; if  (bb) lowvalue += split
     subcs   r4, r5, r4                  ; if  (bb) range = range-split
@@ -150,12 +166,15 @@ token_high_bit_not_set
     bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
     str     r11, [r0, #vp8_writer_pos]
     sub     r3, r3, #8                  ; count -= 8
+
+    VALIDATE_POS r10, r11               ; validate_buffer at pos
+
     strb    r7, [r10, r4]               ; w->buffer[w->pos++]
 
     ; r10 is used earlier in the loop, but r10 is used as
     ; temp variable here.  So after r10 is used, reload
     ; vp8_coef_tree_dcd into r10
-    ldr     r10, [sp, #60]              ; vp8_coef_tree
+    ldr     r10, [sp, #64]              ; vp8_coef_tree
 
 token_count_lt_zero
     lsl     r2, r2, r6                  ; lowvalue <<= shift
@@ -194,12 +213,12 @@ extra_bits_loop
     ldrb    r4, [r9, lr, asr #1]            ; pp[i>>1]
     sub     r7, r5, #1                  ; range-1
     lsls    r12, r12, #1                ; v >> n
-    mul     r4, r4, r7                  ; (range-1) * pp[i>>1]
+    mul     r6, r4, r7                  ; (range-1) * pp[i>>1]
     addcs   lr, lr, #1                  ; i + bb
 
     mov     r7, #1
     ldrsb   lr, [r10, lr]               ; i = b->tree[i+bb]
-    add     r4, r7, r4, lsr #8          ; split = 1 +  (((range-1) * pp[i>>1]) >> 8)
+    add     r4, r7, r6, lsr #8          ; split = 1 +  (((range-1) * pp[i>>1]) >> 8)
 
     addcs   r2, r2, r4                  ; if  (bb) lowvalue += split
     subcs   r4, r5, r4                  ; if  (bb) range = range-split
@@ -245,6 +264,9 @@ extra_high_bit_not_set
     bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
     str     r11, [r0, #vp8_writer_pos]
     sub     r3, r3, #8                  ; count -= 8
+
+    VALIDATE_POS r10, r11               ; validate_buffer at pos
+
     strb    r7, [r10, r4]               ; w->buffer[w->pos++]=(lowvalue >> (24-offset))
     ldr     r10, [sp, #4]               ; b->tree
 extra_count_lt_zero
@@ -293,7 +315,10 @@ end_high_bit_not_set
     lsr     r6, r2, #24                 ; lowvalue >> 24
     add     r12, r4, #1                 ; w->pos++
     bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
-    str     r12, [r0, #0x10]
+    str     r12, [r0, #vp8_writer_pos]
+
+    VALIDATE_POS r7, r12               ; validate_buffer at pos
+
     strb    r6, [r7, r4]
 end_count_zero
 skip_extra_bits
@@ -314,7 +339,7 @@ check_p_lt_stop
     str     r5, [r0, #vp8_writer_range]
     str     r3, [r0, #vp8_writer_count]
     add     sp, sp, #24
-    pop     {r4-r11, pc}
+    pop     {r4-r12, pc}
     ENDP
 
 _VP8_COMP_common_
diff --git a/media/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm b/media/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
index c2eccdb53e1..3a183aa2f0d 100644
--- a/media/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
+++ b/media/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
@@ -10,6 +10,7 @@
 
 
     EXPORT |vp8cx_pack_tokens_into_partitions_armv5|
+    IMPORT |vp8_validate_buffer_arm|
 
     INCLUDE asm_enc_offsets.asm
 
@@ -19,17 +20,31 @@
 
     AREA    |.text|, CODE, READONLY
 
+    ; macro for validating write buffer position
+    ; needs vp8_writer in r0
+    ; start shall not be in r1
+    MACRO
+    VALIDATE_POS $start, $pos
+    push {r0-r3, r12, lr}        ; rest of regs are preserved by subroutine call
+    ldr  r2, [r0, #vp8_writer_buffer_end]
+    ldr  r3, [r0, #vp8_writer_error]
+    mov  r1, $pos
+    mov  r0, $start
+    bl   vp8_validate_buffer_arm
+    pop  {r0-r3, r12, lr}
+    MEND
+
 ; r0 VP8_COMP *cpi
 ; r1 unsigned char *cx_data
-; r2 int num_part
-; r3 *size
+; r2 const unsigned char *cx_data_end
+; r3 int num_part
 ; s0 vp8_coef_encodings
 ; s1 vp8_extra_bits,
-; s2 const vp8_tree_index *,
+; s2 const vp8_tree_index *
 
 |vp8cx_pack_tokens_into_partitions_armv5| PROC
-    push    {r4-r11, lr}
-    sub     sp, sp, #44
+    push    {r4-r12, lr}
+    sub     sp, sp, #40
 
     ; Compute address of cpi->common.mb_rows
     ldr     r4, _VP8_COMP_common_
@@ -39,39 +54,38 @@
     ldr     r5, [r4, r6]                ; load up mb_rows
 
     str     r5, [sp, #36]               ; save mb_rows
-    str     r1, [sp, #24]               ; save cx_data
-    str     r2, [sp, #20]               ; save num_part
-    str     r3, [sp, #8]                ; save *size
-
-    ; *size = 3*(num_part -1 );
-    sub     r2, r2, #1                  ; num_part - 1
-    add     r2, r2, r2, lsl #1          ; 3*(num_part - 1)
-    str     r2, [r3]
-
-    add     r2, r2, r1                  ; cx_data + *size
-    str     r2, [sp, #40]               ; ptr
+    str     r1, [sp, #24]               ; save ptr = cx_data
+    str     r3, [sp, #20]               ; save num_part
+    str     r2, [sp, #8]                ; save cx_data_end
 
     ldr     r4, _VP8_COMP_tplist_
     add     r4, r0, r4
     ldr     r7, [r4, #0]                ; dereference cpi->tp_list
     str     r7, [sp, #32]               ; store start of cpi->tp_list
 
-    ldr     r11, _VP8_COMP_bc2_         ; load up vp8_writer out of cpi
+    ldr     r11, _VP8_COMP_bc_          ; load up vp8_writer out of cpi
     add     r0, r0, r11
 
     mov     r11, #0
     str     r11, [sp, #28]              ; i
 
 numparts_loop
-    ldr     r10, [sp, #40]              ; ptr
+    ldr     r2, _vp8_writer_sz_         ; load up sizeof(vp8_writer)
+    add     r0, r2                      ; bc[i + 1]
+
+    ldr     r10, [sp, #24]              ; ptr
     ldr     r5,  [sp, #36]              ; move mb_rows to the counting section
-    sub     r5, r5, r11                 ; move start point with each partition
+    subs    r5, r5, r11                 ; move start point with each partition
                                         ; mb_rows starts at i
     str     r5,  [sp, #12]
 
     ; Reset all of the VP8 Writer data for each partition that
     ; is processed.
     ; start_encode
+
+    ldr     r3, [sp, #8]
+    str     r3, [r0, #vp8_writer_buffer_end]
+
     mov     r2, #0                      ; vp8_writer_lowvalue
     mov     r5, #255                    ; vp8_writer_range
     mvn     r3, #23                     ; vp8_writer_count
@@ -80,6 +94,8 @@ numparts_loop
     str     r2,  [r0, #vp8_writer_pos]
     str     r10, [r0, #vp8_writer_buffer]
 
+    ble     end_partition               ; if (mb_rows <= 0) end partition
+
 mb_row_loop
 
     ldr     r1, [r7, #tokenlist_start]
@@ -123,7 +139,7 @@ token_loop
     ; off of v, so set a flag here based on this.
     ; This value is refered to as "bb"
     lsls    r12, r12, #1                ; bb = v >> n
-    mul     r4, r4, r7                  ; ((range-1) * pp[i>>1]))
+    mul     r6, r4, r7                  ; ((range-1) * pp[i>>1]))
 
     ; bb can only be 0 or 1.  So only execute this statement
     ; if bb == 1, otherwise it will act like i + 0
@@ -131,7 +147,7 @@ token_loop
 
     mov     r7, #1
     ldrsb   lr, [r10, lr]               ; i = vp8_coef_tree[i+bb]
-    add     r4, r7, r4, lsr #8          ; 1 + (((range-1) * pp[i>>1]) >> 8)
+    add     r4, r7, r6, lsr #8          ; 1 + (((range-1) * pp[i>>1]) >> 8)
 
     addcs   r2, r2, r4                  ; if  (bb) lowvalue += split
     subcs   r4, r5, r4                  ; if  (bb) range = range-split
@@ -180,6 +196,9 @@ token_high_bit_not_set
     bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
     str     r11, [r0, #vp8_writer_pos]
     sub     r3, r3, #8                  ; count -= 8
+
+    VALIDATE_POS r10, r11               ; validate_buffer at pos
+
     strb    r7, [r10, r4]               ; w->buffer[w->pos++]
 
     ; r10 is used earlier in the loop, but r10 is used as
@@ -224,12 +243,12 @@ extra_bits_loop
     ldrb    r4, [r9, lr, asr #1]        ; pp[i>>1]
     sub     r7, r5, #1                  ; range-1
     lsls    r12, r12, #1                ; v >> n
-    mul     r4, r4, r7                  ; (range-1) * pp[i>>1]
+    mul     r6, r4, r7                  ; (range-1) * pp[i>>1]
     addcs   lr, lr, #1                  ; i + bb
 
     mov     r7, #1
     ldrsb   lr, [r10, lr]               ; i = b->tree[i+bb]
-    add     r4, r7, r4, lsr #8          ; split = 1 +  (((range-1) * pp[i>>1]) >> 8)
+    add     r4, r7, r6, lsr #8          ; split = 1 +  (((range-1) * pp[i>>1]) >> 8)
 
     addcs   r2, r2, r4                  ; if  (bb) lowvalue += split
     subcs   r4, r5, r4                  ; if  (bb) range = range-split
@@ -275,6 +294,9 @@ extra_high_bit_not_set
     bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
     str     r11, [r0, #vp8_writer_pos]
     sub     r3, r3, #8                  ; count -= 8
+
+    VALIDATE_POS r10, r11               ; validate_buffer at pos
+
     strb    r7, [r10, r4]               ; w->buffer[w->pos++]=(lowvalue >> (24-offset))
     ldr     r10, [sp, #4]               ; b->tree
 extra_count_lt_zero
@@ -318,12 +340,15 @@ end_high_bit_not_set
     bne     end_count_zero
 
     ldr     r4, [r0, #vp8_writer_pos]
-    mvn     r3, #7
+    mvn     r3, #7                      ; count = -8
     ldr     r7, [r0, #vp8_writer_buffer]
     lsr     r6, r2, #24                 ; lowvalue >> 24
     add     r12, r4, #1                 ; w->pos++
     bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
-    str     r12, [r0, #0x10]
+    str     r12, [r0, #vp8_writer_pos]
+
+    VALIDATE_POS r7, r12                ; validate_buffer at pos
+
     strb    r6, [r7, r4]
 end_count_zero
 skip_extra_bits
@@ -344,6 +369,7 @@ check_p_lt_stop
     str     r6, [sp, #12]
     bgt     mb_row_loop
 
+end_partition
     mov     r12, #32
 
 stop_encode_loop
@@ -398,6 +424,9 @@ token_high_bit_not_set_se
     bic     r2, r2, #0xff000000         ; lowvalue &= 0xffffff
     str     r11, [r0, #vp8_writer_pos]
     sub     r3, r3, #8                  ; count -= 8
+
+    VALIDATE_POS r10, r11               ; validate_buffer at pos
+
     strb    r7, [r10, r4]               ; w->buffer[w->pos++]
 
 token_count_lt_zero_se
@@ -406,33 +435,10 @@ token_count_lt_zero_se
     subs    r12, r12, #1
     bne     stop_encode_loop
 
-    ldr     r10, [sp, #8]               ; *size
-    ldr     r11, [r10]
     ldr     r4,  [r0, #vp8_writer_pos]  ; w->pos
-    add     r11, r11, r4                ; *size += w->pos
-    str     r11, [r10]
-
-    ldr     r9, [sp, #20]               ; num_parts
-    sub     r9, r9, #1
-    ldr     r10, [sp, #28]              ; i
-    cmp     r10, r9                     ; if(i<(num_part - 1))
-    bge     skip_write_partition
-
-    ldr     r12, [sp, #40]              ; ptr
+    ldr     r12, [sp, #24]              ; ptr
     add     r12, r12, r4                ; ptr += w->pos
-    str     r12, [sp, #40]
-
-    ldr     r9, [sp, #24]               ; cx_data
-    mov     r8, r4, asr #8
-    strb    r4, [r9, #0]
-    strb    r8, [r9, #1]
-    mov     r4, r4, asr #16
-    strb    r4, [r9, #2]
-
-    add     r9, r9, #3                  ; cx_data += 3
-    str     r9, [sp, #24]
-
-skip_write_partition
+    str     r12, [sp, #24]
 
     ldr     r11, [sp, #28]              ; i
     ldr     r10, [sp, #20]              ; num_parts
@@ -448,9 +454,8 @@ skip_write_partition
     cmp     r10, r11
     bgt     numparts_loop
 
-
-    add     sp, sp, #44
-    pop     {r4-r11, pc}
+    add     sp, sp, #40
+    pop     {r4-r12, pc}
     ENDP
 
 _VP8_COMP_common_
@@ -459,7 +464,9 @@ _VP8_COMMON_MBrows_
     DCD     vp8_common_mb_rows
 _VP8_COMP_tplist_
     DCD     vp8_comp_tplist
-_VP8_COMP_bc2_
-    DCD     vp8_comp_bc2
+_VP8_COMP_bc_
+    DCD     vp8_comp_bc
+_vp8_writer_sz_
+    DCD     vp8_writer_sz
 
     END
diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm b/media/libvpx/vp8/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm
index ae2f6030dc5..d61f5d94d8d 100644
--- a/media/libvpx/vp8/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm
+++ b/media/libvpx/vp8/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm
@@ -102,9 +102,10 @@ loop
     bne     loop
 
     ; PART 2: check position for eob...
+    ldr     r11, [sp, #0]           ; restore BLOCKD pointer
     mov     lr, #0                  ; init eob
     cmp     r1, #0                  ; coeffs after quantization?
-    ldr     r11, [sp, #0]           ; restore BLOCKD pointer
+    ldr     r12, [r11, #vp8_blockd_eob]
     beq     end                     ; skip eob calculations if all zero
 
     ldr     r0, [r11, #vp8_blockd_qcoeff]
@@ -212,7 +213,7 @@ quant_coeff_1_0
     mov     lr, #1              ; rc=0,  i=0
 
 end
-    str     lr, [r11, #vp8_blockd_eob]
+    strb    lr, [r12]
     ldmfd   sp!, {r1, r4-r11, pc}
 
     ENDP
diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_fast_fdct4x4_armv6.asm b/media/libvpx/vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm
similarity index 99%
rename from media/libvpx/vp8/encoder/arm/armv6/vp8_fast_fdct4x4_armv6.asm
rename to media/libvpx/vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm
index 65bd2b449a5..8034c1db9ad 100644
--- a/media/libvpx/vp8/encoder/arm/armv6/vp8_fast_fdct4x4_armv6.asm
+++ b/media/libvpx/vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm
@@ -8,7 +8,7 @@
 ;  be found in the AUTHORS file in the root of the source tree.
 ;
 
-    EXPORT |vp8_fast_fdct4x4_armv6|
+    EXPORT |vp8_short_fdct4x4_armv6|
 
     ARM
     REQUIRE8
@@ -16,7 +16,7 @@
 
     AREA    |.text|, CODE, READONLY
 ; void vp8_short_fdct4x4_c(short *input, short *output, int pitch)
-|vp8_fast_fdct4x4_armv6| PROC
+|vp8_short_fdct4x4_armv6| PROC
 
     stmfd       sp!, {r4 - r12, lr}
 
diff --git a/media/libvpx/vp8/encoder/arm/armv6/vp8_subtract_armv6.asm b/media/libvpx/vp8/encoder/arm/armv6/vp8_subtract_armv6.asm
index 0ca74387b8a..f329f8f730e 100644
--- a/media/libvpx/vp8/encoder/arm/armv6/vp8_subtract_armv6.asm
+++ b/media/libvpx/vp8/encoder/arm/armv6/vp8_subtract_armv6.asm
@@ -72,22 +72,23 @@ loop_block
 ; r0    short *diff
 ; r1    unsigned char *usrc
 ; r2    unsigned char *vsrc
-; r3    unsigned char *pred
-; stack int stride
+; r3    int src_stride
+; sp    unsigned char *upred
+; sp    unsigned char *vpred
+; sp    int pred_stride
 |vp8_subtract_mbuv_armv6| PROC
 
-    stmfd   sp!, {r4-r12, lr}
+    stmfd   sp!, {r4-r11}
 
     add     r0, r0, #512        ; set *diff point to Cb
-    add     r3, r3, #256        ; set *pred point to Cb
-
     mov     r4, #8              ; loop count
-    ldr     r5, [sp, #40]       ; stride
+    ldr     r5, [sp, #32]       ; upred
+    ldr     r12, [sp, #40]      ; pred_stride
 
     ; Subtract U block
 loop_u
-    ldr     r6, [r1]            ; src       (A)
-    ldr     r7, [r3], #4        ; pred      (A)
+    ldr     r6, [r1]            ; usrc      (A)
+    ldr     r7, [r5]            ; upred     (A)
 
     uxtb16  r8, r6              ; [s2 | s0] (A)
     uxtb16  r9, r7              ; [p2 | p0] (A)
@@ -97,8 +98,8 @@ loop_u
     usub16  r6, r8, r9          ; [d2 | d0] (A)
     usub16  r7, r10, r11        ; [d3 | d1] (A)
 
-    ldr     r10, [r1, #4]       ; src       (B)
-    ldr     r11, [r3], #4       ; pred      (B)
+    ldr     r10, [r1, #4]       ; usrc      (B)
+    ldr     r11, [r5, #4]       ; upred     (B)
 
     pkhbt   r8, r6, r7, lsl #16 ; [d1 | d0] (A)
     pkhtb   r9, r7, r6, asr #16 ; [d3 | d2] (A)
@@ -114,7 +115,8 @@ loop_u
     usub16  r6, r8, r9          ; [d2 | d0] (B)
     usub16  r7, r10, r11        ; [d3 | d1] (B)
 
-    add     r1, r1, r5          ; update usrc pointer
+    add     r1, r1, r3          ; update usrc pointer
+    add     r5, r5, r12         ; update upred pointer
 
     pkhbt   r8, r6, r7, lsl #16 ; [d1 | d0] (B)
     pkhtb   r9, r7, r6, asr #16 ; [d3 | d2] (B)
@@ -125,12 +127,13 @@ loop_u
 
     bne     loop_u
 
+    ldr     r5, [sp, #36]       ; vpred
     mov     r4, #8              ; loop count
 
     ; Subtract V block
 loop_v
-    ldr     r6, [r2]            ; src       (A)
-    ldr     r7, [r3], #4        ; pred      (A)
+    ldr     r6, [r2]            ; vsrc      (A)
+    ldr     r7, [r5]            ; vpred     (A)
 
     uxtb16  r8, r6              ; [s2 | s0] (A)
     uxtb16  r9, r7              ; [p2 | p0] (A)
@@ -140,8 +143,8 @@ loop_v
     usub16  r6, r8, r9          ; [d2 | d0] (A)
     usub16  r7, r10, r11        ; [d3 | d1] (A)
 
-    ldr     r10, [r2, #4]       ; src       (B)
-    ldr     r11, [r3], #4       ; pred      (B)
+    ldr     r10, [r2, #4]       ; vsrc      (B)
+    ldr     r11, [r5, #4]       ; vpred     (B)
 
     pkhbt   r8, r6, r7, lsl #16 ; [d1 | d0] (A)
     pkhtb   r9, r7, r6, asr #16 ; [d3 | d2] (A)
@@ -157,7 +160,8 @@ loop_v
     usub16  r6, r8, r9          ; [d2 | d0] (B)
     usub16  r7, r10, r11        ; [d3 | d1] (B)
 
-    add     r2, r2, r5          ; update vsrc pointer
+    add     r2, r2, r3          ; update vsrc pointer
+    add     r5, r5, r12         ; update vpred pointer
 
     pkhbt   r8, r6, r7, lsl #16 ; [d1 | d0] (B)
     pkhtb   r9, r7, r6, asr #16 ; [d3 | d2] (B)
@@ -168,23 +172,25 @@ loop_v
 
     bne     loop_v
 
-    ldmfd   sp!, {r4-r12, pc}
+    ldmfd   sp!, {r4-r11}
+    bx      lr
 
     ENDP
 
 
 ; r0    short *diff
 ; r1    unsigned char *src
-; r2    unsigned char *pred
-; r3    int stride
+; r2    int src_stride
+; r3    unsigned char *pred
+; sp    int pred_stride
 |vp8_subtract_mby_armv6| PROC
 
     stmfd   sp!, {r4-r11}
-
+    ldr     r12, [sp, #32]      ; pred_stride
     mov     r4, #16
 loop
     ldr     r6, [r1]            ; src       (A)
-    ldr     r7, [r2], #4        ; pred      (A)
+    ldr     r7, [r3]            ; pred      (A)
 
     uxtb16  r8, r6              ; [s2 | s0] (A)
     uxtb16  r9, r7              ; [p2 | p0] (A)
@@ -195,7 +201,7 @@ loop
     usub16  r7, r10, r11        ; [d3 | d1] (A)
 
     ldr     r10, [r1, #4]       ; src       (B)
-    ldr     r11, [r2], #4       ; pred      (B)
+    ldr     r11, [r3, #4]       ; pred      (B)
 
     pkhbt   r8, r6, r7, lsl #16 ; [d1 | d0] (A)
     pkhtb   r9, r7, r6, asr #16 ; [d3 | d2] (A)
@@ -212,7 +218,7 @@ loop
     usub16  r7, r10, r11        ; [d3 | d1] (B)
 
     ldr     r10, [r1, #8]       ; src       (C)
-    ldr     r11, [r2], #4       ; pred      (C)
+    ldr     r11, [r3, #8]       ; pred      (C)
 
     pkhbt   r8, r6, r7, lsl #16 ; [d1 | d0] (B)
     pkhtb   r9, r7, r6, asr #16 ; [d3 | d2] (B)
@@ -229,10 +235,10 @@ loop
     usub16  r7, r10, r11        ; [d3 | d1] (C)
 
     ldr     r10, [r1, #12]      ; src       (D)
-    ldr     r11, [r2], #4       ; pred      (D)
+    ldr     r11, [r3, #12]      ; pred      (D)
 
-    pkhbt   r8, r6, r7, lsl #16  ; [d1 | d0] (C)
-    pkhtb   r9, r7, r6, asr #16  ; [d3 | d2] (C)
+    pkhbt   r8, r6, r7, lsl #16 ; [d1 | d0] (C)
+    pkhtb   r9, r7, r6, asr #16 ; [d3 | d2] (C)
 
     str     r8, [r0], #4        ; diff      (C)
     uxtb16  r8, r10             ; [s2 | s0] (D)
@@ -245,7 +251,8 @@ loop
     usub16  r6, r8, r9          ; [d2 | d0] (D)
     usub16  r7, r10, r11        ; [d3 | d1] (D)
 
-    add     r1, r1, r3          ; update src pointer
+    add     r1, r1, r2          ; update src pointer
+    add     r3, r3, r12         ; update pred pointer
 
     pkhbt   r8, r6, r7, lsl #16 ; [d1 | d0] (D)
     pkhtb   r9, r7, r6, asr #16 ; [d3 | d2] (D)
@@ -257,7 +264,7 @@ loop
     bne     loop
 
     ldmfd   sp!, {r4-r11}
-    mov     pc, lr
+    bx      lr
 
     ENDP
 
diff --git a/media/libvpx/vp8/encoder/arm/armv6/walsh_v6.asm b/media/libvpx/vp8/encoder/arm/armv6/walsh_v6.asm
index 61ffdb315dc..5eaf3f25a90 100644
--- a/media/libvpx/vp8/encoder/arm/armv6/walsh_v6.asm
+++ b/media/libvpx/vp8/encoder/arm/armv6/walsh_v6.asm
@@ -17,129 +17,196 @@
     AREA    |.text|, CODE, READONLY  ; name this block of code
 
 ;short vp8_short_walsh4x4_armv6(short *input, short *output, int pitch)
+; r0    short *input,
+; r1    short *output,
+; r2    int pitch
 |vp8_short_walsh4x4_armv6| PROC
 
     stmdb       sp!, {r4 - r11, lr}
 
-    mov         r12, r2              ; ugh. not clean
-    ldr         r2, [r0]             ; [1  |  0]
-    ldr         r3, [r0, #4]         ; [3  |  2]
-    ldr         r4, [r0, r12]!       ; [5  |  4]
-    ldr         r5, [r0, #4]         ; [7  |  6]
-    ldr         r6, [r0, r12]!       ; [9  |  8]
-    ldr         r7, [r0, #4]         ; [11 | 10]
-    ldr         r8, [r0, r12]!       ; [13 | 12]
-    ldr         r9, [r0, #4]         ; [15 | 14]
+    ldrd        r4, r5, [r0], r2
+    ldr         lr, c00040004
+    ldrd        r6, r7, [r0], r2
 
-    qsubaddx    r10, r2, r3          ; [c1|a1] [1-2   |   0+3]
-    qaddsubx    r11, r2, r3          ; [b1|d1] [1+2   |   0-3]
-    qsubaddx    r12, r4, r5          ; [c1|a1] [5-6   |   4+7]
-    qaddsubx    lr, r4, r5           ; [b1|d1] [5+6   |   4-7]
+    ; 0-3
+    qadd16      r3, r4, r5          ; [d1|a1] [1+3   |   0+2]
+    qsub16      r4, r4, r5          ; [c1|b1] [1-3   |   0-2]
 
-    qaddsubx    r2, r10, r11         ; [1 | 2] [c1+d1 | a1-b1]
-    qaddsubx    r3, r11, r10         ; [0 | 3] [b1+a1 | d1-c1]
-    qaddsubx    r4, r12, lr          ; [5 | 6] [c1+d1 | a1-b1]
-    qaddsubx    r5, lr, r12          ; [4 | 7] [b1+a1 | d1-c1]
+    ldrd        r8, r9, [r0], r2
+    ; 4-7
+    qadd16      r5, r6, r7          ; [d1|a1] [5+7   |   4+6]
+    qsub16      r6, r6, r7          ; [c1|b1] [5-7   |   4-6]
 
-    qsubaddx    r10, r6, r7          ; [c1|a1] [9-10  |  8+11]
-    qaddsubx    r11, r6, r7          ; [b1|d1] [9+10  |  8-11]
-    qsubaddx    r12, r8, r9          ; [c1|a1] [13-14 | 12+15]
-    qaddsubx    lr, r8, r9           ; [b1|d1] [13+14 | 12-15]
+    ldrd        r10, r11, [r0]
+    ; 8-11
+    qadd16      r7, r8, r9          ; [d1|a1] [9+11  |  8+10]
+    qsub16      r8, r8, r9          ; [c1|b1] [9-11  |  8-10]
 
-    qaddsubx    r6, r10, r11         ; [9 |10] [c1+d1 | a1-b1]
-    qaddsubx    r7, r11, r10         ; [8 |11] [b1+a1 | d1-c1]
-    qaddsubx    r8, r12, lr          ; [13|14] [c1+d1 | a1-b1]
-    qaddsubx    r9, lr, r12          ; [12|15] [b1+a1 | d1-c1]
+    ; 12-15
+    qadd16      r9, r10, r11        ; [d1|a1] [13+15 | 12+14]
+    qsub16      r10, r10, r11       ; [c1|b1] [13-15 | 12-14]
 
-    ; first transform complete
 
-    qadd16      r10, r3, r9          ; a1 [0+12  |  3+15]
-    qadd16      r11, r5, r7          ; b1 [4+8   |  7+11]
-    qsub16      r12, r5, r7          ; c1 [4-8   |  7-11]
-    qsub16      lr, r3, r9           ; d1 [0-12  |  3-15]
+    lsls        r2, r3, #16
+    smuad       r11, r3, lr         ; A0 = a1<<2 + d1<<2
+    addne       r11, r11, #1        ; A0 += (a1!=0)
 
-    qadd16      r3, r10, r11         ; a2 [a1+b1] [0 | 3]
-    qadd16      r5, r12, lr          ; b2 [c1+d1] [4 | 7]
-    qsub16      r7, r10, r11         ; c2 [a1-b1] [8 |11]
-    qsub16      r9, lr, r12          ; d2 [d1-c1] [12|15]
+    lsls        r2, r7, #16
+    smuad       r12, r7, lr         ; C0 = a1<<2 + d1<<2
+    addne       r12, r12, #1        ; C0 += (a1!=0)
 
-    qadd16      r10, r2, r8          ; a1 [1+13  |  2+14]
-    qadd16      r11, r4, r6          ; b1 [5+9   |  6+10]
-    qsub16      r12, r4, r6          ; c1 [5-9   |  6-10]
-    qsub16      lr, r2, r8           ; d1 [1-13  |  2-14]
+    add         r0, r11, r12        ; a1_0 = A0 + C0
+    sub         r11, r11, r12       ; b1_0 = A0 - C0
 
-    qadd16      r2, r10, r11         ; a2 [a1+b1] [1 | 2]
-    qadd16      r4, r12, lr          ; b2 [c1+d1] [5 | 6]
-    qsub16      r6, r10, r11         ; c2 [a1-b1] [9 |10]
-    qsub16      r8, lr, r12          ; d2 [d1-c1] [13|14]
+    lsls        r2, r5, #16
+    smuad       r12, r5, lr         ; B0 = a1<<2 + d1<<2
+    addne       r12, r12, #1        ; B0 += (a1!=0)
 
-    ; [a-d]2 += ([a-d]2 > 0)
+    lsls        r2, r9, #16
+    smuad       r2, r9, lr          ; D0 = a1<<2 + d1<<2
+    addne       r2, r2, #1          ; D0 += (a1!=0)
 
-    asrs        r10, r3, #16
-    addpl       r10, r10, #1         ; [~0]
-    asrs        r11, r2, #16
-    addpl       r11, r11, #1         ; [~1]
-    lsl         r11, r11, #15        ; [1  |  x]
-    pkhtb       r10, r11, r10, asr #1; [1  |  0]
-    str         r10, [r1], #4
+    add         lr, r12, r2         ; d1_0 = B0 + D0
+    sub         r12, r12, r2        ; c1_0 = B0 - D0
 
-    lsls        r11, r2, #16
-    addpl       r11, r11, #0x10000   ; [~2]
-    lsls        r12, r3, #16
-    addpl       r12, r12, #0x10000   ; [~3]
-    asr         r12, r12, #1         ; [3  |  x]
-    pkhtb       r11, r12, r11, asr #17; [3  |  2]
-    str         r11, [r1], #4
+    ; op[0,4,8,12]
+    adds        r2, r0, lr          ; a2 = a1_0 + d1_0
+    addmi       r2, r2, #1          ; += a2 < 0
+    add         r2, r2, #3          ; += 3
+    subs        r0, r0, lr          ; d2 = a1_0 - d1_0
+    mov         r2, r2, asr #3      ; >> 3
+    strh        r2, [r1]            ; op[0]
 
-    asrs        r2, r5, #16
-    addpl       r2, r2, #1           ; [~4]
-    asrs        r3, r4, #16
-    addpl       r3, r3, #1           ; [~5]
-    lsl         r3, r3, #15          ; [5  |  x]
-    pkhtb       r2, r3, r2, asr #1   ; [5  |  4]
-    str         r2, [r1], #4
+    addmi       r0, r0, #1          ; += a2 < 0
+    add         r0, r0, #3          ; += 3
+    ldr         lr, c00040004
+    mov         r0, r0, asr #3      ; >> 3
+    strh        r0, [r1, #24]       ; op[12]
 
-    lsls        r2, r4, #16
-    addpl       r2, r2, #0x10000     ; [~6]
-    lsls        r3, r5, #16
-    addpl       r3, r3, #0x10000     ; [~7]
-    asr         r3, r3, #1           ; [7  |  x]
-    pkhtb       r2, r3, r2, asr #17  ; [7  |  6]
-    str         r2, [r1], #4
+    adds        r2, r11, r12        ; b2 = b1_0 + c1_0
+    addmi       r2, r2, #1          ; += a2 < 0
+    add         r2, r2, #3          ; += 3
+    subs        r0, r11, r12        ; c2 = b1_0 - c1_0
+    mov         r2, r2, asr #3      ; >> 3
+    strh        r2, [r1, #8]        ; op[4]
 
-    asrs        r2, r7, #16
-    addpl       r2, r2, #1           ; [~8]
-    asrs        r3, r6, #16
-    addpl       r3, r3, #1           ; [~9]
-    lsl         r3, r3, #15          ; [9  |  x]
-    pkhtb       r2, r3, r2, asr #1   ; [9  |  8]
-    str         r2, [r1], #4
+    addmi       r0, r0, #1          ; += a2 < 0
+    add         r0, r0, #3          ; += 3
+    smusd       r3, r3, lr          ; A3 = a1<<2 - d1<<2
+    smusd       r7, r7, lr          ; C3 = a1<<2 - d1<<2
+    mov         r0, r0, asr #3      ; >> 3
+    strh        r0, [r1, #16]       ; op[8]
 
-    lsls        r2, r6, #16
-    addpl       r2, r2, #0x10000     ; [~10]
-    lsls        r3, r7, #16
-    addpl       r3, r3, #0x10000     ; [~11]
-    asr         r3, r3, #1           ; [11 |  x]
-    pkhtb       r2, r3, r2, asr #17  ; [11 | 10]
-    str         r2, [r1], #4
 
-    asrs        r2, r9, #16
-    addpl       r2, r2, #1           ; [~12]
-    asrs        r3, r8, #16
-    addpl       r3, r3, #1           ; [~13]
-    lsl         r3, r3, #15          ; [13 |  x]
-    pkhtb       r2, r3, r2, asr #1   ; [13 | 12]
-    str         r2, [r1], #4
+    ; op[3,7,11,15]
+    add         r0, r3, r7          ; a1_3 = A3 + C3
+    sub         r3, r3, r7          ; b1_3 = A3 - C3
+
+    smusd       r5, r5, lr          ; B3 = a1<<2 - d1<<2
+    smusd       r9, r9, lr          ; D3 = a1<<2 - d1<<2
+    add         r7, r5, r9          ; d1_3 = B3 + D3
+    sub         r5, r5, r9          ; c1_3 = B3 - D3
+
+    adds        r2, r0, r7          ; a2 = a1_3 + d1_3
+    addmi       r2, r2, #1          ; += a2 < 0
+    add         r2, r2, #3          ; += 3
+    adds        r9, r3, r5          ; b2 = b1_3 + c1_3
+    mov         r2, r2, asr #3      ; >> 3
+    strh        r2, [r1, #6]        ; op[3]
+
+    addmi       r9, r9, #1          ; += a2 < 0
+    add         r9, r9, #3          ; += 3
+    subs        r2, r3, r5          ; c2 = b1_3 - c1_3
+    mov         r9, r9, asr #3      ; >> 3
+    strh        r9, [r1, #14]       ; op[7]
+
+    addmi       r2, r2, #1          ; += a2 < 0
+    add         r2, r2, #3          ; += 3
+    subs        r9, r0, r7          ; d2 = a1_3 - d1_3
+    mov         r2, r2, asr #3      ; >> 3
+    strh        r2, [r1, #22]       ; op[11]
+
+    addmi       r9, r9, #1          ; += a2 < 0
+    add         r9, r9, #3          ; += 3
+    smuad       r3, r4, lr          ; A1 = b1<<2 + c1<<2
+    smuad       r5, r8, lr          ; C1 = b1<<2 + c1<<2
+    mov         r9, r9, asr #3      ; >> 3
+    strh        r9, [r1, #30]       ; op[15]
+
+    ; op[1,5,9,13]
+    add         r0, r3, r5          ; a1_1 = A1 + C1
+    sub         r3, r3, r5          ; b1_1 = A1 - C1
+
+    smuad       r7, r6, lr          ; B1 = b1<<2 + c1<<2
+    smuad       r9, r10, lr         ; D1 = b1<<2 + c1<<2
+    add         r5, r7, r9          ; d1_1 = B1 + D1
+    sub         r7, r7, r9          ; c1_1 = B1 - D1
+
+    adds        r2, r0, r5          ; a2 = a1_1 + d1_1
+    addmi       r2, r2, #1          ; += a2 < 0
+    add         r2, r2, #3          ; += 3
+    adds        r9, r3, r7          ; b2 = b1_1 + c1_1
+    mov         r2, r2, asr #3      ; >> 3
+    strh        r2, [r1, #2]        ; op[1]
+
+    addmi       r9, r9, #1          ; += a2 < 0
+    add         r9, r9, #3          ; += 3
+    subs        r2, r3, r7          ; c2 = b1_1 - c1_1
+    mov         r9, r9, asr #3      ; >> 3
+    strh        r9, [r1, #10]       ; op[5]
+
+    addmi       r2, r2, #1          ; += a2 < 0
+    add         r2, r2, #3          ; += 3
+    subs        r9, r0, r5          ; d2 = a1_1 - d1_1
+    mov         r2, r2, asr #3      ; >> 3
+    strh        r2, [r1, #18]       ; op[9]
+
+    addmi       r9, r9, #1          ; += a2 < 0
+    add         r9, r9, #3          ; += 3
+    smusd       r4, r4, lr          ; A2 = b1<<2 - c1<<2
+    smusd       r8, r8, lr          ; C2 = b1<<2 - c1<<2
+    mov         r9, r9, asr #3      ; >> 3
+    strh        r9, [r1, #26]       ; op[13]
+
+
+    ; op[2,6,10,14]
+    add         r11, r4, r8         ; a1_2 = A2 + C2
+    sub         r12, r4, r8         ; b1_2 = A2 - C2
+
+    smusd       r6, r6, lr          ; B2 = b1<<2 - c1<<2
+    smusd       r10, r10, lr        ; D2 = b1<<2 - c1<<2
+    add         r4, r6, r10         ; d1_2 = B2 + D2
+    sub         r8, r6, r10         ; c1_2 = B2 - D2
+
+    adds        r2, r11, r4         ; a2 = a1_2 + d1_2
+    addmi       r2, r2, #1          ; += a2 < 0
+    add         r2, r2, #3          ; += 3
+    adds        r9, r12, r8         ; b2 = b1_2 + c1_2
+    mov         r2, r2, asr #3      ; >> 3
+    strh        r2, [r1, #4]        ; op[2]
+
+    addmi       r9, r9, #1          ; += a2 < 0
+    add         r9, r9, #3          ; += 3
+    subs        r2, r12, r8         ; c2 = b1_2 - c1_2
+    mov         r9, r9, asr #3      ; >> 3
+    strh        r9, [r1, #12]       ; op[6]
+
+    addmi       r2, r2, #1          ; += a2 < 0
+    add         r2, r2, #3          ; += 3
+    subs        r9, r11, r4         ; d2 = a1_2 - d1_2
+    mov         r2, r2, asr #3      ; >> 3
+    strh        r2, [r1, #20]       ; op[10]
+
+    addmi       r9, r9, #1          ; += a2 < 0
+    add         r9, r9, #3          ; += 3
+    mov         r9, r9, asr #3      ; >> 3
+    strh        r9, [r1, #28]       ; op[14]
 
-    lsls        r2, r8, #16
-    addpl       r2, r2, #0x10000     ; [~14]
-    lsls        r3, r9, #16
-    addpl       r3, r3, #0x10000     ; [~15]
-    asr         r3, r3, #1           ; [15 |  x]
-    pkhtb       r2, r3, r2, asr #17  ; [15 | 14]
-    str         r2, [r1]
 
     ldmia       sp!, {r4 - r11, pc}
     ENDP        ; |vp8_short_walsh4x4_armv6|
 
+c00040004
+    DCD         0x00040004
+
     END
diff --git a/media/libvpx/vp8/encoder/arm/boolhuff_arm.c b/media/libvpx/vp8/encoder/arm/boolhuff_arm.c
new file mode 100644
index 00000000000..17a941bfc65
--- /dev/null
+++ b/media/libvpx/vp8/encoder/arm/boolhuff_arm.c
@@ -0,0 +1,41 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+
+#include "vp8/encoder/boolhuff.h"
+#include "vpx/internal/vpx_codec_internal.h"
+
+const unsigned int vp8_prob_cost[256] =
+{
+    2047, 2047, 1791, 1641, 1535, 1452, 1385, 1328, 1279, 1235, 1196, 1161, 1129, 1099, 1072, 1046,
+    1023, 1000,  979,  959,  940,  922,  905,  889,  873,  858,  843,  829,  816,  803,  790,  778,
+    767,  755,  744,  733,  723,  713,  703,  693,  684,  675,  666,  657,  649,  641,  633,  625,
+    617,  609,  602,  594,  587,  580,  573,  567,  560,  553,  547,  541,  534,  528,  522,  516,
+    511,  505,  499,  494,  488,  483,  477,  472,  467,  462,  457,  452,  447,  442,  437,  433,
+    428,  424,  419,  415,  410,  406,  401,  397,  393,  389,  385,  381,  377,  373,  369,  365,
+    361,  357,  353,  349,  346,  342,  338,  335,  331,  328,  324,  321,  317,  314,  311,  307,
+    304,  301,  297,  294,  291,  288,  285,  281,  278,  275,  272,  269,  266,  263,  260,  257,
+    255,  252,  249,  246,  243,  240,  238,  235,  232,  229,  227,  224,  221,  219,  216,  214,
+    211,  208,  206,  203,  201,  198,  196,  194,  191,  189,  186,  184,  181,  179,  177,  174,
+    172,  170,  168,  165,  163,  161,  159,  156,  154,  152,  150,  148,  145,  143,  141,  139,
+    137,  135,  133,  131,  129,  127,  125,  123,  121,  119,  117,  115,  113,  111,  109,  107,
+    105,  103,  101,   99,   97,   95,   93,   92,   90,   88,   86,   84,   82,   81,   79,   77,
+    75,   73,   72,   70,   68,   66,   65,   63,   61,   60,   58,   56,   55,   53,   51,   50,
+    48,   46,   45,   43,   41,   40,   38,   37,   35,   33,   32,   30,   29,   27,   25,   24,
+    22,   21,   19,   18,   16,   15,   13,   12,   10,    9,    7,    6,    4,    3,    1,   1
+};
+
+int vp8_validate_buffer_arm(const unsigned char *start,
+                            size_t               len,
+                            const unsigned char *end,
+                            struct vpx_internal_error_info *error)
+{
+    return validate_buffer(start, len, end, error);
+}
diff --git a/media/libvpx/vp8/encoder/arm/dct_arm.c b/media/libvpx/vp8/encoder/arm/dct_arm.c
index 60d649d5039..2692acb4964 100644
--- a/media/libvpx/vp8/encoder/arm/dct_arm.c
+++ b/media/libvpx/vp8/encoder/arm/dct_arm.c
@@ -13,12 +13,10 @@
 
 #if HAVE_ARMV6
 
-void vp8_fast_fdct8x4_armv6(short *input, short *output, int pitch)
+void vp8_short_fdct8x4_armv6(short *input, short *output, int pitch)
 {
-    vp8_fast_fdct4x4_armv6(input,   output,    pitch);
-    vp8_fast_fdct4x4_armv6(input + 4, output + 16, pitch);
+    vp8_short_fdct4x4_armv6(input,   output,    pitch);
+    vp8_short_fdct4x4_armv6(input + 4, output + 16, pitch);
 }
 
 #endif /* HAVE_ARMV6 */
-
-
diff --git a/media/libvpx/vp8/encoder/arm/dct_arm.h b/media/libvpx/vp8/encoder/arm/dct_arm.h
index 769d5f4837a..db553c4e076 100644
--- a/media/libvpx/vp8/encoder/arm/dct_arm.h
+++ b/media/libvpx/vp8/encoder/arm/dct_arm.h
@@ -14,18 +14,24 @@
 
 #if HAVE_ARMV6
 extern prototype_fdct(vp8_short_walsh4x4_armv6);
-extern prototype_fdct(vp8_fast_fdct4x4_armv6);
-extern prototype_fdct(vp8_fast_fdct8x4_armv6);
+extern prototype_fdct(vp8_short_fdct4x4_armv6);
+extern prototype_fdct(vp8_short_fdct8x4_armv6);
 
 #if !CONFIG_RUNTIME_CPU_DETECT
 #undef  vp8_fdct_walsh_short4x4
 #define vp8_fdct_walsh_short4x4 vp8_short_walsh4x4_armv6
 
+#undef  vp8_fdct_short4x4
+#define vp8_fdct_short4x4 vp8_short_fdct4x4_armv6
+
+#undef  vp8_fdct_short8x4
+#define vp8_fdct_short8x4 vp8_short_fdct8x4_armv6
+
 #undef  vp8_fdct_fast4x4
-#define vp8_fdct_fast4x4 vp8_fast_fdct4x4_armv6
+#define vp8_fdct_fast4x4 vp8_short_fdct4x4_armv6
 
 #undef  vp8_fdct_fast8x4
-#define vp8_fdct_fast8x4 vp8_fast_fdct8x4_armv6
+#define vp8_fdct_fast8x4 vp8_short_fdct8x4_armv6
 #endif
 
 #endif /* HAVE_ARMV6 */
@@ -45,10 +51,10 @@ extern prototype_fdct(vp8_short_walsh4x4_neon);
 #define vp8_fdct_short8x4 vp8_short_fdct8x4_neon
 
 #undef  vp8_fdct_fast4x4
-#define vp8_fdct_fast4x4 vp8_fast_fdct4x4_neon
+#define vp8_fdct_fast4x4 vp8_short_fdct4x4_neon
 
 #undef  vp8_fdct_fast8x4
-#define vp8_fdct_fast8x4 vp8_fast_fdct8x4_neon
+#define vp8_fdct_fast8x4 vp8_short_fdct8x4_neon
 
 #undef  vp8_fdct_walsh_short4x4
 #define vp8_fdct_walsh_short4x4 vp8_short_walsh4x4_neon
diff --git a/media/libvpx/vp8/encoder/arm/neon/fastfdct4x4_neon.asm b/media/libvpx/vp8/encoder/arm/neon/fastfdct4x4_neon.asm
deleted file mode 100644
index 1cc0bd7817d..00000000000
--- a/media/libvpx/vp8/encoder/arm/neon/fastfdct4x4_neon.asm
+++ /dev/null
@@ -1,124 +0,0 @@
-;
-;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-;
-;  Use of this source code is governed by a BSD-style license
-;  that can be found in the LICENSE file in the root of the source
-;  tree. An additional intellectual property rights grant can be found
-;  in the file PATENTS.  All contributing project authors may
-;  be found in the AUTHORS file in the root of the source tree.
-;
-
-
-    EXPORT  |vp8_fast_fdct4x4_neon|
-
-    ARM
-    REQUIRE8
-    PRESERVE8
-
-    AREA ||.text||, CODE, READONLY, ALIGN=2
-;void vp8_fast_fdct4x4_c(short *input, short *output, int pitch);
-;NOTE:
-;The input *src_diff. src_diff is calculated as:
-;diff_ptr[c] = src_ptr[c] - pred_ptr[c]; (in Subtract* function)
-;In which *src_ptr and *pred_ptr both are unsigned char.
-;Therefore, *src_diff should be in the range of [-255, 255].
-;CAUTION:
-;The input values of 25th block are set in vp8_build_dcblock function, which are out of [-255, 255].
-;But, VP8 encoder only uses vp8_short_fdct4x4_c for 25th block, not vp8_fast_fdct4x4_c. That makes
-;it ok for assuming *input in [-255, 255] in vp8_fast_fdct4x4_c, but not ok in vp8_short_fdct4x4_c.
-
-|vp8_fast_fdct4x4_neon| PROC
-    vld1.16         {d2}, [r0], r2              ;load input
-    ldr             r12, _ffdct_coeff_
-    vld1.16         {d3}, [r0], r2
-    vld1.16         {d4}, [r0], r2
-    vld1.16         {d0}, [r12]
-    vld1.16         {d5}, [r0], r2
-
-    ;First for-loop
-    ;transpose d2, d3, d4, d5. Then, d2=ip[0], d3=ip[1], d4=ip[2], d5=ip[3]
-    vtrn.32         d2, d4
-    vtrn.32         d3, d5
-    vtrn.16         d2, d3
-    vtrn.16         d4, d5
-
-    vadd.s16        d6, d2, d5              ;ip[0]+ip[3]
-    vadd.s16        d7, d3, d4              ;ip[1]+ip[2]
-    vsub.s16        d8, d3, d4              ;ip[1]-ip[2]
-    vsub.s16        d9, d2, d5              ;ip[0]-ip[3]
-    vshl.i16        q3, q3, #1              ; a1, b1
-    vshl.i16        q4, q4, #1              ; c1, d1
-
-    vadd.s16        d10, d6, d7             ;temp1 = a1 + b1
-    vsub.s16        d11, d6, d7             ;temp2 = a1 - b1
-
-    vqdmulh.s16     q6, q5, d0[1]
-    vqdmulh.s16     q8, q4, d0[0]
-    vqdmulh.s16     q7, q4, d0[2]
-
-    vshr.s16        q6, q6, #1
-    vshr.s16        q8, q8, #1
-    vshr.s16        q7, q7, #1              ;d14:temp1 = ( c1 * x_c3)>>16;  d15:temp1 =  (d1 * x_c3)>>16
-    vadd.s16        q8, q4, q8              ;d16:temp2 = ((c1 * x_c1)>>16) + c1;  d17:temp2 = ((d1 * x_c1)>>16) + d1
-
-    vadd.s16        d2, d10, d12            ;op[0] = ((temp1 * x_c2 )>>16) + temp1
-    vadd.s16        d4, d11, d13            ;op[2] = ((temp2 * x_c2 )>>16) + temp2
-    vadd.s16        d3, d14, d17            ;op[1] = temp1 + temp2  -- q is not necessary, just for protection
-    vsub.s16        d5, d15, d16            ;op[3] = temp1 - temp2
-
-    ;Second for-loop
-    ;transpose d2, d3, d4, d5. Then, d2=ip[0], d3=ip[4], d4=ip[8], d5=ip[12]
-    vtrn.32         d2, d4
-    vtrn.32         d3, d5
-    vtrn.16         d2, d3
-    vtrn.16         d4, d5
-
-    vadd.s16        d6, d2, d5              ;a1 = ip[0]+ip[12]
-    vadd.s16        d7, d3, d4              ;b1 = ip[4]+ip[8]
-    vsub.s16        d8, d3, d4              ;c1 = ip[4]-ip[8]
-    vsub.s16        d9, d2, d5              ;d1 = ip[0]-ip[12]
-
-    vadd.s16        d10, d6, d7             ;temp1 = a1 + b1
-    vsub.s16        d11, d6, d7             ;temp2 = a1 - b1
-
-
-    vqdmulh.s16     q6, q5, d0[1]
-    vqdmulh.s16     q8, q4, d0[0]
-    vqdmulh.s16     q7, q4, d0[2]
-
-    vshr.s16        q6, q6, #1
-    vshr.s16        q8, q8, #1
-    vshr.s16        q7, q7, #1              ;d14:temp1 = ( c1 * x_c3)>>16;  d15:temp1 =  (d1 * x_c3)>>16
-    vadd.s16        q8, q4, q8              ;d16:temp2 = ((c1 * x_c1)>>16) + c1;  d17:temp2 = ((d1 * x_c1)>>16) + d1
-
-    vadd.s16        d2, d10, d12            ;a2 = ((temp1 * x_c2 )>>16) + temp1
-    vadd.s16        d4, d11, d13            ;c2 = ((temp2 * x_c2 )>>16) + temp2
-    vadd.s16        d3, d14, d17            ;b2 = temp1 + temp2  -- q is not necessary, just for protection
-    vsub.s16        d5, d15, d16            ;d2 = temp1 - temp2
-
-    vclt.s16        q3, q1, #0
-    vclt.s16        q4, q2, #0
-
-    vsub.s16        q1, q1, q3
-    vsub.s16        q2, q2, q4
-
-    vshr.s16        q1, q1, #1
-    vshr.s16        q2, q2, #1
-
-    vst1.16         {q1, q2}, [r1]
-
-    bx              lr
-
-    ENDP
-
-;-----------------
-
-_ffdct_coeff_
-    DCD     ffdct_coeff
-ffdct_coeff
-; 60547 =  0xEC83
-; 46341 =  0xB505
-; 25080 =  0x61F8
-    DCD     0xB505EC83, 0x000061F8
-
-    END
diff --git a/media/libvpx/vp8/encoder/arm/neon/fastfdct8x4_neon.asm b/media/libvpx/vp8/encoder/arm/neon/fastfdct8x4_neon.asm
deleted file mode 100644
index f6e8bbb833f..00000000000
--- a/media/libvpx/vp8/encoder/arm/neon/fastfdct8x4_neon.asm
+++ /dev/null
@@ -1,177 +0,0 @@
-;
-;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-;
-;  Use of this source code is governed by a BSD-style license
-;  that can be found in the LICENSE file in the root of the source
-;  tree. An additional intellectual property rights grant can be found
-;  in the file PATENTS.  All contributing project authors may
-;  be found in the AUTHORS file in the root of the source tree.
-;
-
-
-    EXPORT  |vp8_fast_fdct8x4_neon|
-
-    ARM
-    REQUIRE8
-    PRESERVE8
-
-    AREA ||.text||, CODE, READONLY, ALIGN=2
-;void vp8_fast_fdct4x4_c(short *input, short *output, int pitch);
-;NOTE:
-;The input *src_diff. src_diff is calculated as:
-;diff_ptr[c] = src_ptr[c] - pred_ptr[c]; (in Subtract* function)
-;In which *src_ptr and *pred_ptr both are unsigned char.
-;Therefore, *src_diff should be in the range of [-255, 255].
-;CAUTION:
-;The input values of 25th block are set in vp8_build_dcblock function, which are out of [-255, 255].
-;But, VP8 encoder only uses vp8_short_fdct4x4_c for 25th block, not vp8_fast_fdct4x4_c. That makes
-;it ok for assuming *input in [-255, 255] in vp8_fast_fdct4x4_c, but not ok in vp8_short_fdct4x4_c.
-
-|vp8_fast_fdct8x4_neon| PROC
-    vld1.16         {q1}, [r0], r2              ;load input
-    ldr             r12, _ffdct8_coeff_
-    vld1.16         {q2}, [r0], r2
-    vld1.16         {q3}, [r0], r2
-    vld1.16         {d0}, [r12]
-    vld1.16         {q4}, [r0], r2
-
-    ;First for-loop
-    ;transpose d2, d4, d6, d8. Then, d2=ip[0], d4=ip[1], d6=ip[2], d8=ip[3]
-    ;transpose d3, d5, d7, d9. Then, d3=ip[0], d5=ip[1], d7=ip[2], d9=ip[3]
-    vtrn.32         d2, d6
-    vtrn.32         d3, d7
-    vtrn.32         d4, d8
-    vtrn.32         d5, d9
-    vtrn.16         d2, d4
-    vtrn.16         d3, d5
-    vtrn.16         d6, d8
-    vtrn.16         d7, d9
-
-    vadd.s16        d10, d2, d8             ;ip[0]+ip[3]
-    vadd.s16        d11, d4, d6             ;ip[1]+ip[2]
-    vsub.s16        d12, d4, d6             ;ip[1]-ip[2]
-    vsub.s16        d13, d2, d8             ;ip[0]-ip[3]
-    vadd.s16        d22, d3, d9
-    vadd.s16        d23, d5, d7
-    vsub.s16        d24, d5, d7
-    vsub.s16        d25, d3, d9
-
-    vshl.i16        q5, q5, #1              ; a1, b1
-    vshl.i16        q6, q6, #1              ; c1, d1
-    vshl.i16        q1, q11, #1
-    vshl.i16        q2, q12, #1
-
-    vadd.s16        d14, d10, d11           ;temp1 = a1 + b1
-    vsub.s16        d15, d10, d11           ;temp2 = a1 - b1
-    vadd.s16        d24, d2, d3
-    vsub.s16        d25, d2, d3
-
-    vqdmulh.s16     q8, q7, d0[1]
-    vqdmulh.s16     q13, q12, d0[1]
-    vqdmulh.s16     q10, q6, d0[0]
-    vqdmulh.s16     q15, q2, d0[0]
-    vqdmulh.s16     q9, q6, d0[2]
-    vqdmulh.s16     q14, q2, d0[2]
-
-    vshr.s16        q8, q8, #1
-    vshr.s16        q13, q13, #1
-    vshr.s16        q10, q10, #1
-    vshr.s16        q15, q15, #1
-    vshr.s16        q9, q9, #1              ;d18:temp1 = ( c1 * x_c3)>>16;  d19:temp1 =  (d1 * x_c3)>>16
-    vshr.s16        q14, q14, #1            ;d28:temp1 = ( c1 * x_c3)>>16;  d29:temp1 =  (d1 * x_c3)>>16
-    vadd.s16        q10, q6, q10            ;d20:temp2 = ((c1 * x_c1)>>16) + c1;  d21:temp2 = ((d1 * x_c1)>>16) + d1
-    vadd.s16        q15, q2, q15            ;d30:temp2 = ((c1 * x_c1)>>16) + c1;  d31:temp2 = ((d1 * x_c1)>>16) + d1
-
-    vadd.s16        d2, d14, d16            ;op[0] = ((temp1 * x_c2 )>>16) + temp1
-    vadd.s16        d3, d24, d26            ;op[0] = ((temp1 * x_c2 )>>16) + temp1
-    vadd.s16        d6, d15, d17            ;op[2] = ((temp2 * x_c2 )>>16) + temp2
-    vadd.s16        d7, d25, d27            ;op[2] = ((temp2 * x_c2 )>>16) + temp2
-    vadd.s16        d4, d18, d21            ;op[1] = temp1 + temp2  -- q is not necessary, just for protection
-    vadd.s16        d5, d28, d31            ;op[1] = temp1 + temp2  -- q is not necessary, just for protection
-    vsub.s16        d8, d19, d20            ;op[3] = temp1 - temp2
-    vsub.s16        d9, d29, d30            ;op[3] = temp1 - temp2
-
-    ;Second for-loop
-    ;transpose d2, d4, d6, d8. Then, d2=ip[0], d4=ip[4], d6=ip[8], d8=ip[12]
-    ;transpose d3, d5, d7, d9. Then, d3=ip[0], d5=ip[4], d7=ip[8], d9=ip[12]
-    vtrn.32         d2, d6
-    vtrn.32         d3, d7
-    vtrn.32         d4, d8
-    vtrn.32         d5, d9
-    vtrn.16         d2, d4
-    vtrn.16         d3, d5
-    vtrn.16         d6, d8
-    vtrn.16         d7, d9
-
-    vadd.s16        d10, d2, d8             ;a1 = ip[0]+ip[12]
-    vadd.s16        d11, d4, d6             ;b1 = ip[4]+ip[8]
-    vsub.s16        d12, d4, d6             ;c1 = ip[4]-ip[8]
-    vsub.s16        d13, d2, d8             ;d1 = ip[0]-ip[12]
-    vadd.s16        d2, d3, d9
-    vadd.s16        d4, d5, d7
-    vsub.s16        d24, d5, d7
-    vsub.s16        d25, d3, d9
-
-    vadd.s16        d14, d10, d11           ;temp1 = a1 + b1
-    vsub.s16        d15, d10, d11           ;temp2 = a1 - b1
-    vadd.s16        d22, d2, d4
-    vsub.s16        d23, d2, d4
-
-    vqdmulh.s16     q8, q7, d0[1]
-    vqdmulh.s16     q13, q11, d0[1]
-    vqdmulh.s16     q10, q6, d0[0]
-    vqdmulh.s16     q15, q12, d0[0]
-    vqdmulh.s16     q9, q6, d0[2]
-    vqdmulh.s16     q14, q12, d0[2]
-
-    vshr.s16        q8, q8, #1
-    vshr.s16        q13, q13, #1
-    vshr.s16        q10, q10, #1
-    vshr.s16        q15, q15, #1
-    vshr.s16        q9, q9, #1              ;d18:temp1 = ( c1 * x_c3)>>16;  d19:temp1 =  (d1 * x_c3)>>16
-    vshr.s16        q14, q14, #1            ;d28:temp1 = ( c1 * x_c3)>>16;  d29:temp1 =  (d1 * x_c3)>>16
-    vadd.s16        q10, q6, q10            ;d20:temp2 = ((c1 * x_c1)>>16) + c1;  d21:temp2 = ((d1 * x_c1)>>16) + d1
-    vadd.s16        q15, q12, q15           ;d30:temp2 = ((c1 * x_c1)>>16) + c1;  d31:temp2 = ((d1 * x_c1)>>16) + d1
-
-    vadd.s16        d2, d14, d16            ;a2 = ((temp1 * x_c2 )>>16) + temp1
-    vadd.s16        d6, d22, d26            ;a2 = ((temp1 * x_c2 )>>16) + temp1
-    vadd.s16        d4, d15, d17            ;c2 = ((temp2 * x_c2 )>>16) + temp2
-    vadd.s16        d8, d23, d27            ;c2 = ((temp2 * x_c2 )>>16) + temp2
-    vadd.s16        d3, d18, d21            ;b2 = temp1 + temp2  -- q is not necessary, just for protection
-    vadd.s16        d7, d28, d31            ;b2 = temp1 + temp2  -- q is not necessary, just for protection
-    vsub.s16        d5, d19, d20            ;d2 = temp1 - temp2
-    vsub.s16        d9, d29, d30            ;d2 = temp1 - temp2
-
-    vclt.s16        q5, q1, #0
-    vclt.s16        q6, q2, #0
-    vclt.s16        q7, q3, #0
-    vclt.s16        q8, q4, #0
-
-    vsub.s16        q1, q1, q5
-    vsub.s16        q2, q2, q6
-    vsub.s16        q3, q3, q7
-    vsub.s16        q4, q4, q8
-
-    vshr.s16        q1, q1, #1
-    vshr.s16        q2, q2, #1
-    vshr.s16        q3, q3, #1
-    vshr.s16        q4, q4, #1
-
-    vst1.16         {q1, q2}, [r1]!
-    vst1.16         {q3, q4}, [r1]
-
-    bx              lr
-
-    ENDP
-
-;-----------------
-
-_ffdct8_coeff_
-    DCD     ffdct8_coeff
-ffdct8_coeff
-; 60547 =  0xEC83
-; 46341 =  0xB505
-; 25080 =  0x61F8
-    DCD     0xB505EC83, 0x000061F8
-
-    END
diff --git a/media/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.asm b/media/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.asm
index dcf3c509091..14305884228 100644
--- a/media/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.asm
+++ b/media/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.asm
@@ -98,7 +98,7 @@
     vmul.s16        q2, q6, q4          ; x * Dequant
     vmul.s16        q3, q7, q5
 
-    ldr             r0, _inv_zig_zag_   ; load ptr of inverse zigzag table
+    adr             r0, inv_zig_zag     ; load ptr of inverse zigzag table
 
     vceq.s16        q8, q8              ; set q8 to all 1
 
@@ -135,17 +135,16 @@
     vmovl.u16       q0, d0
     vmovl.u16       q10, d20
 
-
     vmax.u32        d0, d0, d1
     vmax.u32        d20, d20, d21
     vpmax.u32       d0, d0, d0
     vpmax.u32       d20, d20, d20
 
-    add             r4, r2, #vp8_blockd_eob
-    add             r5, r3, #vp8_blockd_eob
+    ldr             r4, [r2, #vp8_blockd_eob]
+    ldr             r5, [r3, #vp8_blockd_eob]
 
-    vst1.32         {d0[0]}, [r4@32]
-    vst1.32         {d20[0]}, [r5@32]
+    vst1.8          {d0[0]}, [r4]       ; store eob
+    vst1.8          {d20[0]}, [r5]      ; store eob
 
     vldmia          sp!, {q4-q7}
     ldmfd           sp!, {r4-r9}
@@ -182,7 +181,7 @@
     vadd.s16        q12, q14            ; x + Round
     vadd.s16        q13, q15
 
-    ldr             r0, _inv_zig_zag_   ; load ptr of inverse zigzag table
+    adr             r0, inv_zig_zag     ; load ptr of inverse zigzag table
 
     vqdmulh.s16     q12, q8             ; y = ((Round+abs(z)) * Quant) >> 16
     vqdmulh.s16     q13, q9
@@ -196,6 +195,8 @@
     vshr.s16        q12, #1             ; right shift 1 after vqdmulh
     vshr.s16        q13, #1
 
+    ldr             r5, [r1, #vp8_blockd_eob]
+
     orr             r2, r2, r3          ; check if all zero (step 4)
     cmp             r2, #0              ; check if all zero (step 5)
     beq             zero_output         ; check if all zero (step 6)
@@ -230,14 +231,13 @@
 
     vst1.s16        {q2, q3}, [r7@128]  ; store dqcoeff = x * Dequant
 
-    add             r4, r1, #vp8_blockd_eob
-    vst1.32         {d0[0]}, [r4@32]
+    vst1.8          {d0[0]}, [r5]       ; store eob
 
     ldmfd           sp!, {r4-r7}
     bx              lr
 
 zero_output
-    str             r2, [r1, #vp8_blockd_eob]
+    strb            r2, [r5]            ; store eob
     vst1.s16        {q0, q1}, [r6@128]  ; qcoeff = 0
     vst1.s16        {q0, q1}, [r7@128]  ; dqcoeff = 0
 
@@ -247,9 +247,6 @@ zero_output
     ENDP
 
 ; default inverse zigzag table is defined in vp8/common/entropy.c
-_inv_zig_zag_
-    DCD inv_zig_zag
-
     ALIGN 16    ; enable use of @128 bit aligned loads
 inv_zig_zag
     DCW 0x0001, 0x0002, 0x0006, 0x0007
diff --git a/media/libvpx/vp8/encoder/arm/neon/picklpf_arm.c b/media/libvpx/vp8/encoder/arm/neon/picklpf_arm.c
new file mode 100644
index 00000000000..6610d2dc298
--- /dev/null
+++ b/media/libvpx/vp8/encoder/arm/neon/picklpf_arm.c
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "vp8/common/loopfilter.h"
+#include "vpx_scale/yv12config.h"
+
+extern void vp8_memcpy_partial_neon(unsigned char *dst_ptr,
+                                    unsigned char *src_ptr,
+                                    int sz);
+
+
+void vp8_yv12_copy_partial_frame_neon(YV12_BUFFER_CONFIG *src_ybc,
+                                      YV12_BUFFER_CONFIG *dst_ybc)
+{
+    unsigned char *src_y, *dst_y;
+    int yheight;
+    int ystride;
+    int border;
+    int yoffset;
+    int linestocopy;
+
+    border   = src_ybc->border;
+    yheight  = src_ybc->y_height;
+    ystride  = src_ybc->y_stride;
+
+    /* number of MB rows to use in partial filtering */
+    linestocopy = (yheight >> 4) / PARTIAL_FRAME_FRACTION;
+    linestocopy = linestocopy ? linestocopy << 4 : 16;     /* 16 lines per MB */
+
+    /* Copy extra 4 so that full filter context is available if filtering done
+     * on the copied partial frame and not original. Partial filter does mb
+     * filtering for top row also, which can modify3 pixels above.
+     */
+    linestocopy += 4;
+    /* partial image starts at ~middle of frame (macroblock border) */
+    yoffset  = ystride * (((yheight >> 5) * 16) - 4);
+    src_y = src_ybc->y_buffer + yoffset;
+    dst_y = dst_ybc->y_buffer + yoffset;
+
+    vp8_memcpy_partial_neon(dst_y, src_y, ystride * linestocopy);
+}
diff --git a/media/libvpx/vp8/encoder/arm/neon/shortfdct_neon.asm b/media/libvpx/vp8/encoder/arm/neon/shortfdct_neon.asm
index 1b7f3627776..09dd011ec37 100644
--- a/media/libvpx/vp8/encoder/arm/neon/shortfdct_neon.asm
+++ b/media/libvpx/vp8/encoder/arm/neon/shortfdct_neon.asm
@@ -11,134 +11,211 @@
 
     EXPORT  |vp8_short_fdct4x4_neon|
     EXPORT  |vp8_short_fdct8x4_neon|
+
     ARM
     REQUIRE8
     PRESERVE8
 
+    AREA ||.text||, CODE, READONLY, ALIGN=4
 
-    AREA ||.text||, CODE, READONLY, ALIGN=2
 
-; r0    short *input
-; r1    short *output
-; r2    int pitch
-; Input has a pitch, output is contiguous
+    ALIGN 16    ; enable use of @128 bit aligned loads
+coeff
+    DCW      5352,  5352,  5352, 5352
+    DCW      2217,  2217,  2217, 2217
+    DCD     14500, 14500, 14500, 14500
+    DCD      7500,  7500,  7500, 7500
+    DCD     12000, 12000, 12000, 12000
+    DCD     51000, 51000, 51000, 51000
+
+;void vp8_short_fdct4x4_c(short *input, short *output, int pitch)
 |vp8_short_fdct4x4_neon| PROC
-    ldr             r12, _dct_matrix_
-    vld1.16         d0, [r0], r2
-    vld1.16         d1, [r0], r2
-    vld1.16         d2, [r0], r2
-    vld1.16         d3, [r0]
-    vld1.16         {q2, q3}, [r12]
 
-;first stage
-    vmull.s16       q11, d4, d0[0]              ;i=0
-    vmull.s16       q12, d4, d1[0]              ;i=1
-    vmull.s16       q13, d4, d2[0]              ;i=2
-    vmull.s16       q14, d4, d3[0]              ;i=3
+    ; Part one
+    vld1.16         {d0}, [r0@64], r2
+    adr             r12, coeff
+    vld1.16         {d1}, [r0@64], r2
+    vld1.16         {q8}, [r12@128]!        ; d16=5352,  d17=2217
+    vld1.16         {d2}, [r0@64], r2
+    vld1.32         {q9, q10}, [r12@128]!   ;  q9=14500, q10=7500
+    vld1.16         {d3}, [r0@64], r2
 
-    vmlal.s16       q11, d5, d0[1]
-    vmlal.s16       q12, d5, d1[1]
-    vmlal.s16       q13, d5, d2[1]
-    vmlal.s16       q14, d5, d3[1]
+    ; transpose d0=ip[0], d1=ip[1], d2=ip[2], d3=ip[3]
+    vtrn.32         d0, d2
+    vtrn.32         d1, d3
+    vld1.32         {q11,q12}, [r12@128]    ; q11=12000, q12=51000
+    vtrn.16         d0, d1
+    vtrn.16         d2, d3
 
-    vmlal.s16       q11, d6, d0[2]
-    vmlal.s16       q12, d6, d1[2]
-    vmlal.s16       q13, d6, d2[2]
-    vmlal.s16       q14, d6, d3[2]
+    vadd.s16        d4, d0, d3      ; a1 = ip[0] + ip[3]
+    vadd.s16        d5, d1, d2      ; b1 = ip[1] + ip[2]
+    vsub.s16        d6, d1, d2      ; c1 = ip[1] - ip[2]
+    vsub.s16        d7, d0, d3      ; d1 = ip[0] - ip[3]
 
-    vmlal.s16       q11, d7, d0[3]              ;sumtemp for i=0
-    vmlal.s16       q12, d7, d1[3]              ;sumtemp for i=1
-    vmlal.s16       q13, d7, d2[3]              ;sumtemp for i=2
-    vmlal.s16       q14, d7, d3[3]              ;sumtemp for i=3
+    vshl.s16        q2, q2, #3      ; (a1, b1) << 3
+    vshl.s16        q3, q3, #3      ; (c1, d1) << 3
 
-    ; rounding
-    vrshrn.i32      d22, q11, #14
-    vrshrn.i32      d24, q12, #14
-    vrshrn.i32      d26, q13, #14
-    vrshrn.i32      d28, q14, #14
+    vadd.s16        d0, d4, d5      ; op[0] = a1 + b1
+    vsub.s16        d2, d4, d5      ; op[2] = a1 - b1
 
-;second stage
-    vmull.s16       q4, d22, d4[0]              ;i=0
-    vmull.s16       q5, d22, d4[1]              ;i=1
-    vmull.s16       q6, d22, d4[2]              ;i=2
-    vmull.s16       q7, d22, d4[3]              ;i=3
+    vmlal.s16       q9, d7, d16     ; d1*5352 + 14500
+    vmlal.s16       q10, d7, d17    ; d1*2217 + 7500
+    vmlal.s16       q9, d6, d17     ; c1*2217 + d1*5352 + 14500
+    vmlsl.s16       q10, d6, d16    ; d1*2217 - c1*5352 + 7500
 
-    vmlal.s16       q4, d24, d5[0]
-    vmlal.s16       q5, d24, d5[1]
-    vmlal.s16       q6, d24, d5[2]
-    vmlal.s16       q7, d24, d5[3]
+    vshrn.s32       d1, q9, #12     ; op[1] = (c1*2217 + d1*5352 + 14500)>>12
+    vshrn.s32       d3, q10, #12    ; op[3] = (d1*2217 - c1*5352 +  7500)>>12
 
-    vmlal.s16       q4, d26, d6[0]
-    vmlal.s16       q5, d26, d6[1]
-    vmlal.s16       q6, d26, d6[2]
-    vmlal.s16       q7, d26, d6[3]
 
-    vmlal.s16       q4, d28, d7[0]              ;sumtemp for i=0
-    vmlal.s16       q5, d28, d7[1]              ;sumtemp for i=1
-    vmlal.s16       q6, d28, d7[2]              ;sumtemp for i=2
-    vmlal.s16       q7, d28, d7[3]              ;sumtemp for i=3
+    ; Part two
 
-    vrshr.s32       q0, q4, #16
-    vrshr.s32       q1, q5, #16
-    vrshr.s32       q2, q6, #16
-    vrshr.s32       q3, q7, #16
+    ; transpose d0=ip[0], d1=ip[4], d2=ip[8], d3=ip[12]
+    vtrn.32         d0, d2
+    vtrn.32         d1, d3
+    vtrn.16         d0, d1
+    vtrn.16         d2, d3
 
-    vmovn.i32       d0, q0
-    vmovn.i32       d1, q1
-    vmovn.i32       d2, q2
-    vmovn.i32       d3, q3
+    vmov.s16        d26, #7
 
-    vst1.16         {q0, q1}, [r1]
+    vadd.s16        d4, d0, d3      ; a1 = ip[0] + ip[12]
+    vadd.s16        d5, d1, d2      ; b1 = ip[4] + ip[8]
+    vsub.s16        d6, d1, d2      ; c1 = ip[4] - ip[8]
+    vadd.s16        d4, d4, d26     ; a1 + 7
+    vsub.s16        d7, d0, d3      ; d1 = ip[0] - ip[12]
+
+    vadd.s16        d0, d4, d5      ; op[0] = a1 + b1 + 7
+    vsub.s16        d2, d4, d5      ; op[8] = a1 - b1 + 7
+
+    vmlal.s16       q11, d7, d16    ; d1*5352 + 12000
+    vmlal.s16       q12, d7, d17    ; d1*2217 + 51000
+
+    vceq.s16        d4, d7, #0
+
+    vshr.s16        d0, d0, #4
+    vshr.s16        d2, d2, #4
+
+    vmlal.s16       q11, d6, d17    ; c1*2217 + d1*5352 + 12000
+    vmlsl.s16       q12, d6, d16    ; d1*2217 - c1*5352 + 51000
+
+    vmvn.s16        d4, d4
+    vshrn.s32       d1, q11, #16    ; op[4] = (c1*2217 + d1*5352 + 12000)>>16
+    vsub.s16        d1, d1, d4      ; op[4] += (d1!=0)
+    vshrn.s32       d3, q12, #16    ; op[12]= (d1*2217 - c1*5352 + 51000)>>16
+
+    vst1.16         {q0, q1}, [r1@128]
 
     bx              lr
 
     ENDP
 
-; r0    short *input
-; r1    short *output
-; r2    int pitch
+;void vp8_short_fdct8x4_c(short *input, short *output, int pitch)
 |vp8_short_fdct8x4_neon| PROC
-    ; Store link register and input before calling
-    ;  first 4x4 fdct.  Do not need to worry about
-    ;  output or pitch because those pointers are not
-    ;  touched in the 4x4 fdct function
-    stmdb           sp!, {r0, lr}
 
-    bl              vp8_short_fdct4x4_neon
+    ; Part one
 
-    ldmia           sp!, {r0, lr}
+    vld1.16         {q0}, [r0@128], r2
+    adr             r12, coeff
+    vld1.16         {q1}, [r0@128], r2
+    vld1.16         {q8}, [r12@128]!        ; d16=5352,  d17=2217
+    vld1.16         {q2}, [r0@128], r2
+    vld1.32         {q9, q10}, [r12@128]!   ;  q9=14500, q10=7500
+    vld1.16         {q3}, [r0@128], r2
 
-    ; Move to the next block of data.
-    add             r0, r0, #8
-    add             r1, r1, #32
+    ; transpose q0=ip[0], q1=ip[1], q2=ip[2], q3=ip[3]
+    vtrn.32         q0, q2          ; [A0|B0]
+    vtrn.32         q1, q3          ; [A1|B1]
+    vtrn.16         q0, q1          ; [A2|B2]
+    vtrn.16         q2, q3          ; [A3|B3]
 
-    ; Second time through do not store off the
-    ;  link register, just return from the 4x4 fdtc
-    b               vp8_short_fdct4x4_neon
+    vadd.s16        q11, q0, q3     ; a1 = ip[0] + ip[3]
+    vadd.s16        q12, q1, q2     ; b1 = ip[1] + ip[2]
+    vsub.s16        q13, q1, q2     ; c1 = ip[1] - ip[2]
+    vsub.s16        q14, q0, q3     ; d1 = ip[0] - ip[3]
+
+    vshl.s16        q11, q11, #3    ; a1 << 3
+    vshl.s16        q12, q12, #3    ; b1 << 3
+    vshl.s16        q13, q13, #3    ; c1 << 3
+    vshl.s16        q14, q14, #3    ; d1 << 3
+
+    vadd.s16        q0, q11, q12    ; [A0 | B0] = a1 + b1
+    vsub.s16        q2, q11, q12    ; [A2 | B2] = a1 - b1
+
+    vmov.s16        q11, q9         ; 14500
+    vmov.s16        q12, q10        ; 7500
+
+    vmlal.s16       q9, d28, d16    ; A[1] = d1*5352 + 14500
+    vmlal.s16       q10, d28, d17   ; A[3] = d1*2217 + 7500
+    vmlal.s16       q11, d29, d16   ; B[1] = d1*5352 + 14500
+    vmlal.s16       q12, d29, d17   ; B[3] = d1*2217 + 7500
+
+    vmlal.s16       q9, d26, d17    ; A[1] = c1*2217 + d1*5352 + 14500
+    vmlsl.s16       q10, d26, d16   ; A[3] = d1*2217 - c1*5352 + 7500
+    vmlal.s16       q11, d27, d17   ; B[1] = c1*2217 + d1*5352 + 14500
+    vmlsl.s16       q12, d27, d16   ; B[3] = d1*2217 - c1*5352 + 7500
+
+    vshrn.s32       d2, q9, #12     ; A[1] = (c1*2217 + d1*5352 + 14500)>>12
+    vshrn.s32       d6, q10, #12    ; A[3] = (d1*2217 - c1*5352 +  7500)>>12
+    vshrn.s32       d3, q11, #12    ; B[1] = (c1*2217 + d1*5352 + 14500)>>12
+    vshrn.s32       d7, q12, #12    ; B[3] = (d1*2217 - c1*5352 +  7500)>>12
+
+
+    ; Part two
+    vld1.32         {q9,q10}, [r12@128]    ; q9=12000, q10=51000
+
+    ; transpose q0=ip[0], q1=ip[4], q2=ip[8], q3=ip[12]
+    vtrn.32         q0, q2          ; q0=[A0 | B0]
+    vtrn.32         q1, q3          ; q1=[A4 | B4]
+    vtrn.16         q0, q1          ; q2=[A8 | B8]
+    vtrn.16         q2, q3          ; q3=[A12|B12]
+
+    vmov.s16        q15, #7
+
+    vadd.s16        q11, q0, q3     ; a1 = ip[0] + ip[12]
+    vadd.s16        q12, q1, q2     ; b1 = ip[4] + ip[8]
+    vadd.s16        q11, q11, q15   ; a1 + 7
+    vsub.s16        q13, q1, q2     ; c1 = ip[4] - ip[8]
+    vsub.s16        q14, q0, q3     ; d1 = ip[0] - ip[12]
+
+    vadd.s16        q0, q11, q12    ; a1 + b1 + 7
+    vsub.s16        q1, q11, q12    ; a1 - b1 + 7
+
+    vmov.s16        q11, q9         ; 12000
+    vmov.s16        q12, q10        ; 51000
+
+    vshr.s16        d0, d0, #4      ; A[0] = (a1 + b1 + 7)>>4
+    vshr.s16        d4, d1, #4      ; B[0] = (a1 + b1 + 7)>>4
+    vshr.s16        d2, d2, #4      ; A[8] = (a1 + b1 + 7)>>4
+    vshr.s16        d6, d3, #4      ; B[8] = (a1 + b1 + 7)>>4
+
+
+    vmlal.s16       q9, d28, d16    ; A[4]  = d1*5352 + 12000
+    vmlal.s16       q10, d28, d17   ; A[12] = d1*2217 + 51000
+    vmlal.s16       q11, d29, d16   ; B[4]  = d1*5352 + 12000
+    vmlal.s16       q12, d29, d17   ; B[12] = d1*2217 + 51000
+
+    vceq.s16        q14, q14, #0
+
+    vmlal.s16       q9, d26, d17    ; A[4]  = c1*2217 + d1*5352 + 12000
+    vmlsl.s16       q10, d26, d16   ; A[12] = d1*2217 - c1*5352 + 51000
+    vmlal.s16       q11, d27, d17   ; B[4]  = c1*2217 + d1*5352 + 12000
+    vmlsl.s16       q12, d27, d16   ; B[12] = d1*2217 - c1*5352 + 51000
+
+    vmvn.s16        q14, q14
+
+    vshrn.s32       d1, q9, #16     ; A[4] = (c1*2217 + d1*5352 + 12000)>>16
+    vshrn.s32       d3, q10, #16    ; A[12]= (d1*2217 - c1*5352 + 51000)>>16
+    vsub.s16        d1, d1, d28     ; A[4] += (d1!=0)
+
+    vshrn.s32       d5, q11, #16    ; B[4] = (c1*2217 + d1*5352 + 12000)>>16
+    vshrn.s32       d7, q12, #16    ; B[12]= (d1*2217 - c1*5352 + 51000)>>16
+    vsub.s16        d5, d5, d29     ; B[4] += (d1!=0)
+
+    vst1.16         {q0, q1}, [r1@128]! ; block A
+    vst1.16         {q2, q3}, [r1@128]! ; block B
 
-    ; Should never get to this.
     bx              lr
 
     ENDP
 
-;-----------------
-
-_dct_matrix_
-    DCD     dct_matrix
-dct_matrix
-;   DCW     23170,  30274,  23170, 12540
-;   DCW     23170,  12540, -23170,-30274
-;   DCW     23170, -12540, -23170, 30274
-;   DCW     23170, -30274,  23170,-12540
-; 23170 =  0x5a82
-; -23170 =  0xa57e
-; 30274 =  0x7642
-; -30274 =  0x89be
-; 12540 =  0x30fc
-; -12540 = 0xcf04
-    DCD     0x76425a82, 0x30fc5a82
-    DCD     0x30fc5a82, 0x89bea57e
-    DCD     0xcf045a82, 0x7642a57e
-    DCD     0x89be5a82, 0xcf045a82
-
     END
+
diff --git a/media/libvpx/vp8/encoder/arm/neon/subtract_neon.asm b/media/libvpx/vp8/encoder/arm/neon/subtract_neon.asm
index 68c2950621e..91a328c29cf 100644
--- a/media/libvpx/vp8/encoder/arm/neon/subtract_neon.asm
+++ b/media/libvpx/vp8/encoder/arm/neon/subtract_neon.asm
@@ -61,19 +61,24 @@
 
 
 ;==========================================
-;void vp8_subtract_mby_neon(short *diff, unsigned char *src, unsigned char *pred, int stride)
+;void vp8_subtract_mby_neon(short *diff, unsigned char *src, int src_stride
+;                           unsigned char *pred, int pred_stride)
 |vp8_subtract_mby_neon| PROC
+    push            {r4-r7}
     mov             r12, #4
+    ldr             r4, [sp, #16]           ; pred_stride
+    mov             r6, #32                 ; "diff" stride x2
+    add             r5, r0, #16             ; second diff pointer
 
 subtract_mby_loop
-    vld1.8          {q0}, [r1], r3          ;load src
-    vld1.8          {q1}, [r2]!             ;load pred
-    vld1.8          {q2}, [r1], r3
-    vld1.8          {q3}, [r2]!
-    vld1.8          {q4}, [r1], r3
-    vld1.8          {q5}, [r2]!
-    vld1.8          {q6}, [r1], r3
-    vld1.8          {q7}, [r2]!
+    vld1.8          {q0}, [r1], r2          ;load src
+    vld1.8          {q1}, [r3], r4          ;load pred
+    vld1.8          {q2}, [r1], r2
+    vld1.8          {q3}, [r3], r4
+    vld1.8          {q4}, [r1], r2
+    vld1.8          {q5}, [r3], r4
+    vld1.8          {q6}, [r1], r2
+    vld1.8          {q7}, [r3], r4
 
     vsubl.u8        q8, d0, d2
     vsubl.u8        q9, d1, d3
@@ -84,46 +89,53 @@ subtract_mby_loop
     vsubl.u8        q14, d12, d14
     vsubl.u8        q15, d13, d15
 
-    vst1.16         {q8}, [r0]!             ;store diff
-    vst1.16         {q9}, [r0]!
-    vst1.16         {q10}, [r0]!
-    vst1.16         {q11}, [r0]!
-    vst1.16         {q12}, [r0]!
-    vst1.16         {q13}, [r0]!
-    vst1.16         {q14}, [r0]!
-    vst1.16         {q15}, [r0]!
+    vst1.16         {q8}, [r0], r6          ;store diff
+    vst1.16         {q9}, [r5], r6
+    vst1.16         {q10}, [r0], r6
+    vst1.16         {q11}, [r5], r6
+    vst1.16         {q12}, [r0], r6
+    vst1.16         {q13}, [r5], r6
+    vst1.16         {q14}, [r0], r6
+    vst1.16         {q15}, [r5], r6
 
     subs            r12, r12, #1
     bne             subtract_mby_loop
 
+    pop             {r4-r7}
     bx              lr
     ENDP
 
 ;=================================
-;void vp8_subtract_mbuv_neon(short *diff, unsigned char *usrc, unsigned char *vsrc, unsigned char *pred, int stride)
+;void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc,
+;                         int src_stride, unsigned char *upred,
+;                         unsigned char *vpred, int pred_stride)
+
 |vp8_subtract_mbuv_neon| PROC
-    ldr             r12, [sp]
+    push            {r4-r7}
+    ldr             r4, [sp, #16]       ; upred
+    ldr             r5, [sp, #20]       ; vpred
+    ldr             r6, [sp, #24]       ; pred_stride
+    add             r0, r0, #512        ; short *udiff = diff + 256;
+    mov             r12, #32            ; "diff" stride x2
+    add             r7, r0, #16         ; second diff pointer
 
 ;u
-    add             r0, r0, #512        ;   short *udiff = diff + 256;
-    add             r3, r3, #256        ;   unsigned char *upred = pred + 256;
-
-    vld1.8          {d0}, [r1], r12         ;load src
-    vld1.8          {d1}, [r3]!             ;load pred
-    vld1.8          {d2}, [r1], r12
-    vld1.8          {d3}, [r3]!
-    vld1.8          {d4}, [r1], r12
-    vld1.8          {d5}, [r3]!
-    vld1.8          {d6}, [r1], r12
-    vld1.8          {d7}, [r3]!
-    vld1.8          {d8}, [r1], r12
-    vld1.8          {d9}, [r3]!
-    vld1.8          {d10}, [r1], r12
-    vld1.8          {d11}, [r3]!
-    vld1.8          {d12}, [r1], r12
-    vld1.8          {d13}, [r3]!
-    vld1.8          {d14}, [r1], r12
-    vld1.8          {d15}, [r3]!
+    vld1.8          {d0}, [r1], r3      ;load usrc
+    vld1.8          {d1}, [r4], r6      ;load upred
+    vld1.8          {d2}, [r1], r3
+    vld1.8          {d3}, [r4], r6
+    vld1.8          {d4}, [r1], r3
+    vld1.8          {d5}, [r4], r6
+    vld1.8          {d6}, [r1], r3
+    vld1.8          {d7}, [r4], r6
+    vld1.8          {d8}, [r1], r3
+    vld1.8          {d9}, [r4], r6
+    vld1.8          {d10}, [r1], r3
+    vld1.8          {d11}, [r4], r6
+    vld1.8          {d12}, [r1], r3
+    vld1.8          {d13}, [r4], r6
+    vld1.8          {d14}, [r1], r3
+    vld1.8          {d15}, [r4], r6
 
     vsubl.u8        q8, d0, d1
     vsubl.u8        q9, d2, d3
@@ -134,32 +146,32 @@ subtract_mby_loop
     vsubl.u8        q14, d12, d13
     vsubl.u8        q15, d14, d15
 
-    vst1.16         {q8}, [r0]!             ;store diff
-    vst1.16         {q9}, [r0]!
-    vst1.16         {q10}, [r0]!
-    vst1.16         {q11}, [r0]!
-    vst1.16         {q12}, [r0]!
-    vst1.16         {q13}, [r0]!
-    vst1.16         {q14}, [r0]!
-    vst1.16         {q15}, [r0]!
+    vst1.16         {q8}, [r0], r12     ;store diff
+    vst1.16         {q9}, [r7], r12
+    vst1.16         {q10}, [r0], r12
+    vst1.16         {q11}, [r7], r12
+    vst1.16         {q12}, [r0], r12
+    vst1.16         {q13}, [r7], r12
+    vst1.16         {q14}, [r0], r12
+    vst1.16         {q15}, [r7], r12
 
 ;v
-    vld1.8          {d0}, [r2], r12         ;load src
-    vld1.8          {d1}, [r3]!             ;load pred
-    vld1.8          {d2}, [r2], r12
-    vld1.8          {d3}, [r3]!
-    vld1.8          {d4}, [r2], r12
-    vld1.8          {d5}, [r3]!
-    vld1.8          {d6}, [r2], r12
-    vld1.8          {d7}, [r3]!
-    vld1.8          {d8}, [r2], r12
-    vld1.8          {d9}, [r3]!
-    vld1.8          {d10}, [r2], r12
-    vld1.8          {d11}, [r3]!
-    vld1.8          {d12}, [r2], r12
-    vld1.8          {d13}, [r3]!
-    vld1.8          {d14}, [r2], r12
-    vld1.8          {d15}, [r3]!
+    vld1.8          {d0}, [r2], r3      ;load vsrc
+    vld1.8          {d1}, [r5], r6      ;load vpred
+    vld1.8          {d2}, [r2], r3
+    vld1.8          {d3}, [r5], r6
+    vld1.8          {d4}, [r2], r3
+    vld1.8          {d5}, [r5], r6
+    vld1.8          {d6}, [r2], r3
+    vld1.8          {d7}, [r5], r6
+    vld1.8          {d8}, [r2], r3
+    vld1.8          {d9}, [r5], r6
+    vld1.8          {d10}, [r2], r3
+    vld1.8          {d11}, [r5], r6
+    vld1.8          {d12}, [r2], r3
+    vld1.8          {d13}, [r5], r6
+    vld1.8          {d14}, [r2], r3
+    vld1.8          {d15}, [r5], r6
 
     vsubl.u8        q8, d0, d1
     vsubl.u8        q9, d2, d3
@@ -170,16 +182,18 @@ subtract_mby_loop
     vsubl.u8        q14, d12, d13
     vsubl.u8        q15, d14, d15
 
-    vst1.16         {q8}, [r0]!             ;store diff
-    vst1.16         {q9}, [r0]!
-    vst1.16         {q10}, [r0]!
-    vst1.16         {q11}, [r0]!
-    vst1.16         {q12}, [r0]!
-    vst1.16         {q13}, [r0]!
-    vst1.16         {q14}, [r0]!
-    vst1.16         {q15}, [r0]!
+    vst1.16         {q8}, [r0], r12     ;store diff
+    vst1.16         {q9}, [r7], r12
+    vst1.16         {q10}, [r0], r12
+    vst1.16         {q11}, [r7], r12
+    vst1.16         {q12}, [r0], r12
+    vst1.16         {q13}, [r7], r12
+    vst1.16         {q14}, [r0], r12
+    vst1.16         {q15}, [r7], r12
 
+    pop             {r4-r7}
     bx              lr
+
     ENDP
 
     END
diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_memcpy_neon.asm b/media/libvpx/vp8/encoder/arm/neon/vp8_memcpy_neon.asm
index b0450e5233e..5b9f11e5935 100644
--- a/media/libvpx/vp8/encoder/arm/neon/vp8_memcpy_neon.asm
+++ b/media/libvpx/vp8/encoder/arm/neon/vp8_memcpy_neon.asm
@@ -9,7 +9,7 @@
 ;
 
 
-    EXPORT |vp8_memcpy_neon|
+    EXPORT |vp8_memcpy_partial_neon|
 
     ARM
     REQUIRE8
@@ -17,8 +17,10 @@
 
     AREA ||.text||, CODE, READONLY, ALIGN=2
 ;=========================================
-;void vp8_memcpy_neon(unsigned char *dst_ptr, unsigned char *src_ptr, int sz);
-|vp8_memcpy_neon| PROC
+;this is not a full memcpy function!!!
+;void vp8_memcpy_partial_neon(unsigned char *dst_ptr, unsigned char *src_ptr,
+;                             int sz);
+|vp8_memcpy_partial_neon| PROC
     ;pld                [r1]                        ;preload pred data
     ;pld                [r1, #128]
     ;pld                [r1, #256]
diff --git a/media/libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm b/media/libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm
index ba3decf6c1f..22266297a86 100644
--- a/media/libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm
+++ b/media/libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm
@@ -16,58 +16,85 @@
     PRESERVE8
 
     AREA ||.text||, CODE, READONLY, ALIGN=2
-;void vp8_short_walsh4x4_c(short *input, short *output, int pitch)
-
+;void vp8_short_walsh4x4_neon(short *input, short *output, int pitch)
+; r0   short *input,
+; r1   short *output,
+; r2   int pitch
 |vp8_short_walsh4x4_neon| PROC
-    vld1.16         {d2}, [r0], r2              ;load input
-    vld1.16         {d3}, [r0], r2
-    vld1.16         {d4}, [r0], r2
-    vld1.16         {d5}, [r0], r2
+
+    vld1.16         {d0}, [r0@64], r2   ; load input
+    vld1.16         {d1}, [r0@64], r2
+    vld1.16         {d2}, [r0@64], r2
+    vld1.16         {d3}, [r0@64]
 
     ;First for-loop
-    ;transpose d2, d3, d4, d5. Then, d2=ip[0], d3=ip[1], d4=ip[2], d5=ip[3]
-    vtrn.32         d2, d4
-    vtrn.32         d3, d5
+    ;transpose d0, d1, d2, d3. Then, d0=ip[0], d1=ip[1], d2=ip[2], d3=ip[3]
+    vtrn.32         d0, d2
+    vtrn.32         d1, d3
+
+    vmov.s32        q15, #3             ; add 3 to all values
+
+    vtrn.16         d0, d1
     vtrn.16         d2, d3
-    vtrn.16         d4, d5
 
-    vadd.s16        d6, d2, d5              ;a1 = ip[0]+ip[3]
-    vadd.s16        d7, d3, d4              ;b1 = ip[1]+ip[2]
-    vsub.s16        d8, d3, d4              ;c1 = ip[1]-ip[2]
-    vsub.s16        d9, d2, d5              ;d1 = ip[0]-ip[3]
+    vadd.s16        d4, d0, d2          ; ip[0] + ip[2]
+    vadd.s16        d5, d1, d3          ; ip[1] + ip[3]
+    vsub.s16        d6, d1, d3          ; ip[1] - ip[3]
+    vsub.s16        d7, d0, d2          ; ip[0] - ip[2]
 
-    vadd.s16        d2, d6, d7             ;op[0] = a1 + b1
-    vsub.s16        d4, d6, d7             ;op[2] = a1 - b1
-    vadd.s16        d3, d8, d9             ;op[1] = c1 + d1
-    vsub.s16        d5, d9, d8             ;op[3] = d1 - c1
+    vshl.s16        d4, d4, #2          ; a1 = (ip[0] + ip[2]) << 2
+    vshl.s16        d5, d5, #2          ; d1 = (ip[1] + ip[3]) << 2
+    vshl.s16        d6, d6, #2          ; c1 = (ip[1] - ip[3]) << 2
+    vceq.s16        d16, d4, #0         ; a1 == 0
+    vshl.s16        d7, d7, #2          ; b1 = (ip[0] - ip[2]) << 2
+
+    vadd.s16        d0, d4, d5          ; a1 + d1
+    vmvn            d16, d16            ; a1 != 0
+    vsub.s16        d3, d4, d5          ; op[3] = a1 - d1
+    vadd.s16        d1, d7, d6          ; op[1] = b1 + c1
+    vsub.s16        d2, d7, d6          ; op[2] = b1 - c1
+    vsub.s16        d0, d0, d16         ; op[0] = a1 + d1 + (a1 != 0)
 
     ;Second for-loop
-    ;transpose d2, d3, d4, d5. Then, d2=ip[0], d3=ip[4], d4=ip[8], d5=ip[12]
-    vtrn.32         d2, d4
-    vtrn.32         d3, d5
+    ;transpose d0, d1, d2, d3, Then, d0=ip[0], d1=ip[4], d2=ip[8], d3=ip[12]
+    vtrn.32         d1, d3
+    vtrn.32         d0, d2
     vtrn.16         d2, d3
-    vtrn.16         d4, d5
+    vtrn.16         d0, d1
 
-    vadd.s16        d6, d2, d5              ;a1 = ip[0]+ip[12]
-    vadd.s16        d7, d3, d4              ;b1 = ip[4]+ip[8]
-    vsub.s16        d8, d3, d4              ;c1 = ip[4]-ip[8]
-    vsub.s16        d9, d2, d5              ;d1 = ip[0]-ip[12]
+    vaddl.s16       q8, d0, d2          ; a1 = ip[0]+ip[8]
+    vaddl.s16       q9, d1, d3          ; d1 = ip[4]+ip[12]
+    vsubl.s16       q10, d1, d3         ; c1 = ip[4]-ip[12]
+    vsubl.s16       q11, d0, d2         ; b1 = ip[0]-ip[8]
 
-    vadd.s16        d2, d6, d7              ;a2 = a1 + b1;
-    vsub.s16        d4, d6, d7              ;c2 = a1 - b1;
-    vadd.s16        d3, d8, d9              ;b2 = c1 + d1;
-    vsub.s16        d5, d9, d8              ;d2 = d1 - c1;
+    vadd.s32        q0, q8, q9          ; a2 = a1 + d1
+    vadd.s32        q1, q11, q10        ; b2 = b1 + c1
+    vsub.s32        q2, q11, q10        ; c2 = b1 - c1
+    vsub.s32        q3, q8, q9          ; d2 = a1 - d1
 
-    vcgt.s16        q3, q1, #0
-    vcgt.s16        q4, q2, #0
+    vclt.s32        q8, q0, #0
+    vclt.s32        q9, q1, #0
+    vclt.s32        q10, q2, #0
+    vclt.s32        q11, q3, #0
 
-    vsub.s16        q1, q1, q3
-    vsub.s16        q2, q2, q4
+    ; subtract -1 (or 0)
+    vsub.s32        q0, q0, q8          ; a2 += a2 < 0
+    vsub.s32        q1, q1, q9          ; b2 += b2 < 0
+    vsub.s32        q2, q2, q10         ; c2 += c2 < 0
+    vsub.s32        q3, q3, q11         ; d2 += d2 < 0
 
-    vshr.s16        q1, q1, #1
-    vshr.s16        q2, q2, #1
+    vadd.s32        q8, q0, q15         ; a2 + 3
+    vadd.s32        q9, q1, q15         ; b2 + 3
+    vadd.s32        q10, q2, q15        ; c2 + 3
+    vadd.s32        q11, q3, q15        ; d2 + 3
 
-    vst1.16         {q1, q2}, [r1]
+    ; vrshrn? would add 1 << 3-1 = 2
+    vshrn.s32       d0, q8, #3
+    vshrn.s32       d1, q9, #3
+    vshrn.s32       d2, q10, #3
+    vshrn.s32       d3, q11, #3
+
+    vst1.16         {q0, q1}, [r1@128]
 
     bx              lr
 
diff --git a/media/libvpx/vp8/encoder/arm/picklpf_arm.c b/media/libvpx/vp8/encoder/arm/picklpf_arm.c
deleted file mode 100644
index 3fb370c3df7..00000000000
--- a/media/libvpx/vp8/encoder/arm/picklpf_arm.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-#include "vp8/common/onyxc_int.h"
-#include "vp8/encoder/onyx_int.h"
-#include "vp8/encoder/quantize.h"
-#include "vpx_mem/vpx_mem.h"
-#include "vpx_scale/yv12extend.h"
-#include "vpx_scale/vpxscale.h"
-#include "vp8/common/alloccommon.h"
-
-extern void vp8_memcpy_neon(unsigned char *dst_ptr, unsigned char *src_ptr, int sz);
-
-
-void
-vpxyv12_copy_partial_frame_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction)
-{
-    unsigned char *src_y, *dst_y;
-    int yheight;
-    int ystride;
-    int border;
-    int yoffset;
-    int linestocopy;
-
-    border   = src_ybc->border;
-    yheight  = src_ybc->y_height;
-    ystride  = src_ybc->y_stride;
-
-    linestocopy = (yheight >> (Fraction + 4));
-
-    if (linestocopy < 1)
-        linestocopy = 1;
-
-    linestocopy <<= 4;
-
-    yoffset  = ystride * ((yheight >> 5) * 16 - 8);
-    src_y = src_ybc->y_buffer + yoffset;
-    dst_y = dst_ybc->y_buffer + yoffset;
-
-    //vpx_memcpy (dst_y, src_y, ystride * (linestocopy +16));
-    vp8_memcpy_neon((unsigned char *)dst_y, (unsigned char *)src_y, (int)(ystride *(linestocopy + 16)));
-}
diff --git a/media/libvpx/vp8/encoder/arm/quantize_arm.c b/media/libvpx/vp8/encoder/arm/quantize_arm.c
new file mode 100644
index 00000000000..5b3a0275fe6
--- /dev/null
+++ b/media/libvpx/vp8/encoder/arm/quantize_arm.c
@@ -0,0 +1,62 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+
+#include <math.h>
+#include "vpx_mem/vpx_mem.h"
+
+#include "vp8/encoder/quantize.h"
+#include "vp8/common/entropy.h"
+
+
+#if HAVE_ARMV7
+
+/* vp8_quantize_mbX functions here differs from corresponding ones in
+ * quantize.c only by using quantize_b_pair function pointer instead of
+ * the regular quantize_b function pointer */
+void vp8_quantize_mby_neon(MACROBLOCK *x)
+{
+    int i;
+    int has_2nd_order = (x->e_mbd.mode_info_context->mbmi.mode != B_PRED
+        && x->e_mbd.mode_info_context->mbmi.mode != SPLITMV);
+
+    for (i = 0; i < 16; i+=2)
+        x->quantize_b_pair(&x->block[i], &x->block[i+1],
+                           &x->e_mbd.block[i], &x->e_mbd.block[i+1]);
+
+    if(has_2nd_order)
+        x->quantize_b(&x->block[24], &x->e_mbd.block[24]);
+}
+
+void vp8_quantize_mb_neon(MACROBLOCK *x)
+{
+    int i;
+    int has_2nd_order=(x->e_mbd.mode_info_context->mbmi.mode != B_PRED
+        && x->e_mbd.mode_info_context->mbmi.mode != SPLITMV);
+
+    for (i = 0; i < 24; i+=2)
+        x->quantize_b_pair(&x->block[i], &x->block[i+1],
+                           &x->e_mbd.block[i], &x->e_mbd.block[i+1]);
+
+    if (has_2nd_order)
+        x->quantize_b(&x->block[24], &x->e_mbd.block[24]);
+}
+
+
+void vp8_quantize_mbuv_neon(MACROBLOCK *x)
+{
+    int i;
+
+    for (i = 16; i < 24; i+=2)
+        x->quantize_b_pair(&x->block[i], &x->block[i+1],
+                           &x->e_mbd.block[i], &x->e_mbd.block[i+1]);
+}
+
+#endif /* HAVE_ARMV7 */
diff --git a/media/libvpx/vp8/encoder/asm_enc_offsets.c b/media/libvpx/vp8/encoder/asm_enc_offsets.c
index c79e915f805..2e9ca7232c3 100644
--- a/media/libvpx/vp8/encoder/asm_enc_offsets.c
+++ b/media/libvpx/vp8/encoder/asm_enc_offsets.c
@@ -49,6 +49,8 @@ DEFINE(vp8_writer_value,                        offsetof(vp8_writer, value));
 DEFINE(vp8_writer_count,                        offsetof(vp8_writer, count));
 DEFINE(vp8_writer_pos,                          offsetof(vp8_writer, pos));
 DEFINE(vp8_writer_buffer,                       offsetof(vp8_writer, buffer));
+DEFINE(vp8_writer_buffer_end,                   offsetof(vp8_writer, buffer_end));
+DEFINE(vp8_writer_error,                        offsetof(vp8_writer, error));
 
 DEFINE(tokenextra_token,                        offsetof(TOKENEXTRA, Token));
 DEFINE(tokenextra_extra,                        offsetof(TOKENEXTRA, Extra));
@@ -68,7 +70,8 @@ DEFINE(vp8_extra_bit_struct_base_val,           offsetof(vp8_extra_bit_struct, b
 
 DEFINE(vp8_comp_tplist,                         offsetof(VP8_COMP, tplist));
 DEFINE(vp8_comp_common,                         offsetof(VP8_COMP, common));
-DEFINE(vp8_comp_bc2,                            offsetof(VP8_COMP, bc2));
+DEFINE(vp8_comp_bc ,                            offsetof(VP8_COMP, bc));
+DEFINE(vp8_writer_sz ,                          sizeof(vp8_writer));
 
 DEFINE(tokenlist_start,                         offsetof(TOKENLIST, start));
 DEFINE(tokenlist_stop,                          offsetof(TOKENLIST, stop));
diff --git a/media/libvpx/vp8/encoder/bitstream.c b/media/libvpx/vp8/encoder/bitstream.c
index b3c24398c1a..0bb51730e0b 100644
--- a/media/libvpx/vp8/encoder/bitstream.c
+++ b/media/libvpx/vp8/encoder/bitstream.c
@@ -22,7 +22,8 @@
 #include "vpx/vpx_encoder.h"
 #include "vpx_mem/vpx_mem.h"
 #include "bitstream.h"
-#include "vp8/common/defaultcoefcounts.h"
+
+#include "defaultcoefcounts.h"
 
 const int vp8cx_base_skip_false_prob[128] =
 {
@@ -108,7 +109,7 @@ static void update_mbintra_mode_probs(VP8_COMP *cpi)
 {
     VP8_COMMON *const x = & cpi->common;
 
-    vp8_writer *const w = & cpi->bc;
+    vp8_writer *const w = cpi->bc;
 
     {
         vp8_prob Pnew   [VP8_YMODES-1];
@@ -220,6 +221,11 @@ static void pack_tokens_c(vp8_writer *w, const TOKENEXTRA *p, int xcount)
                     w->buffer[x] += 1;
                 }
 
+                validate_buffer(w->buffer + w->pos,
+                                1,
+                                w->buffer_end,
+                                w->error);
+
                 w->buffer[w->pos++] = (lowvalue >> (24 - offset));
                 lowvalue <<= offset;
                 shift = count;
@@ -280,6 +286,11 @@ static void pack_tokens_c(vp8_writer *w, const TOKENEXTRA *p, int xcount)
                             w->buffer[x] += 1;
                         }
 
+                        validate_buffer(w->buffer + w->pos,
+                                        1,
+                                        w->buffer_end,
+                                        w->error);
+
                         w->buffer[w->pos++] = (lowvalue >> (24 - offset));
                         lowvalue <<= offset;
                         shift = count;
@@ -328,6 +339,12 @@ static void pack_tokens_c(vp8_writer *w, const TOKENEXTRA *p, int xcount)
                 if (!++count)
                 {
                     count = -8;
+
+                    validate_buffer(w->buffer + w->pos,
+                                    1,
+                                    w->buffer_end,
+                                    w->error);
+
                     w->buffer[w->pos++] = (lowvalue >> 24);
                     lowvalue &= 0xffffff;
                 }
@@ -357,20 +374,22 @@ static void write_partition_size(unsigned char *cx_data, int size)
 
 }
 
-static void pack_tokens_into_partitions_c(VP8_COMP *cpi, unsigned char *cx_data, int num_part, int *size)
+static void pack_tokens_into_partitions_c(VP8_COMP *cpi, unsigned char *cx_data,
+                                          unsigned char * cx_data_end,
+                                          int num_part)
 {
 
     int i;
     unsigned char *ptr = cx_data;
+    unsigned char *ptr_end = cx_data_end;
     unsigned int shift;
-    vp8_writer *w = &cpi->bc2;
-    *size = 3 * (num_part - 1);
-    cpi->partition_sz[0] += *size;
-    ptr = cx_data + (*size);
+    vp8_writer *w;
+    ptr = cx_data;
 
     for (i = 0; i < num_part; i++)
     {
-        vp8_start_encode(w, ptr);
+        w = cpi->bc + i + 1;
+        vp8_start_encode(w, ptr, ptr_end);
         {
             unsigned int split;
             int count = w->count;
@@ -436,7 +455,13 @@ static void pack_tokens_into_partitions_c(VP8_COMP *cpi, unsigned char *cx_data,
                                 w->buffer[x] += 1;
                             }
 
+                            validate_buffer(w->buffer + w->pos,
+                                            1,
+                                            cx_data_end,
+                                            &cpi->common.error);
+
                             w->buffer[w->pos++] = (lowvalue >> (24 - offset));
+
                             lowvalue <<= offset;
                             shift = count;
                             lowvalue &= 0xffffff;
@@ -496,7 +521,14 @@ static void pack_tokens_into_partitions_c(VP8_COMP *cpi, unsigned char *cx_data,
                                         w->buffer[x] += 1;
                                     }
 
-                                    w->buffer[w->pos++] = (lowvalue >> (24 - offset));
+                                    validate_buffer(w->buffer + w->pos,
+                                                    1,
+                                                    cx_data_end,
+                                                    &cpi->common.error);
+
+                                    w->buffer[w->pos++] =
+                                        (lowvalue >> (24 - offset));
+
                                     lowvalue <<= offset;
                                     shift = count;
                                     lowvalue &= 0xffffff;
@@ -542,7 +574,13 @@ static void pack_tokens_into_partitions_c(VP8_COMP *cpi, unsigned char *cx_data,
                             if (!++count)
                             {
                                 count = -8;
+                                validate_buffer(w->buffer + w->pos,
+                                                1,
+                                                cx_data_end,
+                                                &cpi->common.error);
+
                                 w->buffer[w->pos++] = (lowvalue >> 24);
+
                                 lowvalue &= 0xffffff;
                             }
                         }
@@ -560,17 +598,7 @@ static void pack_tokens_into_partitions_c(VP8_COMP *cpi, unsigned char *cx_data,
         }
 
         vp8_stop_encode(w);
-        *size +=   w->pos;
-
-        /* The first partition size is set earlier */
-        cpi->partition_sz[i + 1] = w->pos;
-
-        if (i < (num_part - 1))
-        {
-            write_partition_size(cx_data, w->pos);
-            cx_data += 3;
-            ptr += w->pos;
-        }
+        ptr += w->pos;
     }
 }
 
@@ -643,6 +671,11 @@ static void pack_mb_row_tokens_c(VP8_COMP *cpi, vp8_writer *w)
                         w->buffer[x] += 1;
                     }
 
+                    validate_buffer(w->buffer + w->pos,
+                                    1,
+                                    w->buffer_end,
+                                    w->error);
+
                     w->buffer[w->pos++] = (lowvalue >> (24 - offset));
                     lowvalue <<= offset;
                     shift = count;
@@ -703,6 +736,11 @@ static void pack_mb_row_tokens_c(VP8_COMP *cpi, vp8_writer *w)
                                 w->buffer[x] += 1;
                             }
 
+                            validate_buffer(w->buffer + w->pos,
+                                            1,
+                                            w->buffer_end,
+                                            w->error);
+
                             w->buffer[w->pos++] = (lowvalue >> (24 - offset));
                             lowvalue <<= offset;
                             shift = count;
@@ -749,6 +787,12 @@ static void pack_mb_row_tokens_c(VP8_COMP *cpi, vp8_writer *w)
                     if (!++count)
                     {
                         count = -8;
+
+                        validate_buffer(w->buffer + w->pos,
+                                        1,
+                                        w->buffer_end,
+                                        w->error);
+
                         w->buffer[w->pos++] = (lowvalue >> 24);
                         lowvalue &= 0xffffff;
                     }
@@ -834,44 +878,46 @@ static void write_mb_features(vp8_writer *w, const MB_MODE_INFO *mi, const MACRO
         }
     }
 }
+void vp8_convert_rfct_to_prob(VP8_COMP *const cpi)
+{
+    const int *const rfct = cpi->count_mb_ref_frame_usage;
+    const int rf_intra = rfct[INTRA_FRAME];
+    const int rf_inter = rfct[LAST_FRAME] + rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME];
 
+    // Calculate the probabilities used to code the ref frame based on useage
+    if (!(cpi->prob_intra_coded = rf_intra * 255 / (rf_intra + rf_inter)))
+        cpi->prob_intra_coded = 1;
+
+    cpi->prob_last_coded = rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
+
+    if (!cpi->prob_last_coded)
+        cpi->prob_last_coded = 1;
+
+    cpi->prob_gf_coded = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
+                  ? (rfct[GOLDEN_FRAME] * 255) / (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]) : 128;
+
+    if (!cpi->prob_gf_coded)
+        cpi->prob_gf_coded = 1;
+
+}
 
 static void pack_inter_mode_mvs(VP8_COMP *const cpi)
 {
     VP8_COMMON *const pc = & cpi->common;
-    vp8_writer *const w = & cpi->bc;
+    vp8_writer *const w = cpi->bc;
     const MV_CONTEXT *mvc = pc->fc.mvc;
 
-    const int *const rfct = cpi->count_mb_ref_frame_usage;
-    const int rf_intra = rfct[INTRA_FRAME];
-    const int rf_inter = rfct[LAST_FRAME] + rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME];
 
     MODE_INFO *m = pc->mi, *ms;
     const int mis = pc->mode_info_stride;
     int mb_row = -1;
 
-    int prob_last_coded;
-    int prob_gf_coded;
     int prob_skip_false = 0;
     ms = pc->mi - 1;
 
     cpi->mb.partition_info = cpi->mb.pi;
 
-    // Calculate the probabilities to be used to code the reference frame based on actual useage this frame
-    if (!(cpi->prob_intra_coded = rf_intra * 255 / (rf_intra + rf_inter)))
-        cpi->prob_intra_coded = 1;
-
-    prob_last_coded = rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
-
-    if (!prob_last_coded)
-        prob_last_coded = 1;
-
-    prob_gf_coded = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
-                    ? (rfct[GOLDEN_FRAME] * 255) / (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]) : 128;
-
-    if (!prob_gf_coded)
-        prob_gf_coded = 1;
-
+    vp8_convert_rfct_to_prob(cpi);
 
 #ifdef ENTROPY_STATS
     active_section = 1;
@@ -892,8 +938,8 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
     }
 
     vp8_write_literal(w, cpi->prob_intra_coded, 8);
-    vp8_write_literal(w, prob_last_coded, 8);
-    vp8_write_literal(w, prob_gf_coded, 8);
+    vp8_write_literal(w, cpi->prob_last_coded, 8);
+    vp8_write_literal(w, cpi->prob_gf_coded, 8);
 
     update_mbintra_mode_probs(cpi);
 
@@ -955,11 +1001,11 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
                 vp8_write(w, 1, cpi->prob_intra_coded);
 
                 if (rf == LAST_FRAME)
-                    vp8_write(w, 0, prob_last_coded);
+                    vp8_write(w, 0, cpi->prob_last_coded);
                 else
                 {
-                    vp8_write(w, 1, prob_last_coded);
-                    vp8_write(w, (rf == GOLDEN_FRAME) ? 0 : 1, prob_gf_coded);
+                    vp8_write(w, 1, cpi->prob_last_coded);
+                    vp8_write(w, (rf == GOLDEN_FRAME) ? 0 : 1, cpi->prob_gf_coded);
                 }
 
                 {
@@ -967,6 +1013,8 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
                     int ct[4];
 
                     vp8_find_near_mvs(xd, m, &n1, &n2, &best_mv, ct, rf, cpi->common.ref_frame_sign_bias);
+                    vp8_clamp_mv2(&best_mv, xd);
+
                     vp8_mv_ref_probs(mv_ref_p, ct);
 
 #ifdef ENTROPY_STATS
@@ -1054,7 +1102,7 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
 
 static void write_kfmodes(VP8_COMP *cpi)
 {
-    vp8_writer *const bc = & cpi->bc;
+    vp8_writer *const bc = cpi->bc;
     const VP8_COMMON *const c = & cpi->common;
     /* const */
     MODE_INFO *m = c->mi;
@@ -1160,7 +1208,7 @@ static void sum_probs_over_prev_coef_context(
     {
         for (j=0; j < PREV_COEF_CONTEXTS; ++j)
         {
-            const int tmp = out[i];
+            const unsigned int tmp = out[i];
             out[i] += probs[j][i];
             /* check for wrap */
             if (out[i] < tmp)
@@ -1193,20 +1241,20 @@ static int independent_coef_context_savings(VP8_COMP *cpi)
             int k = 0;
             unsigned int prev_coef_count_sum[MAX_ENTROPY_TOKENS] = {0};
             int prev_coef_savings[MAX_ENTROPY_TOKENS] = {0};
+            const unsigned int (*probs)[MAX_ENTROPY_TOKENS];
             /* Calculate new probabilities given the constraint that
              * they must be equal over the prev coef contexts
              */
+
+            probs = (const unsigned int (*)[MAX_ENTROPY_TOKENS])
+                                                    cpi->coef_counts[i][j];
+
+            /* Reset to default probabilities at key frames */
             if (cpi->common.frame_type == KEY_FRAME)
-            {
-                /* Reset to default probabilities at key frames */
-                sum_probs_over_prev_coef_context(vp8_default_coef_counts[i][j],
-                                                 prev_coef_count_sum);
-            }
-            else
-            {
-                sum_probs_over_prev_coef_context(cpi->coef_counts[i][j],
-                                                 prev_coef_count_sum);
-            }
+                probs = default_coef_counts[i][j];
+
+            sum_probs_over_prev_coef_context(probs, prev_coef_count_sum);
+
             do
             {
                 /* at every context */
@@ -1311,6 +1359,24 @@ static int default_coef_context_savings(VP8_COMP *cpi)
     return savings;
 }
 
+void vp8_calc_ref_frame_costs(int *ref_frame_cost,
+                              int prob_intra,
+                              int prob_last,
+                              int prob_garf
+                             )
+{
+    ref_frame_cost[INTRA_FRAME]   = vp8_cost_zero(prob_intra);
+    ref_frame_cost[LAST_FRAME]    = vp8_cost_one(prob_intra)
+                                    + vp8_cost_zero(prob_last);
+    ref_frame_cost[GOLDEN_FRAME]  = vp8_cost_one(prob_intra)
+                                    + vp8_cost_one(prob_last)
+                                    + vp8_cost_zero(prob_garf);
+    ref_frame_cost[ALTREF_FRAME]  = vp8_cost_one(prob_intra)
+                                    + vp8_cost_one(prob_last)
+                                    + vp8_cost_one(prob_garf);
+
+}
+
 int vp8_estimate_entropy_savings(VP8_COMP *cpi)
 {
     int savings = 0;
@@ -1318,7 +1384,7 @@ int vp8_estimate_entropy_savings(VP8_COMP *cpi)
     const int *const rfct = cpi->count_mb_ref_frame_usage;
     const int rf_intra = rfct[INTRA_FRAME];
     const int rf_inter = rfct[LAST_FRAME] + rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME];
-    int new_intra, new_last, gf_last, oldtotal, newtotal;
+    int new_intra, new_last, new_garf, oldtotal, newtotal;
     int ref_frame_cost[MAX_REF_FRAMES];
 
     vp8_clear_system_state(); //__asm emms;
@@ -1330,19 +1396,11 @@ int vp8_estimate_entropy_savings(VP8_COMP *cpi)
 
         new_last = rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
 
-        gf_last = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
+        new_garf = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
                   ? (rfct[GOLDEN_FRAME] * 255) / (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]) : 128;
 
-        // new costs
-        ref_frame_cost[INTRA_FRAME]   = vp8_cost_zero(new_intra);
-        ref_frame_cost[LAST_FRAME]    = vp8_cost_one(new_intra)
-                                        + vp8_cost_zero(new_last);
-        ref_frame_cost[GOLDEN_FRAME]  = vp8_cost_one(new_intra)
-                                        + vp8_cost_one(new_last)
-                                        + vp8_cost_zero(gf_last);
-        ref_frame_cost[ALTREF_FRAME]  = vp8_cost_one(new_intra)
-                                        + vp8_cost_one(new_last)
-                                        + vp8_cost_one(gf_last);
+
+        vp8_calc_ref_frame_costs(ref_frame_cost,new_intra,new_last,new_garf);
 
         newtotal =
             rfct[INTRA_FRAME] * ref_frame_cost[INTRA_FRAME] +
@@ -1352,15 +1410,8 @@ int vp8_estimate_entropy_savings(VP8_COMP *cpi)
 
 
         // old costs
-        ref_frame_cost[INTRA_FRAME]   = vp8_cost_zero(cpi->prob_intra_coded);
-        ref_frame_cost[LAST_FRAME]    = vp8_cost_one(cpi->prob_intra_coded)
-                                        + vp8_cost_zero(cpi->prob_last_coded);
-        ref_frame_cost[GOLDEN_FRAME]  = vp8_cost_one(cpi->prob_intra_coded)
-                                        + vp8_cost_one(cpi->prob_last_coded)
-                                        + vp8_cost_zero(cpi->prob_gf_coded);
-        ref_frame_cost[ALTREF_FRAME]  = vp8_cost_one(cpi->prob_intra_coded)
-                                        + vp8_cost_one(cpi->prob_last_coded)
-                                        + vp8_cost_one(cpi->prob_gf_coded);
+        vp8_calc_ref_frame_costs(ref_frame_cost,cpi->prob_intra_coded,
+                                 cpi->prob_last_coded,cpi->prob_gf_coded);
 
         oldtotal =
             rfct[INTRA_FRAME] * ref_frame_cost[INTRA_FRAME] +
@@ -1384,7 +1435,7 @@ int vp8_estimate_entropy_savings(VP8_COMP *cpi)
 static void update_coef_probs(VP8_COMP *cpi)
 {
     int i = 0;
-    vp8_writer *const w = & cpi->bc;
+    vp8_writer *const w = cpi->bc;
     int savings = 0;
 
     vp8_clear_system_state(); //__asm emms;
@@ -1525,16 +1576,17 @@ static void put_delta_q(vp8_writer *bc, int delta_q)
         vp8_write_bit(bc, 0);
 }
 
-void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
+void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned char * dest_end, unsigned long *size)
 {
     int i, j;
     VP8_HEADER oh;
     VP8_COMMON *const pc = & cpi->common;
-    vp8_writer *const bc = & cpi->bc;
+    vp8_writer *const bc = cpi->bc;
     MACROBLOCKD *const xd = & cpi->mb.e_mbd;
     int extra_bytes_packed = 0;
 
     unsigned char *cx_data = dest;
+    unsigned char *cx_data_end = dest_end;
     const int *mb_feature_data_bits;
 
     oh.show_frame = (int) pc->show_frame;
@@ -1543,6 +1595,10 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
     oh.first_partition_length_in_bytes = 0;
 
     mb_feature_data_bits = vp8_mb_feature_data_bits;
+
+    bc[0].error = &pc->error;
+
+    validate_buffer(cx_data, 3, cx_data_end, &cpi->common.error);
     cx_data += 3;
 
 #if defined(SECTIONBITS_OUTPUT)
@@ -1559,6 +1615,8 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
     {
         int v;
 
+        validate_buffer(cx_data, 7, cx_data_end, &cpi->common.error);
+
         // Start / synch code
         cx_data[0] = 0x9D;
         cx_data[1] = 0x01;
@@ -1572,10 +1630,11 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
         cx_data[5] = v;
         cx_data[6] = v >> 8;
 
+
         extra_bytes_packed = 7;
         cx_data += extra_bytes_packed ;
 
-        vp8_start_encode(bc, cx_data);
+        vp8_start_encode(bc, cx_data, cx_data_end);
 
         // signal clr type
         vp8_write_bit(bc, pc->clr_type);
@@ -1583,24 +1642,24 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
 
     }
     else
-        vp8_start_encode(bc, cx_data);
+        vp8_start_encode(bc, cx_data, cx_data_end);
 
 
     // Signal whether or not Segmentation is enabled
-    vp8_write_bit(bc, (xd->segmentation_enabled) ? 1 : 0);
+    vp8_write_bit(bc, xd->segmentation_enabled);
 
     // Indicate which features are enabled
     if (xd->segmentation_enabled)
     {
         // Signal whether or not the segmentation map is being updated.
-        vp8_write_bit(bc, (xd->update_mb_segmentation_map) ? 1 : 0);
-        vp8_write_bit(bc, (xd->update_mb_segmentation_data) ? 1 : 0);
+        vp8_write_bit(bc, xd->update_mb_segmentation_map);
+        vp8_write_bit(bc, xd->update_mb_segmentation_data);
 
         if (xd->update_mb_segmentation_data)
         {
             signed char Data;
 
-            vp8_write_bit(bc, (xd->mb_segement_abs_delta) ? 1 : 0);
+            vp8_write_bit(bc, xd->mb_segement_abs_delta);
 
             // For each segmentation feature (Quant and loop filter level)
             for (i = 0; i < MB_LVL_MAX; i++)
@@ -1657,7 +1716,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
     vp8_write_literal(bc, pc->sharpness_level, 3);
 
     // Write out loop filter deltas applied at the MB level based on mode or ref frame (if they are enabled).
-    vp8_write_bit(bc, (xd->mode_ref_lf_delta_enabled) ? 1 : 0);
+    vp8_write_bit(bc, xd->mode_ref_lf_delta_enabled);
 
     if (xd->mode_ref_lf_delta_enabled)
     {
@@ -1783,9 +1842,9 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
 
     vp8_clear_system_state();  //__asm emms;
 
-    //************************************************
-    // save a copy for later refresh
+    if (pc->refresh_entropy_probs == 0)
     {
+        // save a copy for later refresh
         vpx_memcpy(&cpi->common.lfc, &cpi->common.fc, sizeof(cpi->common.fc));
     }
 
@@ -1817,7 +1876,9 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
 
     vp8_stop_encode(bc);
 
-    oh.first_partition_length_in_bytes = cpi->bc.pos;
+    cx_data += bc->pos;
+
+    oh.first_partition_length_in_bytes = cpi->bc->pos;
 
     /* update frame tag */
     {
@@ -1831,34 +1892,58 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
         dest[2] = v >> 16;
     }
 
-    *size = VP8_HEADER_SIZE + extra_bytes_packed + cpi->bc.pos;
+    *size = VP8_HEADER_SIZE + extra_bytes_packed + cpi->bc->pos;
+
     cpi->partition_sz[0] = *size;
 
     if (pc->multi_token_partition != ONE_PARTITION)
     {
-        int num_part;
-        int asize;
-        num_part = 1 << pc->multi_token_partition;
+        int num_part = 1 << pc->multi_token_partition;
 
-        pack_tokens_into_partitions(cpi, cx_data + bc->pos, num_part, &asize);
+        /* partition size table at the end of first partition */
+        cpi->partition_sz[0] += 3 * (num_part - 1);
+        *size += 3 * (num_part - 1);
 
-        *size += asize;
+        validate_buffer(cx_data, 3 * (num_part - 1), cx_data_end,
+                        &pc->error);
+
+        for(i = 1; i < num_part + 1; i++)
+        {
+            cpi->bc[i].error = &pc->error;
+        }
+
+        pack_tokens_into_partitions(cpi, cx_data + 3 * (num_part - 1),
+                                    cx_data_end, num_part);
+
+        for(i = 1; i < num_part; i++)
+        {
+            cpi->partition_sz[i] = cpi->bc[i].pos;
+            write_partition_size(cx_data, cpi->partition_sz[i]);
+            cx_data += 3;
+            *size += cpi->partition_sz[i]; /* add to total */
+        }
+
+        /* add last partition to total size */
+        cpi->partition_sz[i] = cpi->bc[i].pos;
+        *size += cpi->partition_sz[i];
     }
     else
     {
-        vp8_start_encode(&cpi->bc2, cx_data + bc->pos);
+        bc[1].error = &pc->error;
+
+        vp8_start_encode(&cpi->bc[1], cx_data, cx_data_end);
 
 #if CONFIG_MULTITHREAD
         if (cpi->b_multi_threaded)
-            pack_mb_row_tokens(cpi, &cpi->bc2);
+            pack_mb_row_tokens(cpi, &cpi->bc[1]);
         else
 #endif
-            pack_tokens(&cpi->bc2, cpi->tok, cpi->tok_count);
+            pack_tokens(&cpi->bc[1], cpi->tok, cpi->tok_count);
 
-        vp8_stop_encode(&cpi->bc2);
+        vp8_stop_encode(&cpi->bc[1]);
 
-        *size += cpi->bc2.pos;
-        cpi->partition_sz[1] = cpi->bc2.pos;
+        *size += cpi->bc[1].pos;
+        cpi->partition_sz[1] = cpi->bc[1].pos;
     }
 }
 
diff --git a/media/libvpx/vp8/encoder/bitstream.h b/media/libvpx/vp8/encoder/bitstream.h
index f5d148ea477..9007cede0c0 100644
--- a/media/libvpx/vp8/encoder/bitstream.h
+++ b/media/libvpx/vp8/encoder/bitstream.h
@@ -17,10 +17,13 @@ void vp8cx_pack_tokens_armv5(vp8_writer *w, const TOKENEXTRA *p, int xcount,
                              vp8_token *,
                              vp8_extra_bit_struct *,
                              const vp8_tree_index *);
-void vp8cx_pack_tokens_into_partitions_armv5(VP8_COMP *, unsigned char *, int , int *,
-        vp8_token *,
-        vp8_extra_bit_struct *,
-        const vp8_tree_index *);
+void vp8cx_pack_tokens_into_partitions_armv5(VP8_COMP *,
+                                             unsigned char * cx_data,
+                                             const unsigned char *cx_data_end,
+                                             int num_parts,
+                                             vp8_token *,
+                                             vp8_extra_bit_struct *,
+                                             const vp8_tree_index *);
 void vp8cx_pack_mb_row_tokens_armv5(VP8_COMP *cpi, vp8_writer *w,
                                     vp8_token *,
                                     vp8_extra_bit_struct *,
@@ -32,8 +35,9 @@ void vp8cx_pack_mb_row_tokens_armv5(VP8_COMP *cpi, vp8_writer *w,
 # define pack_mb_row_tokens(a,b)               \
     vp8cx_pack_mb_row_tokens_armv5(a,b,vp8_coef_encodings,vp8_extra_bits,vp8_coef_tree)
 #else
-# define pack_tokens(a,b,c)                  pack_tokens_c(a,b,c)
+# define pack_tokens(a,b,c)                    pack_tokens_c(a,b,c)
 # define pack_tokens_into_partitions(a,b,c,d)  pack_tokens_into_partitions_c(a,b,c,d)
 # define pack_mb_row_tokens(a,b)               pack_mb_row_tokens_c(a,b)
 #endif
+
 #endif
diff --git a/media/libvpx/vp8/encoder/block.h b/media/libvpx/vp8/encoder/block.h
index 0d14b545c8e..0a74ca46db6 100644
--- a/media/libvpx/vp8/encoder/block.h
+++ b/media/libvpx/vp8/encoder/block.h
@@ -45,10 +45,6 @@ typedef struct
     unsigned char **base_src;
     int src;
     int src_stride;
-
-//  MV  enc_mv;
-    int force_empty;
-
 } BLOCK;
 
 typedef struct
@@ -90,6 +86,7 @@ typedef struct
     unsigned int * mb_activity_ptr;
     int * mb_norm_activity_ptr;
     signed int act_zbin_adj;
+    signed int last_act_zbin_adj;
 
     int mvcosts[2][MVvals+1];
     int *mvcost[2];
@@ -106,7 +103,6 @@ typedef struct
     int mv_row_min;
     int mv_row_max;
 
-    int vector_range;    // Used to monitor limiting range of recent vectors to guide search.
     int skip;
 
     int encode_breakout;
diff --git a/media/libvpx/vp8/encoder/boolhuff.c b/media/libvpx/vp8/encoder/boolhuff.c
index 08ae66b8da0..d8ff5f93380 100644
--- a/media/libvpx/vp8/encoder/boolhuff.c
+++ b/media/libvpx/vp8/encoder/boolhuff.c
@@ -40,15 +40,16 @@ const unsigned int vp8_prob_cost[256] =
     22,   21,   19,   18,   16,   15,   13,   12,   10,    9,    7,    6,    4,    3,    1,   1
 };
 
-void vp8_start_encode(BOOL_CODER *br, unsigned char *source)
+void vp8_start_encode(BOOL_CODER *br, unsigned char *source, unsigned char *source_end)
 {
 
-    br->lowvalue = 0;
-    br->range    = 255;
-    br->value    = 0;
-    br->count    = -24;
-    br->buffer   = source;
-    br->pos      = 0;
+    br->lowvalue   = 0;
+    br->range      = 255;
+    br->value      = 0;
+    br->count      = -24;
+    br->buffer     = source;
+    br->buffer_end = source_end;
+    br->pos        = 0;
 }
 
 void vp8_stop_encode(BOOL_CODER *br)
diff --git a/media/libvpx/vp8/encoder/boolhuff.h b/media/libvpx/vp8/encoder/boolhuff.h
index 04755f5329b..569b7791fb9 100644
--- a/media/libvpx/vp8/encoder/boolhuff.h
+++ b/media/libvpx/vp8/encoder/boolhuff.h
@@ -20,6 +20,7 @@
 #define __INC_BOOLHUFF_H
 
 #include "vpx_ports/mem.h"
+#include "vpx/internal/vpx_codec_internal.h"
 
 typedef struct
 {
@@ -29,13 +30,15 @@ typedef struct
     int count;
     unsigned int pos;
     unsigned char *buffer;
+    unsigned char *buffer_end;
+    struct vpx_internal_error_info *error;
 
     // Variables used to track bit costs without outputing to the bitstream
     unsigned int  measure_cost;
     unsigned long bit_counter;
 } BOOL_CODER;
 
-extern void vp8_start_encode(BOOL_CODER *bc, unsigned char *buffer);
+extern void vp8_start_encode(BOOL_CODER *bc, unsigned char *buffer, unsigned char *buffer_end);
 
 extern void vp8_encode_value(BOOL_CODER *br, int data, int bits);
 extern void vp8_stop_encode(BOOL_CODER *bc);
@@ -44,7 +47,19 @@ extern const unsigned int vp8_prob_cost[256];
 
 DECLARE_ALIGNED(16, extern const unsigned char, vp8_norm[256]);
 
+static int validate_buffer(const unsigned char *start,
+                           size_t               len,
+                           const unsigned char *end,
+                           struct vpx_internal_error_info *error)
+{
+    if (start + len > start && start + len < end)
+        return 1;
+    else
+        vpx_internal_error(error, VPX_CODEC_CORRUPT_FRAME,
+            "Truncated packet or corrupt partition ");
 
+    return 0;
+}
 static void vp8_encode_bool(BOOL_CODER *br, int bit, int probability)
 {
     unsigned int split;
@@ -96,7 +111,9 @@ static void vp8_encode_bool(BOOL_CODER *br, int bit, int probability)
             br->buffer[x] += 1;
         }
 
+        validate_buffer(br->buffer + br->pos, 1, br->buffer_end, br->error);
         br->buffer[br->pos++] = (lowvalue >> (24 - offset));
+
         lowvalue <<= offset;
         shift = count;
         lowvalue &= 0xffffff;
diff --git a/media/libvpx/vp8/common/defaultcoefcounts.c b/media/libvpx/vp8/encoder/defaultcoefcounts.h
similarity index 97%
rename from media/libvpx/vp8/common/defaultcoefcounts.c
rename to media/libvpx/vp8/encoder/defaultcoefcounts.h
index b0e2e702abc..2c0f3ddf3b3 100644
--- a/media/libvpx/vp8/common/defaultcoefcounts.c
+++ b/media/libvpx/vp8/encoder/defaultcoefcounts.h
@@ -8,14 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "defaultcoefcounts.h"
-
 /* Generated file, included by entropy.c */
 
-const unsigned int vp8_default_coef_counts[BLOCK_TYPES]
-                                          [COEF_BANDS]
-                                          [PREV_COEF_CONTEXTS]
-                                          [MAX_ENTROPY_TOKENS] =
+static const unsigned int default_coef_counts[BLOCK_TYPES]
+                                             [COEF_BANDS]
+                                             [PREV_COEF_CONTEXTS]
+                                             [MAX_ENTROPY_TOKENS] =
 {
 
     {
diff --git a/media/libvpx/vp8/encoder/encodeframe.c b/media/libvpx/vp8/encoder/encodeframe.c
index 5d4e7e71eb0..51a375e04e5 100644
--- a/media/libvpx/vp8/encoder/encodeframe.c
+++ b/media/libvpx/vp8/encoder/encodeframe.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "encodemb.h"
 #include "encodemv.h"
 #include "vp8/common/common.h"
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <limits.h>
 #include "vp8/common/subpixel.h"
+#include "vp8/common/invtrans.h"
 #include "vpx_ports/vpx_timer.h"
 
 #if CONFIG_RUNTIME_CPU_DETECT
@@ -38,7 +39,12 @@
 #define IF_RTCD(x)  NULL
 #endif
 extern void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t) ;
-
+extern void vp8_calc_ref_frame_costs(int *ref_frame_cost,
+                                     int prob_intra,
+                                     int prob_last,
+                                     int prob_garf
+                                    );
+extern void vp8_convert_rfct_to_prob(VP8_COMP *const cpi);
 extern void vp8cx_initialize_me_consts(VP8_COMP *cpi, int QIndex);
 extern void vp8_auto_select_speed(VP8_COMP *cpi);
 extern void vp8cx_init_mbrthread_data(VP8_COMP *cpi,
@@ -48,8 +54,8 @@ extern void vp8cx_init_mbrthread_data(VP8_COMP *cpi,
                                       int count);
 void vp8_build_block_offsets(MACROBLOCK *x);
 void vp8_setup_block_ptrs(MACROBLOCK *x);
-int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t, int recon_yoffset, int recon_uvoffset);
-int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t);
+int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t, int recon_yoffset, int recon_uvoffset, int mb_row, int mb_col);
+int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t, int mb_row, int mb_col);
 static void adjust_act_zbin( VP8_COMP *cpi, MACROBLOCK *x );
 
 #ifdef MODE_STATS
@@ -92,7 +98,7 @@ static unsigned int tt_activity_measure( VP8_COMP *cpi, MACROBLOCK *x )
      *  lambda using a non-linear combination (e.g., the smallest, or second
      *  smallest, etc.).
      */
-    act =     VARIANCE_INVOKE(&cpi->rtcd.variance, var16x16)(x->src.y_buffer,
+    act =     VARIANCE_INVOKE(&cpi->common.rtcd.variance, var16x16)(x->src.y_buffer,
                     x->src.y_stride, VP8_VAR_OFFS, 0, &sse);
     act = act<<4;
 
@@ -368,7 +374,6 @@ void encode_mb_row(VP8_COMP *cpi,
                    int *segment_counts,
                    int *totalrate)
 {
-    int i;
     int recon_yoffset, recon_uvoffset;
     int mb_col;
     int ref_fb_idx = cm->lst_fb_idx;
@@ -457,7 +462,7 @@ void encode_mb_row(VP8_COMP *cpi,
             vp8_activity_masking(cpi, x);
 
         // Is segmentation enabled
-        // MB level adjutment to quantizer
+        // MB level adjustment to quantizer
         if (xd->segmentation_enabled)
         {
             // Code to set segment id in xd->mbmi.segment_id for current MB (with range checking)
@@ -466,7 +471,7 @@ void encode_mb_row(VP8_COMP *cpi,
             else
                 xd->mode_info_context->mbmi.segment_id = 0;
 
-            vp8cx_mb_init_quantizer(cpi, x);
+            vp8cx_mb_init_quantizer(cpi, x, 1);
         }
         else
             xd->mode_info_context->mbmi.segment_id = 0;         // Set to Segment 0 by default
@@ -475,14 +480,14 @@ void encode_mb_row(VP8_COMP *cpi,
 
         if (cm->frame_type == KEY_FRAME)
         {
-            *totalrate += vp8cx_encode_intra_macro_block(cpi, x, tp);
+            *totalrate += vp8cx_encode_intra_macro_block(cpi, x, tp, mb_row, mb_col);
 #ifdef MODE_STATS
             y_modes[xd->mbmi.mode] ++;
 #endif
         }
         else
         {
-            *totalrate += vp8cx_encode_inter_macroblock(cpi, x, tp, recon_yoffset, recon_uvoffset);
+            *totalrate += vp8cx_encode_inter_macroblock(cpi, x, tp, recon_yoffset, recon_uvoffset, mb_row, mb_col);
 
 #ifdef MODE_STATS
             inter_y_modes[xd->mbmi.mode] ++;
@@ -506,7 +511,8 @@ void encode_mb_row(VP8_COMP *cpi,
             // Special case code for cyclic refresh
             // If cyclic update enabled then copy xd->mbmi.segment_id; (which may have been updated based on mode
             // during vp8cx_encode_inter_macroblock()) back into the global sgmentation map
-            if (cpi->cyclic_refresh_mode_enabled && xd->segmentation_enabled)
+            if ((cpi->current_layer == 0) &&
+                (cpi->cyclic_refresh_mode_enabled && xd->segmentation_enabled))
             {
                 cpi->segmentation_map[map_index+mb_col] = xd->mode_info_context->mbmi.segment_id;
 
@@ -534,10 +540,6 @@ void encode_mb_row(VP8_COMP *cpi,
         // Increment the activity mask pointers.
         x->mb_activity_ptr++;
 
-        /* save the block info */
-        for (i = 0; i < 16; i++)
-            xd->mode_info_context->bmi[i] = xd->block[i].bmi;
-
         // adjust to the next column of macroblocks
         x->src.y_buffer += 16;
         x->src.u_buffer += 8;
@@ -593,8 +595,6 @@ void init_encode_frame_mb_context(VP8_COMP *cpi)
     // Activity map pointer
     x->mb_activity_ptr = cpi->mb_activity_map;
 
-    x->vector_range = 32;
-
     x->act_zbin_adj = 0;
 
     x->partition_info = x->pi;
@@ -639,32 +639,27 @@ void init_encode_frame_mb_context(VP8_COMP *cpi)
     vpx_memset(cm->above_context, 0,
                sizeof(ENTROPY_CONTEXT_PLANES) * cm->mb_cols);
 
-    xd->ref_frame_cost[INTRA_FRAME]   = vp8_cost_zero(cpi->prob_intra_coded);
-
     // Special case treatment when GF and ARF are not sensible options for reference
     if (cpi->ref_frame_flags == VP8_LAST_FLAG)
-    {
-        xd->ref_frame_cost[LAST_FRAME]    = vp8_cost_one(cpi->prob_intra_coded)
-                                        + vp8_cost_zero(255);
-        xd->ref_frame_cost[GOLDEN_FRAME]  = vp8_cost_one(cpi->prob_intra_coded)
-                                        + vp8_cost_one(255)
-                                        + vp8_cost_zero(128);
-        xd->ref_frame_cost[ALTREF_FRAME]  = vp8_cost_one(cpi->prob_intra_coded)
-                                        + vp8_cost_one(255)
-                                        + vp8_cost_one(128);
-    }
+        vp8_calc_ref_frame_costs(xd->ref_frame_cost,
+                                 cpi->prob_intra_coded,255,128);
+    else if ((cpi->oxcf.number_of_layers > 1) &&
+               (cpi->ref_frame_flags == VP8_GOLD_FLAG))
+        vp8_calc_ref_frame_costs(xd->ref_frame_cost,
+                                 cpi->prob_intra_coded,1,255);
+    else if ((cpi->oxcf.number_of_layers > 1) &&
+                (cpi->ref_frame_flags == VP8_ALT_FLAG))
+        vp8_calc_ref_frame_costs(xd->ref_frame_cost,
+                                 cpi->prob_intra_coded,1,1);
     else
-    {
-        xd->ref_frame_cost[LAST_FRAME]    = vp8_cost_one(cpi->prob_intra_coded)
-                                        + vp8_cost_zero(cpi->prob_last_coded);
-        xd->ref_frame_cost[GOLDEN_FRAME]  = vp8_cost_one(cpi->prob_intra_coded)
-                                        + vp8_cost_one(cpi->prob_last_coded)
-                                        + vp8_cost_zero(cpi->prob_gf_coded);
-        xd->ref_frame_cost[ALTREF_FRAME]  = vp8_cost_one(cpi->prob_intra_coded)
-                                        + vp8_cost_one(cpi->prob_last_coded)
-                                        + vp8_cost_one(cpi->prob_gf_coded);
-    }
+        vp8_calc_ref_frame_costs(xd->ref_frame_cost,
+                                 cpi->prob_intra_coded,
+                                 cpi->prob_last_coded,
+                                 cpi->prob_gf_coded);
 
+    xd->fullpixel_mask = 0xffffffff;
+    if(cm->full_pixel)
+        xd->fullpixel_mask = 0xfffffff8;
 }
 
 void vp8_encode_frame(VP8_COMP *cpi)
@@ -939,33 +934,10 @@ void vp8_encode_frame(VP8_COMP *cpi)
     // Adjust the projected reference frame useage probability numbers to reflect
     // what we have just seen. This may be usefull when we make multiple itterations
     // of the recode loop rather than continuing to use values from the previous frame.
-    if ((cm->frame_type != KEY_FRAME) && !cm->refresh_alt_ref_frame && !cm->refresh_golden_frame)
+    if ((cm->frame_type != KEY_FRAME) && ((cpi->oxcf.number_of_layers > 1) ||
+        (!cm->refresh_alt_ref_frame && !cm->refresh_golden_frame)))
     {
-        const int *const rfct = cpi->count_mb_ref_frame_usage;
-        const int rf_intra = rfct[INTRA_FRAME];
-        const int rf_inter = rfct[LAST_FRAME] + rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME];
-
-        if ((rf_intra + rf_inter) > 0)
-        {
-            cpi->prob_intra_coded = (rf_intra * 255) / (rf_intra + rf_inter);
-
-            if (cpi->prob_intra_coded < 1)
-                cpi->prob_intra_coded = 1;
-
-            if ((cm->frames_since_golden > 0) || cpi->source_alt_ref_active)
-            {
-                cpi->prob_last_coded = rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
-
-                if (cpi->prob_last_coded < 1)
-                    cpi->prob_last_coded = 1;
-
-                cpi->prob_gf_coded = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
-                                     ? (rfct[GOLDEN_FRAME] * 255) / (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]) : 128;
-
-                if (cpi->prob_gf_coded < 1)
-                    cpi->prob_gf_coded = 1;
-            }
-        }
+      vp8_convert_rfct_to_prob(cpi);
     }
 
 #if 0
@@ -1117,8 +1089,10 @@ static void adjust_act_zbin( VP8_COMP *cpi, MACROBLOCK *x )
 #endif
 }
 
-int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t)
+int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t,
+                                   int mb_row, int mb_col)
 {
+    MACROBLOCKD *xd = &x->e_mbd;
     int rate;
 
     if (cpi->sf.RD && cpi->compressor_speed != 2)
@@ -1138,9 +1112,17 @@ int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t)
         vp8_encode_intra16x16mby(IF_RTCD(&cpi->rtcd), x);
 
     vp8_encode_intra16x16mbuv(IF_RTCD(&cpi->rtcd), x);
+
     sum_intra_stats(cpi, x);
     vp8_tokenize_mb(cpi, &x->e_mbd, t);
 
+    if (xd->mode_info_context->mbmi.mode != B_PRED)
+        vp8_inverse_transform_mby(xd, IF_RTCD(&cpi->common.rtcd));
+
+    DEQUANT_INVOKE (&cpi->common.rtcd.dequant, idct_add_uv_block)
+                    (xd->qcoeff+16*16, xd->dequant_uv,
+                     xd->dst.u_buffer, xd->dst.v_buffer,
+                     xd->dst.uv_stride, xd->eobs+16);
     return rate;
 }
 #ifdef SPEEDSTATS
@@ -1152,7 +1134,8 @@ extern void vp8_fix_contexts(MACROBLOCKD *x);
 int vp8cx_encode_inter_macroblock
 (
     VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t,
-    int recon_yoffset, int recon_uvoffset
+    int recon_yoffset, int recon_uvoffset,
+    int mb_row, int mb_col
 )
 {
     MACROBLOCKD *const xd = &x->e_mbd;
@@ -1200,8 +1183,10 @@ int vp8cx_encode_inter_macroblock
 
     }
     else
+    {
         vp8_pick_inter_mode(cpi, x, recon_yoffset, recon_uvoffset, &rate,
-                            &distortion, &intra_error);
+                            &distortion, &intra_error, mb_row, mb_col);
+    }
 
     cpi->prediction_error += distortion;
     cpi->intra_error += intra_error;
@@ -1222,7 +1207,7 @@ int vp8cx_encode_inter_macroblock
     if (xd->segmentation_enabled)
     {
         // If cyclic update enabled
-        if (cpi->cyclic_refresh_mode_enabled)
+        if (cpi->current_layer == 0 && cpi->cyclic_refresh_mode_enabled)
         {
             // Clear segment_id back to 0 if not coded (last frame 0,0)
             if ((xd->mode_info_context->mbmi.segment_id == 1) &&
@@ -1231,7 +1216,7 @@ int vp8cx_encode_inter_macroblock
                 xd->mode_info_context->mbmi.segment_id = 0;
 
                 /* segment_id changed, so update */
-                vp8cx_mb_init_quantizer(cpi, x);
+                vp8cx_mb_init_quantizer(cpi, x, 1);
             }
         }
     }
@@ -1257,7 +1242,11 @@ int vp8cx_encode_inter_macroblock
                     cpi->zbin_mode_boost = MV_ZBIN_BOOST;
             }
         }
-        vp8_update_zbin_extra(cpi, x);
+
+        /* The fast quantizer doesn't use zbin_extra, only do so with
+         * the regular quantizer. */
+        if (cpi->sf.improved_quant)
+            vp8_update_zbin_extra(cpi, x);
     }
 
     cpi->count_mb_ref_frame_usage[xd->mode_info_context->mbmi.ref_frame] ++;
@@ -1281,8 +1270,6 @@ int vp8cx_encode_inter_macroblock
     {
         int ref_fb_idx;
 
-        vp8_build_uvmvs(xd, cpi->common.full_pixel);
-
         if (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME)
             ref_fb_idx = cpi->common.lst_fb_idx;
         else if (xd->mode_info_context->mbmi.ref_frame == GOLDEN_FRAME)
@@ -1311,7 +1298,17 @@ int vp8cx_encode_inter_macroblock
     }
 
     if (!x->skip)
+    {
         vp8_tokenize_mb(cpi, xd, t);
+
+        if (xd->mode_info_context->mbmi.mode != B_PRED)
+            vp8_inverse_transform_mby(xd, IF_RTCD(&cpi->common.rtcd));
+
+        DEQUANT_INVOKE (&cpi->common.rtcd.dequant, idct_add_uv_block)
+                        (xd->qcoeff+16*16, xd->dequant_uv,
+                         xd->dst.u_buffer, xd->dst.v_buffer,
+                         xd->dst.uv_stride, xd->eobs+16);
+    }
     else
     {
         if (cpi->common.mb_no_coeff_skip)
diff --git a/media/libvpx/vp8/encoder/encodeintra.c b/media/libvpx/vp8/encoder/encodeintra.c
index 59db0253b46..2e4c542c449 100644
--- a/media/libvpx/vp8/encoder/encodeintra.c
+++ b/media/libvpx/vp8/encoder/encodeintra.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/idct.h"
 #include "quantize.h"
 #include "vp8/common/reconintra.h"
@@ -18,7 +18,6 @@
 #include "vp8/common/invtrans.h"
 #include "vp8/common/recon.h"
 #include "dct.h"
-#include "vp8/common/g_common.h"
 #include "encodeintra.h"
 
 
@@ -37,11 +36,15 @@ int vp8_encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_dc_pred)
 
     if (use_dc_pred)
     {
+        const VP8_ENCODER_RTCD *rtcd = IF_RTCD(&cpi->rtcd);
+
         x->e_mbd.mode_info_context->mbmi.mode = DC_PRED;
         x->e_mbd.mode_info_context->mbmi.uv_mode = DC_PRED;
         x->e_mbd.mode_info_context->mbmi.ref_frame = INTRA_FRAME;
 
-        vp8_encode_intra16x16mby(IF_RTCD(&cpi->rtcd), x);
+        vp8_encode_intra16x16mby(rtcd, x);
+
+        vp8_inverse_transform_mby(&x->e_mbd, IF_RTCD(&cpi->common.rtcd));
     }
     else
     {
@@ -52,7 +55,7 @@ int vp8_encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_dc_pred)
         }
     }
 
-    intra_pred_var = VARIANCE_INVOKE(&cpi->rtcd.variance, getmbss)(x->src_diff);
+    intra_pred_var = VARIANCE_INVOKE(&cpi->common.rtcd.variance, getmbss)(x->src_diff);
 
     return intra_pred_var;
 }
@@ -64,7 +67,8 @@ void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd,
     BLOCK *be = &x->block[ib];
 
     RECON_INVOKE(&rtcd->common->recon, intra4x4_predict)
-                (b, b->bmi.as_mode, b->predictor);
+                (*(b->base_dst) + b->dst, b->dst_stride,
+                 b->bmi.as_mode, b->predictor, 16);
 
     ENCODEMB_INVOKE(&rtcd->encodemb, subb)(be, b, 16);
 
@@ -72,9 +76,17 @@ void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd,
 
     x->quantize_b(be, b);
 
-    vp8_inverse_transform_b(IF_RTCD(&rtcd->common->idct), b, 32);
-
-    RECON_INVOKE(&rtcd->common->recon, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
+    if (*b->eob > 1)
+    {
+        IDCT_INVOKE(IF_RTCD(&rtcd->common->idct), idct16)(b->dqcoeff,
+            b->predictor, 16, *(b->base_dst) + b->dst, b->dst_stride);
+    }
+    else
+    {
+        IDCT_INVOKE(IF_RTCD(&rtcd->common->idct), idct1_scalar_add)
+            (b->dqcoeff[0], b->predictor, 16, *(b->base_dst) + b->dst,
+                b->dst_stride);
+    }
 }
 
 void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *mb)
@@ -92,10 +104,12 @@ void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *mb)
 void vp8_encode_intra16x16mby(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x)
 {
     BLOCK *b = &x->block[0];
+    MACROBLOCKD *xd = &x->e_mbd;
 
-    RECON_INVOKE(&rtcd->common->recon, build_intra_predictors_mby)(&x->e_mbd);
+    RECON_INVOKE(&rtcd->common->recon, build_intra_predictors_mby_s)(&x->e_mbd);
 
-    ENCODEMB_INVOKE(&rtcd->encodemb, submby)(x->src_diff, *(b->base_src), x->e_mbd.predictor, b->src_stride);
+    ENCODEMB_INVOKE(&rtcd->encodemb, submby) (x->src_diff, *(b->base_src),
+        b->src_stride, xd->dst.y_buffer, xd->dst.y_stride);
 
     vp8_transform_intra_mby(x);
 
@@ -103,19 +117,17 @@ void vp8_encode_intra16x16mby(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x)
 
     if (x->optimize)
         vp8_optimize_mby(x, rtcd);
-
-    vp8_inverse_transform_mby(IF_RTCD(&rtcd->common->idct), &x->e_mbd);
-
-    RECON_INVOKE(&rtcd->common->recon, recon_mby)
-        (IF_RTCD(&rtcd->common->recon), &x->e_mbd);
-
 }
 
 void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x)
 {
-    RECON_INVOKE(&rtcd->common->recon, build_intra_predictors_mbuv)(&x->e_mbd);
+    MACROBLOCKD *xd = &x->e_mbd;
 
-    ENCODEMB_INVOKE(&rtcd->encodemb, submbuv)(x->src_diff, x->src.u_buffer, x->src.v_buffer, x->e_mbd.predictor, x->src.uv_stride);
+    RECON_INVOKE(&rtcd->common->recon, build_intra_predictors_mbuv_s)(&x->e_mbd);
+
+    ENCODEMB_INVOKE(&rtcd->encodemb, submbuv)(x->src_diff, x->src.u_buffer,
+        x->src.v_buffer, x->src.uv_stride, xd->dst.u_buffer,
+        xd->dst.v_buffer, xd->dst.uv_stride);
 
     vp8_transform_mbuv(x);
 
@@ -123,8 +135,4 @@ void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x)
 
     if (x->optimize)
         vp8_optimize_mbuv(x, rtcd);
-
-    vp8_inverse_transform_mbuv(IF_RTCD(&rtcd->common->idct), &x->e_mbd);
-
-    vp8_recon_intra_mbuv(IF_RTCD(&rtcd->common->recon), &x->e_mbd);
 }
diff --git a/media/libvpx/vp8/encoder/encodemb.c b/media/libvpx/vp8/encoder/encodemb.c
index 3ed16b68146..c9f75533336 100644
--- a/media/libvpx/vp8/encoder/encodemb.c
+++ b/media/libvpx/vp8/encoder/encodemb.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "encodemb.h"
 #include "vp8/common/reconinter.h"
 #include "quantize.h"
@@ -48,12 +48,12 @@ void vp8_subtract_b_c(BLOCK *be, BLOCKD *bd, int pitch)
     }
 }
 
-void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc, unsigned char *pred, int stride)
+void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc,
+                         int src_stride, unsigned char *upred,
+                         unsigned char *vpred, int pred_stride)
 {
     short *udiff = diff + 256;
     short *vdiff = diff + 320;
-    unsigned char *upred = pred + 256;
-    unsigned char *vpred = pred + 320;
 
     int r, c;
 
@@ -65,8 +65,8 @@ void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc,
         }
 
         udiff += 8;
-        upred += 8;
-        usrc  += stride;
+        upred += pred_stride;
+        usrc  += src_stride;
     }
 
     for (r = 0; r < 8; r++)
@@ -77,12 +77,13 @@ void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc,
         }
 
         vdiff += 8;
-        vpred += 8;
-        vsrc  += stride;
+        vpred += pred_stride;
+        vsrc  += src_stride;
     }
 }
 
-void vp8_subtract_mby_c(short *diff, unsigned char *src, unsigned char *pred, int stride)
+void vp8_subtract_mby_c(short *diff, unsigned char *src, int src_stride,
+                        unsigned char *pred, int pred_stride)
 {
     int r, c;
 
@@ -94,8 +95,8 @@ void vp8_subtract_mby_c(short *diff, unsigned char *src, unsigned char *pred, in
         }
 
         diff += 16;
-        pred += 16;
-        src  += stride;
+        pred += pred_stride;
+        src  += src_stride;
     }
 }
 
@@ -103,8 +104,11 @@ static void vp8_subtract_mb(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x)
 {
     BLOCK *b = &x->block[0];
 
-    ENCODEMB_INVOKE(&rtcd->encodemb, submby)(x->src_diff, *(b->base_src), x->e_mbd.predictor, b->src_stride);
-    ENCODEMB_INVOKE(&rtcd->encodemb, submbuv)(x->src_diff, x->src.u_buffer, x->src.v_buffer, x->e_mbd.predictor, x->src.uv_stride);
+    ENCODEMB_INVOKE(&rtcd->encodemb, submby)(x->src_diff, *(b->base_src),
+        b->src_stride, x->e_mbd.dst.y_buffer, x->e_mbd.dst.y_stride);
+    ENCODEMB_INVOKE(&rtcd->encodemb, submbuv)(x->src_diff, x->src.u_buffer,
+        x->src.v_buffer, x->src.uv_stride, x->e_mbd.dst.u_buffer,
+        x->e_mbd.dst.v_buffer, x->e_mbd.dst.uv_stride);
 }
 
 static void build_dcblock(MACROBLOCK *x)
@@ -274,7 +278,7 @@ static void optimize_b(MACROBLOCK *mb, int ib, int type,
     qcoeff_ptr = d->qcoeff;
     dqcoeff_ptr = d->dqcoeff;
     i0 = !type;
-    eob = d->eob;
+    eob = *d->eob;
 
     /* Now set up a Viterbi trellis to evaluate alternative roundings. */
     rdmult = mb->rdmult * err_mult;
@@ -466,8 +470,45 @@ static void optimize_b(MACROBLOCK *mb, int ib, int type,
     }
     final_eob++;
 
-    d->eob = final_eob;
-    *a = *l = (d->eob != !type);
+    *a = *l = (final_eob != !type);
+    *d->eob = (char)final_eob;
+}
+static void check_reset_2nd_coeffs(MACROBLOCKD *x, int type,
+                                   ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l)
+{
+    int sum=0;
+    int i;
+    BLOCKD *bd = &x->block[24];
+
+    if(bd->dequant[0]>=35 && bd->dequant[1]>=35)
+        return;
+
+    for(i=0;i<(*bd->eob);i++)
+    {
+        int coef = bd->dqcoeff[vp8_default_zig_zag1d[i]];
+        sum+= (coef>=0)?coef:-coef;
+        if(sum>=35)
+            return;
+    }
+    /**************************************************************************
+    our inverse hadamard transform effectively is weighted sum of all 16 inputs
+    with weight either 1 or -1. It has a last stage scaling of (sum+3)>>3. And
+    dc only idct is (dc+4)>>3. So if all the sums are between -35 and 29, the
+    output after inverse wht and idct will be all zero. A sum of absolute value
+    smaller than 35 guarantees all 16 different (+1/-1) weighted sums in wht
+    fall between -35 and +35.
+    **************************************************************************/
+    if(sum < 35)
+    {
+        for(i=0;i<(*bd->eob);i++)
+        {
+            int rc = vp8_default_zig_zag1d[i];
+            bd->qcoeff[rc]=0;
+            bd->dqcoeff[rc]=0;
+        }
+        *bd->eob = 0;
+        *a = *l = (*bd->eob != !type);
+    }
 }
 
 static void optimize_mb(MACROBLOCK *x, const VP8_ENCODER_RTCD *rtcd)
@@ -475,6 +516,7 @@ static void optimize_mb(MACROBLOCK *x, const VP8_ENCODER_RTCD *rtcd)
     int b;
     int type;
     int has_2nd_order;
+
     ENTROPY_CONTEXT_PLANES t_above, t_left;
     ENTROPY_CONTEXT *ta;
     ENTROPY_CONTEXT *tl;
@@ -506,6 +548,8 @@ static void optimize_mb(MACROBLOCK *x, const VP8_ENCODER_RTCD *rtcd)
         b=24;
         optimize_b(x, b, PLANE_TYPE_Y2,
             ta + vp8_block2above[b], tl + vp8_block2left[b], rtcd);
+        check_reset_2nd_coeffs(&x->e_mbd, PLANE_TYPE_Y2,
+            ta + vp8_block2above[b], tl + vp8_block2left[b]);
     }
 }
 
@@ -539,7 +583,7 @@ void vp8_optimize_mby(MACROBLOCK *x, const VP8_ENCODER_RTCD *rtcd)
     for (b = 0; b < 16; b++)
     {
         optimize_b(x, b, type,
-        ta + vp8_block2above[b], tl + vp8_block2left[b], rtcd);
+            ta + vp8_block2above[b], tl + vp8_block2left[b], rtcd);
     }
 
 
@@ -548,6 +592,8 @@ void vp8_optimize_mby(MACROBLOCK *x, const VP8_ENCODER_RTCD *rtcd)
         b=24;
         optimize_b(x, b, PLANE_TYPE_Y2,
             ta + vp8_block2above[b], tl + vp8_block2left[b], rtcd);
+        check_reset_2nd_coeffs(&x->e_mbd, PLANE_TYPE_Y2,
+            ta + vp8_block2above[b], tl + vp8_block2left[b]);
     }
 }
 
@@ -589,41 +635,22 @@ void vp8_encode_inter16x16(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x)
 
     if (x->optimize)
         optimize_mb(x, rtcd);
-
-    vp8_inverse_transform_mb(IF_RTCD(&rtcd->common->idct), &x->e_mbd);
-
-    RECON_INVOKE(&rtcd->common->recon, recon_mb)
-        (IF_RTCD(&rtcd->common->recon), &x->e_mbd);
 }
 
-
 /* this funciton is used by first pass only */
 void vp8_encode_inter16x16y(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x)
 {
     BLOCK *b = &x->block[0];
 
-    vp8_build_inter16x16_predictors_mby(&x->e_mbd);
+    vp8_build_inter16x16_predictors_mby(&x->e_mbd, x->e_mbd.dst.y_buffer,
+                                        x->e_mbd.dst.y_stride);
 
-    ENCODEMB_INVOKE(&rtcd->encodemb, submby)(x->src_diff, *(b->base_src), x->e_mbd.predictor, b->src_stride);
+    ENCODEMB_INVOKE(&rtcd->encodemb, submby)(x->src_diff, *(b->base_src),
+        b->src_stride, x->e_mbd.dst.y_buffer, x->e_mbd.dst.y_stride);
 
     transform_mby(x);
 
     vp8_quantize_mby(x);
 
-    vp8_inverse_transform_mby(IF_RTCD(&rtcd->common->idct), &x->e_mbd);
-
-    RECON_INVOKE(&rtcd->common->recon, recon_mby)
-        (IF_RTCD(&rtcd->common->recon), &x->e_mbd);
-}
-
-
-void vp8_encode_inter16x16uvrd(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x)
-{
-    vp8_build_inter_predictors_mbuv(&x->e_mbd);
-    ENCODEMB_INVOKE(&rtcd->encodemb, submbuv)(x->src_diff, x->src.u_buffer, x->src.v_buffer, x->e_mbd.predictor, x->src.uv_stride);
-
-    vp8_transform_mbuv(x);
-
-    vp8_quantize_mbuv(x);
-
+    vp8_inverse_transform_mby(&x->e_mbd, IF_RTCD(rtcd->common));
 }
diff --git a/media/libvpx/vp8/encoder/encodemb.h b/media/libvpx/vp8/encoder/encodemb.h
index 47fc72dadc9..0fa87cf6860 100644
--- a/media/libvpx/vp8/encoder/encodemb.h
+++ b/media/libvpx/vp8/encoder/encodemb.h
@@ -12,7 +12,8 @@
 #ifndef __INC_ENCODEMB_H
 #define __INC_ENCODEMB_H
 
-#include "vpx_ports/config.h"
+
+#include "vpx_config.h"
 #include "block.h"
 
 #define prototype_mberr(sym) \
@@ -28,11 +29,13 @@
     void (sym)(BLOCK *be,BLOCKD *bd, int pitch)
 
 #define prototype_submby(sym) \
-    void (sym)(short *diff, unsigned char *src, unsigned char *pred, int stride)
+    void (sym)(short *diff, unsigned char *src, int src_stride, \
+        unsigned char *pred, int pred_stride)
 
 #define prototype_submbuv(sym) \
     void (sym)(short *diff, unsigned char *usrc, unsigned char *vsrc,\
-               unsigned char *pred, int stride)
+               int src_stride, unsigned char *upred, unsigned char *vpred,\
+               int pred_stride)
 
 #if ARCH_X86 || ARCH_X86_64
 #include "x86/encodemb_x86.h"
@@ -99,7 +102,7 @@ void vp8_build_dcblock(MACROBLOCK *b);
 void vp8_transform_mb(MACROBLOCK *mb);
 void vp8_transform_mbuv(MACROBLOCK *x);
 void vp8_transform_intra_mby(MACROBLOCK *x);
-void vp8_encode_inter16x16uvrd(const struct VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x);
+
 void vp8_optimize_mby(MACROBLOCK *x, const struct VP8_ENCODER_RTCD *rtcd);
 void vp8_optimize_mbuv(MACROBLOCK *x, const struct VP8_ENCODER_RTCD *rtcd);
 void vp8_encode_inter16x16y(const struct VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x);
diff --git a/media/libvpx/vp8/encoder/encodemv.c b/media/libvpx/vp8/encoder/encodemv.c
index a4849c6540f..0145f6d2042 100644
--- a/media/libvpx/vp8/encoder/encodemv.c
+++ b/media/libvpx/vp8/encoder/encodemv.c
@@ -186,7 +186,7 @@ void vp8_build_component_cost_table(int *mvcost[2], const MV_CONTEXT *mvc, int m
 #define MV_PROB_UPDATE_CORRECTION   -1
 
 
-__inline static void calc_prob(vp8_prob *p, const unsigned int ct[2])
+static void calc_prob(vp8_prob *p, const unsigned int ct[2])
 {
     const unsigned int tot = ct[0] + ct[1];
 
@@ -395,7 +395,7 @@ static void write_component_probs(
 
 void vp8_write_mvprobs(VP8_COMP *cpi)
 {
-    vp8_writer *const w  = & cpi->bc;
+    vp8_writer *const w  = cpi->bc;
     MV_CONTEXT *mvc = cpi->common.fc.mvc;
     int flags[2] = {0, 0};
 #ifdef ENTROPY_STATS
diff --git a/media/libvpx/vp8/encoder/ethreading.c b/media/libvpx/vp8/encoder/ethreading.c
index 1a37f03b9ac..24339a5e03a 100644
--- a/media/libvpx/vp8/encoder/ethreading.c
+++ b/media/libvpx/vp8/encoder/ethreading.c
@@ -20,7 +20,7 @@ extern int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x,
                                          int recon_uvoffset);
 extern int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x,
                                           TOKENEXTRA **t);
-extern void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x);
+extern void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x, int ok_to_skip);
 extern void vp8_build_block_offsets(MACROBLOCK *x);
 extern void vp8_setup_block_ptrs(MACROBLOCK *x);
 
@@ -38,7 +38,7 @@ static THREAD_FUNCTION loopfilter_thread(void *p_data)
 
         if (sem_wait(&cpi->h_event_start_lpf) == 0)
         {
-            if (cpi->b_multi_threaded == FALSE) // we're shutting down
+            if (cpi->b_multi_threaded == 0) // we're shutting down
                 break;
 
             loopfilter_frame(cpi, cm);
@@ -78,13 +78,12 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data)
             int *segment_counts = mbri->segment_counts;
             int *totalrate = &mbri->totalrate;
 
-            if (cpi->b_multi_threaded == FALSE) // we're shutting down
+            if (cpi->b_multi_threaded == 0) // we're shutting down
                 break;
 
             for (mb_row = ithread + 1; mb_row < cm->mb_rows; mb_row += (cpi->encoding_thread_count + 1))
             {
 
-                int i;
                 int recon_yoffset, recon_uvoffset;
                 int mb_col;
                 int ref_fb_idx = cm->lst_fb_idx;
@@ -164,7 +163,7 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data)
                         else
                             xd->mode_info_context->mbmi.segment_id = 0;
 
-                        vp8cx_mb_init_quantizer(cpi, x);
+                        vp8cx_mb_init_quantizer(cpi, x, 1);
                     }
                     else
                         xd->mode_info_context->mbmi.segment_id = 0; // Set to Segment 0 by default
@@ -232,10 +231,6 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data)
                     // Increment the activity mask pointers.
                     x->mb_activity_ptr++;
 
-                    /* save the block info */
-                    for (i = 0; i < 16; i++)
-                        xd->mode_info_context->bmi[i] = xd->block[i].bmi;
-
                     // adjust to the next column of macroblocks
                     x->src.y_buffer += 16;
                     x->src.u_buffer += 8;
@@ -307,7 +302,6 @@ static void setup_mbby_copy(MACROBLOCK *mbdst, MACROBLOCK *mbsrc)
     z->mv_col_max    = x->mv_col_max;
     z->mv_row_min    = x->mv_row_min;
     z->mv_row_max    = x->mv_row_max;
-    z->vector_range = x->vector_range ;
     */
 
     z->vp8_short_fdct4x4     = x->vp8_short_fdct4x4;
@@ -348,12 +342,13 @@ static void setup_mbby_copy(MACROBLOCK *mbdst, MACROBLOCK *mbsrc)
         z->block[i].zbin            = x->block[i].zbin;
         z->block[i].zrun_zbin_boost   = x->block[i].zrun_zbin_boost;
         z->block[i].round           = x->block[i].round;
+        z->q_index                  = x->q_index;
+        z->act_zbin_adj             = x->act_zbin_adj;
+        z->last_act_zbin_adj        = x->last_act_zbin_adj;
         /*
         z->block[i].src             = x->block[i].src;
         */
         z->block[i].src_stride       = x->block[i].src_stride;
-        z->block[i].force_empty      = x->block[i].force_empty;
-
     }
 
     {
@@ -389,10 +384,22 @@ static void setup_mbby_copy(MACROBLOCK *mbdst, MACROBLOCK *mbsrc)
         zd->mb_segement_abs_delta      = xd->mb_segement_abs_delta;
         vpx_memcpy(zd->segment_feature_data, xd->segment_feature_data, sizeof(xd->segment_feature_data));
 
-        for (i = 0; i < 25; i++)
-        {
-            zd->block[i].dequant = xd->block[i].dequant;
-        }
+        vpx_memcpy(zd->dequant_y1_dc, xd->dequant_y1_dc, sizeof(xd->dequant_y1_dc));
+        vpx_memcpy(zd->dequant_y1, xd->dequant_y1, sizeof(xd->dequant_y1));
+        vpx_memcpy(zd->dequant_y2, xd->dequant_y2, sizeof(xd->dequant_y2));
+        vpx_memcpy(zd->dequant_uv, xd->dequant_uv, sizeof(xd->dequant_uv));
+
+#if 1
+        /*TODO:  Remove dequant from BLOCKD.  This is a temporary solution until
+         * the quantizer code uses a passed in pointer to the dequant constants.
+         * This will also require modifications to the x86 and neon assembly.
+         * */
+        for (i = 0; i < 16; i++)
+            zd->block[i].dequant = zd->dequant_y1;
+        for (i = 16; i < 24; i++)
+            zd->block[i].dequant = zd->dequant_uv;
+        zd->block[24].dequant = zd->dequant_y2;
+#endif
     }
 }
 
@@ -423,8 +430,6 @@ void vp8cx_init_mbrthread_data(VP8_COMP *cpi,
 #endif
         mb->gf_active_ptr            = x->gf_active_ptr;
 
-        mb->vector_range             = 32;
-
         vpx_memset(mbr_ei[i].segment_counts, 0, sizeof(mbr_ei[i].segment_counts));
         mbr_ei[i].totalrate = 0;
 
@@ -457,6 +462,9 @@ void vp8cx_init_mbrthread_data(VP8_COMP *cpi,
 
         setup_mbby_copy(&mbr_ei[i].mb, x);
 
+        mbd->fullpixel_mask = 0xffffffff;
+        if(cm->full_pixel)
+            mbd->fullpixel_mask = 0xfffffff8;
     }
 }
 
diff --git a/media/libvpx/vp8/encoder/firstpass.c b/media/libvpx/vp8/encoder/firstpass.c
index 968e3eeef86..73a741e65d5 100644
--- a/media/libvpx/vp8/encoder/firstpass.c
+++ b/media/libvpx/vp8/encoder/firstpass.c
@@ -12,7 +12,7 @@
 #include "limits.h"
 #include "block.h"
 #include "onyx_int.h"
-#include "variance.h"
+#include "vp8/common/variance.h"
 #include "encodeintra.h"
 #include "vp8/common/setupintrarecon.h"
 #include "mcomp.h"
@@ -152,7 +152,7 @@ static void output_stats(const VP8_COMP            *cpi,
 
         fprintf(fpfile, "%12.0f %12.0f %12.0f %12.4f %12.4f %12.4f %12.4f"
                 " %12.4f %12.4f %12.4f %12.4f %12.4f %12.4f %12.4f %12.4f"
-                " %12.0f %12.4f\n",
+                " %12.0f %12.0f %12.4f\n",
                 stats->frame,
                 stats->intra_error,
                 stats->coded_error,
@@ -168,6 +168,7 @@ static void output_stats(const VP8_COMP            *cpi,
                 stats->MVrv,
                 stats->MVcv,
                 stats->mv_in_out_count,
+                stats->new_mv_count,
                 stats->count,
                 stats->duration);
         fclose(fpfile);
@@ -192,6 +193,7 @@ static void zero_stats(FIRSTPASS_STATS *section)
     section->MVrv       = 0.0;
     section->MVcv       = 0.0;
     section->mv_in_out_count  = 0.0;
+    section->new_mv_count = 0.0;
     section->count      = 0.0;
     section->duration   = 1.0;
 }
@@ -213,10 +215,33 @@ static void accumulate_stats(FIRSTPASS_STATS *section, FIRSTPASS_STATS *frame)
     section->MVrv       += frame->MVrv;
     section->MVcv       += frame->MVcv;
     section->mv_in_out_count  += frame->mv_in_out_count;
+    section->new_mv_count += frame->new_mv_count;
     section->count      += frame->count;
     section->duration   += frame->duration;
 }
 
+static void subtract_stats(FIRSTPASS_STATS *section, FIRSTPASS_STATS *frame)
+{
+    section->frame -= frame->frame;
+    section->intra_error -= frame->intra_error;
+    section->coded_error -= frame->coded_error;
+    section->ssim_weighted_pred_err -= frame->ssim_weighted_pred_err;
+    section->pcnt_inter  -= frame->pcnt_inter;
+    section->pcnt_motion -= frame->pcnt_motion;
+    section->pcnt_second_ref -= frame->pcnt_second_ref;
+    section->pcnt_neutral -= frame->pcnt_neutral;
+    section->MVr        -= frame->MVr;
+    section->mvr_abs     -= frame->mvr_abs;
+    section->MVc        -= frame->MVc;
+    section->mvc_abs     -= frame->mvc_abs;
+    section->MVrv       -= frame->MVrv;
+    section->MVcv       -= frame->MVcv;
+    section->mv_in_out_count  -= frame->mv_in_out_count;
+    section->new_mv_count -= frame->new_mv_count;
+    section->count      -= frame->count;
+    section->duration   -= frame->duration;
+}
+
 static void avg_stats(FIRSTPASS_STATS *section)
 {
     if (section->count < 1.0)
@@ -242,49 +267,16 @@ static void avg_stats(FIRSTPASS_STATS *section)
 // Calculate a modified Error used in distributing bits between easier and harder frames
 static double calculate_modified_err(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
 {
-    double av_err = cpi->twopass.total_stats->ssim_weighted_pred_err;
+    double av_err = ( cpi->twopass.total_stats.ssim_weighted_pred_err /
+                      cpi->twopass.total_stats.count );
     double this_err = this_frame->ssim_weighted_pred_err;
     double modified_err;
 
-    //double relative_next_iiratio;
-    //double next_iiratio;
-    //double sum_iiratio;
-    //int i;
-
-    //FIRSTPASS_STATS next_frame;
-    //FIRSTPASS_STATS *start_pos;
-
-    /*start_pos = cpi->twopass.stats_in;
-    sum_iiratio = 0.0;
-    i = 0;
-    while ( (i < 1) && input_stats(cpi,&next_frame) != EOF )
-    {
-
-        next_iiratio = next_frame.intra_error / DOUBLE_DIVIDE_CHECK(next_frame.coded_error);
-        next_iiratio = ( next_iiratio < 1.0 ) ? 1.0 : (next_iiratio > 20.0) ? 20.0 : next_iiratio;
-        sum_iiratio += next_iiratio;
-        i++;
-    }
-    if ( i > 0 )
-    {
-        relative_next_iiratio = sum_iiratio / DOUBLE_DIVIDE_CHECK(cpi->twopass.avg_iiratio * (double)i);
-    }
-    else
-    {
-        relative_next_iiratio = 1.0;
-    }
-    reset_fpf_position(cpi, start_pos);*/
-
     if (this_err > av_err)
         modified_err = av_err * pow((this_err / DOUBLE_DIVIDE_CHECK(av_err)), POW1);
     else
         modified_err = av_err * pow((this_err / DOUBLE_DIVIDE_CHECK(av_err)), POW2);
 
-    /*
-    relative_next_iiratio = pow(relative_next_iiratio,0.25);
-    modified_err = modified_err * relative_next_iiratio;
-    */
-
     return modified_err;
 }
 
@@ -381,7 +373,7 @@ static int frame_max_bits(VP8_COMP *cpi)
     else
     {
         // For VBR base this on the bits and frames left plus the two_pass_vbrmax_section rate passed in by the user
-        max_bits = (int)(((double)cpi->twopass.bits_left / (cpi->twopass.total_stats->count - (double)cpi->common.current_video_frame)) * ((double)cpi->oxcf.two_pass_vbrmax_section / 100.0));
+        max_bits = (int)(((double)cpi->twopass.bits_left / (cpi->twopass.total_stats.count - (double)cpi->common.current_video_frame)) * ((double)cpi->oxcf.two_pass_vbrmax_section / 100.0));
     }
 
     // Trap case where we are out of bits
@@ -393,12 +385,12 @@ static int frame_max_bits(VP8_COMP *cpi)
 
 void vp8_init_first_pass(VP8_COMP *cpi)
 {
-    zero_stats(cpi->twopass.total_stats);
+    zero_stats(&cpi->twopass.total_stats);
 }
 
 void vp8_end_first_pass(VP8_COMP *cpi)
 {
-    output_stats(cpi, cpi->output_pkt_list, cpi->twopass.total_stats);
+    output_stats(cpi, cpi->output_pkt_list, &cpi->twopass.total_stats);
 }
 
 static void zz_motion_search( VP8_COMP *cpi, MACROBLOCK * x, YV12_BUFFER_CONFIG * recon_buffer, int * best_motion_err, int recon_yoffset )
@@ -417,7 +409,7 @@ static void zz_motion_search( VP8_COMP *cpi, MACROBLOCK * x, YV12_BUFFER_CONFIG
 
     ref_ptr = (unsigned char *)(*(d->base_pre) + d->pre );
 
-    VARIANCE_INVOKE(IF_RTCD(&cpi->rtcd.variance), mse16x16) ( src_ptr, src_stride, ref_ptr, ref_stride, (unsigned int *)(best_motion_err));
+    VARIANCE_INVOKE(IF_RTCD(&cpi->common.rtcd.variance), mse16x16) ( src_ptr, src_stride, ref_ptr, ref_stride, (unsigned int *)(best_motion_err));
 }
 
 static void first_pass_motion_search(VP8_COMP *cpi, MACROBLOCK *x,
@@ -441,7 +433,7 @@ static void first_pass_motion_search(VP8_COMP *cpi, MACROBLOCK *x,
     int new_mv_mode_penalty = 256;
 
     // override the default variance function to use MSE
-    v_fn_ptr.vf    = VARIANCE_INVOKE(IF_RTCD(&cpi->rtcd.variance), mse16x16);
+    v_fn_ptr.vf    = VARIANCE_INVOKE(IF_RTCD(&cpi->common.rtcd.variance), mse16x16);
 
     // Set up pointers for this macro block recon buffer
     xd->pre.y_buffer = recon_buffer->y_buffer + recon_yoffset;
@@ -516,8 +508,9 @@ void vp8_first_pass(VP8_COMP *cpi)
     int second_ref_count = 0;
     int intrapenalty = 256;
     int neutral_count = 0;
-
+    int new_mv_count = 0;
     int sum_in_vectors = 0;
+    uint32_t lastmv_as_int = 0;
 
     int_mv zero_ref_mv;
 
@@ -697,6 +690,11 @@ void vp8_first_pass(VP8_COMP *cpi)
                     {
                         mvcount++;
 
+                        // Was it different from the last non zero vector
+                        if ( d->bmi.mv.as_int != lastmv_as_int )
+                            new_mv_count++;
+                        lastmv_as_int = d->bmi.mv.as_int;
+
                         // Does the Row vector point inwards or outwards
                         if (mb_row < cm->mb_rows / 2)
                         {
@@ -779,6 +777,7 @@ void vp8_first_pass(VP8_COMP *cpi)
         fps.MVrv       = 0.0;
         fps.MVcv       = 0.0;
         fps.mv_in_out_count  = 0.0;
+        fps.new_mv_count = 0.0;
         fps.count      = 1.0;
 
         fps.pcnt_inter   = 1.0 * (double)intercount / cm->MBs;
@@ -794,6 +793,7 @@ void vp8_first_pass(VP8_COMP *cpi)
             fps.MVrv = ((double)sum_mvrs - (fps.MVr * fps.MVr / (double)mvcount)) / (double)mvcount;
             fps.MVcv = ((double)sum_mvcs - (fps.MVc * fps.MVc / (double)mvcount)) / (double)mvcount;
             fps.mv_in_out_count = (double)sum_in_vectors / (double)(mvcount * 2);
+            fps.new_mv_count = new_mv_count;
 
             fps.pcnt_motion = 1.0 * (double)mvcount / cpi->common.MBs;
         }
@@ -804,17 +804,17 @@ void vp8_first_pass(VP8_COMP *cpi)
                        - cpi->source->ts_start;
 
         // don't want to do output stats with a stack variable!
-        memcpy(cpi->twopass.this_frame_stats,
+        memcpy(&cpi->twopass.this_frame_stats,
                &fps,
                sizeof(FIRSTPASS_STATS));
-        output_stats(cpi, cpi->output_pkt_list, cpi->twopass.this_frame_stats);
-        accumulate_stats(cpi->twopass.total_stats, &fps);
+        output_stats(cpi, cpi->output_pkt_list, &cpi->twopass.this_frame_stats);
+        accumulate_stats(&cpi->twopass.total_stats, &fps);
     }
 
     // Copy the previous Last Frame into the GF buffer if specific conditions for doing so are met
     if ((cm->current_video_frame > 0) &&
-        (cpi->twopass.this_frame_stats->pcnt_inter > 0.20) &&
-        ((cpi->twopass.this_frame_stats->intra_error / cpi->twopass.this_frame_stats->coded_error) > 2.0))
+        (cpi->twopass.this_frame_stats.pcnt_inter > 0.20) &&
+        ((cpi->twopass.this_frame_stats.intra_error / cpi->twopass.this_frame_stats.coded_error) > 2.0))
     {
         vp8_yv12_copy_frame_ptr(lst_yv12, gld_yv12);
     }
@@ -851,42 +851,114 @@ void vp8_first_pass(VP8_COMP *cpi)
 }
 extern const int vp8_bits_per_mb[2][QINDEX_RANGE];
 
-#define BASE_ERRPERMB   150
-static int estimate_max_q(VP8_COMP *cpi, double section_err, int section_target_bandwitdh)
+// Estimate a cost per mb attributable to overheads such as the coding of
+// modes and motion vectors.
+// Currently simplistic in its assumptions for testing.
+//
+
+
+double bitcost( double prob )
+{
+    return -(log( prob ) / log( 2.0 ));
+}
+static int64_t estimate_modemvcost(VP8_COMP *cpi,
+                                     FIRSTPASS_STATS * fpstats)
+{
+    int mv_cost;
+    int mode_cost;
+
+    double av_pct_inter = fpstats->pcnt_inter / fpstats->count;
+    double av_pct_motion = fpstats->pcnt_motion / fpstats->count;
+    double av_intra = (1.0 - av_pct_inter);
+
+    double zz_cost;
+    double motion_cost;
+    double intra_cost;
+
+    zz_cost = bitcost(av_pct_inter - av_pct_motion);
+    motion_cost = bitcost(av_pct_motion);
+    intra_cost = bitcost(av_intra);
+
+    // Estimate of extra bits per mv overhead for mbs
+    // << 9 is the normalization to the (bits * 512) used in vp8_bits_per_mb
+    mv_cost = ((int)(fpstats->new_mv_count / fpstats->count) * 8) << 9;
+
+    // Crude estimate of overhead cost from modes
+    // << 9 is the normalization to (bits * 512) used in vp8_bits_per_mb
+    mode_cost =
+        (int)( ( ((av_pct_inter - av_pct_motion) * zz_cost) +
+                 (av_pct_motion * motion_cost) +
+                 (av_intra * intra_cost) ) * cpi->common.MBs ) << 9;
+
+    return mv_cost + mode_cost;
+}
+
+static double calc_correction_factor( double err_per_mb,
+                                      double err_devisor,
+                                      double pt_low,
+                                      double pt_high,
+                                      int Q )
+{
+    double power_term;
+    double error_term = err_per_mb / err_devisor;
+    double correction_factor;
+
+    // Adjustment based on Q to power term.
+    power_term = pt_low + (Q * 0.01);
+    power_term = (power_term > pt_high) ? pt_high : power_term;
+
+    // Adjustments to error term
+    // TBD
+
+    // Calculate correction factor
+    correction_factor = pow(error_term, power_term);
+
+    // Clip range
+    correction_factor =
+        (correction_factor < 0.05)
+            ? 0.05 : (correction_factor > 5.0) ? 5.0 : correction_factor;
+
+    return correction_factor;
+}
+
+static int estimate_max_q(VP8_COMP *cpi,
+                          FIRSTPASS_STATS * fpstats,
+                          int section_target_bandwitdh,
+                          int overhead_bits )
 {
     int Q;
     int num_mbs = cpi->common.MBs;
     int target_norm_bits_per_mb;
 
+    double section_err = (fpstats->coded_error / fpstats->count);
     double err_per_mb = section_err / num_mbs;
-    double correction_factor;
-    double corr_high;
+    double err_correction_factor;
     double speed_correction = 1.0;
-    double rolling_ratio;
-
-    double pow_highq = 0.90;
-    double pow_lowq = 0.40;
+    int overhead_bits_per_mb;
 
     if (section_target_bandwitdh <= 0)
         return cpi->twopass.maxq_max_limit;          // Highest value allowed
 
-    target_norm_bits_per_mb = (section_target_bandwitdh < (1 << 20)) ? (512 * section_target_bandwitdh) / num_mbs : 512 * (section_target_bandwitdh / num_mbs);
+    target_norm_bits_per_mb =
+        (section_target_bandwitdh < (1 << 20))
+            ? (512 * section_target_bandwitdh) / num_mbs
+            : 512 * (section_target_bandwitdh / num_mbs);
 
-    // Calculate a corrective factor based on a rolling ratio of bits spent vs target bits
-    if ((cpi->rolling_target_bits > 0.0) && (cpi->active_worst_quality < cpi->worst_quality))
+    // Calculate a corrective factor based on a rolling ratio of bits spent
+    // vs target bits
+    if ((cpi->rolling_target_bits > 0) &&
+        (cpi->active_worst_quality < cpi->worst_quality))
     {
-        rolling_ratio = (double)cpi->rolling_actual_bits / (double)cpi->rolling_target_bits;
+        double rolling_ratio;
+
+        rolling_ratio = (double)cpi->rolling_actual_bits /
+                        (double)cpi->rolling_target_bits;
 
-        //if ( cpi->twopass.est_max_qcorrection_factor > rolling_ratio )
         if (rolling_ratio < 0.95)
-            //cpi->twopass.est_max_qcorrection_factor *= adjustment_rate;
             cpi->twopass.est_max_qcorrection_factor -= 0.005;
-        //else if ( cpi->twopass.est_max_qcorrection_factor < rolling_ratio )
         else if (rolling_ratio > 1.05)
             cpi->twopass.est_max_qcorrection_factor += 0.005;
 
-        //cpi->twopass.est_max_qcorrection_factor /= adjustment_rate;
-
         cpi->twopass.est_max_qcorrection_factor =
             (cpi->twopass.est_max_qcorrection_factor < 0.1)
                 ? 0.1
@@ -894,7 +966,8 @@ static int estimate_max_q(VP8_COMP *cpi, double section_err, int section_target_
                     ? 10.0 : cpi->twopass.est_max_qcorrection_factor;
     }
 
-    // Corrections for higher compression speed settings (reduced compression expected)
+    // Corrections for higher compression speed settings
+    // (reduced compression expected)
     if ((cpi->compressor_speed == 3) || (cpi->compressor_speed == 1))
     {
         if (cpi->oxcf.cpu_used <= 5)
@@ -903,10 +976,10 @@ static int estimate_max_q(VP8_COMP *cpi, double section_err, int section_target_
             speed_correction = 1.25;
     }
 
-    // Correction factor used for Q values >= 20
-    corr_high = pow(err_per_mb / BASE_ERRPERMB, pow_highq);
-    corr_high = (corr_high < 0.05)
-                    ? 0.05 : (corr_high > 5.0) ? 5.0 : corr_high;
+    // Estimate of overhead bits per mb
+    // Correction to overhead bits for min allowed Q.
+    overhead_bits_per_mb = overhead_bits / num_mbs;
+    overhead_bits_per_mb *= pow( 0.98, (double)cpi->twopass.maxq_min_limit );
 
     // Try and pick a max Q that will be high enough to encode the
     // content at the given rate.
@@ -914,18 +987,22 @@ static int estimate_max_q(VP8_COMP *cpi, double section_err, int section_target_
     {
         int bits_per_mb_at_this_q;
 
-        if (Q < 50)
-        {
-            correction_factor = pow(err_per_mb / BASE_ERRPERMB, (pow_lowq + Q * 0.01));
-            correction_factor = (correction_factor < 0.05) ? 0.05 : (correction_factor > 5.0) ? 5.0 : correction_factor;
-        }
-        else
-            correction_factor = corr_high;
+        // Error per MB based correction factor
+        err_correction_factor =
+            calc_correction_factor(err_per_mb, 150.0, 0.40, 0.90, Q);
 
-        bits_per_mb_at_this_q = (int)(.5 + correction_factor
+        bits_per_mb_at_this_q =
+            vp8_bits_per_mb[INTER_FRAME][Q] + overhead_bits_per_mb;
+
+        bits_per_mb_at_this_q = (int)(.5 + err_correction_factor
             * speed_correction * cpi->twopass.est_max_qcorrection_factor
             * cpi->twopass.section_max_qfactor
-            * (double)vp8_bits_per_mb[INTER_FRAME][Q] / 1.0);
+            * (double)bits_per_mb_at_this_q);
+
+        // Mode and motion overhead
+        // As Q rises in real encode loop rd code will force overhead down
+        // We make a crude adjustment for this here as *.98 per Q step.
+        overhead_bits_per_mb = (int)((double)overhead_bits_per_mb * 0.98);
 
         if (bits_per_mb_at_this_q <= target_norm_bits_per_mb)
             break;
@@ -934,17 +1011,15 @@ static int estimate_max_q(VP8_COMP *cpi, double section_err, int section_target_
     // Restriction on active max q for constrained quality mode.
     if ( (cpi->oxcf.end_usage == USAGE_CONSTRAINED_QUALITY) &&
          (Q < cpi->cq_target_quality) )
-         //(Q < cpi->oxcf.cq_level;) )
     {
         Q = cpi->cq_target_quality;
-        //Q = cpi->oxcf.cq_level;
     }
 
     // Adjust maxq_min_limit and maxq_max_limit limits based on
     // averaga q observed in clip for non kf/gf.arf frames
     // Give average a chance to settle though.
     if ( (cpi->ni_frames >
-                  ((unsigned int)cpi->twopass.total_stats->count >> 8)) &&
+                  ((unsigned int)cpi->twopass.total_stats.count >> 8)) &&
          (cpi->ni_frames > 150) )
     {
         cpi->twopass.maxq_max_limit = ((cpi->ni_av_qi + 32) < cpi->worst_quality)
@@ -955,6 +1030,94 @@ static int estimate_max_q(VP8_COMP *cpi, double section_err, int section_target_
 
     return Q;
 }
+
+// For cq mode estimate a cq level that matches the observed
+// complexity and data rate.
+static int estimate_cq( VP8_COMP *cpi,
+                        FIRSTPASS_STATS * fpstats,
+                        int section_target_bandwitdh,
+                        int overhead_bits )
+{
+    int Q;
+    int num_mbs = cpi->common.MBs;
+    int target_norm_bits_per_mb;
+
+    double section_err = (fpstats->coded_error / fpstats->count);
+    double err_per_mb = section_err / num_mbs;
+    double err_correction_factor;
+    double speed_correction = 1.0;
+    double clip_iiratio;
+    double clip_iifactor;
+    int overhead_bits_per_mb;
+
+    if (0)
+    {
+        FILE *f = fopen("epmp.stt", "a");
+        fprintf(f, "%10.2f\n", err_per_mb );
+        fclose(f);
+    }
+
+    target_norm_bits_per_mb = (section_target_bandwitdh < (1 << 20))
+                              ? (512 * section_target_bandwitdh) / num_mbs
+                              : 512 * (section_target_bandwitdh / num_mbs);
+
+    // Estimate of overhead bits per mb
+    overhead_bits_per_mb = overhead_bits / num_mbs;
+
+    // Corrections for higher compression speed settings
+    // (reduced compression expected)
+    if ((cpi->compressor_speed == 3) || (cpi->compressor_speed == 1))
+    {
+        if (cpi->oxcf.cpu_used <= 5)
+            speed_correction = 1.04 + (cpi->oxcf.cpu_used * 0.04);
+        else
+            speed_correction = 1.25;
+    }
+
+    // II ratio correction factor for clip as a whole
+    clip_iiratio = cpi->twopass.total_stats.intra_error /
+                   DOUBLE_DIVIDE_CHECK(cpi->twopass.total_stats.coded_error);
+    clip_iifactor = 1.0 - ((clip_iiratio - 10.0) * 0.025);
+    if (clip_iifactor < 0.80)
+        clip_iifactor = 0.80;
+
+    // Try and pick a Q that can encode the content at the given rate.
+    for (Q = 0; Q < MAXQ; Q++)
+    {
+        int bits_per_mb_at_this_q;
+
+        // Error per MB based correction factor
+        err_correction_factor =
+            calc_correction_factor(err_per_mb, 100.0, 0.40, 0.90, Q);
+
+        bits_per_mb_at_this_q =
+            vp8_bits_per_mb[INTER_FRAME][Q] + overhead_bits_per_mb;
+
+        bits_per_mb_at_this_q =
+            (int)( .5 + err_correction_factor *
+                        speed_correction *
+                        clip_iifactor *
+                        (double)bits_per_mb_at_this_q);
+
+        // Mode and motion overhead
+        // As Q rises in real encode loop rd code will force overhead down
+        // We make a crude adjustment for this here as *.98 per Q step.
+        overhead_bits_per_mb = (int)((double)overhead_bits_per_mb * 0.98);
+
+        if (bits_per_mb_at_this_q <= target_norm_bits_per_mb)
+            break;
+    }
+
+    // Clip value to range "best allowed to (worst allowed - 1)"
+    Q = cq_level[Q];
+    if ( Q >= cpi->worst_quality )
+        Q = cpi->worst_quality - 1;
+    if ( Q < cpi->best_quality )
+        Q = cpi->best_quality;
+
+    return Q;
+}
+
 static int estimate_q(VP8_COMP *cpi, double section_err, int section_target_bandwitdh)
 {
     int Q;
@@ -962,11 +1125,8 @@ static int estimate_q(VP8_COMP *cpi, double section_err, int section_target_band
     int target_norm_bits_per_mb;
 
     double err_per_mb = section_err / num_mbs;
-    double correction_factor;
-    double corr_high;
+    double err_correction_factor;
     double speed_correction = 1.0;
-    double pow_highq = 0.90;
-    double pow_lowq = 0.40;
 
     target_norm_bits_per_mb = (section_target_bandwitdh < (1 << 20)) ? (512 * section_target_bandwitdh) / num_mbs : 512 * (section_target_bandwitdh / num_mbs);
 
@@ -979,24 +1139,20 @@ static int estimate_q(VP8_COMP *cpi, double section_err, int section_target_band
             speed_correction = 1.25;
     }
 
-    // Correction factor used for Q values >= 20
-    corr_high = pow(err_per_mb / BASE_ERRPERMB, pow_highq);
-    corr_high = (corr_high < 0.05) ? 0.05 : (corr_high > 5.0) ? 5.0 : corr_high;
-
     // Try and pick a Q that can encode the content at the given rate.
     for (Q = 0; Q < MAXQ; Q++)
     {
         int bits_per_mb_at_this_q;
 
-        if (Q < 50)
-        {
-            correction_factor = pow(err_per_mb / BASE_ERRPERMB, (pow_lowq + Q * 0.01));
-            correction_factor = (correction_factor < 0.05) ? 0.05 : (correction_factor > 5.0) ? 5.0 : correction_factor;
-        }
-        else
-            correction_factor = corr_high;
+        // Error per MB based correction factor
+        err_correction_factor =
+            calc_correction_factor(err_per_mb, 150.0, 0.40, 0.90, Q);
 
-        bits_per_mb_at_this_q = (int)(.5 + correction_factor * speed_correction * cpi->twopass.est_max_qcorrection_factor * (double)vp8_bits_per_mb[INTER_FRAME][Q] / 1.0);
+        bits_per_mb_at_this_q =
+            (int)( .5 + ( err_correction_factor *
+                          speed_correction *
+                          cpi->twopass.est_max_qcorrection_factor *
+                          (double)vp8_bits_per_mb[INTER_FRAME][Q] / 1.0 ) );
 
         if (bits_per_mb_at_this_q <= target_norm_bits_per_mb)
             break;
@@ -1015,7 +1171,6 @@ static int estimate_kf_group_q(VP8_COMP *cpi, double section_err, int section_ta
 
     double err_per_mb = section_err / num_mbs;
     double err_correction_factor;
-    double corr_high;
     double speed_correction = 1.0;
     double current_spend_ratio = 1.0;
 
@@ -1059,23 +1214,17 @@ static int estimate_kf_group_q(VP8_COMP *cpi, double section_err, int section_ta
     // Combine the various factors calculated above
     combined_correction_factor = speed_correction * iiratio_correction_factor * current_spend_ratio;
 
-    // Correction factor used for Q values >= 20
-    corr_high = pow(err_per_mb / BASE_ERRPERMB, pow_highq);
-    corr_high = (corr_high < 0.05) ? 0.05 : (corr_high > 5.0) ? 5.0 : corr_high;
-
     // Try and pick a Q that should be high enough to encode the content at the given rate.
     for (Q = 0; Q < MAXQ; Q++)
     {
-        // Q values < 20 treated as a special case
-        if (Q < 20)
-        {
-            err_correction_factor = pow(err_per_mb / BASE_ERRPERMB, (pow_lowq + Q * 0.01));
-            err_correction_factor = (err_correction_factor < 0.05) ? 0.05 : (err_correction_factor > 5.0) ? 5.0 : err_correction_factor;
-        }
-        else
-            err_correction_factor = corr_high;
+        // Error per MB based correction factor
+        err_correction_factor =
+            calc_correction_factor(err_per_mb, 150.0, pow_lowq, pow_highq, Q);
 
-        bits_per_mb_at_this_q = (int)(.5 + err_correction_factor * combined_correction_factor * (double)vp8_bits_per_mb[INTER_FRAME][Q]);
+        bits_per_mb_at_this_q =
+            (int)(.5 + ( err_correction_factor *
+                         combined_correction_factor *
+                         (double)vp8_bits_per_mb[INTER_FRAME][Q]) );
 
         if (bits_per_mb_at_this_q <= target_norm_bits_per_mb)
             break;
@@ -1102,77 +1251,6 @@ static int estimate_kf_group_q(VP8_COMP *cpi, double section_err, int section_ta
     return Q;
 }
 
-// For cq mode estimate a cq level that matches the observed
-// complexity and data rate.
-static int estimate_cq(VP8_COMP *cpi, double section_err, int section_target_bandwitdh)
-{
-    int Q;
-    int num_mbs = cpi->common.MBs;
-    int target_norm_bits_per_mb;
-
-    double err_per_mb = section_err / num_mbs;
-    double correction_factor;
-    double corr_high;
-    double speed_correction = 1.0;
-    double pow_highq = 0.90;
-    double pow_lowq = 0.40;
-    double clip_iiratio;
-    double clip_iifactor;
-
-    target_norm_bits_per_mb = (section_target_bandwitdh < (1 << 20))
-                              ? (512 * section_target_bandwitdh) / num_mbs
-                              : 512 * (section_target_bandwitdh / num_mbs);
-
-    // Corrections for higher compression speed settings
-    // (reduced compression expected)
-    if ((cpi->compressor_speed == 3) || (cpi->compressor_speed == 1))
-    {
-        if (cpi->oxcf.cpu_used <= 5)
-            speed_correction = 1.04 + (cpi->oxcf.cpu_used * 0.04);
-        else
-            speed_correction = 1.25;
-    }
-    // II ratio correction factor for clip as a whole
-    clip_iiratio = cpi->twopass.total_stats->intra_error /
-                   DOUBLE_DIVIDE_CHECK(cpi->twopass.total_stats->coded_error);
-    clip_iifactor = 1.0 - ((clip_iiratio - 10.0) * 0.025);
-    if (clip_iifactor < 0.80)
-        clip_iifactor = 0.80;
-
-    // Correction factor used for Q values >= 20
-    corr_high = pow(err_per_mb / BASE_ERRPERMB, pow_highq);
-    corr_high = (corr_high < 0.05) ? 0.05 : (corr_high > 5.0) ? 5.0 : corr_high;
-
-    // Try and pick a Q that can encode the content at the given rate.
-    for (Q = 0; Q < MAXQ; Q++)
-    {
-        int bits_per_mb_at_this_q;
-
-        if (Q < 50)
-        {
-            correction_factor =
-                pow( err_per_mb / BASE_ERRPERMB, (pow_lowq + Q * 0.01));
-
-            correction_factor = (correction_factor < 0.05) ? 0.05
-                                    : (correction_factor > 5.0) ? 5.0
-                                        : correction_factor;
-        }
-        else
-            correction_factor = corr_high;
-
-        bits_per_mb_at_this_q =
-            (int)( .5 + correction_factor *
-                        speed_correction *
-                        clip_iifactor *
-                        (double)vp8_bits_per_mb[INTER_FRAME][Q] / 1.0);
-
-        if (bits_per_mb_at_this_q <= target_norm_bits_per_mb)
-            break;
-    }
-
-    return cq_level[Q];
-}
-
 extern void vp8_new_frame_rate(VP8_COMP *cpi, double framerate);
 
 void vp8_init_second_pass(VP8_COMP *cpi)
@@ -1182,32 +1260,25 @@ void vp8_init_second_pass(VP8_COMP *cpi)
 
     double two_pass_min_rate = (double)(cpi->oxcf.target_bandwidth * cpi->oxcf.two_pass_vbrmin_section / 100);
 
-    zero_stats(cpi->twopass.total_stats);
+    zero_stats(&cpi->twopass.total_stats);
+    zero_stats(&cpi->twopass.total_left_stats);
 
     if (!cpi->twopass.stats_in_end)
         return;
 
-    *cpi->twopass.total_stats = *cpi->twopass.stats_in_end;
-
-    cpi->twopass.total_error_left = cpi->twopass.total_stats->ssim_weighted_pred_err;
-    cpi->twopass.total_intra_error_left = cpi->twopass.total_stats->intra_error;
-    cpi->twopass.total_coded_error_left = cpi->twopass.total_stats->coded_error;
-    cpi->twopass.start_tot_err_left = cpi->twopass.total_error_left;
-
-    //cpi->twopass.bits_left = (int64_t)(cpi->twopass.total_stats->count * cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
-    //cpi->twopass.bits_left -= (int64_t)(cpi->twopass.total_stats->count * two_pass_min_rate / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
+    cpi->twopass.total_stats = *cpi->twopass.stats_in_end;
+    cpi->twopass.total_left_stats = cpi->twopass.total_stats;
 
     // each frame can have a different duration, as the frame rate in the source
     // isn't guaranteed to be constant.   The frame rate prior to the first frame
     // encoded in the second pass is a guess.  However the sum duration is not.
     // Its calculated based on the actual durations of all frames from the first
     // pass.
-    vp8_new_frame_rate(cpi, 10000000.0 * cpi->twopass.total_stats->count / cpi->twopass.total_stats->duration);
+    vp8_new_frame_rate(cpi, 10000000.0 * cpi->twopass.total_stats.count / cpi->twopass.total_stats.duration);
 
-    cpi->output_frame_rate = cpi->oxcf.frame_rate;
-    cpi->twopass.bits_left = (int64_t)(cpi->twopass.total_stats->duration * cpi->oxcf.target_bandwidth / 10000000.0) ;
-    cpi->twopass.bits_left -= (int64_t)(cpi->twopass.total_stats->duration * two_pass_min_rate / 10000000.0);
-    cpi->twopass.clip_bits_total = cpi->twopass.bits_left;
+    cpi->output_frame_rate = cpi->frame_rate;
+    cpi->twopass.bits_left = (int64_t)(cpi->twopass.total_stats.duration * cpi->oxcf.target_bandwidth / 10000000.0) ;
+    cpi->twopass.bits_left -= (int64_t)(cpi->twopass.total_stats.duration * two_pass_min_rate / 10000000.0);
 
     // Calculate a minimum intra value to be used in determining the IIratio
     // scores used in the second pass. We have this minimum to make sure
@@ -1216,8 +1287,6 @@ void vp8_init_second_pass(VP8_COMP *cpi)
     cpi->twopass.kf_intra_err_min = KF_MB_INTRA_MIN * cpi->common.MBs;
     cpi->twopass.gf_intra_err_min = GF_MB_INTRA_MIN * cpi->common.MBs;
 
-    avg_stats(cpi->twopass.total_stats);
-
     // Scan the first pass file and calculate an average Intra / Inter error score ratio for the sequence
     {
         double sum_iiratio = 0.0;
@@ -1232,7 +1301,7 @@ void vp8_init_second_pass(VP8_COMP *cpi)
             sum_iiratio += IIRatio;
         }
 
-        cpi->twopass.avg_iiratio = sum_iiratio / DOUBLE_DIVIDE_CHECK((double)cpi->twopass.total_stats->count);
+        cpi->twopass.avg_iiratio = sum_iiratio / DOUBLE_DIVIDE_CHECK((double)cpi->twopass.total_stats.count);
 
         // Reset file position
         reset_fpf_position(cpi, start_pos);
@@ -1307,7 +1376,7 @@ static int detect_transition_to_still(
     double loop_decay_rate,
     double decay_accumulator )
 {
-    BOOL trans_to_still = FALSE;
+    int trans_to_still = 0;
 
     // Break clause to detect very still sections after motion
     // For example a static image after a fade or other transition
@@ -1337,7 +1406,7 @@ static int detect_transition_to_still(
 
         // Only if it does do we signal a transition to still
         if ( j == still_interval )
-            trans_to_still = TRUE;
+            trans_to_still = 1;
     }
 
     return trans_to_still;
@@ -1346,14 +1415,14 @@ static int detect_transition_to_still(
 // This function detects a flash through the high relative pcnt_second_ref
 // score in the frame following a flash frame. The offset passed in should
 // reflect this
-static BOOL detect_flash( VP8_COMP *cpi, int offset )
+static int detect_flash( VP8_COMP *cpi, int offset )
 {
     FIRSTPASS_STATS next_frame;
 
-    BOOL flash_detected = FALSE;
+    int flash_detected = 0;
 
     // Read the frame data.
-    // The return is FALSE (no flash detected) if not a valid frame
+    // The return is 0 (no flash detected) if not a valid frame
     if ( read_frame_stats(cpi, &next_frame, offset) != EOF )
     {
         // What we are looking for here is a situation where there is a
@@ -1364,7 +1433,7 @@ static BOOL detect_flash( VP8_COMP *cpi, int offset )
         if ( (next_frame.pcnt_second_ref > next_frame.pcnt_inter) &&
              (next_frame.pcnt_second_ref >= 0.5 ) )
         {
-            flash_detected = TRUE;
+            flash_detected = 1;
 
             /*if (1)
             {
@@ -1473,14 +1542,13 @@ static int calc_arf_boost(
 
     int i;
     double boost_score = 0.0;
-    double fwd_boost_score = 0.0;
     double mv_ratio_accumulator = 0.0;
     double decay_accumulator = 1.0;
     double this_frame_mv_in_out = 0.0;
     double mv_in_out_accumulator = 0.0;
     double abs_mv_in_out_accumulator = 0.0;
     double r;
-    BOOL flash_detected = FALSE;
+    int flash_detected = 0;
 
     // Search forward from the proposed arf/next gf position
     for ( i = 0; i < f_frames; i++ )
@@ -1609,7 +1677,7 @@ static void define_gf_group(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
     int alt_boost = 0;
     int f_boost = 0;
     int b_boost = 0;
-    BOOL flash_detected;
+    int flash_detected;
 
     cpi->twopass.gf_group_bits = 0;
     cpi->twopass.gf_decay_rate = 0;
@@ -1683,7 +1751,7 @@ static void define_gf_group(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
                                          loop_decay_rate,
                                          decay_accumulator ) )
         {
-            allow_alt_ref = FALSE;
+            allow_alt_ref = 0;
             boost_score = old_boost_score;
             break;
         }
@@ -1855,7 +1923,7 @@ static void define_gf_group(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
             int frames_bwd = cpi->oxcf.arnr_max_frames - 1;
             int frames_fwd = cpi->oxcf.arnr_max_frames - 1;
 
-            cpi->source_alt_ref_pending = TRUE;
+            cpi->source_alt_ref_pending = 1;
 
             // For alt ref frames the error score for the end frame of the
             // group (the alt ref frame) should not contribute to the group
@@ -1881,7 +1949,7 @@ static void define_gf_group(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
             // Note: this_frame->frame has been updated in the loop
             // so it now points at the ARF frame.
             half_gf_int = cpi->baseline_gf_interval >> 1;
-            frames_after_arf = cpi->twopass.total_stats->count -
+            frames_after_arf = cpi->twopass.total_stats.count -
                                this_frame->frame - 1;
 
             switch (cpi->oxcf.arnr_type)
@@ -1921,13 +1989,13 @@ static void define_gf_group(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
         }
         else
         {
-            cpi->source_alt_ref_pending = FALSE;
+            cpi->source_alt_ref_pending = 0;
             cpi->baseline_gf_interval = i;
         }
     }
     else
     {
-        cpi->source_alt_ref_pending = FALSE;
+        cpi->source_alt_ref_pending = 0;
         cpi->baseline_gf_interval = i;
     }
 
@@ -1937,7 +2005,7 @@ static void define_gf_group(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
     // where cpi->twopass.kf_group_bits is tied to cpi->twopass.bits_left.
     // This is also important for short clips where there may only be one
     // key frame.
-    if (cpi->twopass.frames_to_key >= (int)(cpi->twopass.total_stats->count -
+    if (cpi->twopass.frames_to_key >= (int)(cpi->twopass.total_stats.count -
                                             cpi->common.current_video_frame))
     {
         cpi->twopass.kf_group_bits =
@@ -2107,6 +2175,10 @@ static void define_gf_group(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
         if (cpi->twopass.gf_group_bits < 0)
             cpi->twopass.gf_group_bits = 0;
 
+        // This condition could fail if there are two kfs very close together
+        // despite (MIN_GF_INTERVAL) and would cause a devide by 0 in the
+        // calculation of cpi->twopass.alt_extra_bits.
+        if ( cpi->baseline_gf_interval >= 3 )
         {
 #if NEW_BOOST
             int boost = (cpi->source_alt_ref_pending)
@@ -2114,22 +2186,27 @@ static void define_gf_group(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
 #else
             int boost = cpi->gfu_boost;
 #endif
-            // Set aside some bits for a mid gf sequence boost
-            if ((boost > 150) && (cpi->baseline_gf_interval > 5))
+            if ( boost >= 150 )
             {
-                int pct_extra = (boost - 100) / 50;
-                pct_extra = (pct_extra > 10) ? 10 : pct_extra;
+                int pct_extra;
 
-                cpi->twopass.mid_gf_extra_bits =
+                pct_extra = (boost - 100) / 50;
+                pct_extra = (pct_extra > 20) ? 20 : pct_extra;
+
+                cpi->twopass.alt_extra_bits =
                     (cpi->twopass.gf_group_bits * pct_extra) / 100;
-                cpi->twopass.gf_group_bits -= cpi->twopass.mid_gf_extra_bits;
+                cpi->twopass.gf_group_bits -= cpi->twopass.alt_extra_bits;
+                cpi->twopass.alt_extra_bits /=
+                    ((cpi->baseline_gf_interval-1)>>1);
             }
             else
-                cpi->twopass.mid_gf_extra_bits = 0;
+                cpi->twopass.alt_extra_bits = 0;
         }
+        else
+            cpi->twopass.alt_extra_bits = 0;
     }
 
-    // Adjustment to estimate_max_q based on a measure of complexity of the section
+    // Adjustments based on a measure of complexity of the section
     if (cpi->common.frame_type != KEY_FRAME)
     {
         FIRSTPASS_STATS sectionstats;
@@ -2206,9 +2283,12 @@ static void assign_std_frame_bits(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
 
     target_frame_size += cpi->min_frame_bandwidth;                                          // Add in the minimum number of bits that is set aside for every frame.
 
-    // Special case for the frame that lies half way between two gfs
-    if (cpi->common.frames_since_golden == cpi->baseline_gf_interval / 2)
-        target_frame_size += cpi->twopass.mid_gf_extra_bits;
+    // Every other frame gets a few extra bits
+    if ( (cpi->common.frames_since_golden & 0x01) &&
+         (cpi->frames_till_gf_update_due > 0) )
+    {
+        target_frame_size += cpi->twopass.alt_extra_bits;
+    }
 
     cpi->per_frame_bandwidth = target_frame_size;                                           // Per frame bit target for this frame
 }
@@ -2216,9 +2296,9 @@ static void assign_std_frame_bits(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
 void vp8_second_pass(VP8_COMP *cpi)
 {
     int tmp_q;
-    int frames_left = (int)(cpi->twopass.total_stats->count - cpi->common.current_video_frame);
+    int frames_left = (int)(cpi->twopass.total_stats.count - cpi->common.current_video_frame);
 
-    FIRSTPASS_STATS this_frame;
+    FIRSTPASS_STATS this_frame = {0};
     FIRSTPASS_STATS this_frame_copy;
 
     double this_frame_error;
@@ -2227,6 +2307,8 @@ void vp8_second_pass(VP8_COMP *cpi)
 
     FIRSTPASS_STATS *start_pos;
 
+    int overhead_bits;
+
     if (!cpi->twopass.stats_in)
     {
         return ;
@@ -2259,7 +2341,7 @@ void vp8_second_pass(VP8_COMP *cpi)
             cpi->twopass.gf_group_error_left = cpi->twopass.kf_group_error_left;
             cpi->baseline_gf_interval = cpi->twopass.frames_to_key;
             cpi->frames_till_gf_update_due = cpi->baseline_gf_interval;
-            cpi->source_alt_ref_pending = FALSE;
+            cpi->source_alt_ref_pending = 0;
         }
 
     }
@@ -2326,20 +2408,26 @@ void vp8_second_pass(VP8_COMP *cpi)
     if (cpi->target_bandwidth < 0)
         cpi->target_bandwidth = 0;
 
+
+    // Account for mv, mode and other overheads.
+    overhead_bits = estimate_modemvcost(
+                        cpi, &cpi->twopass.total_left_stats );
+
+    // Special case code for first frame.
     if (cpi->common.current_video_frame == 0)
     {
         cpi->twopass.est_max_qcorrection_factor = 1.0;
 
-        // Experimental code to try and set a cq_level in constrained
-        // quality mode.
+        // Set a cq_level in constrained quality mode.
         if ( cpi->oxcf.end_usage == USAGE_CONSTRAINED_QUALITY )
         {
             int est_cq;
 
             est_cq =
                 estimate_cq( cpi,
-                             (cpi->twopass.total_coded_error_left / frames_left),
-                             (int)(cpi->twopass.bits_left / frames_left));
+                             &cpi->twopass.total_left_stats,
+                             (int)(cpi->twopass.bits_left / frames_left),
+                             overhead_bits );
 
             cpi->cq_target_quality = cpi->oxcf.cq_level;
             if ( est_cq > cpi->cq_target_quality )
@@ -2349,9 +2437,12 @@ void vp8_second_pass(VP8_COMP *cpi)
         // guess at maxq needed in 2nd pass
         cpi->twopass.maxq_max_limit = cpi->worst_quality;
         cpi->twopass.maxq_min_limit = cpi->best_quality;
-        tmp_q = estimate_max_q( cpi,
-                                (cpi->twopass.total_coded_error_left / frames_left),
-                                (int)(cpi->twopass.bits_left / frames_left));
+
+        tmp_q = estimate_max_q(
+                    cpi,
+                    &cpi->twopass.total_left_stats,
+                    (int)(cpi->twopass.bits_left / frames_left),
+                    overhead_bits );
 
         // Limit the maxq value returned subsequently.
         // This increases the risk of overspend or underspend if the initial
@@ -2372,14 +2463,18 @@ void vp8_second_pass(VP8_COMP *cpi)
     // radical adjustments to the allowed quantizer range just to use up a
     // few surplus bits or get beneath the target rate.
     else if ( (cpi->common.current_video_frame <
-                  (((unsigned int)cpi->twopass.total_stats->count * 255)>>8)) &&
+                 (((unsigned int)cpi->twopass.total_stats.count * 255)>>8)) &&
               ((cpi->common.current_video_frame + cpi->baseline_gf_interval) <
-                  (unsigned int)cpi->twopass.total_stats->count) )
+                 (unsigned int)cpi->twopass.total_stats.count) )
     {
         if (frames_left < 1)
             frames_left = 1;
 
-        tmp_q = estimate_max_q(cpi, (cpi->twopass.total_coded_error_left / frames_left), (int)(cpi->twopass.bits_left / frames_left));
+        tmp_q = estimate_max_q(
+                    cpi,
+                    &cpi->twopass.total_left_stats,
+                    (int)(cpi->twopass.bits_left / frames_left),
+                    overhead_bits );
 
         // Move active_worst_quality but in a damped way
         if (tmp_q > cpi->active_worst_quality)
@@ -2387,19 +2482,20 @@ void vp8_second_pass(VP8_COMP *cpi)
         else if (tmp_q < cpi->active_worst_quality)
             cpi->active_worst_quality --;
 
-        cpi->active_worst_quality = ((cpi->active_worst_quality * 3) + tmp_q + 2) / 4;
+        cpi->active_worst_quality =
+            ((cpi->active_worst_quality * 3) + tmp_q + 2) / 4;
     }
 
     cpi->twopass.frames_to_key --;
-    cpi->twopass.total_error_left      -= this_frame_error;
-    cpi->twopass.total_intra_error_left -= this_frame_intra_error;
-    cpi->twopass.total_coded_error_left -= this_frame_coded_error;
+
+    // Update the total stats remaining sturcture
+    subtract_stats(&cpi->twopass.total_left_stats, &this_frame );
 }
 
 
-static BOOL test_candidate_kf(VP8_COMP *cpi,  FIRSTPASS_STATS *last_frame, FIRSTPASS_STATS *this_frame, FIRSTPASS_STATS *next_frame)
+static int test_candidate_kf(VP8_COMP *cpi,  FIRSTPASS_STATS *last_frame, FIRSTPASS_STATS *this_frame, FIRSTPASS_STATS *next_frame)
 {
-    BOOL is_viable_kf = FALSE;
+    int is_viable_kf = 0;
 
     // Does the frame satisfy the primary criteria of a key frame
     //      If so, then examine how well it predicts subsequent frames
@@ -2473,13 +2569,13 @@ static BOOL test_candidate_kf(VP8_COMP *cpi,  FIRSTPASS_STATS *last_frame, FIRST
 
         // If there is tolerable prediction for at least the next 3 frames then break out else discard this pottential key frame and move on
         if (boost_score > 5.0 && (i > 3))
-            is_viable_kf = TRUE;
+            is_viable_kf = 1;
         else
         {
             // Reset the file position
             reset_fpf_position(cpi, start_pos);
 
-            is_viable_kf = FALSE;
+            is_viable_kf = 0;
         }
     }
 
@@ -2515,7 +2611,7 @@ static void find_next_key_frame(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
     cpi->this_key_frame_forced = cpi->next_key_frame_forced;
 
     // Clear the alt ref active flag as this can never be active on a key frame
-    cpi->source_alt_ref_active = FALSE;
+    cpi->source_alt_ref_active = 0;
 
     // Kf is always a gf so clear frames till next gf counter
     cpi->frames_till_gf_update_due = 0;
@@ -2551,8 +2647,11 @@ static void find_next_key_frame(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
             && lookup_next_frame_stats(cpi, &next_frame) != EOF)
         {
             // Normal scene cut check
-            if (test_candidate_kf(cpi, &last_frame, this_frame, &next_frame))
+            if ( ( i >= MIN_GF_INTERVAL ) &&
+                 test_candidate_kf(cpi, &last_frame, this_frame, &next_frame) )
+            {
                 break;
+            }
 
             // How fast is prediction quality decaying
             loop_decay_rate = get_prediction_decay_rate(cpi, &next_frame);
@@ -2628,10 +2727,10 @@ static void find_next_key_frame(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
         // Reset to the start of the group
         reset_fpf_position(cpi, current_pos);
 
-        cpi->next_key_frame_forced = TRUE;
+        cpi->next_key_frame_forced = 1;
     }
     else
-        cpi->next_key_frame_forced = FALSE;
+        cpi->next_key_frame_forced = 0;
 
     // Special case for the last frame of the file
     if (cpi->twopass.stats_in >= cpi->twopass.stats_in_end)
@@ -2935,8 +3034,8 @@ static void find_next_key_frame(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
 
     if (cpi->oxcf.allow_spatial_resampling)
     {
-        int resample_trigger = FALSE;
-        int last_kf_resampled = FALSE;
+        int resample_trigger = 0;
+        int last_kf_resampled = 0;
         int kf_q;
         int scale_val = 0;
         int hr, hs, vr, vs;
@@ -2954,15 +3053,15 @@ static void find_next_key_frame(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
         double effective_size_ratio;
 
         if ((cpi->common.Width != cpi->oxcf.Width) || (cpi->common.Height != cpi->oxcf.Height))
-            last_kf_resampled = TRUE;
+            last_kf_resampled = 1;
 
         // Set back to unscaled by defaults
         cpi->common.horiz_scale = NORMAL;
         cpi->common.vert_scale = NORMAL;
 
         // Calculate Average bits per frame.
-        //av_bits_per_frame = cpi->twopass.bits_left/(double)(cpi->twopass.total_stats->count - cpi->common.current_video_frame);
-        av_bits_per_frame = cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate);
+        //av_bits_per_frame = cpi->twopass.bits_left/(double)(cpi->twopass.total_stats.count - cpi->common.current_video_frame);
+        av_bits_per_frame = cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->frame_rate);
         //if ( av_bits_per_frame < 0.0 )
         //  av_bits_per_frame = 0.0
 
@@ -3018,21 +3117,21 @@ static void find_next_key_frame(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
                 (last_kf_resampled && (projected_buffer_level < (cpi->oxcf.resample_up_water_mark * cpi->oxcf.optimal_buffer_level / 100))))
                 //( ((cpi->buffer_level < (cpi->oxcf.resample_down_water_mark * cpi->oxcf.optimal_buffer_level / 100))) &&
                 //  ((projected_buffer_level < (cpi->oxcf.resample_up_water_mark * cpi->oxcf.optimal_buffer_level / 100))) ))
-                resample_trigger = TRUE;
+                resample_trigger = 1;
             else
-                resample_trigger = FALSE;
+                resample_trigger = 0;
         }
         else
         {
-            int64_t clip_bits = (int64_t)(cpi->twopass.total_stats->count * cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
+            int64_t clip_bits = (int64_t)(cpi->twopass.total_stats.count * cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->frame_rate));
             int64_t over_spend = cpi->oxcf.starting_buffer_level - cpi->buffer_level;
 
             if ((last_kf_resampled && (kf_q > cpi->worst_quality)) ||                                               // If triggered last time the threshold for triggering again is reduced
                 ((kf_q > cpi->worst_quality) &&                                                                  // Projected Q higher than allowed and ...
                  (over_spend > clip_bits / 20)))                                                               // ... Overspend > 5% of total bits
-                resample_trigger = TRUE;
+                resample_trigger = 1;
             else
-                resample_trigger = FALSE;
+                resample_trigger = 0;
 
         }
 
diff --git a/media/libvpx/vp8/encoder/generic/csystemdependent.c b/media/libvpx/vp8/encoder/generic/csystemdependent.c
index 9906105545f..acd83159b7c 100644
--- a/media/libvpx/vp8/encoder/generic/csystemdependent.c
+++ b/media/libvpx/vp8/encoder/generic/csystemdependent.c
@@ -9,67 +9,22 @@
  */
 
 
-#include "vpx_ports/config.h"
-#include "vp8/encoder/variance.h"
+#include "vpx_config.h"
 #include "vp8/encoder/onyx_int.h"
 
 
 void vp8_arch_x86_encoder_init(VP8_COMP *cpi);
 void vp8_arch_arm_encoder_init(VP8_COMP *cpi);
 
-void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction);
-extern void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction);
+void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc,
+                                        YV12_BUFFER_CONFIG *dst_ybc);
+extern void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc,
+                                        YV12_BUFFER_CONFIG *dst_ybc);
 
 void vp8_cmachine_specific_config(VP8_COMP *cpi)
 {
 #if CONFIG_RUNTIME_CPU_DETECT
     cpi->rtcd.common                    = &cpi->common.rtcd;
-    cpi->rtcd.variance.sad16x16              = vp8_sad16x16_c;
-    cpi->rtcd.variance.sad16x8               = vp8_sad16x8_c;
-    cpi->rtcd.variance.sad8x16               = vp8_sad8x16_c;
-    cpi->rtcd.variance.sad8x8                = vp8_sad8x8_c;
-    cpi->rtcd.variance.sad4x4                = vp8_sad4x4_c;
-
-    cpi->rtcd.variance.sad16x16x3            = vp8_sad16x16x3_c;
-    cpi->rtcd.variance.sad16x8x3             = vp8_sad16x8x3_c;
-    cpi->rtcd.variance.sad8x16x3             = vp8_sad8x16x3_c;
-    cpi->rtcd.variance.sad8x8x3              = vp8_sad8x8x3_c;
-    cpi->rtcd.variance.sad4x4x3              = vp8_sad4x4x3_c;
-
-    cpi->rtcd.variance.sad16x16x8            = vp8_sad16x16x8_c;
-    cpi->rtcd.variance.sad16x8x8             = vp8_sad16x8x8_c;
-    cpi->rtcd.variance.sad8x16x8             = vp8_sad8x16x8_c;
-    cpi->rtcd.variance.sad8x8x8              = vp8_sad8x8x8_c;
-    cpi->rtcd.variance.sad4x4x8              = vp8_sad4x4x8_c;
-
-    cpi->rtcd.variance.sad16x16x4d           = vp8_sad16x16x4d_c;
-    cpi->rtcd.variance.sad16x8x4d            = vp8_sad16x8x4d_c;
-    cpi->rtcd.variance.sad8x16x4d            = vp8_sad8x16x4d_c;
-    cpi->rtcd.variance.sad8x8x4d             = vp8_sad8x8x4d_c;
-    cpi->rtcd.variance.sad4x4x4d             = vp8_sad4x4x4d_c;
-#if ARCH_X86 || ARCH_X86_64
-    cpi->rtcd.variance.copy32xn              = vp8_copy32xn_c;
-#endif
-    cpi->rtcd.variance.var4x4                = vp8_variance4x4_c;
-    cpi->rtcd.variance.var8x8                = vp8_variance8x8_c;
-    cpi->rtcd.variance.var8x16               = vp8_variance8x16_c;
-    cpi->rtcd.variance.var16x8               = vp8_variance16x8_c;
-    cpi->rtcd.variance.var16x16              = vp8_variance16x16_c;
-
-    cpi->rtcd.variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;
-    cpi->rtcd.variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_c;
-    cpi->rtcd.variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
-    cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;
-    cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_c;
-    cpi->rtcd.variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_c;
-    cpi->rtcd.variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_c;
-    cpi->rtcd.variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_c;
-    cpi->rtcd.variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_c;
-
-    cpi->rtcd.variance.mse16x16              = vp8_mse16x16_c;
-    cpi->rtcd.variance.getmbss               = vp8_get_mb_ss_c;
-
-    cpi->rtcd.variance.get4x4sse_cs          = vp8_get4x4sse_cs_c;
 
     cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_c;
     cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_c;
@@ -99,11 +54,6 @@ void vp8_cmachine_specific_config(VP8_COMP *cpi)
     // Pure C:
     vp8_yv12_copy_partial_frame_ptr = vp8_yv12_copy_partial_frame;
 
-#if CONFIG_INTERNAL_STATS
-    cpi->rtcd.variance.ssimpf_8x8            = ssim_parms_8x8_c;
-    cpi->rtcd.variance.ssimpf                = ssim_parms_c;
-#endif
-
 #if ARCH_X86 || ARCH_X86_64
     vp8_arch_x86_encoder_init(cpi);
 #endif
diff --git a/media/libvpx/vp8/encoder/lookahead.c b/media/libvpx/vp8/encoder/lookahead.c
index d7f85cba1de..3e582e3691f 100644
--- a/media/libvpx/vp8/encoder/lookahead.c
+++ b/media/libvpx/vp8/encoder/lookahead.c
@@ -48,7 +48,7 @@ vp8_lookahead_destroy(struct lookahead_ctx *ctx)
     {
         if(ctx->buf)
         {
-            int i;
+            unsigned int i;
 
             for(i = 0; i < ctx->max_sz; i++)
                 vp8_yv12_de_alloc_frame_buffer(&ctx->buf[i].img);
@@ -65,7 +65,7 @@ vp8_lookahead_init(unsigned int width,
                    unsigned int depth)
 {
     struct lookahead_ctx *ctx = NULL;
-    int i;
+    unsigned int i;
 
     /* Clamp the lookahead queue depth */
     if(depth < 1)
@@ -102,15 +102,68 @@ vp8_lookahead_push(struct lookahead_ctx *ctx,
                    YV12_BUFFER_CONFIG   *src,
                    int64_t               ts_start,
                    int64_t               ts_end,
-                   unsigned int          flags)
+                   unsigned int          flags,
+                   unsigned char        *active_map)
 {
     struct lookahead_entry* buf;
+    int row, col, active_end;
+    int mb_rows = (src->y_height + 15) >> 4;
+    int mb_cols = (src->y_width + 15) >> 4;
 
     if(ctx->sz + 1 > ctx->max_sz)
         return 1;
     ctx->sz++;
     buf = pop(ctx, &ctx->write_idx);
-    vp8_copy_and_extend_frame(src, &buf->img);
+
+    // Only do this partial copy if the following conditions are all met:
+    // 1. Lookahead queue has has size of 1.
+    // 2. Active map is provided.
+    // 3. This is not a key frame, golden nor altref frame.
+    if (ctx->max_sz == 1 && active_map && !flags)
+    {
+        for (row = 0; row < mb_rows; ++row)
+        {
+            col = 0;
+
+            while (1)
+            {
+                // Find the first active macroblock in this row.
+                for (; col < mb_cols; ++col)
+                {
+                    if (active_map[col])
+                        break;
+                }
+
+                // No more active macroblock in this row.
+                if (col == mb_cols)
+                    break;
+
+                // Find the end of active region in this row.
+                active_end = col;
+
+                for (; active_end < mb_cols; ++active_end)
+                {
+                    if (!active_map[active_end])
+                        break;
+                }
+
+                // Only copy this active region.
+                vp8_copy_and_extend_frame_with_rect(src, &buf->img,
+                                                    row << 4,
+                                                    col << 4, 16,
+                                                    (active_end - col) << 4);
+
+                // Start again from the end of this active region.
+                col = active_end;
+            }
+
+            active_map += mb_cols;
+        }
+    }
+    else
+    {
+        vp8_copy_and_extend_frame(src, &buf->img);
+    }
     buf->ts_start = ts_start;
     buf->ts_end = ts_end;
     buf->flags = flags;
@@ -135,7 +188,7 @@ vp8_lookahead_pop(struct lookahead_ctx *ctx,
 
 struct lookahead_entry*
 vp8_lookahead_peek(struct lookahead_ctx *ctx,
-                   int                   index)
+                   unsigned int          index)
 {
     struct lookahead_entry* buf = NULL;
 
diff --git a/media/libvpx/vp8/encoder/lookahead.h b/media/libvpx/vp8/encoder/lookahead.h
index a483d7e0b9b..32bafcd633f 100644
--- a/media/libvpx/vp8/encoder/lookahead.h
+++ b/media/libvpx/vp8/encoder/lookahead.h
@@ -47,18 +47,23 @@ void vp8_lookahead_destroy(struct lookahead_ctx *ctx);
  * This function will copy the source image into a new framebuffer with
  * the expected stride/border.
  *
- * \param[in] ctx       Pointer to the lookahead context
- * \param[in] src       Pointer to the image to enqueue
- * \param[in] ts_start  Timestamp for the start of this frame
- * \param[in] ts_end    Timestamp for the end of this frame
- * \param[in] flags     Flags set on this frame
+ * If active_map is non-NULL and there is only one frame in the queue, then copy
+ * only active macroblocks.
+ *
+ * \param[in] ctx         Pointer to the lookahead context
+ * \param[in] src         Pointer to the image to enqueue
+ * \param[in] ts_start    Timestamp for the start of this frame
+ * \param[in] ts_end      Timestamp for the end of this frame
+ * \param[in] flags       Flags set on this frame
+ * \param[in] active_map  Map that specifies which macroblock is active
  */
 int
 vp8_lookahead_push(struct lookahead_ctx *ctx,
                    YV12_BUFFER_CONFIG   *src,
                    int64_t               ts_start,
                    int64_t               ts_end,
-                   unsigned int          flags);
+                   unsigned int          flags,
+                   unsigned char        *active_map);
 
 
 /**\brief Get the next source buffer to encode
@@ -87,7 +92,7 @@ vp8_lookahead_pop(struct lookahead_ctx *ctx,
  */
 struct lookahead_entry*
 vp8_lookahead_peek(struct lookahead_ctx *ctx,
-                   int                   index);
+                   unsigned int          index);
 
 
 /**\brief Get the number of frames currently in the lookahead queue
diff --git a/media/libvpx/vp8/encoder/mcomp.c b/media/libvpx/vp8/encoder/mcomp.c
index ff84306e7bc..735af95ca32 100644
--- a/media/libvpx/vp8/encoder/mcomp.c
+++ b/media/libvpx/vp8/encoder/mcomp.c
@@ -9,9 +9,10 @@
  */
 
 
+#include "onyx_int.h"
 #include "mcomp.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include <stdio.h>
 #include <limits.h>
 #include <math.h>
@@ -182,8 +183,6 @@ void vp8_init3smotion_compensation(MACROBLOCK *x, int stride)
 #define IFMVCV(r,c,s,e) if ( c >= minc && c <= maxc && r >= minr && r <= maxr) s else e;
 #define ERR(r,c) (MVC(r,c)+DIST(r,c)) // returns distortion + motion vector cost
 #define CHECK_BETTER(v,r,c) IFMVCV(r,c,{thismse = DIST(r,c); if((v = (MVC(r,c)+thismse)) < besterr) { besterr = v; br=r; bc=c; *distortion = thismse; *sse1 = sse; }}, v=INT_MAX;)// checks if (r,c) has better score than previous best
-#define MIN(x,y) (((x)<(y))?(x):(y))
-#define MAX(x,y) (((x)>(y))?(x):(y))
 
 int vp8_find_best_sub_pixel_step_iteratively(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
                                              int_mv *bestmv, int_mv *ref_mv,
@@ -331,8 +330,7 @@ int vp8_find_best_sub_pixel_step_iteratively(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
 #undef IFMVCV
 #undef ERR
 #undef CHECK_BETTER
-#undef MIN
-#undef MAX
+
 int vp8_find_best_sub_pixel_step(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
                                  int_mv *bestmv, int_mv *ref_mv,
                                  int error_per_bit,
@@ -661,6 +659,7 @@ int vp8_find_best_half_pixel_step(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
     unsigned char *z = (*(b->base_src) + b->src);
     int left, right, up, down, diag;
     unsigned int sse;
+    int whichdir ;
     int thismse;
     int y_stride;
 
@@ -740,8 +739,6 @@ int vp8_find_best_half_pixel_step(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
         *sse1 = sse;
     }
 
-    // somewhat strangely not doing all the diagonals for half pel is slower than doing them.
-#if 0
     // now check 1 more diagonal -
     whichdir = (left < right ? 0 : 1) + (up < down ? 0 : 2);
     this_mv = startmv;
@@ -749,39 +746,28 @@ int vp8_find_best_half_pixel_step(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
     switch (whichdir)
     {
     case 0:
-        this_mv.col = (this_mv.col - 8) | 4;
-        this_mv.row = (this_mv.row - 8) | 4;
-        diag = vfp->svf(y - 1 - y_stride, y_stride, 4, 4, z, b->src_stride, &sse);
+        this_mv.as_mv.col = (this_mv.as_mv.col - 8) | 4;
+        this_mv.as_mv.row = (this_mv.as_mv.row - 8) | 4;
+        thismse = vfp->svf_halfpix_hv(y - 1 - y_stride, y_stride, z, b->src_stride, &sse);
         break;
     case 1:
-        this_mv.col += 4;
-        this_mv.row = (this_mv.row - 8) | 4;
-        diag = vfp->svf(y - y_stride, y_stride, 4, 4, z, b->src_stride, &sse);
+        this_mv.as_mv.col += 4;
+        this_mv.as_mv.row = (this_mv.as_mv.row - 8) | 4;
+        thismse = vfp->svf_halfpix_hv(y - y_stride, y_stride, z, b->src_stride, &sse);
         break;
     case 2:
-        this_mv.col = (this_mv.col - 8) | 4;
-        this_mv.row += 4;
-        diag = vfp->svf(y - 1, y_stride, 4, 4, z, b->src_stride, &sse);
+        this_mv.as_mv.col = (this_mv.as_mv.col - 8) | 4;
+        this_mv.as_mv.row += 4;
+        thismse = vfp->svf_halfpix_hv(y - 1, y_stride, z, b->src_stride, &sse);
         break;
     case 3:
-        this_mv.col += 4;
-        this_mv.row += 4;
-        diag = vfp->svf(y, y_stride, 4, 4, z, b->src_stride, &sse);
+    default:
+        this_mv.as_mv.col += 4;
+        this_mv.as_mv.row += 4;
+        thismse = vfp->svf_halfpix_hv(y, y_stride, z, b->src_stride, &sse);
         break;
     }
 
-    diag += mv_err_cost(&this_mv, ref_mv, mvcost, error_per_bit);
-
-    if (diag < bestmse)
-    {
-        *bestmv = this_mv;
-        bestmse = diag;
-    }
-
-#else
-    this_mv.as_mv.col = (this_mv.as_mv.col - 8) | 4;
-    this_mv.as_mv.row = (this_mv.as_mv.row - 8) | 4;
-    thismse = vfp->svf_halfpix_hv(y - 1 - y_stride, y_stride, z, b->src_stride, &sse);
     diag = thismse + mv_err_cost(&this_mv, ref_mv, mvcost, error_per_bit);
 
     if (diag < bestmse)
@@ -792,44 +778,6 @@ int vp8_find_best_half_pixel_step(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
         *sse1 = sse;
     }
 
-    this_mv.as_mv.col += 8;
-    thismse = vfp->svf_halfpix_hv(y - y_stride, y_stride, z, b->src_stride, &sse);
-    diag = thismse + mv_err_cost(&this_mv, ref_mv, mvcost, error_per_bit);
-
-    if (diag < bestmse)
-    {
-        *bestmv = this_mv;
-        bestmse = diag;
-        *distortion = thismse;
-        *sse1 = sse;
-    }
-
-    this_mv.as_mv.col = (this_mv.as_mv.col - 8) | 4;
-    this_mv.as_mv.row = startmv.as_mv.row + 4;
-    thismse = vfp->svf_halfpix_hv(y - 1, y_stride, z, b->src_stride, &sse);
-    diag = thismse + mv_err_cost(&this_mv, ref_mv, mvcost, error_per_bit);
-
-    if (diag < bestmse)
-    {
-        *bestmv = this_mv;
-        bestmse = diag;
-        *distortion = thismse;
-        *sse1 = sse;
-    }
-
-    this_mv.as_mv.col += 8;
-    thismse = vfp->svf_halfpix_hv(y, y_stride, z, b->src_stride, &sse);
-    diag = thismse + mv_err_cost(&this_mv, ref_mv, mvcost, error_per_bit);
-
-    if (diag < bestmse)
-    {
-        *bestmv = this_mv;
-        bestmse = diag;
-        *distortion = thismse;
-        *sse1 = sse;
-    }
-
-#endif
     return bestmse;
 }
 
@@ -904,6 +852,8 @@ int vp8_hex_search
     int k = -1;
     int all_in;
     int best_site = -1;
+    int hex_range = 127;
+    int dia_range = 8;
 
     int_mv fcenter_mv;
     fcenter_mv.as_mv.row = center_mv->as_mv.row >> 3;
@@ -923,6 +873,18 @@ int vp8_hex_search
                         in_what_stride, 0x7fffffff)
             + mvsad_err_cost(&this_mv, &fcenter_mv, mvsadcost, sad_per_bit);
 
+#if CONFIG_MULTI_RES_ENCODING
+    /* Lower search range based on prediction info */
+    if (search_param >= 6) goto cal_neighbors;
+    else if (search_param >= 5) hex_range = 4;
+    else if (search_param >= 4) hex_range = 6;
+    else if (search_param >= 3) hex_range = 15;
+    else if (search_param >= 2) hex_range = 31;
+    else if (search_param >= 1) hex_range = 63;
+
+    dia_range = 8;
+#endif
+
     // hex search
     //j=0
     CHECK_BOUNDS(2)
@@ -959,7 +921,7 @@ int vp8_hex_search
         k = best_site;
     }
 
-    for (j = 1; j < 127; j++)
+    for (j = 1; j < hex_range; j++)
     {
         best_site = -1;
         CHECK_BOUNDS(2)
@@ -1001,7 +963,7 @@ int vp8_hex_search
 
     // check 4 1-away neighbors
 cal_neighbors:
-    for (j = 0; j < 32; j++)
+    for (j = 0; j < dia_range; j++)
     {
         best_site = -1;
         CHECK_BOUNDS(1)
@@ -1194,7 +1156,7 @@ int vp8_diamond_search_sadx4
     int tot_steps;
     int_mv this_mv;
 
-    int bestsad = INT_MAX;
+    unsigned int bestsad = UINT_MAX;
     int best_site = 0;
     int last_site = 0;
 
@@ -1435,7 +1397,7 @@ int vp8_full_search_sadx3(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv,
     unsigned char *bestaddress;
     int_mv *best_mv = &d->bmi.mv;
     int_mv this_mv;
-    int bestsad = INT_MAX;
+    unsigned int bestsad = UINT_MAX;
     int r, c;
 
     unsigned char *check_here;
@@ -1565,7 +1527,7 @@ int vp8_full_search_sadx8(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv,
     unsigned char *bestaddress;
     int_mv *best_mv = &d->bmi.mv;
     int_mv this_mv;
-    int bestsad = INT_MAX;
+    unsigned int bestsad = UINT_MAX;
     int r, c;
 
     unsigned char *check_here;
diff --git a/media/libvpx/vp8/encoder/mcomp.h b/media/libvpx/vp8/encoder/mcomp.h
index 416c4d5eb6a..949c77838b9 100644
--- a/media/libvpx/vp8/encoder/mcomp.h
+++ b/media/libvpx/vp8/encoder/mcomp.h
@@ -13,7 +13,7 @@
 #define __INC_MCOMP_H
 
 #include "block.h"
-#include "variance.h"
+#include "vp8/common/variance.h"
 
 #ifdef ENTROPY_STATS
 extern void init_mv_ref_counts();
diff --git a/media/libvpx/vp8/encoder/mr_dissim.c b/media/libvpx/vp8/encoder/mr_dissim.c
new file mode 100644
index 00000000000..7a62a06ec0b
--- /dev/null
+++ b/media/libvpx/vp8/encoder/mr_dissim.c
@@ -0,0 +1,201 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+
+#include <limits.h>
+#include "vpx_config.h"
+#include "onyx_int.h"
+#include "mr_dissim.h"
+#include "vpx_mem/vpx_mem.h"
+#include "rdopt.h"
+
+void vp8_cal_low_res_mb_cols(VP8_COMP *cpi)
+{
+    int low_res_w;
+
+    /* Support arbitrary down-sampling factor */
+    unsigned int iw = cpi->oxcf.Width*cpi->oxcf.mr_down_sampling_factor.den
+                      + cpi->oxcf.mr_down_sampling_factor.num - 1;
+
+    low_res_w = iw/cpi->oxcf.mr_down_sampling_factor.num;
+    cpi->mr_low_res_mb_cols = ((low_res_w + 15) >> 4);
+}
+
+#define GET_MV(x)    \
+if(x->mbmi.ref_frame !=INTRA_FRAME)   \
+{   \
+    mvx[cnt] = x->mbmi.mv.as_mv.row;  \
+    mvy[cnt] = x->mbmi.mv.as_mv.col;  \
+    cnt++;    \
+}
+
+#define GET_MV_SIGN(x)    \
+if(x->mbmi.ref_frame !=INTRA_FRAME)   \
+{   \
+    mvx[cnt] = x->mbmi.mv.as_mv.row;  \
+    mvy[cnt] = x->mbmi.mv.as_mv.col;  \
+    if (cm->ref_frame_sign_bias[x->mbmi.ref_frame]  \
+        != cm->ref_frame_sign_bias[tmp->mbmi.ref_frame])  \
+    {  \
+        mvx[cnt] *= -1;   \
+        mvy[cnt] *= -1;   \
+    }  \
+    cnt++;  \
+}
+
+void vp8_cal_dissimilarity(VP8_COMP *cpi)
+{
+    VP8_COMMON *cm = &cpi->common;
+
+    /* Note: The first row & first column in mip are outside the frame, which
+     * were initialized to all 0.(ref_frame, mode, mv...)
+     * Their ref_frame = 0 means they won't be counted in the following
+     * calculation.
+     */
+    if (cpi->oxcf.mr_total_resolutions >1
+        && cpi->oxcf.mr_encoder_id < (cpi->oxcf.mr_total_resolutions - 1))
+    {
+        /* Store info for show/no-show frames for supporting alt_ref.
+         * If parent frame is alt_ref, child has one too.
+         */
+        if(cm->frame_type != KEY_FRAME)
+        {
+            int mb_row;
+            int mb_col;
+            /* Point to beginning of allocated MODE_INFO arrays. */
+            MODE_INFO *tmp = cm->mip + cm->mode_info_stride;
+            LOWER_RES_INFO* store_mode_info
+                            = (LOWER_RES_INFO*)cpi->oxcf.mr_low_res_mode_info;
+
+            for (mb_row = 0; mb_row < cm->mb_rows; mb_row ++)
+            {
+                tmp++;
+                for (mb_col = 0; mb_col < cm->mb_cols; mb_col ++)
+                {
+                    int dissim = INT_MAX;
+
+                    if(tmp->mbmi.ref_frame !=INTRA_FRAME)
+                    {
+                        int              mvx[8];
+                        int              mvy[8];
+                        int              mmvx;
+                        int              mmvy;
+                        int              cnt=0;
+                        const MODE_INFO *here = tmp;
+                        const MODE_INFO *above = here - cm->mode_info_stride;
+                        const MODE_INFO *left = here - 1;
+                        const MODE_INFO *aboveleft = above - 1;
+                        const MODE_INFO *aboveright = NULL;
+                        const MODE_INFO *right = NULL;
+                        const MODE_INFO *belowleft = NULL;
+                        const MODE_INFO *below = NULL;
+                        const MODE_INFO *belowright = NULL;
+
+                        /* If alternate reference frame is used, we have to
+                         * check sign of MV. */
+                        if(cpi->oxcf.play_alternate)
+                        {
+                            /* Gather mv of neighboring MBs */
+                            GET_MV_SIGN(above)
+                            GET_MV_SIGN(left)
+                            GET_MV_SIGN(aboveleft)
+
+                            if(mb_col < (cm->mb_cols-1))
+                            {
+                                right = here + 1;
+                                aboveright = above + 1;
+                                GET_MV_SIGN(right)
+                                GET_MV_SIGN(aboveright)
+                            }
+
+                            if(mb_row < (cm->mb_rows-1))
+                            {
+                                below = here + cm->mode_info_stride;
+                                belowleft = below - 1;
+                                GET_MV_SIGN(below)
+                                GET_MV_SIGN(belowleft)
+                            }
+
+                            if(mb_col < (cm->mb_cols-1)
+                                && mb_row < (cm->mb_rows-1))
+                            {
+                                belowright = below + 1;
+                                GET_MV_SIGN(belowright)
+                            }
+                        }else
+                        {
+                            /* No alt_ref and gather mv of neighboring MBs */
+                            GET_MV(above)
+                            GET_MV(left)
+                            GET_MV(aboveleft)
+
+                            if(mb_col < (cm->mb_cols-1))
+                            {
+                                right = here + 1;
+                                aboveright = above + 1;
+                                GET_MV(right)
+                                GET_MV(aboveright)
+                            }
+
+                            if(mb_row < (cm->mb_rows-1))
+                            {
+                                below = here + cm->mode_info_stride;
+                                belowleft = below - 1;
+                                GET_MV(below)
+                                GET_MV(belowleft)
+                            }
+
+                            if(mb_col < (cm->mb_cols-1)
+                                && mb_row < (cm->mb_rows-1))
+                            {
+                                belowright = below + 1;
+                                GET_MV(belowright)
+                            }
+                        }
+
+                        if (cnt > 0)
+                        {
+                            int max_mvx = mvx[0];
+                            int min_mvx = mvx[0];
+                            int max_mvy = mvy[0];
+                            int min_mvy = mvy[0];
+                            int i;
+
+                            if (cnt > 1)
+                            {
+                                for (i=1; i< cnt; i++)
+                                {
+                                    if (mvx[i] > max_mvx) max_mvx = mvx[i];
+                                    else if (mvx[i] < min_mvx) min_mvx = mvx[i];
+                                    if (mvy[i] > max_mvy) max_mvy = mvy[i];
+                                    else if (mvy[i] < min_mvy) min_mvy = mvy[i];
+                                }
+                            }
+
+                            mmvx = MAX(abs(min_mvx - here->mbmi.mv.as_mv.row),
+                                       abs(max_mvx - here->mbmi.mv.as_mv.row));
+                            mmvy = MAX(abs(min_mvy - here->mbmi.mv.as_mv.col),
+                                       abs(max_mvy - here->mbmi.mv.as_mv.col));
+                            dissim = MAX(mmvx, mmvy);
+                        }
+                    }
+
+                    /* Store mode info for next resolution encoding */
+                    store_mode_info->mode = tmp->mbmi.mode;
+                    store_mode_info->ref_frame = tmp->mbmi.ref_frame;
+                    store_mode_info->mv.as_int = tmp->mbmi.mv.as_int;
+                    store_mode_info->dissim = dissim;
+                    tmp++;
+                    store_mode_info++;
+                }
+            }
+        }
+    }
+}
diff --git a/media/libvpx/vpx_ports/config.h b/media/libvpx/vp8/encoder/mr_dissim.h
similarity index 72%
rename from media/libvpx/vpx_ports/config.h
rename to media/libvpx/vp8/encoder/mr_dissim.h
index 1abe70da929..3d2c2035fc0 100644
--- a/media/libvpx/vpx_ports/config.h
+++ b/media/libvpx/vp8/encoder/mr_dissim.h
@@ -7,4 +7,13 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
+
+
+#ifndef __INC_MR_DISSIM_H
+#define __INC_MR_DISSIM_H
 #include "vpx_config.h"
+
+extern void vp8_cal_low_res_mb_cols(VP8_COMP *cpi);
+extern void vp8_cal_dissimilarity(VP8_COMP *cpi);
+
+#endif
diff --git a/media/libvpx/vp8/encoder/onyx_if.c b/media/libvpx/vp8/encoder/onyx_if.c
index b1b3abde68b..cb0f2bb12d8 100644
--- a/media/libvpx/vp8/encoder/onyx_if.c
+++ b/media/libvpx/vp8/encoder/onyx_if.c
@@ -23,7 +23,6 @@
 #include "ratectrl.h"
 #include "vp8/common/quant_common.h"
 #include "segmentation.h"
-#include "vp8/common/g_common.h"
 #include "vpx_scale/yv12extend.h"
 #if CONFIG_POSTPROC
 #include "vp8/common/postproc.h"
@@ -36,6 +35,9 @@
 #if ARCH_ARM
 #include "vpx_ports/arm.h"
 #endif
+#if CONFIG_MULTI_RES_ENCODING
+#include "mr_dissim.h"
+#endif
 
 #include <math.h>
 #include <stdio.h>
@@ -67,6 +69,7 @@ extern void vp8_yv12_copy_src_frame_func_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_
 #endif
 
 int vp8_estimate_entropy_savings(VP8_COMP *cpi);
+
 int vp8_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest, const vp8_variance_rtcd_vtable_t *rtcd);
 
 extern void vp8_temporal_filter_prepare_c(VP8_COMP *cpi, int distance);
@@ -237,6 +240,85 @@ void vp8_initialize()
 extern FILE *vpxlogc;
 #endif
 
+static void save_layer_context(VP8_COMP *cpi)
+{
+    LAYER_CONTEXT *lc = &cpi->layer_context[cpi->current_layer];
+
+    // Save layer dependent coding state
+    lc->target_bandwidth                 = cpi->target_bandwidth;
+    //lc->target_bandwidth                 = cpi->oxcf.target_bandwidth;
+    lc->starting_buffer_level            = cpi->oxcf.starting_buffer_level;
+    lc->optimal_buffer_level             = cpi->oxcf.optimal_buffer_level;
+    lc->maximum_buffer_size              = cpi->oxcf.maximum_buffer_size;
+    lc->starting_buffer_level_in_ms      = cpi->oxcf.starting_buffer_level_in_ms;
+    lc->optimal_buffer_level_in_ms       = cpi->oxcf.optimal_buffer_level_in_ms;
+    lc->maximum_buffer_size_in_ms        = cpi->oxcf.maximum_buffer_size_in_ms;
+    lc->buffer_level                     = cpi->buffer_level;
+    lc->bits_off_target                  = cpi->bits_off_target;
+    lc->total_actual_bits                = cpi->total_actual_bits;
+    lc->worst_quality                    = cpi->worst_quality;
+    lc->active_worst_quality             = cpi->active_worst_quality;
+    lc->best_quality                     = cpi->best_quality;
+    lc->active_best_quality              = cpi->active_best_quality;
+    lc->ni_av_qi                         = cpi->ni_av_qi;
+    lc->ni_tot_qi                        = cpi->ni_tot_qi;
+    lc->ni_frames                        = cpi->ni_frames;
+    lc->avg_frame_qindex                 = cpi->avg_frame_qindex;
+    lc->rate_correction_factor           = cpi->rate_correction_factor;
+    lc->key_frame_rate_correction_factor = cpi->key_frame_rate_correction_factor;
+    lc->gf_rate_correction_factor        = cpi->gf_rate_correction_factor;
+    lc->zbin_over_quant                  = cpi->zbin_over_quant;
+    lc->inter_frame_target               = cpi->inter_frame_target;
+    lc->total_byte_count                 = cpi->total_byte_count;
+    lc->filter_level                     = cpi->common.filter_level;
+
+    lc->last_frame_percent_intra         = cpi->last_frame_percent_intra;
+
+    memcpy (lc->count_mb_ref_frame_usage,
+            cpi->count_mb_ref_frame_usage,
+            sizeof(cpi->count_mb_ref_frame_usage));
+}
+
+static void restore_layer_context(VP8_COMP *cpi, const int layer)
+{
+    LAYER_CONTEXT *lc = &cpi->layer_context[layer];
+
+    // Restore layer dependent coding state
+    cpi->current_layer                    = layer;
+    cpi->target_bandwidth                 = lc->target_bandwidth;
+    cpi->oxcf.target_bandwidth            = lc->target_bandwidth;
+    cpi->oxcf.starting_buffer_level       = lc->starting_buffer_level;
+    cpi->oxcf.optimal_buffer_level        = lc->optimal_buffer_level;
+    cpi->oxcf.maximum_buffer_size         = lc->maximum_buffer_size;
+    cpi->oxcf.starting_buffer_level_in_ms = lc->starting_buffer_level_in_ms;
+    cpi->oxcf.optimal_buffer_level_in_ms  = lc->optimal_buffer_level_in_ms;
+    cpi->oxcf.maximum_buffer_size_in_ms   = lc->maximum_buffer_size_in_ms;
+    cpi->buffer_level                     = lc->buffer_level;
+    cpi->bits_off_target                  = lc->bits_off_target;
+    cpi->total_actual_bits                = lc->total_actual_bits;
+    //cpi->worst_quality                    = lc->worst_quality;
+    cpi->active_worst_quality             = lc->active_worst_quality;
+    //cpi->best_quality                     = lc->best_quality;
+    cpi->active_best_quality              = lc->active_best_quality;
+    cpi->ni_av_qi                         = lc->ni_av_qi;
+    cpi->ni_tot_qi                        = lc->ni_tot_qi;
+    cpi->ni_frames                        = lc->ni_frames;
+    cpi->avg_frame_qindex                 = lc->avg_frame_qindex;
+    cpi->rate_correction_factor           = lc->rate_correction_factor;
+    cpi->key_frame_rate_correction_factor = lc->key_frame_rate_correction_factor;
+    cpi->gf_rate_correction_factor        = lc->gf_rate_correction_factor;
+    cpi->zbin_over_quant                  = lc->zbin_over_quant;
+    cpi->inter_frame_target               = lc->inter_frame_target;
+    cpi->total_byte_count                 = lc->total_byte_count;
+    cpi->common.filter_level              = lc->filter_level;
+
+    cpi->last_frame_percent_intra         = lc->last_frame_percent_intra;
+
+    memcpy (cpi->count_mb_ref_frame_usage,
+            lc->count_mb_ref_frame_usage,
+            sizeof(cpi->count_mb_ref_frame_usage));
+}
+
 static void setup_features(VP8_COMP *cpi)
 {
     // Set up default state for MB feature flags
@@ -282,7 +364,7 @@ static void dealloc_compressor_data(VP8_COMP *cpi)
 
     vp8_de_alloc_frame_buffers(&cpi->common);
 
-    vp8_yv12_de_alloc_frame_buffer(&cpi->last_frame_uf);
+    vp8_yv12_de_alloc_frame_buffer(&cpi->pick_lf_lvl_frame);
     vp8_yv12_de_alloc_frame_buffer(&cpi->scaled_source);
 #if VP8_TEMPORAL_ALT_REF
     vp8_yv12_de_alloc_frame_buffer(&cpi->alt_ref_buffer);
@@ -304,39 +386,25 @@ static void dealloc_compressor_data(VP8_COMP *cpi)
 
     vpx_free(cpi->mb.pip);
     cpi->mb.pip = 0;
-
-#if !(CONFIG_REALTIME_ONLY)
-    vpx_free(cpi->twopass.total_stats);
-    cpi->twopass.total_stats = 0;
-
-    vpx_free(cpi->twopass.this_frame_stats);
-    cpi->twopass.this_frame_stats = 0;
-#endif
 }
 
-static void enable_segmentation(VP8_PTR ptr)
+static void enable_segmentation(VP8_COMP *cpi)
 {
-    VP8_COMP *cpi = (VP8_COMP *)(ptr);
-
     // Set the appropriate feature bit
     cpi->mb.e_mbd.segmentation_enabled = 1;
     cpi->mb.e_mbd.update_mb_segmentation_map = 1;
     cpi->mb.e_mbd.update_mb_segmentation_data = 1;
 }
-static void disable_segmentation(VP8_PTR ptr)
+static void disable_segmentation(VP8_COMP *cpi)
 {
-    VP8_COMP *cpi = (VP8_COMP *)(ptr);
-
     // Clear the appropriate feature bit
     cpi->mb.e_mbd.segmentation_enabled = 0;
 }
 
 // Valid values for a segment are 0 to 3
 // Segmentation map is arrange as [Rows][Columns]
-static void set_segmentation_map(VP8_PTR ptr, unsigned char *segmentation_map)
+static void set_segmentation_map(VP8_COMP *cpi, unsigned char *segmentation_map)
 {
-    VP8_COMP *cpi = (VP8_COMP *)(ptr);
-
     // Copy in the new segmentation map
     vpx_memcpy(cpi->segmentation_map, segmentation_map, (cpi->common.mb_rows * cpi->common.mb_cols));
 
@@ -353,19 +421,15 @@ static void set_segmentation_map(VP8_PTR ptr, unsigned char *segmentation_map)
 // abs_delta = SEGMENT_DELTADATA (deltas) abs_delta = SEGMENT_ABSDATA (use the absolute values given).
 //
 //
-static void set_segment_data(VP8_PTR ptr, signed char *feature_data, unsigned char abs_delta)
+static void set_segment_data(VP8_COMP *cpi, signed char *feature_data, unsigned char abs_delta)
 {
-    VP8_COMP *cpi = (VP8_COMP *)(ptr);
-
     cpi->mb.e_mbd.mb_segement_abs_delta = abs_delta;
     vpx_memcpy(cpi->segment_feature_data, feature_data, sizeof(cpi->segment_feature_data));
 }
 
 
-static void segmentation_test_function(VP8_PTR ptr)
+static void segmentation_test_function(VP8_COMP *cpi)
 {
-    VP8_COMP *cpi = (VP8_COMP *)(ptr);
-
     unsigned char *seg_map;
     signed char feature_data[MB_LVL_MAX][MAX_MB_SEGMENTS];
 
@@ -393,10 +457,10 @@ static void segmentation_test_function(VP8_PTR ptr)
     }*/
 
     // Set the segmentation Map
-    set_segmentation_map(ptr, seg_map);
+    set_segmentation_map(cpi, seg_map);
 
     // Activate segmentation.
-    enable_segmentation(ptr);
+    enable_segmentation(cpi);
 
     // Set up the quant segment data
     feature_data[MB_LVL_ALT_Q][0] = 0;
@@ -411,7 +475,7 @@ static void segmentation_test_function(VP8_PTR ptr)
 
     // Initialise the feature data structure
     // SEGMENT_DELTADATA    0, SEGMENT_ABSDATA      1
-    set_segment_data(ptr, &feature_data[0][0], SEGMENT_DELTADATA);
+    set_segment_data(cpi, &feature_data[0][0], SEGMENT_DELTADATA);
 
     // Delete sementation map
         vpx_free(seg_map);
@@ -485,10 +549,10 @@ static void cyclic_background_refresh(VP8_COMP *cpi, int Q, int lf_adjustment)
     }
 
     // Set the segmentation Map
-    set_segmentation_map((VP8_PTR)cpi, seg_map);
+    set_segmentation_map(cpi, seg_map);
 
     // Activate segmentation.
-    enable_segmentation((VP8_PTR)cpi);
+    enable_segmentation(cpi);
 
     // Set up the quant segment data
     feature_data[MB_LVL_ALT_Q][0] = 0;
@@ -504,10 +568,10 @@ static void cyclic_background_refresh(VP8_COMP *cpi, int Q, int lf_adjustment)
 
     // Initialise the feature data structure
     // SEGMENT_DELTADATA    0, SEGMENT_ABSDATA      1
-    set_segment_data((VP8_PTR)cpi, &feature_data[0][0], SEGMENT_DELTADATA);
+    set_segment_data(cpi, &feature_data[0][0], SEGMENT_DELTADATA);
 
     // Delete sementation map
-        vpx_free(seg_map);
+    vpx_free(seg_map);
 
     seg_map = 0;
 
@@ -533,6 +597,93 @@ static void set_default_lf_deltas(VP8_COMP *cpi)
     cpi->mb.e_mbd.mode_lf_deltas[3] = 4;               // Split mv
 }
 
+/* Convenience macros for mapping speed and mode into a continuous
+ * range
+ */
+#define GOOD(x) (x+1)
+#define RT(x) (x+7)
+
+static int speed_map(int speed, int *map)
+{
+    int res;
+
+    do
+    {
+        res = *map++;
+    } while(speed >= *map++);
+    return res;
+}
+
+static int thresh_mult_map_znn[] = {
+    /* map common to zero, nearest, and near */
+    0, GOOD(2), 1500, GOOD(3), 2000, RT(0), 1000, RT(2), 2000, INT_MAX
+};
+
+static int thresh_mult_map_vhpred[] = {
+    1000, GOOD(2), 1500, GOOD(3), 2000, RT(0), 1000, RT(1), 2000,
+    RT(7), INT_MAX, INT_MAX
+};
+
+static int thresh_mult_map_bpred[] = {
+    2000, GOOD(0), 2500, GOOD(2), 5000, GOOD(3), 7500, RT(0), 2500, RT(1), 5000,
+    RT(6), INT_MAX, INT_MAX
+};
+
+static int thresh_mult_map_tm[] = {
+    1000, GOOD(2), 1500, GOOD(3), 2000, RT(0), 0, RT(1), 1000, RT(2), 2000,
+    RT(7), INT_MAX, INT_MAX
+};
+
+static int thresh_mult_map_new1[] = {
+    1000, GOOD(2), 2000, RT(0), 2000, INT_MAX
+};
+
+static int thresh_mult_map_new2[] = {
+    1000, GOOD(2), 2000, GOOD(3), 2500, GOOD(5), 4000, RT(0), 2000, RT(2), 2500,
+    RT(5), 4000, INT_MAX
+};
+
+static int thresh_mult_map_split1[] = {
+    2500, GOOD(0), 1700, GOOD(2), 10000, GOOD(3), 25000, GOOD(4), INT_MAX,
+    RT(0), 5000, RT(1), 10000, RT(2), 25000, RT(3), INT_MAX, INT_MAX
+};
+
+static int thresh_mult_map_split2[] = {
+    5000, GOOD(0), 4500, GOOD(2), 20000, GOOD(3), 50000, GOOD(4), INT_MAX,
+    RT(0), 10000, RT(1), 20000, RT(2), 50000, RT(3), INT_MAX, INT_MAX
+};
+
+static int mode_check_freq_map_zn2[] = {
+    /* {zero,nearest}{2,3} */
+    0, RT(10), 1<<1, RT(11), 1<<2, RT(12), 1<<3, INT_MAX
+};
+
+static int mode_check_freq_map_vhbpred[] = {
+    0, GOOD(5), 2, RT(0), 0, RT(3), 2, RT(5), 4, INT_MAX
+};
+
+static int mode_check_freq_map_near2[] = {
+    0, GOOD(5), 2, RT(0), 0, RT(3), 2, RT(10), 1<<2, RT(11), 1<<3, RT(12), 1<<4,
+    INT_MAX
+};
+
+static int mode_check_freq_map_new1[] = {
+    0, RT(10), 1<<1, RT(11), 1<<2, RT(12), 1<<3, INT_MAX
+};
+
+static int mode_check_freq_map_new2[] = {
+    0, GOOD(5), 4, RT(0), 0, RT(3), 4, RT(10), 1<<3, RT(11), 1<<4, RT(12), 1<<5,
+    INT_MAX
+};
+
+static int mode_check_freq_map_split1[] = {
+    0, GOOD(2), 2, GOOD(3), 7, RT(1), 2, RT(2), 7, INT_MAX
+};
+
+static int mode_check_freq_map_split2[] = {
+    0, GOOD(1), 2, GOOD(2), 4, GOOD(3), 15, RT(1), 4, RT(2), 15, INT_MAX
+};
+
 void vp8_set_speed_features(VP8_COMP *cpi)
 {
     SPEED_FEATURES *sf = &cpi->sf;
@@ -541,6 +692,7 @@ void vp8_set_speed_features(VP8_COMP *cpi)
     int i;
     VP8_COMMON *cm = &cpi->common;
     int last_improved_quant = sf->improved_quant;
+    int ref_frames;
 
     // Initialise default mode frequency sampling variables
     for (i = 0; i < MAX_MODES; i ++)
@@ -574,93 +726,90 @@ void vp8_set_speed_features(VP8_COMP *cpi)
     for (i = 0; i < MAX_MODES; i++)
         sf->thresh_mult[i] = 0;
 
+    /* Count enabled references */
+    ref_frames = 1;
+    if (cpi->ref_frame_flags & VP8_LAST_FLAG)
+        ref_frames++;
+    if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
+        ref_frames++;
+    if (cpi->ref_frame_flags & VP8_ALT_FLAG)
+        ref_frames++;
+
+    /* Convert speed to continuous range, with clamping */
+    if (Mode == 0)
+        Speed = 0;
+    else if (Mode == 2)
+        Speed = RT(Speed);
+    else
+    {
+        if (Speed > 5)
+            Speed = 5;
+        Speed = GOOD(Speed);
+    }
+
+    sf->thresh_mult[THR_ZERO1] =
+    sf->thresh_mult[THR_NEAREST1] =
+    sf->thresh_mult[THR_NEAR1] =
+    sf->thresh_mult[THR_DC] = 0; /* always */
+
+    sf->thresh_mult[THR_ZERO2] =
+    sf->thresh_mult[THR_ZERO3] =
+    sf->thresh_mult[THR_NEAREST2] =
+    sf->thresh_mult[THR_NEAREST3] =
+    sf->thresh_mult[THR_NEAR2]  =
+    sf->thresh_mult[THR_NEAR3]  = speed_map(Speed, thresh_mult_map_znn);
+
+    sf->thresh_mult[THR_V_PRED] =
+    sf->thresh_mult[THR_H_PRED] = speed_map(Speed, thresh_mult_map_vhpred);
+    sf->thresh_mult[THR_B_PRED] = speed_map(Speed, thresh_mult_map_bpred);
+    sf->thresh_mult[THR_TM]     = speed_map(Speed, thresh_mult_map_tm);
+    sf->thresh_mult[THR_NEW1]   = speed_map(Speed, thresh_mult_map_new1);
+    sf->thresh_mult[THR_NEW2]   =
+    sf->thresh_mult[THR_NEW3]   = speed_map(Speed, thresh_mult_map_new2);
+    sf->thresh_mult[THR_SPLIT1] = speed_map(Speed, thresh_mult_map_split1);
+    sf->thresh_mult[THR_SPLIT2] =
+    sf->thresh_mult[THR_SPLIT3] = speed_map(Speed, thresh_mult_map_split2);
+
+    cpi->mode_check_freq[THR_ZERO1] =
+    cpi->mode_check_freq[THR_NEAREST1] =
+    cpi->mode_check_freq[THR_NEAR1] =
+    cpi->mode_check_freq[THR_TM]     =
+    cpi->mode_check_freq[THR_DC] = 0; /* always */
+
+    cpi->mode_check_freq[THR_ZERO2] =
+    cpi->mode_check_freq[THR_ZERO3] =
+    cpi->mode_check_freq[THR_NEAREST2] =
+    cpi->mode_check_freq[THR_NEAREST3] = speed_map(Speed,
+                                                   mode_check_freq_map_zn2);
+
+    cpi->mode_check_freq[THR_NEAR2]  =
+    cpi->mode_check_freq[THR_NEAR3]  = speed_map(Speed,
+                                                 mode_check_freq_map_near2);
+
+    cpi->mode_check_freq[THR_V_PRED] =
+    cpi->mode_check_freq[THR_H_PRED] =
+    cpi->mode_check_freq[THR_B_PRED] = speed_map(Speed,
+                                                 mode_check_freq_map_vhbpred);
+    cpi->mode_check_freq[THR_NEW1]   = speed_map(Speed,
+                                                 mode_check_freq_map_new1);
+    cpi->mode_check_freq[THR_NEW2]   =
+    cpi->mode_check_freq[THR_NEW3]   = speed_map(Speed,
+                                                 mode_check_freq_map_new2);
+    cpi->mode_check_freq[THR_SPLIT1] = speed_map(Speed,
+                                                 mode_check_freq_map_split1);
+    cpi->mode_check_freq[THR_SPLIT2] =
+    cpi->mode_check_freq[THR_SPLIT3] = speed_map(Speed,
+                                                 mode_check_freq_map_split2);
+    Speed = cpi->Speed;
     switch (Mode)
     {
 #if !(CONFIG_REALTIME_ONLY)
     case 0: // best quality mode
-        sf->thresh_mult[THR_ZEROMV   ] = 0;
-        sf->thresh_mult[THR_ZEROG    ] = 0;
-        sf->thresh_mult[THR_ZEROA    ] = 0;
-        sf->thresh_mult[THR_NEARESTMV] = 0;
-        sf->thresh_mult[THR_NEARESTG ] = 0;
-        sf->thresh_mult[THR_NEARESTA ] = 0;
-        sf->thresh_mult[THR_NEARMV   ] = 0;
-        sf->thresh_mult[THR_NEARG    ] = 0;
-        sf->thresh_mult[THR_NEARA    ] = 0;
-
-        sf->thresh_mult[THR_DC       ] = 0;
-
-        sf->thresh_mult[THR_V_PRED   ] = 1000;
-        sf->thresh_mult[THR_H_PRED   ] = 1000;
-        sf->thresh_mult[THR_B_PRED   ] = 2000;
-        sf->thresh_mult[THR_TM       ] = 1000;
-
-        sf->thresh_mult[THR_NEWMV    ] = 1000;
-        sf->thresh_mult[THR_NEWG     ] = 1000;
-        sf->thresh_mult[THR_NEWA     ] = 1000;
-
-        sf->thresh_mult[THR_SPLITMV  ] = 2500;
-        sf->thresh_mult[THR_SPLITG   ] = 5000;
-        sf->thresh_mult[THR_SPLITA   ] = 5000;
-
-
         sf->first_step = 0;
         sf->max_step_search_steps = MAX_MVSEARCH_STEPS;
         break;
     case 1:
     case 3:
-        sf->thresh_mult[THR_NEARESTMV] = 0;
-        sf->thresh_mult[THR_ZEROMV   ] = 0;
-        sf->thresh_mult[THR_DC       ] = 0;
-        sf->thresh_mult[THR_NEARMV   ] = 0;
-        sf->thresh_mult[THR_V_PRED   ] = 1000;
-        sf->thresh_mult[THR_H_PRED   ] = 1000;
-        sf->thresh_mult[THR_B_PRED   ] = 2500;
-        sf->thresh_mult[THR_TM       ] = 1000;
-
-        sf->thresh_mult[THR_NEARESTG ] = 1000;
-        sf->thresh_mult[THR_NEARESTA ] = 1000;
-
-        sf->thresh_mult[THR_ZEROG    ] = 1000;
-        sf->thresh_mult[THR_ZEROA    ] = 1000;
-        sf->thresh_mult[THR_NEARG    ] = 1000;
-        sf->thresh_mult[THR_NEARA    ] = 1000;
-
-#if 1
-        sf->thresh_mult[THR_ZEROMV   ] = 0;
-        sf->thresh_mult[THR_ZEROG    ] = 0;
-        sf->thresh_mult[THR_ZEROA    ] = 0;
-        sf->thresh_mult[THR_NEARESTMV] = 0;
-        sf->thresh_mult[THR_NEARESTG ] = 0;
-        sf->thresh_mult[THR_NEARESTA ] = 0;
-        sf->thresh_mult[THR_NEARMV   ] = 0;
-        sf->thresh_mult[THR_NEARG    ] = 0;
-        sf->thresh_mult[THR_NEARA    ] = 0;
-
-//        sf->thresh_mult[THR_DC       ] = 0;
-
-//        sf->thresh_mult[THR_V_PRED   ] = 1000;
-//        sf->thresh_mult[THR_H_PRED   ] = 1000;
-//        sf->thresh_mult[THR_B_PRED   ] = 2000;
-//        sf->thresh_mult[THR_TM       ] = 1000;
-
-        sf->thresh_mult[THR_NEWMV    ] = 1000;
-        sf->thresh_mult[THR_NEWG     ] = 1000;
-        sf->thresh_mult[THR_NEWA     ] = 1000;
-
-        sf->thresh_mult[THR_SPLITMV  ] = 1700;
-        sf->thresh_mult[THR_SPLITG   ] = 4500;
-        sf->thresh_mult[THR_SPLITA   ] = 4500;
-#else
-        sf->thresh_mult[THR_NEWMV    ] = 1500;
-        sf->thresh_mult[THR_NEWG     ] = 1500;
-        sf->thresh_mult[THR_NEWA     ] = 1500;
-
-        sf->thresh_mult[THR_SPLITMV  ] = 5000;
-        sf->thresh_mult[THR_SPLITG   ] = 10000;
-        sf->thresh_mult[THR_SPLITA   ] = 10000;
-#endif
-
         if (Speed > 0)
         {
             /* Disable coefficient optimization above speed 0 */
@@ -669,83 +818,10 @@ void vp8_set_speed_features(VP8_COMP *cpi)
             sf->no_skip_block4x4_search = 0;
 
             sf->first_step = 1;
-
-            cpi->mode_check_freq[THR_SPLITG] = 2;
-            cpi->mode_check_freq[THR_SPLITA] = 2;
-            cpi->mode_check_freq[THR_SPLITMV] = 0;
-        }
-
-        if (Speed > 1)
-        {
-            cpi->mode_check_freq[THR_SPLITG] = 4;
-            cpi->mode_check_freq[THR_SPLITA] = 4;
-            cpi->mode_check_freq[THR_SPLITMV] = 2;
-
-            sf->thresh_mult[THR_TM       ] = 1500;
-            sf->thresh_mult[THR_V_PRED   ] = 1500;
-            sf->thresh_mult[THR_H_PRED   ] = 1500;
-            sf->thresh_mult[THR_B_PRED   ] = 5000;
-
-            if (cpi->ref_frame_flags & VP8_LAST_FLAG)
-            {
-                sf->thresh_mult[THR_NEWMV    ] = 2000;
-                sf->thresh_mult[THR_SPLITMV  ] = 10000;
-            }
-
-            if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTG ] = 1500;
-                sf->thresh_mult[THR_ZEROG    ] = 1500;
-                sf->thresh_mult[THR_NEARG    ] = 1500;
-                sf->thresh_mult[THR_NEWG     ] = 2000;
-                sf->thresh_mult[THR_SPLITG   ] = 20000;
-            }
-
-            if (cpi->ref_frame_flags & VP8_ALT_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTA ] = 1500;
-                sf->thresh_mult[THR_ZEROA    ] = 1500;
-                sf->thresh_mult[THR_NEARA    ] = 1500;
-                sf->thresh_mult[THR_NEWA     ] = 2000;
-                sf->thresh_mult[THR_SPLITA   ] = 20000;
-            }
         }
 
         if (Speed > 2)
         {
-            cpi->mode_check_freq[THR_SPLITG] = 15;
-            cpi->mode_check_freq[THR_SPLITA] = 15;
-            cpi->mode_check_freq[THR_SPLITMV] = 7;
-
-            sf->thresh_mult[THR_TM       ] = 2000;
-            sf->thresh_mult[THR_V_PRED   ] = 2000;
-            sf->thresh_mult[THR_H_PRED   ] = 2000;
-            sf->thresh_mult[THR_B_PRED   ] = 7500;
-
-            if (cpi->ref_frame_flags & VP8_LAST_FLAG)
-            {
-                sf->thresh_mult[THR_NEWMV    ] = 2000;
-                sf->thresh_mult[THR_SPLITMV  ] = 25000;
-            }
-
-            if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTG ] = 2000;
-                sf->thresh_mult[THR_ZEROG    ] = 2000;
-                sf->thresh_mult[THR_NEARG    ] = 2000;
-                sf->thresh_mult[THR_NEWG     ] = 2500;
-                sf->thresh_mult[THR_SPLITG   ] = 50000;
-            }
-
-            if (cpi->ref_frame_flags & VP8_ALT_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTA ] = 2000;
-                sf->thresh_mult[THR_ZEROA    ] = 2000;
-                sf->thresh_mult[THR_NEARA    ] = 2000;
-                sf->thresh_mult[THR_NEWA     ] = 2500;
-                sf->thresh_mult[THR_SPLITA   ] = 50000;
-            }
-
             sf->improved_quant = 0;
             sf->improved_dct = 0;
 
@@ -757,18 +833,6 @@ void vp8_set_speed_features(VP8_COMP *cpi)
 
         if (Speed > 3)
         {
-            sf->thresh_mult[THR_SPLITA  ] = INT_MAX;
-            sf->thresh_mult[THR_SPLITG  ] = INT_MAX;
-            sf->thresh_mult[THR_SPLITMV  ] = INT_MAX;
-
-            cpi->mode_check_freq[THR_V_PRED] = 0;
-            cpi->mode_check_freq[THR_H_PRED] = 0;
-            cpi->mode_check_freq[THR_B_PRED] = 0;
-            cpi->mode_check_freq[THR_NEARG] = 0;
-            cpi->mode_check_freq[THR_NEWG] = 0;
-            cpi->mode_check_freq[THR_NEARA] = 0;
-            cpi->mode_check_freq[THR_NEWA] = 0;
-
             sf->auto_filter = 1;
             sf->recode_loop = 0; // recode loop off
             sf->RD = 0;         // Turn rd off
@@ -778,38 +842,6 @@ void vp8_set_speed_features(VP8_COMP *cpi)
         if (Speed > 4)
         {
             sf->auto_filter = 0;                     // Faster selection of loop filter
-
-            cpi->mode_check_freq[THR_V_PRED] = 2;
-            cpi->mode_check_freq[THR_H_PRED] = 2;
-            cpi->mode_check_freq[THR_B_PRED] = 2;
-
-            if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
-            {
-                cpi->mode_check_freq[THR_NEARG] = 2;
-                cpi->mode_check_freq[THR_NEWG] = 4;
-            }
-
-            if (cpi->ref_frame_flags & VP8_ALT_FLAG)
-            {
-                cpi->mode_check_freq[THR_NEARA] = 2;
-                cpi->mode_check_freq[THR_NEWA] = 4;
-            }
-
-            if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTG ] = 2000;
-                sf->thresh_mult[THR_ZEROG    ] = 2000;
-                sf->thresh_mult[THR_NEARG    ] = 2000;
-                sf->thresh_mult[THR_NEWG     ] = 4000;
-            }
-
-            if (cpi->ref_frame_flags & VP8_ALT_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTA ] = 2000;
-                sf->thresh_mult[THR_ZEROA    ] = 2000;
-                sf->thresh_mult[THR_NEARA    ] = 2000;
-                sf->thresh_mult[THR_NEWA     ] = 4000;
-            }
         }
 
         break;
@@ -819,67 +851,10 @@ void vp8_set_speed_features(VP8_COMP *cpi)
         sf->recode_loop = 0;
         sf->auto_filter = 1;
         sf->iterative_sub_pixel = 1;
-        sf->thresh_mult[THR_NEARESTMV] = 0;
-        sf->thresh_mult[THR_ZEROMV   ] = 0;
-        sf->thresh_mult[THR_DC       ] = 0;
-        sf->thresh_mult[THR_TM       ] = 0;
-        sf->thresh_mult[THR_NEARMV   ] = 0;
-        sf->thresh_mult[THR_V_PRED   ] = 1000;
-        sf->thresh_mult[THR_H_PRED   ] = 1000;
-        sf->thresh_mult[THR_B_PRED   ] = 2500;
-        sf->thresh_mult[THR_NEARESTG ] = 1000;
-        sf->thresh_mult[THR_ZEROG    ] = 1000;
-        sf->thresh_mult[THR_NEARG    ] = 1000;
-        sf->thresh_mult[THR_NEARESTA ] = 1000;
-        sf->thresh_mult[THR_ZEROA    ] = 1000;
-        sf->thresh_mult[THR_NEARA    ] = 1000;
-        sf->thresh_mult[THR_NEWMV    ] = 2000;
-        sf->thresh_mult[THR_NEWG     ] = 2000;
-        sf->thresh_mult[THR_NEWA     ] = 2000;
-        sf->thresh_mult[THR_SPLITMV  ] = 5000;
-        sf->thresh_mult[THR_SPLITG   ] = 10000;
-        sf->thresh_mult[THR_SPLITA   ] = 10000;
         sf->search_method = NSTEP;
 
         if (Speed > 0)
         {
-            cpi->mode_check_freq[THR_SPLITG] = 4;
-            cpi->mode_check_freq[THR_SPLITA] = 4;
-            cpi->mode_check_freq[THR_SPLITMV] = 2;
-
-            sf->thresh_mult[THR_DC       ] = 0;
-            sf->thresh_mult[THR_TM       ] = 1000;
-            sf->thresh_mult[THR_V_PRED   ] = 2000;
-            sf->thresh_mult[THR_H_PRED   ] = 2000;
-            sf->thresh_mult[THR_B_PRED   ] = 5000;
-
-            if (cpi->ref_frame_flags & VP8_LAST_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTMV] = 0;
-                sf->thresh_mult[THR_ZEROMV   ] = 0;
-                sf->thresh_mult[THR_NEARMV   ] = 0;
-                sf->thresh_mult[THR_NEWMV    ] = 2000;
-                sf->thresh_mult[THR_SPLITMV  ] = 10000;
-            }
-
-            if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTG ] = 1000;
-                sf->thresh_mult[THR_ZEROG    ] = 1000;
-                sf->thresh_mult[THR_NEARG    ] = 1000;
-                sf->thresh_mult[THR_NEWG     ] = 2000;
-                sf->thresh_mult[THR_SPLITG   ] = 20000;
-            }
-
-            if (cpi->ref_frame_flags & VP8_ALT_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTA ] = 1000;
-                sf->thresh_mult[THR_ZEROA    ] = 1000;
-                sf->thresh_mult[THR_NEARA    ] = 1000;
-                sf->thresh_mult[THR_NEWA     ] = 2000;
-                sf->thresh_mult[THR_SPLITA   ] = 20000;
-            }
-
             sf->improved_quant = 0;
             sf->improved_dct = 0;
 
@@ -888,133 +863,28 @@ void vp8_set_speed_features(VP8_COMP *cpi)
             sf->first_step = 1;
         }
 
-        if (Speed > 1)
-        {
-            cpi->mode_check_freq[THR_SPLITMV] = 7;
-            cpi->mode_check_freq[THR_SPLITG] = 15;
-            cpi->mode_check_freq[THR_SPLITA] = 15;
-
-            sf->thresh_mult[THR_TM       ] = 2000;
-            sf->thresh_mult[THR_V_PRED   ] = 2000;
-            sf->thresh_mult[THR_H_PRED   ] = 2000;
-            sf->thresh_mult[THR_B_PRED   ] = 5000;
-
-            if (cpi->ref_frame_flags & VP8_LAST_FLAG)
-            {
-                sf->thresh_mult[THR_NEWMV    ] = 2000;
-                sf->thresh_mult[THR_SPLITMV  ] = 25000;
-            }
-
-            if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTG ] = 2000;
-                sf->thresh_mult[THR_ZEROG    ] = 2000;
-                sf->thresh_mult[THR_NEARG    ] = 2000;
-                sf->thresh_mult[THR_NEWG     ] = 2500;
-                sf->thresh_mult[THR_SPLITG   ] = 50000;
-            }
-
-            if (cpi->ref_frame_flags & VP8_ALT_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTA ] = 2000;
-                sf->thresh_mult[THR_ZEROA    ] = 2000;
-                sf->thresh_mult[THR_NEARA    ] = 2000;
-                sf->thresh_mult[THR_NEWA     ] = 2500;
-                sf->thresh_mult[THR_SPLITA   ] = 50000;
-            }
-
-        }
-
         if (Speed > 2)
-        {
             sf->auto_filter = 0;                     // Faster selection of loop filter
 
-            cpi->mode_check_freq[THR_V_PRED] = 2;
-            cpi->mode_check_freq[THR_H_PRED] = 2;
-            cpi->mode_check_freq[THR_B_PRED] = 2;
-
-            if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
-            {
-                cpi->mode_check_freq[THR_NEARG] = 2;
-                cpi->mode_check_freq[THR_NEWG] = 4;
-            }
-
-            if (cpi->ref_frame_flags & VP8_ALT_FLAG)
-            {
-                cpi->mode_check_freq[THR_NEARA] = 2;
-                cpi->mode_check_freq[THR_NEWA] = 4;
-            }
-
-            sf->thresh_mult[THR_SPLITMV  ] = INT_MAX;
-            sf->thresh_mult[THR_SPLITG  ] = INT_MAX;
-            sf->thresh_mult[THR_SPLITA  ] = INT_MAX;
-
-        }
-
         if (Speed > 3)
         {
             sf->RD = 0;
-
             sf->auto_filter = 1;
         }
 
         if (Speed > 4)
         {
             sf->auto_filter = 0;                     // Faster selection of loop filter
-
             sf->search_method = HEX;
-            //sf->search_method = DIAMOND;
-
             sf->iterative_sub_pixel = 0;
-
-            cpi->mode_check_freq[THR_V_PRED] = 4;
-            cpi->mode_check_freq[THR_H_PRED] = 4;
-            cpi->mode_check_freq[THR_B_PRED] = 4;
-
-            if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
-            {
-                cpi->mode_check_freq[THR_NEARG] = 2;
-                cpi->mode_check_freq[THR_NEWG] = 4;
-            }
-
-            if (cpi->ref_frame_flags & VP8_ALT_FLAG)
-            {
-                cpi->mode_check_freq[THR_NEARA] = 2;
-                cpi->mode_check_freq[THR_NEWA] = 4;
-            }
-
-            sf->thresh_mult[THR_TM       ] = 2000;
-            sf->thresh_mult[THR_B_PRED   ] = 5000;
-
-            if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTG ] = 2000;
-                sf->thresh_mult[THR_ZEROG    ] = 2000;
-                sf->thresh_mult[THR_NEARG    ] = 2000;
-                sf->thresh_mult[THR_NEWG     ] = 4000;
-            }
-
-            if (cpi->ref_frame_flags & VP8_ALT_FLAG)
-            {
-                sf->thresh_mult[THR_NEARESTA ] = 2000;
-                sf->thresh_mult[THR_ZEROA    ] = 2000;
-                sf->thresh_mult[THR_NEARA    ] = 2000;
-                sf->thresh_mult[THR_NEWA     ] = 4000;
-            }
-        }
-
-        if (Speed > 5)
-        {
-            // Disable split MB intra prediction mode
-            sf->thresh_mult[THR_B_PRED] = INT_MAX;
         }
 
         if (Speed > 6)
         {
-            unsigned int i, sum = 0;
+            unsigned int sum = 0;
             unsigned int total_mbs = cm->MBs;
-            int thresh;
-            int total_skip;
+            int i, thresh;
+            unsigned int total_skip;
 
             int min = 2000;
 
@@ -1046,109 +916,53 @@ void vp8_set_speed_features(VP8_COMP *cpi)
             if (thresh < 2000)
                 thresh = 2000;
 
-            if (cpi->ref_frame_flags & VP8_LAST_FLAG)
+            if (ref_frames > 1)
             {
-                sf->thresh_mult[THR_NEWMV] = thresh;
-                sf->thresh_mult[THR_NEARESTMV ] = thresh >> 1;
-                sf->thresh_mult[THR_NEARMV    ] = thresh >> 1;
+                sf->thresh_mult[THR_NEW1 ] = thresh;
+                sf->thresh_mult[THR_NEAREST1  ] = thresh >> 1;
+                sf->thresh_mult[THR_NEAR1     ] = thresh >> 1;
             }
 
-            if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
+            if (ref_frames > 2)
             {
-                sf->thresh_mult[THR_NEWG] = thresh << 1;
-                sf->thresh_mult[THR_NEARESTG ] = thresh;
-                sf->thresh_mult[THR_NEARG    ] = thresh;
+                sf->thresh_mult[THR_NEW2] = thresh << 1;
+                sf->thresh_mult[THR_NEAREST2 ] = thresh;
+                sf->thresh_mult[THR_NEAR2    ] = thresh;
             }
 
-            if (cpi->ref_frame_flags & VP8_ALT_FLAG)
+            if (ref_frames > 3)
             {
-                sf->thresh_mult[THR_NEWA] = thresh << 1;
-                sf->thresh_mult[THR_NEARESTA ] = thresh;
-                sf->thresh_mult[THR_NEARA    ] = thresh;
+                sf->thresh_mult[THR_NEW3] = thresh << 1;
+                sf->thresh_mult[THR_NEAREST3 ] = thresh;
+                sf->thresh_mult[THR_NEAR3    ] = thresh;
             }
 
-            // Disable other intra prediction modes
-            sf->thresh_mult[THR_TM] = INT_MAX;
-            sf->thresh_mult[THR_V_PRED] = INT_MAX;
-            sf->thresh_mult[THR_H_PRED] = INT_MAX;
-
             sf->improved_mv_pred = 0;
         }
 
         if (Speed > 8)
-        {
             sf->quarter_pixel_search = 0;
-        }
 
-        if (Speed > 9)
+        if(cm->version == 0)
         {
-            int Tmp = cpi->Speed - 8;
+            cm->filter_type = NORMAL_LOOPFILTER;
 
-            if (Tmp > 4)
-                Tmp = 4;
-
-            if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
-            {
-                cpi->mode_check_freq[THR_ZEROG] = 1 << (Tmp - 1);
-                cpi->mode_check_freq[THR_NEARESTG] = 1 << (Tmp - 1);
-                cpi->mode_check_freq[THR_NEARG] = 1 << Tmp;
-                cpi->mode_check_freq[THR_NEWG] = 1 << (Tmp + 1);
-            }
-
-            if (cpi->ref_frame_flags & VP8_ALT_FLAG)
-            {
-                cpi->mode_check_freq[THR_ZEROA] = 1 << (Tmp - 1);
-                cpi->mode_check_freq[THR_NEARESTA] = 1 << (Tmp - 1);
-                cpi->mode_check_freq[THR_NEARA] = 1 << Tmp;
-                cpi->mode_check_freq[THR_NEWA] = 1 << (Tmp + 1);
-            }
-
-            cpi->mode_check_freq[THR_NEWMV] = 1 << (Tmp - 1);
+            if (Speed >= 14)
+                cm->filter_type = SIMPLE_LOOPFILTER;
         }
-
-        cm->filter_type = NORMAL_LOOPFILTER;
-
-        if (Speed >= 14)
+        else
+        {
             cm->filter_type = SIMPLE_LOOPFILTER;
-
-        if (Speed >= 15)
-        {
-            sf->half_pixel_search = 0;        // This has a big hit on quality. Last resort
         }
 
+        // This has a big hit on quality. Last resort
+        if (Speed >= 15)
+            sf->half_pixel_search = 0;
+
         vpx_memset(cpi->error_bins, 0, sizeof(cpi->error_bins));
 
     }; /* switch */
 
-    /* disable frame modes if flags not set */
-    if (!(cpi->ref_frame_flags & VP8_LAST_FLAG))
-    {
-        sf->thresh_mult[THR_NEWMV    ] = INT_MAX;
-        sf->thresh_mult[THR_NEARESTMV] = INT_MAX;
-        sf->thresh_mult[THR_ZEROMV   ] = INT_MAX;
-        sf->thresh_mult[THR_NEARMV   ] = INT_MAX;
-        sf->thresh_mult[THR_SPLITMV  ] = INT_MAX;
-    }
-
-    if (!(cpi->ref_frame_flags & VP8_GOLD_FLAG))
-    {
-        sf->thresh_mult[THR_NEARESTG ] = INT_MAX;
-        sf->thresh_mult[THR_ZEROG    ] = INT_MAX;
-        sf->thresh_mult[THR_NEARG    ] = INT_MAX;
-        sf->thresh_mult[THR_NEWG     ] = INT_MAX;
-        sf->thresh_mult[THR_SPLITG   ] = INT_MAX;
-    }
-
-    if (!(cpi->ref_frame_flags & VP8_ALT_FLAG))
-    {
-        sf->thresh_mult[THR_NEARESTA ] = INT_MAX;
-        sf->thresh_mult[THR_ZEROA    ] = INT_MAX;
-        sf->thresh_mult[THR_NEARA    ] = INT_MAX;
-        sf->thresh_mult[THR_NEWA     ] = INT_MAX;
-        sf->thresh_mult[THR_SPLITA   ] = INT_MAX;
-    }
-
-
     // Slow quant, dct and trellis not worthwhile for first pass
     // so make sure they are always turned off.
     if ( cpi->pass == 1 )
@@ -1230,6 +1044,9 @@ void vp8_set_speed_features(VP8_COMP *cpi)
     frames_at_speed[cpi->Speed]++;
 #endif
 }
+#undef GOOD
+#undef RT
+
 static void alloc_raw_frame_buffers(VP8_COMP *cpi)
 {
     int width = (cpi->oxcf.Width + 15) & ~15;
@@ -1289,7 +1106,7 @@ void vp8_alloc_compressor_data(VP8_COMP *cpi)
         height += 16 - (height & 0xf);
 
 
-    if (vp8_yv12_alloc_frame_buffer(&cpi->last_frame_uf,
+    if (vp8_yv12_alloc_frame_buffer(&cpi->pick_lf_lvl_frame,
                                     width, height, VP8BORDERINPIXELS))
         vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,
                            "Failed to allocate last frame buffer");
@@ -1330,20 +1147,6 @@ void vp8_alloc_compressor_data(VP8_COMP *cpi)
                     vpx_calloc(sizeof(unsigned int),
                     cm->mb_rows * cm->mb_cols));
 
-#if !(CONFIG_REALTIME_ONLY)
-        vpx_free(cpi->twopass.total_stats);
-
-    cpi->twopass.total_stats = vpx_calloc(1, sizeof(FIRSTPASS_STATS));
-
-        vpx_free(cpi->twopass.this_frame_stats);
-
-    cpi->twopass.this_frame_stats = vpx_calloc(1, sizeof(FIRSTPASS_STATS));
-
-    if(!cpi->twopass.total_stats || !cpi->twopass.this_frame_stats)
-        vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,
-                           "Failed to allocate firstpass stats");
-#endif
-
 #if CONFIG_MULTITHREAD
     if (width < 640)
         cpi->mt_sync_range = 1;
@@ -1355,7 +1158,7 @@ void vp8_alloc_compressor_data(VP8_COMP *cpi)
         cpi->mt_sync_range = 16;
 #endif
 
-        vpx_free(cpi->tplist);
+    vpx_free(cpi->tplist);
 
     CHECK_MEM_ERROR(cpi->tplist, vpx_malloc(sizeof(TOKENLIST) * cpi->common.mb_rows));
 }
@@ -1389,11 +1192,13 @@ void vp8_new_frame_rate(VP8_COMP *cpi, double framerate)
     if(framerate < .1)
         framerate = 30;
 
-    cpi->oxcf.frame_rate             = framerate;
-    cpi->output_frame_rate            = cpi->oxcf.frame_rate;
-    cpi->per_frame_bandwidth          = (int)(cpi->oxcf.target_bandwidth / cpi->output_frame_rate);
-    cpi->av_per_frame_bandwidth        = (int)(cpi->oxcf.target_bandwidth / cpi->output_frame_rate);
-    cpi->min_frame_bandwidth          = (int)(cpi->av_per_frame_bandwidth * cpi->oxcf.two_pass_vbrmin_section / 100);
+    cpi->frame_rate             = framerate;
+    cpi->output_frame_rate      = framerate;
+    cpi->per_frame_bandwidth    = (int)(cpi->oxcf.target_bandwidth /
+                                  cpi->output_frame_rate);
+    cpi->av_per_frame_bandwidth = cpi->per_frame_bandwidth;
+    cpi->min_frame_bandwidth    = (int)(cpi->av_per_frame_bandwidth *
+                                  cpi->oxcf.two_pass_vbrmin_section / 100);
 
     // Set Maximum gf/arf interval
     cpi->max_gf_interval = ((int)(cpi->output_frame_rate / 2.0) + 2);
@@ -1430,9 +1235,8 @@ rescale(int val, int num, int denom)
 }
 
 
-static void init_config(VP8_PTR ptr, VP8_CONFIG *oxcf)
+static void init_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
 {
-    VP8_COMP *cpi = (VP8_COMP *)(ptr);
     VP8_COMMON *cm = &cpi->common;
 
     cpi->oxcf = *oxcf;
@@ -1444,8 +1248,22 @@ static void init_config(VP8_PTR ptr, VP8_CONFIG *oxcf)
     cm->version = oxcf->Version;
     vp8_setup_version(cm);
 
+    /* frame rate is not available on the first frame, as it's derived from
+     * the observed timestamps. The actual value used here doesn't matter
+     * too much, as it will adapt quickly. If the reciprocal of the timebase
+     * seems like a reasonable framerate, then use that as a guess, otherwise
+     * use 30.
+     */
+    cpi->frame_rate = (double)(oxcf->timebase.den) /
+                      (double)(oxcf->timebase.num);
+
+    if (cpi->frame_rate > 180)
+        cpi->frame_rate = 30;
+
+    cpi->ref_frame_rate = cpi->frame_rate;
+
     // change includes all joint functionality
-    vp8_change_config(ptr, oxcf);
+    vp8_change_config(cpi, oxcf);
 
     // Initialize active best and worst q and average q values.
     cpi->active_worst_quality         = cpi->oxcf.worst_allowed_q;
@@ -1464,6 +1282,69 @@ static void init_config(VP8_PTR ptr, VP8_CONFIG *oxcf)
     cpi->total_actual_bits            = 0;
     cpi->total_target_vs_actual       = 0;
 
+    // Temporal scalabilty
+    if (cpi->oxcf.number_of_layers > 1)
+    {
+        unsigned int i;
+        double prev_layer_frame_rate=0;
+
+        for (i=0; i<cpi->oxcf.number_of_layers; i++)
+        {
+            LAYER_CONTEXT *lc = &cpi->layer_context[i];
+
+            // Layer configuration
+            lc->frame_rate =
+                        cpi->output_frame_rate / cpi->oxcf.rate_decimator[i];
+            lc->target_bandwidth = cpi->oxcf.target_bitrate[i] * 1000;
+
+            lc->starting_buffer_level_in_ms = oxcf->starting_buffer_level;
+            lc->optimal_buffer_level_in_ms  = oxcf->optimal_buffer_level;
+            lc->maximum_buffer_size_in_ms   = oxcf->maximum_buffer_size;
+
+            lc->starting_buffer_level =
+              rescale(oxcf->starting_buffer_level,
+                          lc->target_bandwidth, 1000);
+
+            if (oxcf->optimal_buffer_level == 0)
+                lc->optimal_buffer_level = lc->target_bandwidth / 8;
+            else
+                lc->optimal_buffer_level =
+                  rescale(oxcf->optimal_buffer_level,
+                          lc->target_bandwidth, 1000);
+
+            if (oxcf->maximum_buffer_size == 0)
+                lc->maximum_buffer_size = lc->target_bandwidth / 8;
+            else
+                lc->maximum_buffer_size =
+                  rescale(oxcf->maximum_buffer_size,
+                          lc->target_bandwidth, 1000);
+
+            // Work out the average size of a frame within this layer
+            if (i > 0)
+                lc->avg_frame_size_for_layer = (cpi->oxcf.target_bitrate[i] -
+                    cpi->oxcf.target_bitrate[i-1]) * 1000 /
+                    (lc->frame_rate - prev_layer_frame_rate);
+
+            lc->active_worst_quality         = cpi->oxcf.worst_allowed_q;
+            lc->active_best_quality          = cpi->oxcf.best_allowed_q;
+            lc->avg_frame_qindex             = cpi->oxcf.worst_allowed_q;
+
+            lc->buffer_level                 = lc->starting_buffer_level;
+            lc->bits_off_target              = lc->starting_buffer_level;
+
+            lc->total_actual_bits                 = 0;
+            lc->ni_av_qi                          = 0;
+            lc->ni_tot_qi                         = 0;
+            lc->ni_frames                         = 0;
+            lc->rate_correction_factor            = 1.0;
+            lc->key_frame_rate_correction_factor  = 1.0;
+            lc->gf_rate_correction_factor         = 1.0;
+            lc->inter_frame_target                = 0.0;
+
+            prev_layer_frame_rate = lc->frame_rate;
+        }
+    }
+
 #if VP8_TEMPORAL_ALT_REF
     {
         int i;
@@ -1476,10 +1357,59 @@ static void init_config(VP8_PTR ptr, VP8_CONFIG *oxcf)
 #endif
 }
 
-
-void vp8_change_config(VP8_PTR ptr, VP8_CONFIG *oxcf)
+void update_layer_contexts (VP8_COMP *cpi)
+{
+    VP8_CONFIG *oxcf = &cpi->oxcf;
+
+    /* Update snapshots of the layer contexts to reflect new parameters */
+    if (oxcf->number_of_layers > 1)
+    {
+        unsigned int i;
+        double prev_layer_frame_rate=0;
+
+        for (i=0; i<oxcf->number_of_layers; i++)
+        {
+            LAYER_CONTEXT *lc = &cpi->layer_context[i];
+
+            lc->frame_rate =
+                cpi->ref_frame_rate / oxcf->rate_decimator[i];
+            lc->target_bandwidth = oxcf->target_bitrate[i] * 1000;
+
+            lc->starting_buffer_level = rescale(
+                          oxcf->starting_buffer_level_in_ms,
+                          lc->target_bandwidth, 1000);
+
+            if (oxcf->optimal_buffer_level == 0)
+                lc->optimal_buffer_level = lc->target_bandwidth / 8;
+            else
+                lc->optimal_buffer_level = rescale(
+                          oxcf->optimal_buffer_level_in_ms,
+                          lc->target_bandwidth, 1000);
+
+            if (oxcf->maximum_buffer_size == 0)
+                lc->maximum_buffer_size = lc->target_bandwidth / 8;
+            else
+                lc->maximum_buffer_size = rescale(
+                          oxcf->maximum_buffer_size_in_ms,
+                          lc->target_bandwidth, 1000);
+
+            // Work out the average size of a frame within this layer
+            if (i > 0)
+                lc->avg_frame_size_for_layer = (oxcf->target_bitrate[i] -
+                    oxcf->target_bitrate[i-1]) * 1000 /
+                    (lc->frame_rate - prev_layer_frame_rate);
+
+            lc->active_worst_quality         = oxcf->worst_allowed_q;
+            lc->active_best_quality          = oxcf->best_allowed_q;
+            lc->avg_frame_qindex             = oxcf->worst_allowed_q;
+
+            prev_layer_frame_rate = lc->frame_rate;
+        }
+    }
+}
+
+void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
 {
-    VP8_COMP *cpi = (VP8_COMP *)(ptr);
     VP8_COMMON *cm = &cpi->common;
 
     if (!cpi)
@@ -1617,9 +1547,12 @@ void vp8_change_config(VP8_PTR ptr, VP8_CONFIG *oxcf)
     // local file playback mode == really big buffer
     if (cpi->oxcf.end_usage == USAGE_LOCAL_FILE_PLAYBACK)
     {
-        cpi->oxcf.starting_buffer_level   = 60000;
-        cpi->oxcf.optimal_buffer_level    = 60000;
-        cpi->oxcf.maximum_buffer_size     = 240000;
+        cpi->oxcf.starting_buffer_level       = 60000;
+        cpi->oxcf.optimal_buffer_level        = 60000;
+        cpi->oxcf.maximum_buffer_size         = 240000;
+        cpi->oxcf.starting_buffer_level_in_ms = 60000;
+        cpi->oxcf.optimal_buffer_level_in_ms  = 60000;
+        cpi->oxcf.maximum_buffer_size_in_ms   = 240000;
     }
 
     // Convert target bandwidth from Kbit/s to Bit/s
@@ -1645,7 +1578,7 @@ void vp8_change_config(VP8_PTR ptr, VP8_CONFIG *oxcf)
                     cpi->oxcf.target_bandwidth, 1000);
 
     // Set up frame rate and related parameters rate control values.
-    vp8_new_frame_rate(cpi, cpi->oxcf.frame_rate);
+    vp8_new_frame_rate(cpi, cpi->frame_rate);
 
     // Set absolute upper and lower quality limits
     cpi->worst_quality               = cpi->oxcf.worst_allowed_q;
@@ -1671,7 +1604,7 @@ void vp8_change_config(VP8_PTR ptr, VP8_CONFIG *oxcf)
       cpi->active_best_quality = cpi->oxcf.worst_allowed_q;
     }
 
-    cpi->buffered_mode = (cpi->oxcf.optimal_buffer_level > 0) ? TRUE : FALSE;
+    cpi->buffered_mode = cpi->oxcf.optimal_buffer_level > 0;
 
     cpi->cq_target_quality = cpi->oxcf.cq_level;
 
@@ -1685,11 +1618,11 @@ void vp8_change_config(VP8_PTR ptr, VP8_CONFIG *oxcf)
 
     cpi->target_bandwidth = cpi->oxcf.target_bandwidth;
 
-    cm->Width       = cpi->oxcf.Width     ;
-    cm->Height      = cpi->oxcf.Height    ;
+    cm->Width       = cpi->oxcf.Width;
+    cm->Height      = cpi->oxcf.Height;
 
     cm->horiz_scale  = cpi->horiz_scale;
-    cm->vert_scale   = cpi->vert_scale ;
+    cm->vert_scale   = cpi->vert_scale;
 
     // VP8 sharpness level mapping 0-7 (vs 0-10 in general VPx dialogs)
     if (cpi->oxcf.Sharpness > 7)
@@ -1770,19 +1703,14 @@ static void cal_mvsadcosts(int *mvsadcost[2])
     while (++i <= mvfp_max);
 }
 
-VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf)
+struct VP8_COMP* vp8_create_compressor(VP8_CONFIG *oxcf)
 {
     int i;
-    volatile union
-    {
-        VP8_COMP *cpi;
-        VP8_PTR   ptr;
-    } ctx;
 
     VP8_COMP *cpi;
     VP8_COMMON *cm;
 
-    cpi = ctx.cpi = vpx_memalign(32, sizeof(VP8_COMP));
+    cpi = vpx_memalign(32, sizeof(VP8_COMP));
     // Check that the CPI instance is valid
     if (!cpi)
         return 0;
@@ -1793,10 +1721,8 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf)
 
     if (setjmp(cm->error.jmp))
     {
-        VP8_PTR ptr = ctx.ptr;
-
-        ctx.cpi->common.error.setjmp = 0;
-        vp8_remove_compressor(&ptr);
+        cpi->common.error.setjmp = 0;
+        vp8_remove_compressor(&cpi);
         return 0;
     }
 
@@ -1807,7 +1733,7 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf)
     vp8_create_common(&cpi->common);
     vp8_cmachine_specific_config(cpi);
 
-    init_config((VP8_PTR)cpi, oxcf);
+    init_config(cpi, oxcf);
 
     memcpy(cpi->base_skip_false_prob, vp8cx_base_skip_false_prob, sizeof(vp8cx_base_skip_false_prob));
     cpi->common.current_video_frame   = 0;
@@ -1820,7 +1746,7 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf)
     cpi->prob_gf_coded                = 128;
     cpi->prob_intra_coded             = 63;
 
-    // Prime the recent reference frame useage counters.
+    // Prime the recent reference frame usage counters.
     // Hereafter they will be maintained as a sort of moving average
     cpi->recent_ref_frame_usage[INTRA_FRAME]  = 1;
     cpi->recent_ref_frame_usage[LAST_FRAME]   = 1;
@@ -1886,7 +1812,7 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf)
         cpi->cyclic_refresh_map = (signed char *) NULL;
 
     // Test function for segmentation
-    //segmentation_test_function((VP8_PTR) cpi);
+    //segmentation_test_function( cpi);
 
 #ifdef ENTROPY_STATS
     init_context_counters();
@@ -1897,11 +1823,11 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf)
 
     cpi->frames_since_key = 8;        // Give a sensible default for the first frame.
     cpi->key_frame_frequency = cpi->oxcf.key_freq;
-    cpi->this_key_frame_forced = FALSE;
-    cpi->next_key_frame_forced = FALSE;
+    cpi->this_key_frame_forced = 0;
+    cpi->next_key_frame_forced = 0;
 
-    cpi->source_alt_ref_pending = FALSE;
-    cpi->source_alt_ref_active = FALSE;
+    cpi->source_alt_ref_pending = 0;
+    cpi->source_alt_ref_active = 0;
     cpi->common.refresh_alt_ref_frame = 0;
 
     cpi->b_calculate_psnr = CONFIG_INTERNAL_STATS;
@@ -2027,62 +1953,62 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf)
     vp8cx_create_encoder_threads(cpi);
 #endif
 
-    cpi->fn_ptr[BLOCK_16X16].sdf            = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x16);
-    cpi->fn_ptr[BLOCK_16X16].vf             = VARIANCE_INVOKE(&cpi->rtcd.variance, var16x16);
-    cpi->fn_ptr[BLOCK_16X16].svf            = VARIANCE_INVOKE(&cpi->rtcd.variance, subpixvar16x16);
-    cpi->fn_ptr[BLOCK_16X16].svf_halfpix_h  = VARIANCE_INVOKE(&cpi->rtcd.variance, halfpixvar16x16_h);
-    cpi->fn_ptr[BLOCK_16X16].svf_halfpix_v  = VARIANCE_INVOKE(&cpi->rtcd.variance, halfpixvar16x16_v);
-    cpi->fn_ptr[BLOCK_16X16].svf_halfpix_hv = VARIANCE_INVOKE(&cpi->rtcd.variance, halfpixvar16x16_hv);
-    cpi->fn_ptr[BLOCK_16X16].sdx3f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x16x3);
-    cpi->fn_ptr[BLOCK_16X16].sdx8f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x16x8);
-    cpi->fn_ptr[BLOCK_16X16].sdx4df         = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x16x4d);
+    cpi->fn_ptr[BLOCK_16X16].sdf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x16);
+    cpi->fn_ptr[BLOCK_16X16].vf             = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var16x16);
+    cpi->fn_ptr[BLOCK_16X16].svf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, subpixvar16x16);
+    cpi->fn_ptr[BLOCK_16X16].svf_halfpix_h  = VARIANCE_INVOKE(&cpi->common.rtcd.variance, halfpixvar16x16_h);
+    cpi->fn_ptr[BLOCK_16X16].svf_halfpix_v  = VARIANCE_INVOKE(&cpi->common.rtcd.variance, halfpixvar16x16_v);
+    cpi->fn_ptr[BLOCK_16X16].svf_halfpix_hv = VARIANCE_INVOKE(&cpi->common.rtcd.variance, halfpixvar16x16_hv);
+    cpi->fn_ptr[BLOCK_16X16].sdx3f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x16x3);
+    cpi->fn_ptr[BLOCK_16X16].sdx8f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x16x8);
+    cpi->fn_ptr[BLOCK_16X16].sdx4df         = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x16x4d);
 
-    cpi->fn_ptr[BLOCK_16X8].sdf            = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x8);
-    cpi->fn_ptr[BLOCK_16X8].vf             = VARIANCE_INVOKE(&cpi->rtcd.variance, var16x8);
-    cpi->fn_ptr[BLOCK_16X8].svf            = VARIANCE_INVOKE(&cpi->rtcd.variance, subpixvar16x8);
+    cpi->fn_ptr[BLOCK_16X8].sdf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x8);
+    cpi->fn_ptr[BLOCK_16X8].vf             = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var16x8);
+    cpi->fn_ptr[BLOCK_16X8].svf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, subpixvar16x8);
     cpi->fn_ptr[BLOCK_16X8].svf_halfpix_h  = NULL;
     cpi->fn_ptr[BLOCK_16X8].svf_halfpix_v  = NULL;
     cpi->fn_ptr[BLOCK_16X8].svf_halfpix_hv = NULL;
-    cpi->fn_ptr[BLOCK_16X8].sdx3f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x8x3);
-    cpi->fn_ptr[BLOCK_16X8].sdx8f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x8x8);
-    cpi->fn_ptr[BLOCK_16X8].sdx4df         = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x8x4d);
+    cpi->fn_ptr[BLOCK_16X8].sdx3f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x8x3);
+    cpi->fn_ptr[BLOCK_16X8].sdx8f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x8x8);
+    cpi->fn_ptr[BLOCK_16X8].sdx4df         = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad16x8x4d);
 
-    cpi->fn_ptr[BLOCK_8X16].sdf            = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x16);
-    cpi->fn_ptr[BLOCK_8X16].vf             = VARIANCE_INVOKE(&cpi->rtcd.variance, var8x16);
-    cpi->fn_ptr[BLOCK_8X16].svf            = VARIANCE_INVOKE(&cpi->rtcd.variance, subpixvar8x16);
+    cpi->fn_ptr[BLOCK_8X16].sdf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x16);
+    cpi->fn_ptr[BLOCK_8X16].vf             = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var8x16);
+    cpi->fn_ptr[BLOCK_8X16].svf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, subpixvar8x16);
     cpi->fn_ptr[BLOCK_8X16].svf_halfpix_h  = NULL;
     cpi->fn_ptr[BLOCK_8X16].svf_halfpix_v  = NULL;
     cpi->fn_ptr[BLOCK_8X16].svf_halfpix_hv = NULL;
-    cpi->fn_ptr[BLOCK_8X16].sdx3f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x16x3);
-    cpi->fn_ptr[BLOCK_8X16].sdx8f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x16x8);
-    cpi->fn_ptr[BLOCK_8X16].sdx4df         = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x16x4d);
+    cpi->fn_ptr[BLOCK_8X16].sdx3f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x16x3);
+    cpi->fn_ptr[BLOCK_8X16].sdx8f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x16x8);
+    cpi->fn_ptr[BLOCK_8X16].sdx4df         = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x16x4d);
 
-    cpi->fn_ptr[BLOCK_8X8].sdf            = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x8);
-    cpi->fn_ptr[BLOCK_8X8].vf             = VARIANCE_INVOKE(&cpi->rtcd.variance, var8x8);
-    cpi->fn_ptr[BLOCK_8X8].svf            = VARIANCE_INVOKE(&cpi->rtcd.variance, subpixvar8x8);
+    cpi->fn_ptr[BLOCK_8X8].sdf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x8);
+    cpi->fn_ptr[BLOCK_8X8].vf             = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var8x8);
+    cpi->fn_ptr[BLOCK_8X8].svf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, subpixvar8x8);
     cpi->fn_ptr[BLOCK_8X8].svf_halfpix_h  = NULL;
     cpi->fn_ptr[BLOCK_8X8].svf_halfpix_v  = NULL;
     cpi->fn_ptr[BLOCK_8X8].svf_halfpix_hv = NULL;
-    cpi->fn_ptr[BLOCK_8X8].sdx3f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x8x3);
-    cpi->fn_ptr[BLOCK_8X8].sdx8f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x8x8);
-    cpi->fn_ptr[BLOCK_8X8].sdx4df         = VARIANCE_INVOKE(&cpi->rtcd.variance, sad8x8x4d);
+    cpi->fn_ptr[BLOCK_8X8].sdx3f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x8x3);
+    cpi->fn_ptr[BLOCK_8X8].sdx8f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x8x8);
+    cpi->fn_ptr[BLOCK_8X8].sdx4df         = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad8x8x4d);
 
-    cpi->fn_ptr[BLOCK_4X4].sdf            = VARIANCE_INVOKE(&cpi->rtcd.variance, sad4x4);
-    cpi->fn_ptr[BLOCK_4X4].vf             = VARIANCE_INVOKE(&cpi->rtcd.variance, var4x4);
-    cpi->fn_ptr[BLOCK_4X4].svf            = VARIANCE_INVOKE(&cpi->rtcd.variance, subpixvar4x4);
+    cpi->fn_ptr[BLOCK_4X4].sdf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad4x4);
+    cpi->fn_ptr[BLOCK_4X4].vf             = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var4x4);
+    cpi->fn_ptr[BLOCK_4X4].svf            = VARIANCE_INVOKE(&cpi->common.rtcd.variance, subpixvar4x4);
     cpi->fn_ptr[BLOCK_4X4].svf_halfpix_h  = NULL;
     cpi->fn_ptr[BLOCK_4X4].svf_halfpix_v  = NULL;
     cpi->fn_ptr[BLOCK_4X4].svf_halfpix_hv = NULL;
-    cpi->fn_ptr[BLOCK_4X4].sdx3f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad4x4x3);
-    cpi->fn_ptr[BLOCK_4X4].sdx8f          = VARIANCE_INVOKE(&cpi->rtcd.variance, sad4x4x8);
-    cpi->fn_ptr[BLOCK_4X4].sdx4df         = VARIANCE_INVOKE(&cpi->rtcd.variance, sad4x4x4d);
+    cpi->fn_ptr[BLOCK_4X4].sdx3f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad4x4x3);
+    cpi->fn_ptr[BLOCK_4X4].sdx8f          = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad4x4x8);
+    cpi->fn_ptr[BLOCK_4X4].sdx4df         = VARIANCE_INVOKE(&cpi->common.rtcd.variance, sad4x4x4d);
 
 #if ARCH_X86 || ARCH_X86_64
-    cpi->fn_ptr[BLOCK_16X16].copymem        = VARIANCE_INVOKE(&cpi->rtcd.variance, copy32xn);
-    cpi->fn_ptr[BLOCK_16X8].copymem        = VARIANCE_INVOKE(&cpi->rtcd.variance, copy32xn);
-    cpi->fn_ptr[BLOCK_8X16].copymem        = VARIANCE_INVOKE(&cpi->rtcd.variance, copy32xn);
-    cpi->fn_ptr[BLOCK_8X8].copymem        = VARIANCE_INVOKE(&cpi->rtcd.variance, copy32xn);
-    cpi->fn_ptr[BLOCK_4X4].copymem        = VARIANCE_INVOKE(&cpi->rtcd.variance, copy32xn);
+    cpi->fn_ptr[BLOCK_16X16].copymem        = VARIANCE_INVOKE(&cpi->common.rtcd.variance, copy32xn);
+    cpi->fn_ptr[BLOCK_16X8].copymem        = VARIANCE_INVOKE(&cpi->common.rtcd.variance, copy32xn);
+    cpi->fn_ptr[BLOCK_8X16].copymem        = VARIANCE_INVOKE(&cpi->common.rtcd.variance, copy32xn);
+    cpi->fn_ptr[BLOCK_8X8].copymem        = VARIANCE_INVOKE(&cpi->common.rtcd.variance, copy32xn);
+    cpi->fn_ptr[BLOCK_4X4].copymem        = VARIANCE_INVOKE(&cpi->common.rtcd.variance, copy32xn);
 #endif
 
     cpi->full_search_sad = SEARCH_INVOKE(&cpi->rtcd.search, full_search);
@@ -2099,14 +2025,21 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf)
     vp8_loop_filter_init(cm);
 
     cpi->common.error.setjmp = 0;
-    return (VP8_PTR) cpi;
+
+#if CONFIG_MULTI_RES_ENCODING
+    /* Calculate # of MBs in a row in lower-resolution level image. */
+    if (cpi->oxcf.mr_encoder_id > 0)
+        vp8_cal_low_res_mb_cols(cpi);
+#endif
+
+    return  cpi;
 
 }
 
 
-void vp8_remove_compressor(VP8_PTR *ptr)
+void vp8_remove_compressor(VP8_COMP **ptr)
 {
-    VP8_COMP *cpi = (VP8_COMP *)(*ptr);
+    VP8_COMP *cpi = *ptr;
 
     if (!cpi)
         return;
@@ -2135,35 +2068,106 @@ void vp8_remove_compressor(VP8_PTR *ptr)
             FILE *f = fopen("opsnr.stt", "a");
             double time_encoded = (cpi->last_end_time_stamp_seen
                                    - cpi->first_time_stamp_ever) / 10000000.000;
-            double total_encode_time = (cpi->time_receive_data + cpi->time_compress_data)   / 1000.000;
-            double dr = (double)cpi->bytes * (double) 8 / (double)1000  / time_encoded;
+            double total_encode_time = (cpi->time_receive_data +
+                                            cpi->time_compress_data) / 1000.000;
+            double dr = (double)cpi->bytes * 8.0 / 1000.0 / time_encoded;
 
             if (cpi->b_calculate_psnr)
             {
-                YV12_BUFFER_CONFIG *lst_yv12 = &cpi->common.yv12_fb[cpi->common.lst_fb_idx];
-                double samples = 3.0 / 2 * cpi->count * lst_yv12->y_width * lst_yv12->y_height;
-                double total_psnr = vp8_mse2psnr(samples, 255.0, cpi->total_sq_error);
-                double total_psnr2 = vp8_mse2psnr(samples, 255.0, cpi->total_sq_error2);
-                double total_ssim = 100 * pow(cpi->summed_quality / cpi->summed_weights, 8.0);
+                YV12_BUFFER_CONFIG *lst_yv12 =
+                              &cpi->common.yv12_fb[cpi->common.lst_fb_idx];
 
-                fprintf(f, "Bitrate\tAVGPsnr\tGLBPsnr\tAVPsnrP\tGLPsnrP\tVPXSSIM\t  Time(us)\n");
-                fprintf(f, "%7.3f\t%7.3f\t%7.3f\t%7.3f\t%7.3f\t%7.3f\t%8.0f\n",
-                        dr, cpi->total / cpi->count, total_psnr, cpi->totalp / cpi->count, total_psnr2, total_ssim,
-                        total_encode_time);
+                if (cpi->oxcf.number_of_layers > 1)
+                {
+                    int i;
+
+                    fprintf(f, "Layer\tBitrate\tAVGPsnr\tGLBPsnr\tAVPsnrP\t"
+                               "GLPsnrP\tVPXSSIM\t\n");
+                    for (i=0; i<cpi->oxcf.number_of_layers; i++)
+                    {
+                        double dr = (double)cpi->bytes_in_layer[i] *
+                                              8.0 / 1000.0  / time_encoded;
+                        double samples = 3.0 / 2 * cpi->frames_in_layer[i] *
+                                         lst_yv12->y_width * lst_yv12->y_height;
+                        double total_psnr = vp8_mse2psnr(samples, 255.0,
+                                                  cpi->total_error2[i]);
+                        double total_psnr2 = vp8_mse2psnr(samples, 255.0,
+                                                  cpi->total_error2_p[i]);
+                        double total_ssim = 100 * pow(cpi->sum_ssim[i] /
+                                                      cpi->sum_weights[i], 8.0);
+
+                        fprintf(f, "%5d\t%7.3f\t%7.3f\t%7.3f\t%7.3f\t"
+                                   "%7.3f\t%7.3f\n",
+                                   i, dr,
+                                   cpi->sum_psnr[i] / cpi->frames_in_layer[i],
+                                   total_psnr,
+                                   cpi->sum_psnr_p[i] / cpi->frames_in_layer[i],
+                                   total_psnr2, total_ssim);
+                    }
+                }
+                else
+                {
+                    double samples = 3.0 / 2 * cpi->count *
+                                        lst_yv12->y_width * lst_yv12->y_height;
+                    double total_psnr = vp8_mse2psnr(samples, 255.0,
+                                                         cpi->total_sq_error);
+                    double total_psnr2 = vp8_mse2psnr(samples, 255.0,
+                                                         cpi->total_sq_error2);
+                    double total_ssim = 100 * pow(cpi->summed_quality /
+                                                      cpi->summed_weights, 8.0);
+
+                    fprintf(f, "Bitrate\tAVGPsnr\tGLBPsnr\tAVPsnrP\t"
+                               "GLPsnrP\tVPXSSIM\t  Time(us)\n");
+                    fprintf(f, "%7.3f\t%7.3f\t%7.3f\t%7.3f\t%7.3f\t"
+                               "%7.3f\t%8.0f\n",
+                               dr, cpi->total / cpi->count, total_psnr,
+                               cpi->totalp / cpi->count, total_psnr2,
+                               total_ssim, total_encode_time);
+                }
             }
 
             if (cpi->b_calculate_ssimg)
             {
-                fprintf(f, "BitRate\tSSIM_Y\tSSIM_U\tSSIM_V\tSSIM_A\t  Time(us)\n");
-                fprintf(f, "%7.3f\t%6.4f\t%6.4f\t%6.4f\t%6.4f\t%8.0f\n", dr,
-                        cpi->total_ssimg_y / cpi->count, cpi->total_ssimg_u / cpi->count,
-                        cpi->total_ssimg_v / cpi->count, cpi->total_ssimg_all / cpi->count, total_encode_time);
+                if (cpi->oxcf.number_of_layers > 1)
+                {
+                    int i;
+
+                    fprintf(f, "Layer\tBitRate\tSSIM_Y\tSSIM_U\tSSIM_V\tSSIM_A\t"
+                               "Time(us)\n");
+                    for (i=0; i<cpi->oxcf.number_of_layers; i++)
+                    {
+                        double dr = (double)cpi->bytes_in_layer[i] *
+                                    8.0 / 1000.0  / time_encoded;
+                        fprintf(f, "%5d\t%7.3f\t%6.4f\t"
+                                "%6.4f\t%6.4f\t%6.4f\t%8.0f\n",
+                                i, dr,
+                                cpi->total_ssimg_y_in_layer[i] /
+                                     cpi->frames_in_layer[i],
+                                cpi->total_ssimg_u_in_layer[i] /
+                                     cpi->frames_in_layer[i],
+                                cpi->total_ssimg_v_in_layer[i] /
+                                     cpi->frames_in_layer[i],
+                                cpi->total_ssimg_all_in_layer[i] /
+                                     cpi->frames_in_layer[i],
+                                total_encode_time);
+                    }
+                }
+                else
+                {
+                    fprintf(f, "BitRate\tSSIM_Y\tSSIM_U\tSSIM_V\tSSIM_A\t"
+                               "Time(us)\n");
+                    fprintf(f, "%7.3f\t%6.4f\t%6.4f\t%6.4f\t%6.4f\t%8.0f\n", dr,
+                            cpi->total_ssimg_y / cpi->count,
+                            cpi->total_ssimg_u / cpi->count,
+                            cpi->total_ssimg_v / cpi->count,
+                            cpi->total_ssimg_all / cpi->count, total_encode_time);
+                }
             }
 
             fclose(f);
 #if 0
             f = fopen("qskip.stt", "a");
-            fprintf(f, "minq:%d -maxq:%d skipture:skipfalse = %d:%d\n", cpi->oxcf.best_allowed_q, cpi->oxcf.worst_allowed_q, skiptruecount, skipfalsecount);
+            fprintf(f, "minq:%d -maxq:%d skiptrue:skipfalse = %d:%d\n", cpi->oxcf.best_allowed_q, cpi->oxcf.worst_allowed_q, skiptruecount, skipfalsecount);
             fclose(f);
 #endif
 
@@ -2195,7 +2199,7 @@ void vp8_remove_compressor(VP8_PTR *ptr)
         {
             extern int count_mb_seg[4];
             FILE *f = fopen("modes.stt", "a");
-            double dr = (double)cpi->oxcf.frame_rate * (double)bytes * (double)8 / (double)count / (double)1000 ;
+            double dr = (double)cpi->frame_rate * (double)bytes * (double)8 / (double)count / (double)1000 ;
             fprintf(f, "intra_mode in Intra Frames:\n");
             fprintf(f, "Y: %8d, %8d, %8d, %8d, %8d\n", y_modes[0], y_modes[1], y_modes[2], y_modes[3], y_modes[4]);
             fprintf(f, "UV:%8d, %8d, %8d, %8d\n", uv_modes[0], uv_modes[1], uv_modes[2], uv_modes[3]);
@@ -2392,6 +2396,7 @@ static uint64_t calc_plane_error(unsigned char *orig, int orig_stride,
         recon += recon_stride;
     }
 
+    vp8_clear_system_state();
     return total_sse;
 }
 
@@ -2410,7 +2415,7 @@ static void generate_psnr_packet(VP8_COMP *cpi)
     sse = calc_plane_error(orig->y_buffer, orig->y_stride,
                            recon->y_buffer, recon->y_stride,
                            width, height,
-                           IF_RTCD(&cpi->rtcd.variance));
+                           IF_RTCD(&cpi->common.rtcd.variance));
     pkt.data.psnr.sse[0] = sse;
     pkt.data.psnr.sse[1] = sse;
     pkt.data.psnr.samples[0] = width * height;
@@ -2422,7 +2427,7 @@ static void generate_psnr_packet(VP8_COMP *cpi)
     sse = calc_plane_error(orig->u_buffer, orig->uv_stride,
                            recon->u_buffer, recon->uv_stride,
                            width, height,
-                           IF_RTCD(&cpi->rtcd.variance));
+                           IF_RTCD(&cpi->common.rtcd.variance));
     pkt.data.psnr.sse[0] += sse;
     pkt.data.psnr.sse[2] = sse;
     pkt.data.psnr.samples[0] += width * height;
@@ -2431,7 +2436,7 @@ static void generate_psnr_packet(VP8_COMP *cpi)
     sse = calc_plane_error(orig->v_buffer, orig->uv_stride,
                            recon->v_buffer, recon->uv_stride,
                            width, height,
-                           IF_RTCD(&cpi->rtcd.variance));
+                           IF_RTCD(&cpi->common.rtcd.variance));
     pkt.data.psnr.sse[0] += sse;
     pkt.data.psnr.sse[3] = sse;
     pkt.data.psnr.samples[0] += width * height;
@@ -2445,20 +2450,16 @@ static void generate_psnr_packet(VP8_COMP *cpi)
 }
 
 
-int vp8_use_as_reference(VP8_PTR ptr, int ref_frame_flags)
+int vp8_use_as_reference(VP8_COMP *cpi, int ref_frame_flags)
 {
-    VP8_COMP *cpi = (VP8_COMP *)(ptr);
-
     if (ref_frame_flags > 7)
         return -1 ;
 
     cpi->ref_frame_flags = ref_frame_flags;
     return 0;
 }
-int vp8_update_reference(VP8_PTR ptr, int ref_frame_flags)
+int vp8_update_reference(VP8_COMP *cpi, int ref_frame_flags)
 {
-    VP8_COMP *cpi = (VP8_COMP *)(ptr);
-
     if (ref_frame_flags > 7)
         return -1 ;
 
@@ -2478,9 +2479,8 @@ int vp8_update_reference(VP8_PTR ptr, int ref_frame_flags)
     return 0;
 }
 
-int vp8_get_reference(VP8_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd)
+int vp8_get_reference(VP8_COMP *cpi, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd)
 {
-    VP8_COMP *cpi = (VP8_COMP *)(ptr);
     VP8_COMMON *cm = &cpi->common;
     int ref_fb_idx;
 
@@ -2497,9 +2497,8 @@ int vp8_get_reference(VP8_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONF
 
     return 0;
 }
-int vp8_set_reference(VP8_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd)
+int vp8_set_reference(VP8_COMP *cpi, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd)
 {
-    VP8_COMP *cpi = (VP8_COMP *)(ptr);
     VP8_COMMON *cm = &cpi->common;
 
     int ref_fb_idx;
@@ -2517,9 +2516,8 @@ int vp8_set_reference(VP8_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONF
 
     return 0;
 }
-int vp8_update_entropy(VP8_PTR comp, int update)
+int vp8_update_entropy(VP8_COMP *cpi, int update)
 {
-    VP8_COMP *cpi = (VP8_COMP *) comp;
     VP8_COMMON *cm = &cpi->common;
     cm->refresh_entropy_probs = update;
 
@@ -2675,10 +2673,10 @@ static void update_alt_ref_frame_stats(VP8_COMP *cpi)
     cpi->common.frames_since_golden = 0;
 
     // Clear the alternate reference update pending flag.
-    cpi->source_alt_ref_pending = FALSE;
+    cpi->source_alt_ref_pending = 0;
 
     // Set the alternate refernce frame active flag
-    cpi->source_alt_ref_active = TRUE;
+    cpi->source_alt_ref_active = 1;
 
 
 }
@@ -2741,12 +2739,12 @@ static void update_golden_frame_stats(VP8_COMP *cpi)
         if (cpi->oxcf.fixed_q >= 0 &&
             cpi->oxcf.play_alternate && !cpi->common.refresh_alt_ref_frame)
         {
-            cpi->source_alt_ref_pending = TRUE;
+            cpi->source_alt_ref_pending = 1;
             cpi->frames_till_gf_update_due = cpi->baseline_gf_interval;
         }
 
         if (!cpi->source_alt_ref_pending)
-            cpi->source_alt_ref_active = FALSE;
+            cpi->source_alt_ref_active = 0;
 
         // Decrement count down till next gf
         if (cpi->frames_till_gf_update_due > 0)
@@ -2780,47 +2778,6 @@ static void update_rd_ref_frame_probs(VP8_COMP *cpi)
 {
     VP8_COMMON *cm = &cpi->common;
 
-#if 0
-    const int *const rfct = cpi->recent_ref_frame_usage;
-    const int rf_intra = rfct[INTRA_FRAME];
-    const int rf_inter = rfct[LAST_FRAME] + rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME];
-
-    if (cm->frame_type == KEY_FRAME)
-    {
-        cpi->prob_intra_coded = 255;
-        cpi->prob_last_coded  = 128;
-        cpi->prob_gf_coded  = 128;
-    }
-    else if (!(rf_intra + rf_inter))
-    {
-        // This is a trap in case this function is called with cpi->recent_ref_frame_usage[] blank.
-        cpi->prob_intra_coded = 63;
-        cpi->prob_last_coded  = 128;
-        cpi->prob_gf_coded    = 128;
-    }
-    else
-    {
-        cpi->prob_intra_coded = (rf_intra * 255) / (rf_intra + rf_inter);
-
-        if (cpi->prob_intra_coded < 1)
-            cpi->prob_intra_coded = 1;
-
-        if ((cm->frames_since_golden > 0) || cpi->source_alt_ref_active)
-        {
-            cpi->prob_last_coded = rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
-
-            if (cpi->prob_last_coded < 1)
-                cpi->prob_last_coded = 1;
-
-            cpi->prob_gf_coded = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
-                                 ? (rfct[GOLDEN_FRAME] * 255) / (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]) : 128;
-
-            if (cpi->prob_gf_coded < 1)
-                cpi->prob_gf_coded = 1;
-        }
-    }
-
-#else
     const int *const rfct = cpi->count_mb_ref_frame_usage;
     const int rf_intra = rfct[INTRA_FRAME];
     const int rf_inter = rfct[LAST_FRAME] + rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME];
@@ -2833,58 +2790,39 @@ static void update_rd_ref_frame_probs(VP8_COMP *cpi)
     }
     else if (!(rf_intra + rf_inter))
     {
-        // This is a trap in case this function is called with cpi->recent_ref_frame_usage[] blank.
         cpi->prob_intra_coded = 63;
         cpi->prob_last_coded  = 128;
         cpi->prob_gf_coded    = 128;
     }
-    else
-    {
-        cpi->prob_intra_coded = (rf_intra * 255) / (rf_intra + rf_inter);
-
-        if (cpi->prob_intra_coded < 1)
-            cpi->prob_intra_coded = 1;
-
-        cpi->prob_last_coded = rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
-
-        if (cpi->prob_last_coded < 1)
-            cpi->prob_last_coded = 1;
-
-        cpi->prob_gf_coded = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
-                             ? (rfct[GOLDEN_FRAME] * 255) / (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]) : 128;
-
-        if (cpi->prob_gf_coded < 1)
-            cpi->prob_gf_coded = 1;
-    }
 
     // update reference frame costs since we can do better than what we got last frame.
+    if (cpi->oxcf.number_of_layers == 1)
+    {
+        if (cpi->common.refresh_alt_ref_frame)
+        {
+            cpi->prob_intra_coded += 40;
+            cpi->prob_last_coded = 200;
+            cpi->prob_gf_coded = 1;
+        }
+        else if (cpi->common.frames_since_golden == 0)
+        {
+            cpi->prob_last_coded = 214;
+        }
+        else if (cpi->common.frames_since_golden == 1)
+        {
+            cpi->prob_last_coded = 192;
+            cpi->prob_gf_coded = 220;
+        }
+        else if (cpi->source_alt_ref_active)
+        {
+            cpi->prob_gf_coded -= 20;
 
-    if (cpi->common.refresh_alt_ref_frame)
-    {
-        cpi->prob_intra_coded += 40;
-        cpi->prob_last_coded = 200;
-        cpi->prob_gf_coded = 1;
+            if (cpi->prob_gf_coded < 10)
+                cpi->prob_gf_coded = 10;
+        }
+        if (!cpi->source_alt_ref_active)
+            cpi->prob_gf_coded = 255;
     }
-    else if (cpi->common.frames_since_golden == 0)
-    {
-        cpi->prob_last_coded = 214;
-        cpi->prob_gf_coded = 1;
-    }
-    else if (cpi->common.frames_since_golden == 1)
-    {
-        cpi->prob_last_coded = 192;
-        cpi->prob_gf_coded = 220;
-    }
-    else if (cpi->source_alt_ref_active)
-    {
-        //int dist = cpi->common.frames_till_alt_ref_frame + cpi->common.frames_since_golden;
-        cpi->prob_gf_coded -= 20;
-
-        if (cpi->prob_gf_coded < 10)
-            cpi->prob_gf_coded = 10;
-    }
-
-#endif
 }
 
 
@@ -2893,12 +2831,12 @@ static int decide_key_frame(VP8_COMP *cpi)
 {
     VP8_COMMON *cm = &cpi->common;
 
-    int code_key_frame = FALSE;
+    int code_key_frame = 0;
 
     cpi->kf_boost = 0;
 
     if (cpi->Speed > 11)
-        return FALSE;
+        return 0;
 
     // Clear down mmx registers
     vp8_clear_system_state();  //__asm emms;
@@ -2940,10 +2878,10 @@ static int decide_key_frame(VP8_COMP *cpi)
             && (change > .25 || change2 > .25))
         {
             /*(change > 1.4 || change < .75)&& cpi->this_frame_percent_intra > cpi->last_frame_percent_intra + 3*/
-            return TRUE;
+            return 1;
         }
 
-        return FALSE;
+        return 0;
 
     }
 
@@ -2953,7 +2891,7 @@ static int decide_key_frame(VP8_COMP *cpi)
         ((cpi->this_frame_percent_intra > 95) &&
          (cpi->this_frame_percent_intra >= (cpi->last_frame_percent_intra + 5))))
     {
-        code_key_frame = TRUE;
+        code_key_frame = 1;
     }
     // in addition if the following are true and this is not a golden frame then code a key frame
     // Note that on golden frames there often seems to be a pop in intra useage anyway hence this
@@ -2966,7 +2904,7 @@ static int decide_key_frame(VP8_COMP *cpi)
               (cpi->this_frame_percent_intra > (cpi->last_frame_percent_intra + 10))))
     {
         if (!cm->refresh_golden_frame)
-            code_key_frame = TRUE;
+            code_key_frame = 1;
     }
 
     return code_key_frame;
@@ -3022,11 +2960,11 @@ void write_cx_frame_to_file(YV12_BUFFER_CONFIG *frame, int this_frame)
 
 // Function to test for conditions that indeicate we should loop
 // back and recode a frame.
-static BOOL recode_loop_test( VP8_COMP *cpi,
+static int recode_loop_test( VP8_COMP *cpi,
                               int high_limit, int low_limit,
                               int q, int maxq, int minq )
 {
-    BOOL    force_recode = FALSE;
+    int force_recode = 0;
     VP8_COMMON *cm = &cpi->common;
 
     // Is frame recode allowed at all
@@ -3042,7 +2980,7 @@ static BOOL recode_loop_test( VP8_COMP *cpi,
         if ( ((cpi->projected_frame_size > high_limit) && (q < maxq)) ||
              ((cpi->projected_frame_size < low_limit) && (q > minq)) )
         {
-            force_recode = TRUE;
+            force_recode = 1;
         }
         // Special Constrained quality tests
         else if (cpi->oxcf.end_usage == USAGE_CONSTRAINED_QUALITY)
@@ -3052,14 +2990,14 @@ static BOOL recode_loop_test( VP8_COMP *cpi,
                  (cpi->projected_frame_size <
                      ((cpi->this_frame_target * 7) >> 3)))
             {
-                force_recode = TRUE;
+                force_recode = 1;
             }
             // Severe undershoot and between auto and user cq level
             else if ( (q > cpi->oxcf.cq_level) &&
                       (cpi->projected_frame_size < cpi->min_frame_bandwidth) &&
                       (cpi->active_best_quality > cpi->oxcf.cq_level))
             {
-                force_recode = TRUE;
+                force_recode = 1;
                 cpi->active_best_quality = cpi->oxcf.cq_level;
             }
         }
@@ -3202,6 +3140,7 @@ static void encode_frame_to_data_rate
     VP8_COMP *cpi,
     unsigned long *size,
     unsigned char *dest,
+    unsigned char* dest_end,
     unsigned int *frame_flags
 )
 {
@@ -3209,7 +3148,7 @@ static void encode_frame_to_data_rate
     int frame_over_shoot_limit;
     int frame_under_shoot_limit;
 
-    int Loop = FALSE;
+    int Loop = 0;
     int loop_count;
     int this_q;
     int last_zbin_oq;
@@ -3221,10 +3160,10 @@ static void encode_frame_to_data_rate
     int top_index;
     int bottom_index;
     VP8_COMMON *cm = &cpi->common;
-    int active_worst_qchanged = FALSE;
+    int active_worst_qchanged = 0;
 
-    int overshoot_seen = FALSE;
-    int undershoot_seen = FALSE;
+    int overshoot_seen = 0;
+    int undershoot_seen = 0;
     int drop_mark = cpi->oxcf.drop_frames_water_mark * cpi->oxcf.optimal_buffer_level / 100;
     int drop_mark75 = drop_mark * 2 / 3;
     int drop_mark50 = drop_mark / 4;
@@ -3235,18 +3174,19 @@ static void encode_frame_to_data_rate
     vp8_clear_system_state();
 
     // Test code for segmentation of gf/arf (0,0)
-    //segmentation_test_function((VP8_PTR) cpi);
+    //segmentation_test_function( cpi);
 
-#if CONFIG_REALTIME_ONLY
-    if(cpi->oxcf.auto_key && cm->frame_type != KEY_FRAME)
+    if (cpi->compressor_speed == 2)
     {
-        if(cpi->force_next_frame_intra)
+        if(cpi->oxcf.auto_key && cm->frame_type != KEY_FRAME)
         {
-            cm->frame_type = KEY_FRAME;  /* delayed intra frame */
+            if(cpi->force_next_frame_intra)
+            {
+                cm->frame_type = KEY_FRAME;  /* delayed intra frame */
+            }
         }
+        cpi->force_next_frame_intra = 0;
     }
-    cpi->force_next_frame_intra = 0;
-#endif
 
     // For an alt ref frame in 2 pass we skip the call to the second pass function that sets the target bandwidth
 #if !(CONFIG_REALTIME_ONLY)
@@ -3274,13 +3214,12 @@ static void encode_frame_to_data_rate
     // Enable or disable mode based tweaking of the zbin
     // For 2 Pass Only used where GF/ARF prediction quality
     // is above a threshold
-    cpi->zbin_mode_boost = 0;
-    cpi->zbin_mode_boost_enabled = TRUE;
+    cpi->zbin_mode_boost_enabled = 1;
     if (cpi->pass == 2)
     {
         if ( cpi->gfu_boost <= 400 )
         {
-            cpi->zbin_mode_boost_enabled = FALSE;
+            cpi->zbin_mode_boost_enabled = 0;
         }
     }
 
@@ -3321,7 +3260,7 @@ static void encode_frame_to_data_rate
         }
 
         // The alternate reference frame cannot be active for a key frame
-        cpi->source_alt_ref_active = FALSE;
+        cpi->source_alt_ref_active = 0;
 
         // Reset the RD threshold multipliers to default of * 1 (128)
         for (i = 0; i < MAX_MODES; i++)
@@ -3333,9 +3272,9 @@ static void encode_frame_to_data_rate
     // Test code for segmentation
     //if ( (cm->frame_type == KEY_FRAME) || ((cm->current_video_frame % 2) == 0))
     //if ( (cm->current_video_frame % 2) == 0 )
-    //  enable_segmentation((VP8_PTR)cpi);
+    //  enable_segmentation(cpi);
     //else
-    //  disable_segmentation((VP8_PTR)cpi);
+    //  disable_segmentation(cpi);
 
 #if 0
     // Experimental code for lagged compress and one pass
@@ -3413,7 +3352,11 @@ static void encode_frame_to_data_rate
         else if (cpi->decimation_count > 0)
         {
             cpi->decimation_count --;
+
             cpi->bits_off_target += cpi->av_per_frame_bandwidth;
+            if (cpi->bits_off_target > cpi->oxcf.maximum_buffer_size)
+                cpi->bits_off_target = cpi->oxcf.maximum_buffer_size;
+
             cm->current_video_frame++;
             cpi->frames_since_key++;
 
@@ -3423,6 +3366,21 @@ static void encode_frame_to_data_rate
 
             cpi->buffer_level = cpi->bits_off_target;
 
+            if (cpi->oxcf.number_of_layers > 1)
+            {
+                unsigned int i;
+
+                // Propagate bits saved by dropping the frame to higher layers
+                for (i=cpi->current_layer+1; i<cpi->oxcf.number_of_layers; i++)
+                {
+                    LAYER_CONTEXT *lc = &cpi->layer_context[i];
+                    lc->bits_off_target += cpi->av_per_frame_bandwidth;
+                    if (lc->bits_off_target > lc->maximum_buffer_size)
+                        lc->bits_off_target = lc->maximum_buffer_size;
+                    lc->buffer_level = lc->bits_off_target;
+                }
+            }
+
             return;
         }
         else
@@ -3469,7 +3427,7 @@ static void encode_frame_to_data_rate
     }
 
     // Set an active best quality and if necessary active worst quality
-    // There is some odd behaviour for one pass here that needs attention.
+    // There is some odd behavior for one pass here that needs attention.
     if ( (cpi->pass == 2) || (cpi->ni_frames > 150))
     {
         vp8_clear_system_state();
@@ -3501,21 +3459,23 @@ static void encode_frame_to_data_rate
                cpi->active_best_quality = kf_high_motion_minq[Q];
         }
 
-        else if (cm->refresh_golden_frame || cpi->common.refresh_alt_ref_frame)
+        else if (cpi->oxcf.number_of_layers==1 &&
+                (cm->refresh_golden_frame || cpi->common.refresh_alt_ref_frame))
         {
             // Use the lower of cpi->active_worst_quality and recent
             // average Q as basis for GF/ARF Q limit unless last frame was
             // a key frame.
             if ( (cpi->frames_since_key > 1) &&
-                 (cpi->avg_frame_qindex < cpi->active_worst_quality) )
+               (cpi->avg_frame_qindex < cpi->active_worst_quality) )
             {
                 Q = cpi->avg_frame_qindex;
+            }
 
-                if ( (cpi->oxcf.end_usage == USAGE_CONSTRAINED_QUALITY) &&
-                     (Q < cpi->oxcf.cq_level) )
-                {
-                    Q = cpi->oxcf.cq_level;
-                }
+            // For constrained quality dont allow Q less than the cq level
+            if ( (cpi->oxcf.end_usage == USAGE_CONSTRAINED_QUALITY) &&
+                 (Q < cpi->cq_target_quality) )
+            {
+                Q = cpi->cq_target_quality;
             }
 
             if ( cpi->pass == 2 )
@@ -3526,6 +3486,13 @@ static void encode_frame_to_data_rate
                     cpi->active_best_quality = gf_high_motion_minq[Q];
                 else
                     cpi->active_best_quality = gf_mid_motion_minq[Q];
+
+                // Constrained quality use slightly lower active best.
+                if ( cpi->oxcf.end_usage == USAGE_CONSTRAINED_QUALITY )
+                {
+                    cpi->active_best_quality =
+                        cpi->active_best_quality * 15/16;
+                }
             }
             // One pass more conservative
             else
@@ -3536,7 +3503,7 @@ static void encode_frame_to_data_rate
             cpi->active_best_quality = inter_minq[Q];
 
             // For the constant/constrained quality mode we dont want
-            // the quality to rise above the cq level.
+            // q to fall below the cq level.
             if ((cpi->oxcf.end_usage == USAGE_CONSTRAINED_QUALITY) &&
                 (cpi->active_best_quality < cpi->cq_target_quality) )
             {
@@ -3589,8 +3556,9 @@ static void encode_frame_to_data_rate
 
     if (cpi->active_best_quality < cpi->best_quality)
         cpi->active_best_quality = cpi->best_quality;
-    else if (cpi->active_best_quality > cpi->active_worst_quality)
-        cpi->active_best_quality = cpi->active_worst_quality;
+
+    if ( cpi->active_worst_quality < cpi->active_best_quality )
+        cpi->active_worst_quality = cpi->active_best_quality;
 
     // Determine initial Q to try
     Q = vp8_regulate_q(cpi, cpi->this_frame_target);
@@ -3599,13 +3567,17 @@ static void encode_frame_to_data_rate
     // Set highest allowed value for Zbin over quant
     if (cm->frame_type == KEY_FRAME)
         zbin_oq_high = 0; //ZBIN_OQ_MAX/16
-    else if (cm->refresh_alt_ref_frame || (cm->refresh_golden_frame && !cpi->source_alt_ref_active))
-        zbin_oq_high = 16;
+    else if ((cpi->oxcf.number_of_layers == 1) && ((cm->refresh_alt_ref_frame ||
+              (cm->refresh_golden_frame && !cpi->source_alt_ref_active))))
+    {
+          zbin_oq_high = 16;
+    }
     else
         zbin_oq_high = ZBIN_OQ_MAX;
 
-    // Setup background Q adjustment for error resilliant mode
-    if (cpi->cyclic_refresh_mode_enabled)
+    // Setup background Q adjustment for error resilient mode.
+    // For multi-layer encodes only enable this for the base layer.
+    if (cpi->cyclic_refresh_mode_enabled && (cpi->current_layer==0))
         cyclic_background_refresh(cpi, Q, 0);
 
     vp8_compute_frame_size_bounds(cpi, &frame_under_shoot_limit, &frame_over_shoot_limit);
@@ -3738,10 +3710,8 @@ static void encode_frame_to_data_rate
                 if (cpi->prob_skip_false > 250)
                     cpi->prob_skip_false = 250;
 
-                if (cpi->is_src_frame_alt_ref)
+                if (cpi->oxcf.number_of_layers == 1 && cpi->is_src_frame_alt_ref)
                     cpi->prob_skip_false = 1;
-
-
             }
 
 #if 0
@@ -3775,15 +3745,15 @@ static void encode_frame_to_data_rate
         // (assuming that we didn't)!
         if (cpi->pass != 2 && cpi->oxcf.auto_key && cm->frame_type != KEY_FRAME)
         {
+            int key_frame_decision = decide_key_frame(cpi);
 
-#if CONFIG_REALTIME_ONLY
+            if (cpi->compressor_speed == 2)
             {
                 /* we don't do re-encoding in realtime mode
                  * if key frame is decided than we force it on next frame */
-                cpi->force_next_frame_intra = decide_key_frame(cpi);
+                cpi->force_next_frame_intra = key_frame_decision;
             }
-#else
-            if (decide_key_frame(cpi))
+            else if (key_frame_decision)
             {
                 // Reset all our sizing numbers and recode
                 cm->frame_type = KEY_FRAME;
@@ -3791,7 +3761,7 @@ static void encode_frame_to_data_rate
                 vp8_pick_frame_size(cpi);
 
                 // Clear the Alt reference frame active flag when we have a key frame
-                cpi->source_alt_ref_active = FALSE;
+                cpi->source_alt_ref_active = 0;
 
                 // Reset the loop filter deltas and segmentation map
                 setup_features(cpi);
@@ -3816,11 +3786,10 @@ static void encode_frame_to_data_rate
                 q_high = cpi->active_worst_quality;
 
                 loop_count++;
-                Loop = TRUE;
+                Loop = 1;
 
                 continue;
             }
-#endif
         }
 
         vp8_clear_system_state();
@@ -3845,10 +3814,10 @@ static void encode_frame_to_data_rate
             }
 
             // If we have updated the active max Q do not call vp8_update_rate_correction_factors() this loop.
-            active_worst_qchanged = TRUE;
+            active_worst_qchanged = 1;
         }
         else
-            active_worst_qchanged = FALSE;
+            active_worst_qchanged = 0;
 
 #if !(CONFIG_REALTIME_ONLY)
         // Special case handling for forced key frames
@@ -3857,7 +3826,7 @@ static void encode_frame_to_data_rate
             int last_q = Q;
             int kf_err = vp8_calc_ss_err(cpi->Source,
                                          &cm->yv12_fb[cm->new_fb_idx],
-                                         IF_RTCD(&cpi->rtcd.variance));
+                                         IF_RTCD(&cpi->common.rtcd.variance));
 
             // The key frame is not good enough
             if ( kf_err > ((cpi->ambient_err * 7) >> 3) )
@@ -3884,7 +3853,7 @@ static void encode_frame_to_data_rate
             else if (Q < q_low)
                 Q = q_low;
 
-            Loop = ((Q != last_q)) ? TRUE : FALSE;
+            Loop = Q != last_q;
         }
 
         // Is the projected frame size out of range and are we allowed to attempt to recode.
@@ -3941,7 +3910,7 @@ static void encode_frame_to_data_rate
                     }
                 }
 
-                overshoot_seen = TRUE;
+                overshoot_seen = 1;
             }
             // Frame is too small
             else
@@ -3991,7 +3960,7 @@ static void encode_frame_to_data_rate
                     }
                 }
 
-                undershoot_seen = TRUE;
+                undershoot_seen = 1;
             }
 
             // Clamp Q to upper and lower limits:
@@ -4003,18 +3972,18 @@ static void encode_frame_to_data_rate
             // Clamp cpi->zbin_over_quant
             cpi->zbin_over_quant = (cpi->zbin_over_quant < zbin_oq_low) ? zbin_oq_low : (cpi->zbin_over_quant > zbin_oq_high) ? zbin_oq_high : cpi->zbin_over_quant;
 
-            //Loop = ((Q != last_q) || (last_zbin_oq != cpi->zbin_over_quant)) ? TRUE : FALSE;
-            Loop = ((Q != last_q)) ? TRUE : FALSE;
+            //Loop = (Q != last_q) || (last_zbin_oq != cpi->zbin_over_quant);
+            Loop = Q != last_q;
             last_zbin_oq = cpi->zbin_over_quant;
         }
         else
 #endif
-            Loop = FALSE;
+            Loop = 0;
 
         if (cpi->is_src_frame_alt_ref)
-            Loop = FALSE;
+            Loop = 0;
 
-        if (Loop == TRUE)
+        if (Loop == 1)
         {
             vp8_restore_coding_context(cpi);
             loop_count++;
@@ -4023,7 +3992,7 @@ static void encode_frame_to_data_rate
 #endif
         }
     }
-    while (Loop == TRUE);
+    while (Loop == 1);
 
 #if 0
     // Experimental code for lagged and one pass
@@ -4054,16 +4023,23 @@ static void encode_frame_to_data_rate
     {
         cpi->ambient_err = vp8_calc_ss_err(cpi->Source,
                                            &cm->yv12_fb[cm->new_fb_idx],
-                                           IF_RTCD(&cpi->rtcd.variance));
+                                           IF_RTCD(&cpi->common.rtcd.variance));
     }
 
-    // This frame's MVs are saved and will be used in next frame's MV prediction.
-    // Last frame has one more line(add to bottom) and one more column(add to right) than cm->mip. The edge elements are initialized to 0.
-    if(cm->show_frame)   //do not save for altref frame
+    /* This frame's MVs are saved and will be used in next frame's MV predictor.
+     * Last frame has one more line(add to bottom) and one more column(add to
+     * right) than cm->mip. The edge elements are initialized to 0.
+     */
+#if CONFIG_MULTI_RES_ENCODING
+    if(!cpi->oxcf.mr_encoder_id && cm->show_frame)
+#else
+    if(cm->show_frame)   /* do not save for altref frame */
+#endif
     {
         int mb_row;
         int mb_col;
-        MODE_INFO *tmp = cm->mip; //point to beginning of allocated MODE_INFO arrays.
+        /* Point to beginning of allocated MODE_INFO arrays. */
+        MODE_INFO *tmp = cm->mip;
 
         if(cm->frame_type != KEY_FRAME)
         {
@@ -4082,10 +4058,15 @@ static void encode_frame_to_data_rate
         }
     }
 
+#if CONFIG_MULTI_RES_ENCODING
+    vp8_cal_dissimilarity(cpi);
+#endif
+
     // Update the GF useage maps.
-    // This is done after completing the compression of a frame when all modes etc. are finalized but before loop filter
-    // This is done after completing the compression of a frame when all modes etc. are finalized but before loop filter
-    vp8_update_gf_useage_maps(cpi, cm, &cpi->mb);
+    // This is done after completing the compression of a frame when all
+    // modes etc. are finalized but before loop filter
+    if (cpi->oxcf.number_of_layers == 1)
+        vp8_update_gf_useage_maps(cpi, cm, &cpi->mb);
 
     if (cm->frame_type == KEY_FRAME)
         cm->refresh_last_frame = 1;
@@ -4133,7 +4114,7 @@ static void encode_frame_to_data_rate
 #endif
 
     // build the bitstream
-    vp8_pack_bitstream(cpi, dest, size);
+    vp8_pack_bitstream(cpi, dest, dest_end, size);
 
 #if CONFIG_MULTITHREAD
     /* wait for loopfilter thread done */
@@ -4151,6 +4132,13 @@ static void encode_frame_to_data_rate
     cpi->total_byte_count += (*size);
     cpi->projected_frame_size = (*size) << 3;
 
+    if (cpi->oxcf.number_of_layers > 1)
+    {
+        unsigned int i;
+        for (i=cpi->current_layer+1; i<cpi->oxcf.number_of_layers; i++)
+          cpi->layer_context[i].total_byte_count += (*size);
+    }
+
     if (!active_worst_qchanged)
         vp8_update_rate_correction_factors(cpi, 2);
 
@@ -4166,7 +4154,8 @@ static void encode_frame_to_data_rate
         cpi->avg_frame_qindex = (2 + 3 * cpi->avg_frame_qindex + cm->base_qindex) >> 2;
 
     // Keep a record from which we can calculate the average Q excluding GF updates and key frames
-    if ((cm->frame_type != KEY_FRAME) && !cm->refresh_golden_frame && !cm->refresh_alt_ref_frame)
+    if ((cm->frame_type != KEY_FRAME) && ((cpi->oxcf.number_of_layers > 1) ||
+        (!cm->refresh_golden_frame && !cm->refresh_alt_ref_frame)))
     {
         cpi->ni_frames++;
 
@@ -4212,12 +4201,12 @@ static void encode_frame_to_data_rate
         (cpi->buffer_level < cpi->oxcf.drop_frames_water_mark * cpi->oxcf.optimal_buffer_level / 100) &&
         (cpi->projected_frame_size > (4 * cpi->this_frame_target)))
     {
-        cpi->drop_frame = TRUE;
+        cpi->drop_frame = 1;
     }
 
 #endif
 
-    // Set the count for maximum consequative dropped frames based upon the ratio of
+    // Set the count for maximum consecutive dropped frames based upon the ratio of
     // this frame size to the target average per frame bandwidth.
     // (cpi->av_per_frame_bandwidth > 0) is just a sanity check to prevent / 0.
     if (cpi->drop_frames_allowed && (cpi->av_per_frame_bandwidth > 0))
@@ -4235,6 +4224,10 @@ static void encode_frame_to_data_rate
     else
         cpi->bits_off_target += cpi->av_per_frame_bandwidth - cpi->projected_frame_size;
 
+    // Clip the buffer level to the maximum specified buffer size
+    if (cpi->bits_off_target > cpi->oxcf.maximum_buffer_size)
+        cpi->bits_off_target = cpi->oxcf.maximum_buffer_size;
+
     // Rolling monitors of whether we are over or underspending used to help regulate min and Max Q in two pass.
     cpi->rolling_target_bits = ((cpi->rolling_target_bits * 3) + cpi->this_frame_target + 2) / 4;
     cpi->rolling_actual_bits = ((cpi->rolling_actual_bits * 3) + cpi->projected_frame_size + 2) / 4;
@@ -4242,13 +4235,36 @@ static void encode_frame_to_data_rate
     cpi->long_rolling_actual_bits = ((cpi->long_rolling_actual_bits * 31) + cpi->projected_frame_size + 16) / 32;
 
     // Actual bits spent
-    cpi->total_actual_bits    += cpi->projected_frame_size;
+    cpi->total_actual_bits += cpi->projected_frame_size;
 
     // Debug stats
     cpi->total_target_vs_actual += (cpi->this_frame_target - cpi->projected_frame_size);
 
     cpi->buffer_level = cpi->bits_off_target;
 
+    // Propagate values to higher temporal layers
+    if (cpi->oxcf.number_of_layers > 1)
+    {
+        unsigned int i;
+
+        for (i=cpi->current_layer+1; i<cpi->oxcf.number_of_layers; i++)
+        {
+            LAYER_CONTEXT *lc = &cpi->layer_context[i];
+            int bits_off_for_this_layer = lc->target_bandwidth / lc->frame_rate
+                                                - cpi->projected_frame_size;
+
+            lc->bits_off_target += bits_off_for_this_layer;
+
+            // Clip buffer level to maximum buffer size for the layer
+            if (lc->bits_off_target > lc->maximum_buffer_size)
+                lc->bits_off_target = lc->maximum_buffer_size;
+
+            lc->total_actual_bits += cpi->projected_frame_size;
+            lc->total_target_vs_actual += bits_off_for_this_layer;
+            lc->buffer_level = lc->bits_off_target;
+        }
+    }
+
     // Update bits left to the kf and gf groups to account for overshoot or undershoot on these frames
     if (cm->frame_type == KEY_FRAME)
     {
@@ -4294,42 +4310,50 @@ static void encode_frame_to_data_rate
 
         vp8_clear_system_state();  //__asm emms;
 
-        if (cpi->twopass.total_coded_error_left != 0.0)
-            fprintf(f, "%10d %10d %10d %10d %10d %10d %10d %10d %6d %6d"
+        if (cpi->twopass.total_left_stats.coded_error != 0.0)
+            fprintf(f, "%10d %10d %10d %10d %10d %10d %10d %10d %10d %6d %6d"
                        "%6d %6d %6d %5d %5d %5d %8d %8.2f %10d %10.3f"
                        "%10.3f %8d\n",
                        cpi->common.current_video_frame, cpi->this_frame_target,
                        cpi->projected_frame_size,
                        (cpi->projected_frame_size - cpi->this_frame_target),
                        (int)cpi->total_target_vs_actual,
+                       cpi->buffer_level,
                        (cpi->oxcf.starting_buffer_level-cpi->bits_off_target),
                        (int)cpi->total_actual_bits, cm->base_qindex,
                        cpi->active_best_quality, cpi->active_worst_quality,
-                       cpi->ni_av_qi, cpi->cq_target_quality, cpi->zbin_over_quant,
+                       cpi->ni_av_qi, cpi->cq_target_quality,
+                       cpi->zbin_over_quant,
                        //cpi->avg_frame_qindex, cpi->zbin_over_quant,
                        cm->refresh_golden_frame, cm->refresh_alt_ref_frame,
                        cm->frame_type, cpi->gfu_boost,
-                       cpi->twopass.est_max_qcorrection_factor, (int)cpi->twopass.bits_left,
-                       cpi->twopass.total_coded_error_left,
-                       (double)cpi->twopass.bits_left / cpi->twopass.total_coded_error_left,
+                       cpi->twopass.est_max_qcorrection_factor,
+                       (int)cpi->twopass.bits_left,
+                       cpi->twopass.total_left_stats.coded_error,
+                       (double)cpi->twopass.bits_left /
+                           cpi->twopass.total_left_stats.coded_error,
                        cpi->tot_recode_hits);
         else
-            fprintf(f, "%10d %10d %10d %10d %10d %10d %10d %10d %6d %6d"
+            fprintf(f, "%10d %10d %10d %10d %10d %10d %10d %10d %10d %6d %6d"
                        "%6d %6d %6d %5d %5d %5d %8d %8.2f %10d %10.3f"
                        "%8d\n",
                        cpi->common.current_video_frame,
                        cpi->this_frame_target, cpi->projected_frame_size,
                        (cpi->projected_frame_size - cpi->this_frame_target),
                        (int)cpi->total_target_vs_actual,
+                       cpi->buffer_level,
                        (cpi->oxcf.starting_buffer_level-cpi->bits_off_target),
                        (int)cpi->total_actual_bits, cm->base_qindex,
                        cpi->active_best_quality, cpi->active_worst_quality,
-                       cpi->ni_av_qi, cpi->cq_target_quality, cpi->zbin_over_quant,
+                       cpi->ni_av_qi, cpi->cq_target_quality,
+                       cpi->zbin_over_quant,
                        //cpi->avg_frame_qindex, cpi->zbin_over_quant,
                        cm->refresh_golden_frame, cm->refresh_alt_ref_frame,
                        cm->frame_type, cpi->gfu_boost,
-                       cpi->twopass.est_max_qcorrection_factor, (int)cpi->twopass.bits_left,
-                       cpi->twopass.total_coded_error_left, cpi->tot_recode_hits);
+                       cpi->twopass.est_max_qcorrection_factor,
+                       (int)cpi->twopass.bits_left,
+                       cpi->twopass.total_left_stats.coded_error,
+                       cpi->tot_recode_hits);
 
         fclose(f);
 
@@ -4513,20 +4537,20 @@ static void check_gf_quality(VP8_COMP *cpi)
 }
 
 #if !(CONFIG_REALTIME_ONLY)
-static void Pass2Encode(VP8_COMP *cpi, unsigned long *size, unsigned char *dest, unsigned int *frame_flags)
+static void Pass2Encode(VP8_COMP *cpi, unsigned long *size, unsigned char *dest, unsigned char * dest_end, unsigned int *frame_flags)
 {
 
     if (!cpi->common.refresh_alt_ref_frame)
         vp8_second_pass(cpi);
 
-    encode_frame_to_data_rate(cpi, size, dest, frame_flags);
+    encode_frame_to_data_rate(cpi, size, dest, dest_end, frame_flags);
     cpi->twopass.bits_left -= 8 * *size;
 
     if (!cpi->common.refresh_alt_ref_frame)
     {
         double two_pass_min_rate = (double)(cpi->oxcf.target_bandwidth
             *cpi->oxcf.two_pass_vbrmin_section / 100);
-        cpi->twopass.bits_left += (int64_t)(two_pass_min_rate / cpi->oxcf.frame_rate);
+        cpi->twopass.bits_left += (int64_t)(two_pass_min_rate / cpi->frame_rate);
     }
 }
 #endif
@@ -4538,12 +4562,11 @@ extern void vp8_pop_neon(int64_t *store);
 #endif
 
 
-int vp8_receive_raw_frame(VP8_PTR ptr, unsigned int frame_flags, YV12_BUFFER_CONFIG *sd, int64_t time_stamp, int64_t end_time)
+int vp8_receive_raw_frame(VP8_COMP *cpi, unsigned int frame_flags, YV12_BUFFER_CONFIG *sd, int64_t time_stamp, int64_t end_time)
 {
 #if HAVE_ARMV7
     int64_t store_reg[8];
 #endif
-    VP8_COMP              *cpi = (VP8_COMP *) ptr;
     VP8_COMMON            *cm = &cpi->common;
     struct vpx_usec_timer  timer;
     int                    res = 0;
@@ -4559,7 +4582,7 @@ int vp8_receive_raw_frame(VP8_PTR ptr, unsigned int frame_flags, YV12_BUFFER_CON
 
     vpx_usec_timer_start(&timer);
     if(vp8_lookahead_push(cpi->lookahead, sd, time_stamp, end_time,
-                          frame_flags))
+                          frame_flags, cpi->active_map_enabled ? cpi->active_map : NULL))
         res = -1;
     cm->clr_type = sd->clrtype;
     vpx_usec_timer_mark(&timer);
@@ -4592,13 +4615,12 @@ static int frame_is_reference(const VP8_COMP *cpi)
 }
 
 
-int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned long *size, unsigned char *dest, int64_t *time_stamp, int64_t *time_end, int flush)
+int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned long *size, unsigned char *dest, unsigned char *dest_end, int64_t *time_stamp, int64_t *time_end, int flush)
 {
 #if HAVE_ARMV7
     int64_t store_reg[8];
 #endif
-    VP8_COMP *cpi = (VP8_COMP *) ptr;
-    VP8_COMMON *cm = &cpi->common;
+    VP8_COMMON *cm;
     struct vpx_usec_timer  tsctimer;
     struct vpx_usec_timer  ticktimer;
     struct vpx_usec_timer  cmptimer;
@@ -4607,6 +4629,16 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
     if (!cpi)
         return -1;
 
+    cm = &cpi->common;
+
+    if (setjmp(cpi->common.error.jmp))
+    {
+        cpi->common.error.setjmp = 0;
+        return VPX_CODEC_CORRUPT_FRAME;
+    }
+
+    cpi->common.error.setjmp = 1;
+
 #if HAVE_ARMV7
 #if CONFIG_RUNTIME_CPU_DETECT
     if (cm->rtcd.flags & HAS_NEON)
@@ -4641,7 +4673,7 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
             cm->refresh_golden_frame = 0;
             cm->refresh_last_frame = 0;
             cm->show_frame = 0;
-            cpi->source_alt_ref_pending = FALSE;   // Clear Pending altf Ref flag.
+            cpi->source_alt_ref_pending = 0;  // Clear Pending alt Ref flag.
             cpi->is_src_frame_alt_ref = 0;
         }
     }
@@ -4663,8 +4695,8 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
 
     if (cpi->source)
     {
-        cpi->un_scaled_source =
         cpi->Source = force_src_buffer ? force_src_buffer : &cpi->source->img;
+        cpi->un_scaled_source = cpi->Source;
         *time_stamp = cpi->source->ts_start;
         *time_end = cpi->source->ts_end;
         *frame_flags = cpi->source->flags;
@@ -4700,7 +4732,7 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
     }
 
     // adjust frame rates based on timestamps given
-    if (!cm->refresh_alt_ref_frame)
+    if (!cm->refresh_alt_ref_frame || (cpi->oxcf.number_of_layers > 1))
     {
         int64_t this_duration;
         int step = 0;
@@ -4725,7 +4757,7 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
         if (this_duration)
         {
             if (step)
-                vp8_new_frame_rate(cpi, 10000000.0 / this_duration);
+                cpi->ref_frame_rate = 10000000.0 / this_duration;
             else
             {
                 double avg_duration, interval;
@@ -4738,21 +4770,50 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
                 if(interval > 10000000.0)
                     interval = 10000000;
 
-                avg_duration = 10000000.0 / cpi->oxcf.frame_rate;
+                avg_duration = 10000000.0 / cpi->ref_frame_rate;
                 avg_duration *= (interval - avg_duration + this_duration);
                 avg_duration /= interval;
 
-                vp8_new_frame_rate(cpi, 10000000.0 / avg_duration);
+                cpi->ref_frame_rate = 10000000.0 / avg_duration;
             }
+
+            if (cpi->oxcf.number_of_layers > 1)
+            {
+                int i;
+
+                // Update frame rates for each layer
+                for (i=0; i<cpi->oxcf.number_of_layers; i++)
+                {
+                    LAYER_CONTEXT *lc = &cpi->layer_context[i];
+                    lc->frame_rate = cpi->ref_frame_rate /
+                                  cpi->oxcf.rate_decimator[i];
+                }
+            }
+            else
+                vp8_new_frame_rate(cpi, cpi->ref_frame_rate);
         }
 
         cpi->last_time_stamp_seen = cpi->source->ts_start;
         cpi->last_end_time_stamp_seen = cpi->source->ts_end;
     }
 
+    if (cpi->oxcf.number_of_layers > 1)
+    {
+        int layer;
+
+        update_layer_contexts (cpi);
+
+        // Restore layer specific context & set frame rate
+        layer = cpi->oxcf.layer_id[
+                            cm->current_video_frame % cpi->oxcf.periodicity];
+        restore_layer_context (cpi, layer);
+        vp8_new_frame_rate (cpi, cpi->layer_context[layer].frame_rate);
+    }
+
     if (cpi->compressor_speed == 2)
     {
-        check_gf_quality(cpi);
+        if (cpi->oxcf.number_of_layers == 1)
+            check_gf_quality(cpi);
         vpx_usec_timer_start(&tsctimer);
         vpx_usec_timer_start(&ticktimer);
     }
@@ -4803,11 +4864,11 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
     }
     else if (cpi->pass == 2)
     {
-        Pass2Encode(cpi, size, dest, frame_flags);
+        Pass2Encode(cpi, size, dest, dest_end, frame_flags);
     }
     else
 #endif
-        encode_frame_to_data_rate(cpi, size, dest, frame_flags);
+        encode_frame_to_data_rate(cpi, size, dest, dest_end, frame_flags);
 
     if (cpi->compressor_speed == 2)
     {
@@ -4845,6 +4906,17 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
         vpx_memcpy(&cm->fc, &cm->lfc, sizeof(cm->fc));
     }
 
+    // Save the contexts separately for alt ref, gold and last.
+    // (TODO jbb -> Optimize this with pointers to avoid extra copies. )
+    if(cm->refresh_alt_ref_frame)
+        vpx_memcpy(&cpi->lfc_a, &cm->fc, sizeof(cm->fc));
+
+    if(cm->refresh_golden_frame)
+        vpx_memcpy(&cpi->lfc_g, &cm->fc, sizeof(cm->fc));
+
+    if(cm->refresh_last_frame)
+        vpx_memcpy(&cpi->lfc_n, &cm->fc, sizeof(cm->fc));
+
     // if its a dropped frame honor the requests on subsequent frames
     if (*size > 0)
     {
@@ -4859,6 +4931,10 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
 
     }
 
+    // Save layer specific state
+    if (cpi->oxcf.number_of_layers > 1)
+        save_layer_context (cpi);
+
     vpx_usec_timer_mark(&cmptimer);
     cpi->time_compress_data += vpx_usec_timer_elapsed(&cmptimer);
 
@@ -4888,19 +4964,19 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
                 int y_samples = orig->y_height * orig->y_width ;
                 int uv_samples = orig->uv_height * orig->uv_width ;
                 int t_samples = y_samples + 2 * uv_samples;
-                int64_t sq_error;
+                int64_t sq_error, sq_error2;
 
                 ye = calc_plane_error(orig->y_buffer, orig->y_stride,
                   recon->y_buffer, recon->y_stride, orig->y_width, orig->y_height,
-                  IF_RTCD(&cpi->rtcd.variance));
+                  IF_RTCD(&cpi->common.rtcd.variance));
 
                 ue = calc_plane_error(orig->u_buffer, orig->uv_stride,
                   recon->u_buffer, recon->uv_stride, orig->uv_width, orig->uv_height,
-                  IF_RTCD(&cpi->rtcd.variance));
+                  IF_RTCD(&cpi->common.rtcd.variance));
 
                 ve = calc_plane_error(orig->v_buffer, orig->uv_stride,
                   recon->v_buffer, recon->uv_stride, orig->uv_width, orig->uv_height,
-                  IF_RTCD(&cpi->rtcd.variance));
+                  IF_RTCD(&cpi->common.rtcd.variance));
 
                 sq_error = ye + ue + ve;
 
@@ -4920,33 +4996,51 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
 
                     ye = calc_plane_error(orig->y_buffer, orig->y_stride,
                       pp->y_buffer, pp->y_stride, orig->y_width, orig->y_height,
-                      IF_RTCD(&cpi->rtcd.variance));
+                      IF_RTCD(&cpi->common.rtcd.variance));
 
                     ue = calc_plane_error(orig->u_buffer, orig->uv_stride,
                       pp->u_buffer, pp->uv_stride, orig->uv_width, orig->uv_height,
-                      IF_RTCD(&cpi->rtcd.variance));
+                      IF_RTCD(&cpi->common.rtcd.variance));
 
                     ve = calc_plane_error(orig->v_buffer, orig->uv_stride,
                       pp->v_buffer, pp->uv_stride, orig->uv_width, orig->uv_height,
-                      IF_RTCD(&cpi->rtcd.variance));
+                      IF_RTCD(&cpi->common.rtcd.variance));
 
-                    sq_error = ye + ue + ve;
+                    sq_error2 = ye + ue + ve;
 
-                    frame_psnr2 = vp8_mse2psnr(t_samples, 255.0, sq_error);
+                    frame_psnr2 = vp8_mse2psnr(t_samples, 255.0, sq_error2);
 
                     cpi->totalp_y += vp8_mse2psnr(y_samples, 255.0, ye);
                     cpi->totalp_u += vp8_mse2psnr(uv_samples, 255.0, ue);
                     cpi->totalp_v += vp8_mse2psnr(uv_samples, 255.0, ve);
-                    cpi->total_sq_error2 += sq_error;
+                    cpi->total_sq_error2 += sq_error2;
                     cpi->totalp  += frame_psnr2;
 
                     frame_ssim2 = vp8_calc_ssim(cpi->Source,
                       &cm->post_proc_buffer, 1, &weight,
-                      IF_RTCD(&cpi->rtcd.variance));
+                      IF_RTCD(&cpi->common.rtcd.variance));
 
                     cpi->summed_quality += frame_ssim2 * weight;
                     cpi->summed_weights += weight;
 
+                    if (cpi->oxcf.number_of_layers > 1)
+                    {
+                         int i;
+
+                         for (i=cpi->current_layer;
+                                       i<cpi->oxcf.number_of_layers; i++)
+                         {
+                             cpi->frames_in_layer[i]++;
+
+                             cpi->bytes_in_layer[i] += *size;
+                             cpi->sum_psnr[i]       += frame_psnr;
+                             cpi->sum_psnr_p[i]     += frame_psnr2;
+                             cpi->total_error2[i]   += sq_error;
+                             cpi->total_error2_p[i] += sq_error2;
+                             cpi->sum_ssim[i]       += frame_ssim2 * weight;
+                             cpi->sum_weights[i]    += weight;
+                         }
+                    }
                 }
             }
 
@@ -4954,11 +5048,31 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
             {
                 double y, u, v, frame_all;
                 frame_all =  vp8_calc_ssimg(cpi->Source, cm->frame_to_show,
-                    &y, &u, &v, IF_RTCD(&cpi->rtcd.variance));
-                cpi->total_ssimg_y += y;
-                cpi->total_ssimg_u += u;
-                cpi->total_ssimg_v += v;
-                cpi->total_ssimg_all += frame_all;
+                    &y, &u, &v, IF_RTCD(&cpi->common.rtcd.variance));
+
+                if (cpi->oxcf.number_of_layers > 1)
+                {
+                    int i;
+
+                    for (i=cpi->current_layer;
+                         i<cpi->oxcf.number_of_layers; i++)
+                    {
+                        if (!cpi->b_calculate_psnr)
+                            cpi->frames_in_layer[i]++;
+
+                        cpi->total_ssimg_y_in_layer[i] += y;
+                        cpi->total_ssimg_u_in_layer[i] += u;
+                        cpi->total_ssimg_v_in_layer[i] += v;
+                        cpi->total_ssimg_all_in_layer[i] += frame_all;
+                    }
+                }
+                else
+                {
+                    cpi->total_ssimg_y += y;
+                    cpi->total_ssimg_u += u;
+                    cpi->total_ssimg_v += v;
+                    cpi->total_ssimg_all += frame_all;
+                }
             }
 
         }
@@ -4998,13 +5112,13 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
     }
 #endif
 
+    cpi->common.error.setjmp = 0;
+
     return 0;
 }
 
-int vp8_get_preview_raw_frame(VP8_PTR comp, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t *flags)
+int vp8_get_preview_raw_frame(VP8_COMP *cpi, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t *flags)
 {
-    VP8_COMP *cpi = (VP8_COMP *) comp;
-
     if (cpi->common.refresh_alt_ref_frame)
         return -1;
     else
@@ -5033,9 +5147,8 @@ int vp8_get_preview_raw_frame(VP8_PTR comp, YV12_BUFFER_CONFIG *dest, vp8_ppflag
     }
 }
 
-int vp8_set_roimap(VP8_PTR comp, unsigned char *map, unsigned int rows, unsigned int cols, int delta_q[4], int delta_lf[4], unsigned int threshold[4])
+int vp8_set_roimap(VP8_COMP *cpi, unsigned char *map, unsigned int rows, unsigned int cols, int delta_q[4], int delta_lf[4], unsigned int threshold[4])
 {
-    VP8_COMP *cpi = (VP8_COMP *) comp;
     signed char feature_data[MB_LVL_MAX][MAX_MB_SEGMENTS];
 
     if (cpi->common.mb_rows != rows || cpi->common.mb_cols != cols)
@@ -5043,15 +5156,15 @@ int vp8_set_roimap(VP8_PTR comp, unsigned char *map, unsigned int rows, unsigned
 
     if (!map)
     {
-        disable_segmentation((VP8_PTR)cpi);
+        disable_segmentation(cpi);
         return 0;
     }
 
     // Set the segmentation Map
-    set_segmentation_map((VP8_PTR)cpi, map);
+    set_segmentation_map(cpi, map);
 
     // Activate segmentation.
-    enable_segmentation((VP8_PTR)cpi);
+    enable_segmentation(cpi);
 
     // Set up the quant segment data
     feature_data[MB_LVL_ALT_Q][0] = delta_q[0];
@@ -5072,15 +5185,13 @@ int vp8_set_roimap(VP8_PTR comp, unsigned char *map, unsigned int rows, unsigned
 
     // Initialise the feature data structure
     // SEGMENT_DELTADATA    0, SEGMENT_ABSDATA      1
-    set_segment_data((VP8_PTR)cpi, &feature_data[0][0], SEGMENT_DELTADATA);
+    set_segment_data(cpi, &feature_data[0][0], SEGMENT_DELTADATA);
 
     return 0;
 }
 
-int vp8_set_active_map(VP8_PTR comp, unsigned char *map, unsigned int rows, unsigned int cols)
+int vp8_set_active_map(VP8_COMP *cpi, unsigned char *map, unsigned int rows, unsigned int cols)
 {
-    VP8_COMP *cpi = (VP8_COMP *) comp;
-
     if (rows == cpi->common.mb_rows && cols == cpi->common.mb_cols)
     {
         if (map)
@@ -5100,10 +5211,8 @@ int vp8_set_active_map(VP8_PTR comp, unsigned char *map, unsigned int rows, unsi
     }
 }
 
-int vp8_set_internal_size(VP8_PTR comp, VPX_SCALING horiz_mode, VPX_SCALING vert_mode)
+int vp8_set_internal_size(VP8_COMP *cpi, VPX_SCALING horiz_mode, VPX_SCALING vert_mode)
 {
-    VP8_COMP *cpi = (VP8_COMP *) comp;
-
     if (horiz_mode <= ONETWO)
         cpi->common.horiz_scale = horiz_mode;
     else
@@ -5145,8 +5254,7 @@ int vp8_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest, const
 }
 
 
-int vp8_get_quantizer(VP8_PTR c)
+int vp8_get_quantizer(VP8_COMP *cpi)
 {
-    VP8_COMP   *cpi = (VP8_COMP *) c;
     return cpi->common.base_qindex;
 }
diff --git a/media/libvpx/vp8/encoder/onyx_int.h b/media/libvpx/vp8/encoder/onyx_int.h
index 127fe5db7d8..02bc4997d00 100644
--- a/media/libvpx/vp8/encoder/onyx_int.h
+++ b/media/libvpx/vp8/encoder/onyx_int.h
@@ -13,12 +13,12 @@
 #define __INC_VP8_INT_H
 
 #include <stdio.h>
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/onyx.h"
 #include "treewriter.h"
 #include "tokenize.h"
 #include "vp8/common/onyxc_int.h"
-#include "variance.h"
+#include "vp8/common/variance.h"
 #include "dct.h"
 #include "encodemb.h"
 #include "quantize.h"
@@ -56,6 +56,11 @@
 #define VP8_TEMPORAL_ALT_REF 1
 #endif
 
+#define MAX_PERIODICITY 16
+
+#define MAX(x,y) (((x)>(y))?(x):(y))
+#define MIN(x,y) (((x)<(y))?(x):(y))
+
 typedef struct
 {
     int kf_indicated;
@@ -108,6 +113,7 @@ typedef struct
     double MVrv;
     double MVcv;
     double mv_in_out_count;
+    double new_mv_count;
     double duration;
     double count;
 }
@@ -130,34 +136,34 @@ typedef struct
 
 typedef enum
 {
-    THR_ZEROMV         = 0,
+    THR_ZERO1          = 0,
     THR_DC             = 1,
 
-    THR_NEARESTMV      = 2,
-    THR_NEARMV         = 3,
+    THR_NEAREST1       = 2,
+    THR_NEAR1          = 3,
 
-    THR_ZEROG          = 4,
-    THR_NEARESTG       = 5,
+    THR_ZERO2          = 4,
+    THR_NEAREST2       = 5,
 
-    THR_ZEROA          = 6,
-    THR_NEARESTA       = 7,
+    THR_ZERO3          = 6,
+    THR_NEAREST3       = 7,
 
-    THR_NEARG          = 8,
-    THR_NEARA          = 9,
+    THR_NEAR2          = 8,
+    THR_NEAR3          = 9,
 
     THR_V_PRED         = 10,
     THR_H_PRED         = 11,
     THR_TM             = 12,
 
-    THR_NEWMV          = 13,
-    THR_NEWG           = 14,
-    THR_NEWA           = 15,
+    THR_NEW1           = 13,
+    THR_NEW2           = 14,
+    THR_NEW3           = 15,
 
-    THR_SPLITMV        = 16,
-    THR_SPLITG         = 17,
-    THR_SPLITA         = 18,
+    THR_SPLIT1         = 16,
+    THR_SPLIT2         = 17,
+    THR_SPLIT3         = 18,
 
-    THR_B_PRED         = 19,
+    THR_B_PRED         = 19
 }
 THR_MODES;
 
@@ -219,7 +225,6 @@ typedef struct
 typedef struct VP8_ENCODER_RTCD
 {
     VP8_COMMON_RTCD            *common;
-    vp8_variance_rtcd_vtable_t  variance;
     vp8_fdct_rtcd_vtable_t      fdct;
     vp8_encodemb_rtcd_vtable_t  encodemb;
     vp8_quantize_rtcd_vtable_t  quantize;
@@ -237,6 +242,55 @@ enum
     BLOCK_MAX_SEGMENTS
 };
 
+typedef struct
+{
+    // Layer configuration
+    double frame_rate;
+    int target_bandwidth;
+
+    // Layer specific coding parameters
+    int starting_buffer_level;
+    int optimal_buffer_level;
+    int maximum_buffer_size;
+    int starting_buffer_level_in_ms;
+    int optimal_buffer_level_in_ms;
+    int maximum_buffer_size_in_ms;
+
+    int avg_frame_size_for_layer;
+
+    int buffer_level;
+    int bits_off_target;
+
+    int64_t total_actual_bits;
+    int total_target_vs_actual;
+
+    int worst_quality;
+    int active_worst_quality;
+    int best_quality;
+    int active_best_quality;
+
+    int ni_av_qi;
+    int ni_tot_qi;
+    int ni_frames;
+    int avg_frame_qindex;
+
+    double rate_correction_factor;
+    double key_frame_rate_correction_factor;
+    double gf_rate_correction_factor;
+
+    int zbin_over_quant;
+
+    int inter_frame_target;
+    int64_t total_byte_count;
+
+    int filter_level;
+
+    int last_frame_percent_intra;
+
+    int count_mb_ref_frame_usage[MAX_REF_FRAMES];
+
+} LAYER_CONTEXT;
+
 typedef struct VP8_COMP
 {
 
@@ -265,8 +319,7 @@ typedef struct VP8_COMP
 
     MACROBLOCK mb;
     VP8_COMMON common;
-    vp8_writer bc, bc2;
-    // bool_writer *bc2;
+    vp8_writer bc[9]; // one boolcoder for each partition
 
     VP8_CONFIG oxcf;
 
@@ -288,7 +341,7 @@ typedef struct VP8_COMP
     int gold_is_alt;  // don't do both alt and gold search ( just do gold).
 
     //int refresh_alt_ref_frame;
-    YV12_BUFFER_CONFIG last_frame_uf;
+    YV12_BUFFER_CONFIG pick_lf_lvl_frame;
 
     TOKENEXTRA *tok;
     unsigned int tok_count;
@@ -362,12 +415,16 @@ typedef struct VP8_COMP
     int zbin_over_quant;
     int zbin_mode_boost;
     int zbin_mode_boost_enabled;
+    int last_zbin_over_quant;
+    int last_zbin_mode_boost;
 
     int64_t total_byte_count;
 
     int buffered_mode;
 
-    int buffer_level;
+    double frame_rate;
+    double ref_frame_rate;
+    int64_t buffer_level;
     int bits_off_target;
 
     int rolling_target_bits;
@@ -514,15 +571,21 @@ typedef struct VP8_COMP
 
     int base_skip_false_prob[128];
 
+    FRAME_CONTEXT lfc_n; /* last frame entropy */
+    FRAME_CONTEXT lfc_a; /* last alt ref entropy */
+    FRAME_CONTEXT lfc_g; /* last gold ref entropy */
+
+
     struct twopass_rc
     {
         unsigned int section_intra_rating;
         double section_max_qfactor;
         unsigned int next_iiratio;
         unsigned int this_iiratio;
-        FIRSTPASS_STATS *total_stats;
-        FIRSTPASS_STATS *this_frame_stats;
+        FIRSTPASS_STATS total_stats;
+        FIRSTPASS_STATS this_frame_stats;
         FIRSTPASS_STATS *stats_in, *stats_in_end, *stats_in_start;
+        FIRSTPASS_STATS total_left_stats;
         int first_pass_done;
         int64_t bits_left;
         int64_t clip_bits_total;
@@ -530,10 +593,6 @@ typedef struct VP8_COMP
         double modified_error_total;
         double modified_error_used;
         double modified_error_left;
-        double total_error_left;
-        double total_intra_error_left;
-        double total_coded_error_left;
-        double start_tot_err_left;
         double kf_intra_err_min;
         double gf_intra_err_min;
         int frames_to_key;
@@ -552,7 +611,7 @@ typedef struct VP8_COMP
 
         int gf_group_bits;                // Projected Bits available for a group of frames including 1 GF or ARF
         int gf_bits;                     // Bits for the golden frame or ARF - 2 pass only
-        int mid_gf_extra_bits;             // A few extra bits for the frame half way between two gfs.
+        int alt_extra_bits;
         double est_max_qcorrection_factor;
     } twopass;
 
@@ -609,17 +668,40 @@ typedef struct VP8_COMP
     int *lf_ref_frame_sign_bias;
     int *lf_ref_frame;
 
-#if CONFIG_REALTIME_ONLY
     int force_next_frame_intra; /* force next frame to intra when kf_auto says so */
-#endif
+
     int droppable;
+
+    // Coding layer state variables
+    unsigned int current_layer;
+    LAYER_CONTEXT layer_context[MAX_LAYERS];
+
+    int64_t frames_in_layer[MAX_LAYERS];
+    int64_t bytes_in_layer[MAX_LAYERS];
+    double sum_psnr[MAX_LAYERS];
+    double sum_psnr_p[MAX_LAYERS];
+    double total_error2[MAX_LAYERS];
+    double total_error2_p[MAX_LAYERS];
+    double sum_ssim[MAX_LAYERS];
+    double sum_weights[MAX_LAYERS];
+
+    double total_ssimg_y_in_layer[MAX_LAYERS];
+    double total_ssimg_u_in_layer[MAX_LAYERS];
+    double total_ssimg_v_in_layer[MAX_LAYERS];
+    double total_ssimg_all_in_layer[MAX_LAYERS];
+
+#if CONFIG_MULTI_RES_ENCODING
+    /* Number of MBs per row at lower-resolution level */
+    int    mr_low_res_mb_cols;
+#endif
+
 } VP8_COMP;
 
 void control_data_rate(VP8_COMP *cpi);
 
 void vp8_encode_frame(VP8_COMP *cpi);
 
-void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size);
+void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned char *dest_end, unsigned long *size);
 
 void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x);
 
diff --git a/media/libvpx/vp8/encoder/pickinter.c b/media/libvpx/vp8/encoder/pickinter.c
index 9cdaf7d5331..d6becf7e62c 100644
--- a/media/libvpx/vp8/encoder/pickinter.c
+++ b/media/libvpx/vp8/encoder/pickinter.c
@@ -10,7 +10,7 @@
 
 
 #include <limits.h>
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "onyx_int.h"
 #include "modecosts.h"
 #include "encodeintra.h"
@@ -21,8 +21,7 @@
 #include "vp8/common/reconinter.h"
 #include "vp8/common/reconintra.h"
 #include "vp8/common/reconintra4x4.h"
-#include "vp8/common/g_common.h"
-#include "variance.h"
+#include "vp8/common/variance.h"
 #include "mcomp.h"
 #include "rdopt.h"
 #include "vpx_mem/vpx_mem.h"
@@ -39,7 +38,7 @@ extern int VP8_UVSSE(MACROBLOCK *x, const vp8_variance_rtcd_vtable_t *rtcd);
 extern unsigned int cnt_pm;
 #endif
 
-extern const MV_REFERENCE_FRAME vp8_ref_frame_order[MAX_MODES];
+extern const int vp8_ref_frame_order[MAX_MODES];
 extern const MB_PREDICTION_MODE vp8_mode_order[MAX_MODES];
 
 extern unsigned int (*vp8_get4x4sse_cs)(unsigned char *src_ptr, int  source_stride, unsigned char *ref_ptr, int  recon_stride);
@@ -96,32 +95,6 @@ static int get_inter_mbpred_error(MACROBLOCK *mb,
 }
 
 
-unsigned int vp8_get4x4sse_cs_c
-(
-    const unsigned char *src_ptr,
-    int  source_stride,
-    const unsigned char *ref_ptr,
-    int  recon_stride
-)
-{
-    int distortion = 0;
-    int r, c;
-
-    for (r = 0; r < 4; r++)
-    {
-        for (c = 0; c < 4; c++)
-        {
-            int diff = src_ptr[c] - ref_ptr[c];
-            distortion += diff * diff;
-        }
-
-        src_ptr += source_stride;
-        ref_ptr += recon_stride;
-    }
-
-    return distortion;
-}
-
 static int get_prediction_error(BLOCK *be, BLOCKD *b, const vp8_variance_rtcd_vtable_t *rtcd)
 {
     unsigned char *sptr;
@@ -157,8 +130,9 @@ static int pick_intra4x4block(
 
         rate = mode_costs[mode];
         RECON_INVOKE(&rtcd->common->recon, intra4x4_predict)
-                     (b, mode, b->predictor);
-        distortion = get_prediction_error(be, b, &rtcd->variance);
+                     (*(b->base_dst) + b->dst, b->dst_stride,
+                      mode, b->predictor, 16);
+        distortion = get_prediction_error(be, b, &rtcd->common->variance);
         this_rd = RDCOST(x->rdmult, x->rddiv, rate, distortion);
 
         if (this_rd < best_rd)
@@ -401,17 +375,78 @@ static void update_mvcount(VP8_COMP *cpi, MACROBLOCKD *xd, int_mv *best_ref_mv)
     }
 }
 
+
+#if CONFIG_MULTI_RES_ENCODING
+static
+void get_lower_res_motion_info(VP8_COMP *cpi, MACROBLOCKD *xd, int *dissim,
+                               int *parent_ref_frame,
+                               MB_PREDICTION_MODE *parent_mode,
+                               int_mv *parent_ref_mv, int mb_row, int mb_col)
+{
+    LOWER_RES_INFO* store_mode_info
+                          = (LOWER_RES_INFO*)cpi->oxcf.mr_low_res_mode_info;
+    unsigned int parent_mb_index;
+    //unsigned int parent_mb_index = map_640x480_to_320x240[mb_row][mb_col];
+
+    /* Consider different down_sampling_factor.  */
+    {
+        /* TODO: Removed the loop that supports special down_sampling_factor
+         * such as 2, 4, 8. Will revisit it if needed.
+         * Should also try using a look-up table to see if it helps
+         * performance. */
+        int round = cpi->oxcf.mr_down_sampling_factor.num/2;
+        int parent_mb_row, parent_mb_col;
+
+        parent_mb_row = (mb_row*cpi->oxcf.mr_down_sampling_factor.den+round)
+                    /cpi->oxcf.mr_down_sampling_factor.num;
+        parent_mb_col = (mb_col*cpi->oxcf.mr_down_sampling_factor.den+round)
+                    /cpi->oxcf.mr_down_sampling_factor.num;
+        parent_mb_index = parent_mb_row*cpi->mr_low_res_mb_cols + parent_mb_col;
+    }
+
+    /* Read lower-resolution mode & motion result from memory.*/
+    *parent_ref_frame = store_mode_info[parent_mb_index].ref_frame;
+    *parent_mode =  store_mode_info[parent_mb_index].mode;
+    *dissim = store_mode_info[parent_mb_index].dissim;
+
+    /* For highest-resolution encoder, adjust dissim value. Lower its quality
+     * for good performance. */
+    if (cpi->oxcf.mr_encoder_id == (cpi->oxcf.mr_total_resolutions - 1))
+        *dissim>>=1;
+
+    if(*parent_ref_frame != INTRA_FRAME)
+    {
+        /* Consider different down_sampling_factor.
+         * The result can be rounded to be more precise, but it takes more time.
+         */
+        //int round = cpi->oxcf.mr_down_sampling_factor.den/2;
+        (*parent_ref_mv).as_mv.row = store_mode_info[parent_mb_index].mv.as_mv.row
+                                  *cpi->oxcf.mr_down_sampling_factor.num
+                                  /cpi->oxcf.mr_down_sampling_factor.den;
+        (*parent_ref_mv).as_mv.col = store_mode_info[parent_mb_index].mv.as_mv.col
+                                  *cpi->oxcf.mr_down_sampling_factor.num
+                                  /cpi->oxcf.mr_down_sampling_factor.den;
+
+        vp8_clamp_mv2(parent_ref_mv, xd);
+    }
+}
+#endif
+
+
 void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
                          int recon_uvoffset, int *returnrate,
-                         int *returndistortion, int *returnintra)
+                         int *returndistortion, int *returnintra, int mb_row,
+                         int mb_col)
 {
     BLOCK *b = &x->block[0];
     BLOCKD *d = &x->e_mbd.block[0];
     MACROBLOCKD *xd = &x->e_mbd;
     MB_MODE_INFO best_mbmode;
 
+    int_mv best_ref_mv_sb[2];
+    int_mv mode_mv_sb[2][MB_MODE_COUNT];
     int_mv best_ref_mv;
-    int_mv mode_mv[MB_MODE_COUNT];
+    int_mv *mode_mv;
     MB_PREDICTION_MODE this_mode;
     int num00;
     int mdcounts[4];
@@ -421,78 +456,62 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
     int rate;
     int rate2;
     int distortion2;
-    int bestsme;
-    //int all_rds[MAX_MODES];         // Experimental debug code.
+    int bestsme = INT_MAX;
     int best_mode_index = 0;
     unsigned int sse = INT_MAX, best_sse = INT_MAX;
 
     int_mv mvp;
+
     int near_sadidx[8] = {0, 1, 2, 3, 4, 5, 6, 7};
     int saddone=0;
     int sr=0;    //search range got from mv_pred(). It uses step_param levels. (0-7)
 
-    int_mv nearest_mv[4];
-    int_mv near_mv[4];
-    int_mv frame_best_ref_mv[4];
-    int MDCounts[4][4];
-    unsigned char *y_buffer[4];
-    unsigned char *u_buffer[4];
-    unsigned char *v_buffer[4];
+    unsigned char *plane[4][3];
+    int ref_frame_map[4];
+    int sign_bias = 0;
 
-    int skip_mode[4] = {0, 0, 0, 0};
+    int have_subp_search = cpi->sf.half_pixel_search;  /* In real-time mode,
+                                       when Speed >= 15, no sub-pixel search. */
 
-    int have_subp_search = cpi->sf.half_pixel_search;  /* In real-time mode, when Speed >= 15, no sub-pixel search. */
+#if CONFIG_MULTI_RES_ENCODING
+    int dissim = INT_MAX;
+    int parent_ref_frame = 0;
+    int_mv parent_ref_mv;
+    MB_PREDICTION_MODE parent_mode = 0;
 
-    vpx_memset(mode_mv, 0, sizeof(mode_mv));
-    vpx_memset(nearest_mv, 0, sizeof(nearest_mv));
-    vpx_memset(near_mv, 0, sizeof(near_mv));
+    if (cpi->oxcf.mr_encoder_id)
+        get_lower_res_motion_info(cpi, xd, &dissim, &parent_ref_frame,
+                                  &parent_mode, &parent_ref_mv, mb_row, mb_col);
+#endif
+
+    mode_mv = mode_mv_sb[sign_bias];
+    best_ref_mv.as_int = 0;
+    vpx_memset(mode_mv_sb, 0, sizeof(mode_mv_sb));
     vpx_memset(&best_mbmode, 0, sizeof(best_mbmode));
 
+    /* Setup search priorities */
+    get_reference_search_order(cpi, ref_frame_map);
 
-    // set up all the refframe dependent pointers.
-    if (cpi->ref_frame_flags & VP8_LAST_FLAG)
+    /* Check to see if there is at least 1 valid reference frame that we need
+     * to calculate near_mvs.
+     */
+    if (ref_frame_map[1] > 0)
     {
-        YV12_BUFFER_CONFIG *lst_yv12 = &cpi->common.yv12_fb[cpi->common.lst_fb_idx];
+        sign_bias = vp8_find_near_mvs_bias(&x->e_mbd,
+                                           x->e_mbd.mode_info_context,
+                                           mode_mv_sb,
+                                           best_ref_mv_sb,
+                                           mdcounts,
+                                           ref_frame_map[1],
+                                           cpi->common.ref_frame_sign_bias);
 
-        vp8_find_near_mvs(&x->e_mbd, x->e_mbd.mode_info_context, &nearest_mv[LAST_FRAME], &near_mv[LAST_FRAME],
-                          &frame_best_ref_mv[LAST_FRAME], MDCounts[LAST_FRAME], LAST_FRAME, cpi->common.ref_frame_sign_bias);
-
-        y_buffer[LAST_FRAME] = lst_yv12->y_buffer + recon_yoffset;
-        u_buffer[LAST_FRAME] = lst_yv12->u_buffer + recon_uvoffset;
-        v_buffer[LAST_FRAME] = lst_yv12->v_buffer + recon_uvoffset;
+        mode_mv = mode_mv_sb[sign_bias];
+        best_ref_mv.as_int = best_ref_mv_sb[sign_bias].as_int;
     }
-    else
-        skip_mode[LAST_FRAME] = 1;
 
-    if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
-    {
-        YV12_BUFFER_CONFIG *gld_yv12 = &cpi->common.yv12_fb[cpi->common.gld_fb_idx];
+    get_predictor_pointers(cpi, plane, recon_yoffset, recon_uvoffset);
 
-        vp8_find_near_mvs(&x->e_mbd, x->e_mbd.mode_info_context, &nearest_mv[GOLDEN_FRAME], &near_mv[GOLDEN_FRAME],
-                          &frame_best_ref_mv[GOLDEN_FRAME], MDCounts[GOLDEN_FRAME], GOLDEN_FRAME, cpi->common.ref_frame_sign_bias);
-
-        y_buffer[GOLDEN_FRAME] = gld_yv12->y_buffer + recon_yoffset;
-        u_buffer[GOLDEN_FRAME] = gld_yv12->u_buffer + recon_uvoffset;
-        v_buffer[GOLDEN_FRAME] = gld_yv12->v_buffer + recon_uvoffset;
-    }
-    else
-        skip_mode[GOLDEN_FRAME] = 1;
-
-    if (cpi->ref_frame_flags & VP8_ALT_FLAG && cpi->source_alt_ref_active)
-    {
-        YV12_BUFFER_CONFIG *alt_yv12 = &cpi->common.yv12_fb[cpi->common.alt_fb_idx];
-
-        vp8_find_near_mvs(&x->e_mbd, x->e_mbd.mode_info_context, &nearest_mv[ALTREF_FRAME], &near_mv[ALTREF_FRAME],
-                          &frame_best_ref_mv[ALTREF_FRAME], MDCounts[ALTREF_FRAME], ALTREF_FRAME, cpi->common.ref_frame_sign_bias);
-
-        y_buffer[ALTREF_FRAME] = alt_yv12->y_buffer + recon_yoffset;
-        u_buffer[ALTREF_FRAME] = alt_yv12->u_buffer + recon_uvoffset;
-        v_buffer[ALTREF_FRAME] = alt_yv12->v_buffer + recon_uvoffset;
-    }
-    else
-        skip_mode[ALTREF_FRAME] = 1;
-
-    cpi->mbs_tested_so_far++;          // Count of the number of MBs tested so far this frame
+    cpi->mbs_tested_so_far++; // Count of the number of MBs tested so far this frame
 
     *returnintra = INT_MAX;
     x->skip = 0;
@@ -505,35 +524,92 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
     {
         int frame_cost;
         int this_rd = INT_MAX;
+        int this_ref_frame = ref_frame_map[vp8_ref_frame_order[mode_index]];
 
         if (best_rd <= cpi->rd_threshes[mode_index])
             continue;
 
-        x->e_mbd.mode_info_context->mbmi.ref_frame = vp8_ref_frame_order[mode_index];
-
-        if (skip_mode[x->e_mbd.mode_info_context->mbmi.ref_frame])
+        if (this_ref_frame < 0)
             continue;
 
-        // Check to see if the testing frequency for this mode is at its max
-        // If so then prevent it from being tested and increase the threshold for its testing
-        if (cpi->mode_test_hit_counts[mode_index] && (cpi->mode_check_freq[mode_index] > 1))
+        x->e_mbd.mode_info_context->mbmi.ref_frame = this_ref_frame;
+
+#if CONFIG_MULTI_RES_ENCODING
+        if (cpi->oxcf.mr_encoder_id)
         {
-            //if ( (cpi->mbs_tested_so_far / cpi->mode_test_hit_counts[mode_index]) <= cpi->mode_check_freq[mode_index] )
-            if (cpi->mbs_tested_so_far <= (cpi->mode_check_freq[mode_index] * cpi->mode_test_hit_counts[mode_index]))
+            /* If parent MB is intra, child MB is intra. */
+            if (!parent_ref_frame && this_ref_frame)
+                continue;
+
+            /* If parent MB is inter, and it is unlikely there are multiple
+             * objects in parent MB, we use parent ref frame as child MB's
+             * ref frame. */
+            if (parent_ref_frame && dissim < 8
+                && parent_ref_frame != this_ref_frame)
+                continue;
+        }
+#endif
+
+        // everything but intra
+        if (x->e_mbd.mode_info_context->mbmi.ref_frame)
+        {
+            x->e_mbd.pre.y_buffer = plane[this_ref_frame][0];
+            x->e_mbd.pre.u_buffer = plane[this_ref_frame][1];
+            x->e_mbd.pre.v_buffer = plane[this_ref_frame][2];
+
+            if (sign_bias != cpi->common.ref_frame_sign_bias[this_ref_frame])
             {
-                // Increase the threshold for coding this mode to make it less likely to be chosen
+                sign_bias = cpi->common.ref_frame_sign_bias[this_ref_frame];
+                mode_mv = mode_mv_sb[sign_bias];
+                best_ref_mv.as_int = best_ref_mv_sb[sign_bias].as_int;
+            }
+
+#if CONFIG_MULTI_RES_ENCODING
+            if (cpi->oxcf.mr_encoder_id)
+            {
+                if (vp8_mode_order[mode_index] == NEARESTMV &&
+                    mode_mv[NEARESTMV].as_int ==0)
+                    continue;
+                if (vp8_mode_order[mode_index] == NEARMV &&
+                    mode_mv[NEARMV].as_int ==0)
+                    continue;
+
+                if (vp8_mode_order[mode_index] == NEWMV && parent_mode == ZEROMV
+                    && best_ref_mv.as_int==0) //&& dissim==0
+                    continue;
+                else if(vp8_mode_order[mode_index] == NEWMV && dissim==0
+                    && best_ref_mv.as_int==parent_ref_mv.as_int)
+                    continue;
+            }
+#endif
+        }
+
+        /* Check to see if the testing frequency for this mode is at its max
+         * If so then prevent it from being tested and increase the threshold
+         * for its testing */
+        if (cpi->mode_test_hit_counts[mode_index] &&
+                                         (cpi->mode_check_freq[mode_index] > 1))
+        {
+            if (cpi->mbs_tested_so_far <= (cpi->mode_check_freq[mode_index] *
+                                         cpi->mode_test_hit_counts[mode_index]))
+            {
+                /* Increase the threshold for coding this mode to make it less
+                 * likely to be chosen */
                 cpi->rd_thresh_mult[mode_index] += 4;
 
                 if (cpi->rd_thresh_mult[mode_index] > MAX_THRESHMULT)
                     cpi->rd_thresh_mult[mode_index] = MAX_THRESHMULT;
 
-                cpi->rd_threshes[mode_index] = (cpi->rd_baseline_thresh[mode_index] >> 7) * cpi->rd_thresh_mult[mode_index];
-
+                cpi->rd_threshes[mode_index] =
+                                 (cpi->rd_baseline_thresh[mode_index] >> 7) *
+                                 cpi->rd_thresh_mult[mode_index];
                 continue;
             }
         }
 
-        // We have now reached the point where we are going to test the current mode so increment the counter for the number of times it has been tested
+        /* We have now reached the point where we are going to test the current
+         * mode so increment the counter for the number of times it has been
+         * tested */
         cpi->mode_test_hit_counts[mode_index] ++;
 
         rate2 = 0;
@@ -541,42 +617,28 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
 
         this_mode = vp8_mode_order[mode_index];
 
-        // Experimental debug code.
-        //all_rds[mode_index] = -1;
-
         x->e_mbd.mode_info_context->mbmi.mode = this_mode;
         x->e_mbd.mode_info_context->mbmi.uv_mode = DC_PRED;
 
-        // Work out the cost assosciated with selecting the reference frame
+        /* Work out the cost assosciated with selecting the reference frame */
         frame_cost =
             x->e_mbd.ref_frame_cost[x->e_mbd.mode_info_context->mbmi.ref_frame];
         rate2 += frame_cost;
 
-        // everything but intra
-        if (x->e_mbd.mode_info_context->mbmi.ref_frame)
-        {
-            x->e_mbd.pre.y_buffer = y_buffer[x->e_mbd.mode_info_context->mbmi.ref_frame];
-            x->e_mbd.pre.u_buffer = u_buffer[x->e_mbd.mode_info_context->mbmi.ref_frame];
-            x->e_mbd.pre.v_buffer = v_buffer[x->e_mbd.mode_info_context->mbmi.ref_frame];
-            mode_mv[NEARESTMV] = nearest_mv[x->e_mbd.mode_info_context->mbmi.ref_frame];
-            mode_mv[NEARMV] = near_mv[x->e_mbd.mode_info_context->mbmi.ref_frame];
-            best_ref_mv = frame_best_ref_mv[x->e_mbd.mode_info_context->mbmi.ref_frame];
-            memcpy(mdcounts, MDCounts[x->e_mbd.mode_info_context->mbmi.ref_frame], sizeof(mdcounts));
-        }
-
-        // Only consider ZEROMV/ALTREF_FRAME for alt ref frame,
-        // unless ARNR filtering is enabled in which case we want
-        // an unfiltered alternative
+        /* Only consider ZEROMV/ALTREF_FRAME for alt ref frame,
+         * unless ARNR filtering is enabled in which case we want
+         * an unfiltered alternative */
         if (cpi->is_src_frame_alt_ref && (cpi->oxcf.arnr_max_frames == 0))
         {
-            if (this_mode != ZEROMV || x->e_mbd.mode_info_context->mbmi.ref_frame != ALTREF_FRAME)
+            if (this_mode != ZEROMV ||
+                x->e_mbd.mode_info_context->mbmi.ref_frame != ALTREF_FRAME)
                 continue;
         }
 
         switch (this_mode)
         {
         case B_PRED:
-            // Pass best so far to pick_intra4x4mby_modes to use as breakout
+            /* Pass best so far to pick_intra4x4mby_modes to use as breakout */
             distortion2 = best_sse;
             pick_intra4x4mby_modes(IF_RTCD(&cpi->rtcd), x, &rate, &distortion2);
 
@@ -588,7 +650,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
             {
                 rate2 += rate;
                 distortion2 = VARIANCE_INVOKE
-                                (&cpi->rtcd.variance, var16x16)(
+                                (&cpi->common.rtcd.variance, var16x16)(
                                     *(b->base_src), b->src_stride,
                                     x->e_mbd.predictor, 16, &sse);
                 this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2);
@@ -613,7 +675,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
         case TM_PRED:
             RECON_INVOKE(&cpi->common.rtcd.recon, build_intra_predictors_mby)
                 (&x->e_mbd);
-            distortion2 = VARIANCE_INVOKE(&cpi->rtcd.variance, var16x16)
+            distortion2 = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var16x16)
                                           (*(b->base_src), b->src_stride,
                                           x->e_mbd.predictor, 16, &sse);
             rate2 += x->mbmode_cost[x->e_mbd.frame_type][x->e_mbd.mode_info_context->mbmi.mode];
@@ -635,10 +697,12 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
             int sadpb = x->sadperbit16;
             int_mv mvp_full;
 
-            int col_min = (best_ref_mv.as_mv.col>>3) - MAX_FULL_PEL_VAL + ((best_ref_mv.as_mv.col & 7)?1:0);
-            int row_min = (best_ref_mv.as_mv.row>>3) - MAX_FULL_PEL_VAL + ((best_ref_mv.as_mv.row & 7)?1:0);
-            int col_max = (best_ref_mv.as_mv.col>>3) + MAX_FULL_PEL_VAL;
-            int row_max = (best_ref_mv.as_mv.row>>3) + MAX_FULL_PEL_VAL;
+            int col_min = ((best_ref_mv.as_mv.col+7)>>3) - MAX_FULL_PEL_VAL;
+            int row_min = ((best_ref_mv.as_mv.row+7)>>3) - MAX_FULL_PEL_VAL;
+            int col_max = (best_ref_mv.as_mv.col>>3)
+                         + MAX_FULL_PEL_VAL;
+            int row_max = (best_ref_mv.as_mv.row>>3)
+                         + MAX_FULL_PEL_VAL;
 
             int tmp_col_min = x->mv_col_min;
             int tmp_col_max = x->mv_col_max;
@@ -650,110 +714,156 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
             // Further step/diamond searches as necessary
             step_param = cpi->sf.first_step + speed_adjust;
 
-            if(cpi->sf.improved_mv_pred)
+#if CONFIG_MULTI_RES_ENCODING
+            if (cpi->oxcf.mr_encoder_id)
             {
-                if(!saddone)
-                {
-                    vp8_cal_sad(cpi,xd,x, recon_yoffset ,&near_sadidx[0] );
-                    saddone = 1;
-                }
-
-                vp8_mv_pred(cpi, &x->e_mbd, x->e_mbd.mode_info_context, &mvp,
-                            x->e_mbd.mode_info_context->mbmi.ref_frame, cpi->common.ref_frame_sign_bias, &sr, &near_sadidx[0]);
-
-                sr += speed_adjust;
-                //adjust search range according to sr from mv prediction
-                if(sr > step_param)
-                    step_param = sr;
-
-                mvp_full.as_mv.col = mvp.as_mv.col>>3;
-                mvp_full.as_mv.row = mvp.as_mv.row>>3;
+                // Use parent MV as predictor. Adjust search range accordingly.
+                mvp.as_int = parent_ref_mv.as_int;
+                mvp_full.as_mv.col = parent_ref_mv.as_mv.col>>3;
+                mvp_full.as_mv.row = parent_ref_mv.as_mv.row>>3;
 
+                if(dissim <=32) step_param += 3;
+                else if(dissim <=128) step_param += 2;
+                else step_param += 1;
             }else
+#endif
             {
-                mvp.as_int = best_ref_mv.as_int;
-                mvp_full.as_mv.col = best_ref_mv.as_mv.col>>3;
-                mvp_full.as_mv.row = best_ref_mv.as_mv.row>>3;
-            }
-
-            // Get intersection of UMV window and valid MV window to reduce # of checks in diamond search.
-            if (x->mv_col_min < col_min )
-                x->mv_col_min = col_min;
-            if (x->mv_col_max > col_max )
-                x->mv_col_max = col_max;
-            if (x->mv_row_min < row_min )
-                x->mv_row_min = row_min;
-            if (x->mv_row_max > row_max )
-                x->mv_row_max = row_max;
-
-            further_steps = (cpi->Speed >= 8)? 0: (cpi->sf.max_step_search_steps - 1 - step_param);
-
-            if (cpi->sf.search_method == HEX)
-            {
-                bestsme = vp8_hex_search(x, b, d, &mvp_full, &d->bmi.mv, step_param,
-                                      sadpb, &cpi->fn_ptr[BLOCK_16X16],
-                                      x->mvsadcost, x->mvcost, &best_ref_mv);
-                mode_mv[NEWMV].as_int = d->bmi.mv.as_int;
-            }
-            else
-            {
-                bestsme = cpi->diamond_search_sad(x, b, d, &mvp_full, &d->bmi.mv,
-                                      step_param, sadpb, &num00,
-                                      &cpi->fn_ptr[BLOCK_16X16],
-                                      x->mvcost, &best_ref_mv);
-                mode_mv[NEWMV].as_int = d->bmi.mv.as_int;
-
-                // Further step/diamond searches as necessary
-                n = 0;
-                //further_steps = (cpi->sf.max_step_search_steps - 1) - step_param;
-
-                n = num00;
-                num00 = 0;
-
-                while (n < further_steps)
+                if(cpi->sf.improved_mv_pred)
                 {
-                    n++;
-
-                    if (num00)
-                        num00--;
-                    else
+                    if(!saddone)
                     {
-                        thissme =
-                        cpi->diamond_search_sad(x, b, d, &mvp_full,
-                                                &d->bmi.mv,
-                                                step_param + n,
-                                                sadpb, &num00,
-                                                &cpi->fn_ptr[BLOCK_16X16],
-                                                x->mvcost, &best_ref_mv);
-                        if (thissme < bestsme)
-                        {
-                            bestsme = thissme;
-                            mode_mv[NEWMV].as_int = d->bmi.mv.as_int;
-                        }
-                        else
-                        {
-                            d->bmi.mv.as_int = mode_mv[NEWMV].as_int;
-                        }
+                        vp8_cal_sad(cpi,xd,x, recon_yoffset ,&near_sadidx[0] );
+                        saddone = 1;
                     }
+
+                    vp8_mv_pred(cpi, &x->e_mbd, x->e_mbd.mode_info_context,
+                                &mvp,x->e_mbd.mode_info_context->mbmi.ref_frame,
+                                cpi->common.ref_frame_sign_bias, &sr,
+                                &near_sadidx[0]);
+
+                    sr += speed_adjust;
+                    //adjust search range according to sr from mv prediction
+                    if(sr > step_param)
+                        step_param = sr;
+
+                    mvp_full.as_mv.col = mvp.as_mv.col>>3;
+                    mvp_full.as_mv.row = mvp.as_mv.row>>3;
+                }else
+                {
+                    mvp.as_int = best_ref_mv.as_int;
+                    mvp_full.as_mv.col = best_ref_mv.as_mv.col>>3;
+                    mvp_full.as_mv.row = best_ref_mv.as_mv.row>>3;
                 }
             }
 
-            x->mv_col_min = tmp_col_min;
-            x->mv_col_max = tmp_col_max;
-            x->mv_row_min = tmp_row_min;
-            x->mv_row_max = tmp_row_max;
+#if CONFIG_MULTI_RES_ENCODING
+            if (cpi->oxcf.mr_encoder_id && dissim <= 2 &&
+                MAX(abs(best_ref_mv.as_mv.row - parent_ref_mv.as_mv.row),
+                    abs(best_ref_mv.as_mv.col - parent_ref_mv.as_mv.col)) <= 4)
+            {
+                d->bmi.mv.as_int = mvp_full.as_int;
+                mode_mv[NEWMV].as_int = mvp_full.as_int;
 
-            if (bestsme < INT_MAX)
                 cpi->find_fractional_mv_step(x, b, d, &d->bmi.mv, &best_ref_mv,
                                              x->errorperbit,
                                              &cpi->fn_ptr[BLOCK_16X16],
                                              cpi->mb.mvcost,
                                              &distortion2,&sse);
+            }else
+#endif
+            {
+                /* Get intersection of UMV window and valid MV window to
+                 * reduce # of checks in diamond search. */
+                if (x->mv_col_min < col_min )
+                    x->mv_col_min = col_min;
+                if (x->mv_col_max > col_max )
+                    x->mv_col_max = col_max;
+                if (x->mv_row_min < row_min )
+                    x->mv_row_min = row_min;
+                if (x->mv_row_max > row_max )
+                    x->mv_row_max = row_max;
+
+                further_steps = (cpi->Speed >= 8)?
+                           0: (cpi->sf.max_step_search_steps - 1 - step_param);
+
+                if (cpi->sf.search_method == HEX)
+                {
+#if CONFIG_MULTI_RES_ENCODING
+                /* TODO: In higher-res pick_inter_mode, step_param is used to
+                 * modify hex search range. Here, set step_param to 0 not to
+                 * change the behavior in lowest-resolution encoder.
+                 * Will improve it later.
+                 */
+                if (!cpi->oxcf.mr_encoder_id)
+                    step_param = 0;
+#endif
+                    bestsme = vp8_hex_search(x, b, d, &mvp_full, &d->bmi.mv,
+                                          step_param, sadpb,
+                                          &cpi->fn_ptr[BLOCK_16X16],
+                                          x->mvsadcost, x->mvcost, &best_ref_mv);
+                    mode_mv[NEWMV].as_int = d->bmi.mv.as_int;
+                }
+                else
+                {
+                    bestsme = cpi->diamond_search_sad(x, b, d, &mvp_full,
+                                          &d->bmi.mv, step_param, sadpb, &num00,
+                                          &cpi->fn_ptr[BLOCK_16X16],
+                                          x->mvcost, &best_ref_mv);
+                    mode_mv[NEWMV].as_int = d->bmi.mv.as_int;
+
+                    // Further step/diamond searches as necessary
+                    n = 0;
+                    //further_steps = (cpi->sf.max_step_search_steps - 1) - step_param;
+
+                    n = num00;
+                    num00 = 0;
+
+                    while (n < further_steps)
+                    {
+                        n++;
+
+                        if (num00)
+                            num00--;
+                        else
+                        {
+                            thissme =
+                            cpi->diamond_search_sad(x, b, d, &mvp_full,
+                                                    &d->bmi.mv,
+                                                    step_param + n,
+                                                    sadpb, &num00,
+                                                    &cpi->fn_ptr[BLOCK_16X16],
+                                                    x->mvcost, &best_ref_mv);
+                            if (thissme < bestsme)
+                            {
+                                bestsme = thissme;
+                                mode_mv[NEWMV].as_int = d->bmi.mv.as_int;
+                            }
+                            else
+                            {
+                                d->bmi.mv.as_int = mode_mv[NEWMV].as_int;
+                            }
+                        }
+                    }
+                }
+
+                x->mv_col_min = tmp_col_min;
+                x->mv_col_max = tmp_col_max;
+                x->mv_row_min = tmp_row_min;
+                x->mv_row_max = tmp_row_max;
+
+                if (bestsme < INT_MAX)
+                    cpi->find_fractional_mv_step(x, b, d, &d->bmi.mv,
+                                             &best_ref_mv, x->errorperbit,
+                                             &cpi->fn_ptr[BLOCK_16X16],
+                                             cpi->mb.mvcost,
+                                             &distortion2,&sse);
+            }
 
             mode_mv[NEWMV].as_int = d->bmi.mv.as_int;
 
             // mv cost;
-            rate2 += vp8_mv_bit_cost(&mode_mv[NEWMV], &best_ref_mv, cpi->mb.mvcost, 128);
+            rate2 += vp8_mv_bit_cost(&mode_mv[NEWMV], &best_ref_mv,
+                                     cpi->mb.mvcost, 128);
         }
 
         case NEARESTMV:
@@ -764,17 +874,31 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
 
         case ZEROMV:
 
-            // Trap vectors that reach beyond the UMV borders
-            // Note that ALL New MV, Nearest MV Near MV and Zero MV code drops through to this point
-            // because of the lack of break statements in the previous two cases.
-            if (((mode_mv[this_mode].as_mv.row >> 3) < x->mv_row_min) || ((mode_mv[this_mode].as_mv.row >> 3) > x->mv_row_max) ||
-                ((mode_mv[this_mode].as_mv.col >> 3) < x->mv_col_min) || ((mode_mv[this_mode].as_mv.col >> 3) > x->mv_col_max))
+            /* Trap vectors that reach beyond the UMV borders
+             * Note that ALL New MV, Nearest MV Near MV and Zero MV code drops
+             * through to this point because of the lack of break statements
+             * in the previous two cases.
+             */
+            if (((mode_mv[this_mode].as_mv.row >> 3) < x->mv_row_min) ||
+                ((mode_mv[this_mode].as_mv.row >> 3) > x->mv_row_max) ||
+                ((mode_mv[this_mode].as_mv.col >> 3) < x->mv_col_min) ||
+                ((mode_mv[this_mode].as_mv.col >> 3) > x->mv_col_max))
                 continue;
 
             rate2 += vp8_cost_mv_ref(this_mode, mdcounts);
             x->e_mbd.mode_info_context->mbmi.mv.as_int =
                                                     mode_mv[this_mode].as_int;
 
+            /* Exit early and don't compute the distortion if this macroblock
+             * is marked inactive. */
+            if (cpi->active_map_enabled && x->active_ptr[0] == 0)
+            {
+                sse = 0;
+                distortion2 = 0;
+                x->skip = 1;
+                break;
+            }
+
             if((this_mode != NEWMV) ||
                 !(have_subp_search) || cpi->common.full_pixel==1)
                 distortion2 = get_inter_mbpred_error(x,
@@ -783,16 +907,12 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
 
             this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2);
 
-            if (cpi->active_map_enabled && x->active_ptr[0] == 0)
-            {
-                x->skip = 1;
-            }
-            else if (sse < x->encode_breakout)
+            if (sse < x->encode_breakout)
             {
                 // Check u and v to make sure skip is ok
                 int sse2 = 0;
 
-                sse2 = VP8_UVSSE(x, IF_RTCD(&cpi->rtcd.variance));
+                sse2 = VP8_UVSSE(x, IF_RTCD(&cpi->common.rtcd.variance));
 
                 if (sse2 * 2 < x->encode_breakout)
                     x->skip = 1;
@@ -805,9 +925,6 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
             break;
         }
 
-        // Experimental debug code.
-        //all_rds[mode_index] = this_rd;
-
         if (this_rd < best_rd || x->skip)
         {
             // Note index of best mode
@@ -817,14 +934,23 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
             *returndistortion = distortion2;
             best_sse = sse;
             best_rd = this_rd;
-            vpx_memcpy(&best_mbmode, &x->e_mbd.mode_info_context->mbmi, sizeof(MB_MODE_INFO));
+            vpx_memcpy(&best_mbmode, &x->e_mbd.mode_info_context->mbmi,
+                       sizeof(MB_MODE_INFO));
 
-            // Testing this mode gave rise to an improvement in best error score. Lower threshold a bit for next time
-            cpi->rd_thresh_mult[mode_index] = (cpi->rd_thresh_mult[mode_index] >= (MIN_THRESHMULT + 2)) ? cpi->rd_thresh_mult[mode_index] - 2 : MIN_THRESHMULT;
-            cpi->rd_threshes[mode_index] = (cpi->rd_baseline_thresh[mode_index] >> 7) * cpi->rd_thresh_mult[mode_index];
+            /* Testing this mode gave rise to an improvement in best error
+             * score. Lower threshold a bit for next time
+             */
+            cpi->rd_thresh_mult[mode_index] =
+                     (cpi->rd_thresh_mult[mode_index] >= (MIN_THRESHMULT + 2)) ?
+                     cpi->rd_thresh_mult[mode_index] - 2 : MIN_THRESHMULT;
+            cpi->rd_threshes[mode_index] =
+                                   (cpi->rd_baseline_thresh[mode_index] >> 7) *
+                                   cpi->rd_thresh_mult[mode_index];
         }
 
-        // If the mode did not help improve the best error case then raise the threshold for testing that mode next time around.
+        /* If the mode did not help improve the best error case then raise the
+         * threshold for testing that mode next time around.
+         */
         else
         {
             cpi->rd_thresh_mult[mode_index] += 4;
@@ -832,7 +958,9 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
             if (cpi->rd_thresh_mult[mode_index] > MAX_THRESHMULT)
                 cpi->rd_thresh_mult[mode_index] = MAX_THRESHMULT;
 
-            cpi->rd_threshes[mode_index] = (cpi->rd_baseline_thresh[mode_index] >> 7) * cpi->rd_thresh_mult[mode_index];
+            cpi->rd_threshes[mode_index] =
+                         (cpi->rd_baseline_thresh[mode_index] >> 7) *
+                         cpi->rd_thresh_mult[mode_index];
         }
 
         if (x->skip)
@@ -844,8 +972,14 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
     {
         int best_adjustment = (cpi->rd_thresh_mult[best_mode_index] >> 3);
 
-        cpi->rd_thresh_mult[best_mode_index] = (cpi->rd_thresh_mult[best_mode_index] >= (MIN_THRESHMULT + best_adjustment)) ? cpi->rd_thresh_mult[best_mode_index] - best_adjustment : MIN_THRESHMULT;
-        cpi->rd_threshes[best_mode_index] = (cpi->rd_baseline_thresh[best_mode_index] >> 7) * cpi->rd_thresh_mult[best_mode_index];
+        cpi->rd_thresh_mult[best_mode_index] =
+                        (cpi->rd_thresh_mult[best_mode_index]
+                        >= (MIN_THRESHMULT + best_adjustment)) ?
+                        cpi->rd_thresh_mult[best_mode_index] - best_adjustment :
+                        MIN_THRESHMULT;
+        cpi->rd_threshes[best_mode_index] =
+                        (cpi->rd_baseline_thresh[best_mode_index] >> 7) *
+                        cpi->rd_thresh_mult[best_mode_index];
     }
 
 
@@ -868,14 +1002,17 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
         x->e_mbd.mode_info_context->mbmi.mv.as_int = 0;
         x->e_mbd.mode_info_context->mbmi.uv_mode = DC_PRED;
         x->e_mbd.mode_info_context->mbmi.mb_skip_coeff =
-                                        (cpi->common.mb_no_coeff_skip) ? 1 : 0;
+                                        (cpi->common.mb_no_coeff_skip);
         x->e_mbd.mode_info_context->mbmi.partitioning = 0;
 
         return;
     }
 
-    /* set to the best mb mode */
-    vpx_memcpy(&x->e_mbd.mode_info_context->mbmi, &best_mbmode, sizeof(MB_MODE_INFO));
+    /* set to the best mb mode, this copy can be skip if x->skip since it
+     * already has the right content */
+    if (!x->skip)
+        vpx_memcpy(&x->e_mbd.mode_info_context->mbmi, &best_mbmode,
+                   sizeof(MB_MODE_INFO));
 
     if (best_mbmode.mode <= B_PRED)
     {
@@ -883,7 +1020,11 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
         pick_intra_mbuv_mode(x);
     }
 
-    update_mvcount(cpi, &x->e_mbd, &frame_best_ref_mv[xd->mode_info_context->mbmi.ref_frame]);
+    if (sign_bias
+      != cpi->common.ref_frame_sign_bias[xd->mode_info_context->mbmi.ref_frame])
+        best_ref_mv.as_int = best_ref_mv_sb[!sign_bias].as_int;
+
+    update_mvcount(cpi, &x->e_mbd, &best_ref_mv);
 }
 
 
@@ -905,7 +1046,7 @@ void vp8_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate_)
         x->e_mbd.mode_info_context->mbmi.mode = mode;
         RECON_INVOKE(&cpi->common.rtcd.recon, build_intra_predictors_mby)
             (&x->e_mbd);
-        distortion = VARIANCE_INVOKE(&cpi->rtcd.variance, var16x16)
+        distortion = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var16x16)
             (*(b->base_src), b->src_stride, x->e_mbd.predictor, 16, &sse);
         rate = x->mbmode_cost[x->e_mbd.frame_type][mode];
         this_rd = RDCOST(x->rdmult, x->rddiv, rate, distortion);
diff --git a/media/libvpx/vp8/encoder/pickinter.h b/media/libvpx/vp8/encoder/pickinter.h
index a0103d165d6..3d83782b5e4 100644
--- a/media/libvpx/vp8/encoder/pickinter.h
+++ b/media/libvpx/vp8/encoder/pickinter.h
@@ -11,9 +11,13 @@
 
 #ifndef __INC_PICKINTER_H
 #define __INC_PICKINTER_H
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/onyxc_int.h"
 
-extern void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra);
+extern void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
+                                int recon_uvoffset, int *returnrate,
+                                int *returndistortion, int *returnintra,
+                                int mb_row, int mb_col);
 extern void vp8_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate);
+
 #endif
diff --git a/media/libvpx/vp8/encoder/picklpf.c b/media/libvpx/vp8/encoder/picklpf.c
index beefe8d8ea0..d89ba6e871a 100644
--- a/media/libvpx/vp8/encoder/picklpf.c
+++ b/media/libvpx/vp8/encoder/picklpf.c
@@ -22,9 +22,6 @@
 #endif
 
 extern int vp8_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest, const vp8_variance_rtcd_vtable_t *rtcd);
-#if HAVE_ARMV7
-extern void vp8_yv12_copy_frame_yonly_no_extend_frame_borders_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-#endif
 
 #if CONFIG_RUNTIME_CPU_DETECT
 #define IF_RTCD(x) (x)
@@ -32,12 +29,11 @@ extern void vp8_yv12_copy_frame_yonly_no_extend_frame_borders_neon(YV12_BUFFER_C
 #define IF_RTCD(x) NULL
 #endif
 
-extern void
-(*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc,
-                                   YV12_BUFFER_CONFIG *dst_ybc,
-                                   int Fraction);
-void
-vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction)
+extern void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc,
+                                               YV12_BUFFER_CONFIG *dst_ybc);
+
+void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc,
+                                 YV12_BUFFER_CONFIG *dst_ybc)
 {
     unsigned char *src_y, *dst_y;
     int yheight;
@@ -50,21 +46,26 @@ vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst
     yheight  = src_ybc->y_height;
     ystride  = src_ybc->y_stride;
 
-    linestocopy = (yheight >> (Fraction + 4));
+    /* number of MB rows to use in partial filtering */
+    linestocopy = (yheight >> 4) / PARTIAL_FRAME_FRACTION;
+    linestocopy = linestocopy ? linestocopy << 4 : 16;     /* 16 lines per MB */
 
-    if (linestocopy < 1)
-        linestocopy = 1;
-
-    linestocopy <<= 4;
-
-    yoffset  = ystride * ((yheight >> 5) * 16 - 8);
+    /* Copy extra 4 so that full filter context is available if filtering done
+     * on the copied partial frame and not original. Partial filter does mb
+     * filtering for top row also, which can modify3 pixels above.
+     */
+    linestocopy += 4;
+    /* partial image starts at ~middle of frame (macroblock border)*/
+    yoffset  = ystride * (((yheight >> 5) * 16) - 4);
     src_y = src_ybc->y_buffer + yoffset;
     dst_y = dst_ybc->y_buffer + yoffset;
 
-    vpx_memcpy(dst_y, src_y, ystride *(linestocopy + 16));
+    vpx_memcpy(dst_y, src_y, ystride * linestocopy);
 }
 
-static int vp8_calc_partial_ssl_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest, int Fraction, const vp8_variance_rtcd_vtable_t *rtcd)
+static int calc_partial_ssl_err(YV12_BUFFER_CONFIG *source,
+                                YV12_BUFFER_CONFIG *dest,
+                                const vp8_variance_rtcd_vtable_t *rtcd)
 {
     int i, j;
     int Total = 0;
@@ -72,17 +73,16 @@ static int vp8_calc_partial_ssl_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONF
     unsigned char *src = source->y_buffer;
     unsigned char *dst = dest->y_buffer;
 
-    int linestocopy = (source->y_height >> (Fraction + 4));
-    (void)rtcd;
+    int linestocopy;
 
-    if (linestocopy < 1)
-        linestocopy = 1;
-
-    linestocopy <<= 4;
+    /* number of MB rows to use in partial filtering */
+    linestocopy = (source->y_height >> 4) / PARTIAL_FRAME_FRACTION;
+    linestocopy = linestocopy ? linestocopy << 4 : 16;     /* 16 lines per MB */
 
 
-    srcoffset = source->y_stride   * (dest->y_height >> 5) * 16;
-    dstoffset = dest->y_stride     * (dest->y_height >> 5) * 16;
+    /* partial image starts at ~middle of frame (macroblock border)*/
+    srcoffset = source->y_stride * ((dest->y_height >> 5) * 16);
+    dstoffset = dest->y_stride   * ((dest->y_height >> 5) * 16);
 
     src += srcoffset;
     dst += dstoffset;
@@ -93,7 +93,9 @@ static int vp8_calc_partial_ssl_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONF
         for (j = 0; j < source->y_width; j += 16)
         {
             unsigned int sse;
-            Total += VARIANCE_INVOKE(rtcd, mse16x16)(src + j, source->y_stride, dst + j, dest->y_stride, &sse);
+            Total += VARIANCE_INVOKE(rtcd, mse16x16)(src + j, source->y_stride,
+                                                     dst + j, dest->y_stride,
+                                                     &sse);
         }
 
         src += 16 * source->y_stride;
@@ -108,7 +110,8 @@ static int get_min_filter_level(VP8_COMP *cpi, int base_qindex)
 {
     int min_filter_level;
 
-    if (cpi->source_alt_ref_active && cpi->common.refresh_golden_frame && !cpi->common.refresh_alt_ref_frame)
+    if (cpi->source_alt_ref_active && cpi->common.refresh_golden_frame &&
+        !cpi->common.refresh_alt_ref_frame)
         min_filter_level = 0;
     else
     {
@@ -149,9 +152,10 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
     int max_filter_level = get_max_filter_level(cpi, cm->base_qindex);
     int filt_val;
     int best_filt_val = cm->filter_level;
+    YV12_BUFFER_CONFIG * saved_frame = cm->frame_to_show;
 
-    //  Make a copy of the unfiltered / processed recon buffer
-    vp8_yv12_copy_partial_frame_ptr(cm->frame_to_show, &cpi->last_frame_uf, 3);
+    /* Replace unfiltered frame buffer with a new one */
+    cm->frame_to_show = &cpi->pick_lf_lvl_frame;
 
     if (cm->frame_type == KEY_FRAME)
         cm->sharpness_level = 0;
@@ -174,27 +178,26 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
     best_filt_val = filt_val;
 
     // Get the err using the previous frame's filter value.
+
+    /* Copy the unfiltered / processed recon buffer to the new buffer */
+    vp8_yv12_copy_partial_frame_ptr(saved_frame, cm->frame_to_show);
     vp8_loop_filter_partial_frame(cm, &cpi->mb.e_mbd, filt_val);
 
-    best_err = vp8_calc_partial_ssl_err(sd, cm->frame_to_show, 3, IF_RTCD(&cpi->rtcd.variance));
+    best_err = calc_partial_ssl_err(sd, cm->frame_to_show,
+                                    IF_RTCD(&cpi->common.rtcd.variance));
 
-    //  Re-instate the unfiltered frame
-    vp8_yv12_copy_partial_frame_ptr(&cpi->last_frame_uf, cm->frame_to_show, 3);
-
-    filt_val -= (1 + ((filt_val > 10) ? 1 : 0));
+    filt_val -= 1 + (filt_val > 10);
 
     // Search lower filter levels
     while (filt_val >= min_filter_level)
     {
         // Apply the loop filter
+        vp8_yv12_copy_partial_frame_ptr(saved_frame, cm->frame_to_show);
         vp8_loop_filter_partial_frame(cm, &cpi->mb.e_mbd, filt_val);
 
         // Get the err for filtered frame
-        filt_err = vp8_calc_partial_ssl_err(sd, cm->frame_to_show, 3, IF_RTCD(&cpi->rtcd.variance));
-
-        //  Re-instate the unfiltered frame
-        vp8_yv12_copy_partial_frame_ptr(&cpi->last_frame_uf, cm->frame_to_show, 3);
-
+        filt_err = calc_partial_ssl_err(sd, cm->frame_to_show,
+                                        IF_RTCD(&cpi->common.rtcd.variance));
 
         // Update the best case record or exit loop.
         if (filt_err < best_err)
@@ -206,11 +209,11 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
             break;
 
         // Adjust filter level
-        filt_val -= (1 + ((filt_val > 10) ? 1 : 0));
+        filt_val -= 1 + (filt_val > 10);
     }
 
     // Search up (note that we have already done filt_val = cm->filter_level)
-    filt_val = cm->filter_level + (1 + ((filt_val > 10) ? 1 : 0));
+    filt_val = cm->filter_level + 1 + (filt_val > 10);
 
     if (best_filt_val == cm->filter_level)
     {
@@ -220,13 +223,13 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
         while (filt_val < max_filter_level)
         {
             // Apply the loop filter
+            vp8_yv12_copy_partial_frame_ptr(saved_frame, cm->frame_to_show);
+
             vp8_loop_filter_partial_frame(cm, &cpi->mb.e_mbd, filt_val);
 
             // Get the err for filtered frame
-            filt_err = vp8_calc_partial_ssl_err(sd, cm->frame_to_show, 3, IF_RTCD(&cpi->rtcd.variance));
-
-            //  Re-instate the unfiltered frame
-            vp8_yv12_copy_partial_frame_ptr(&cpi->last_frame_uf, cm->frame_to_show, 3);
+            filt_err = calc_partial_ssl_err(sd, cm->frame_to_show,
+                                            IF_RTCD(&cpi->common.rtcd.variance));
 
             // Update the best case record or exit loop.
             if (filt_err < best_err)
@@ -240,7 +243,7 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
                 break;
 
             // Adjust filter level
-            filt_val += (1 + ((filt_val > 10) ? 1 : 0));
+            filt_val += 1 + (filt_val > 10);
         }
     }
 
@@ -251,6 +254,9 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
 
     if (cm->filter_level > max_filter_level)
         cm->filter_level = max_filter_level;
+
+    /* restore unfiltered frame pointer */
+    cm->frame_to_show = saved_frame;
 }
 
 // Stub function for now Alt LF not used
@@ -281,25 +287,16 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
     int filt_best;
     int filt_direction = 0;
 
-    int Bias = 0;                       // Bias against raising loop filter and in favour of lowering it
+    int Bias = 0;                       // Bias against raising loop filter and in favor of lowering it
 
-    //  Make a copy of the unfiltered / processed recon buffer
-#if HAVE_ARMV7
-#if CONFIG_RUNTIME_CPU_DETECT
-    if (cm->rtcd.flags & HAS_NEON)
-#endif
-    {
-        vp8_yv12_copy_frame_yonly_no_extend_frame_borders_neon(cm->frame_to_show, &cpi->last_frame_uf);
-    }
-#if CONFIG_RUNTIME_CPU_DETECT
-    else
-#endif
-#endif
-#if !HAVE_ARMV7 || CONFIG_RUNTIME_CPU_DETECT
-    {
-        vp8_yv12_copy_frame_ptr(cm->frame_to_show, &cpi->last_frame_uf);
-    }
-#endif
+    int ss_err[MAX_LOOP_FILTER + 1];
+
+    YV12_BUFFER_CONFIG * saved_frame = cm->frame_to_show;
+
+    vpx_memset(ss_err, 0, sizeof(ss_err));
+
+    /* Replace unfiltered frame buffer with a new one */
+    cm->frame_to_show = &cpi->pick_lf_lvl_frame;
 
     if (cm->frame_type == KEY_FRAME)
         cm->sharpness_level = 0;
@@ -318,29 +315,19 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
     filter_step = (filt_mid < 16) ? 4 : filt_mid / 4;
 
     // Get baseline error score
+
+    /* Copy the unfiltered / processed recon buffer to the new buffer */
+    vp8_yv12_copy_y_ptr(saved_frame, cm->frame_to_show);
+
     vp8cx_set_alt_lf_level(cpi, filt_mid);
     vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_mid);
 
-    best_err = vp8_calc_ss_err(sd, cm->frame_to_show, IF_RTCD(&cpi->rtcd.variance));
-    filt_best = filt_mid;
+    best_err = vp8_calc_ss_err(sd, cm->frame_to_show,
+                               IF_RTCD(&cpi->common.rtcd.variance));
 
-    //  Re-instate the unfiltered frame
-#if HAVE_ARMV7
-#if CONFIG_RUNTIME_CPU_DETECT
-    if (cm->rtcd.flags & HAS_NEON)
-#endif
-    {
-        vp8_yv12_copy_frame_yonly_no_extend_frame_borders_neon(&cpi->last_frame_uf, cm->frame_to_show);
-    }
-#if CONFIG_RUNTIME_CPU_DETECT
-    else
-#endif
-#endif
-#if !HAVE_ARMV7 || CONFIG_RUNTIME_CPU_DETECT
-    {
-        vp8_yv12_copy_frame_yonly_ptr(&cpi->last_frame_uf, cm->frame_to_show);
-    }
-#endif
+    ss_err[filt_mid] = best_err;
+
+    filt_best = filt_mid;
 
     while (filter_step > 0)
     {
@@ -355,29 +342,19 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
 
         if ((filt_direction <= 0) && (filt_low != filt_mid))
         {
-            // Get Low filter error score
-            vp8cx_set_alt_lf_level(cpi, filt_low);
-            vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_low);
-
-            filt_err = vp8_calc_ss_err(sd, cm->frame_to_show, IF_RTCD(&cpi->rtcd.variance));
-
-            //  Re-instate the unfiltered frame
-#if HAVE_ARMV7
-#if CONFIG_RUNTIME_CPU_DETECT
-            if (cm->rtcd.flags & HAS_NEON)
-#endif
+            if(ss_err[filt_low] == 0)
             {
-                vp8_yv12_copy_frame_yonly_no_extend_frame_borders_neon(&cpi->last_frame_uf, cm->frame_to_show);
+                // Get Low filter error score
+                vp8_yv12_copy_y_ptr(saved_frame, cm->frame_to_show);
+                vp8cx_set_alt_lf_level(cpi, filt_low);
+                vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_low);
+
+                filt_err = vp8_calc_ss_err(sd, cm->frame_to_show,
+                                           IF_RTCD(&cpi->common.rtcd.variance));
+                ss_err[filt_low] = filt_err;
             }
-#if CONFIG_RUNTIME_CPU_DETECT
             else
-#endif
-#endif
-#if !HAVE_ARMV7 || CONFIG_RUNTIME_CPU_DETECT
-            {
-                vp8_yv12_copy_frame_yonly_ptr(&cpi->last_frame_uf, cm->frame_to_show);
-            }
-#endif
+                filt_err = ss_err[filt_low];
 
             // If value is close to the best so far then bias towards a lower loop filter value.
             if ((filt_err - Bias) < best_err)
@@ -393,28 +370,18 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
         // Now look at filt_high
         if ((filt_direction >= 0) && (filt_high != filt_mid))
         {
-            vp8cx_set_alt_lf_level(cpi, filt_high);
-            vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_high);
-
-            filt_err = vp8_calc_ss_err(sd, cm->frame_to_show, IF_RTCD(&cpi->rtcd.variance));
-
-            //  Re-instate the unfiltered frame
-#if HAVE_ARMV7
-#if CONFIG_RUNTIME_CPU_DETECT
-            if (cm->rtcd.flags & HAS_NEON)
-#endif
+            if(ss_err[filt_high] == 0)
             {
-                vp8_yv12_copy_frame_yonly_no_extend_frame_borders_neon(&cpi->last_frame_uf, cm->frame_to_show);
+                vp8_yv12_copy_y_ptr(saved_frame, cm->frame_to_show);
+                vp8cx_set_alt_lf_level(cpi, filt_high);
+                vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_high);
+
+                filt_err = vp8_calc_ss_err(sd, cm->frame_to_show,
+                                           IF_RTCD(&cpi->common.rtcd.variance));
+                ss_err[filt_high] = filt_err;
             }
-#if CONFIG_RUNTIME_CPU_DETECT
             else
-#endif
-#endif
-#if !HAVE_ARMV7 || CONFIG_RUNTIME_CPU_DETECT
-            {
-                vp8_yv12_copy_frame_yonly_ptr(&cpi->last_frame_uf, cm->frame_to_show);
-            }
-#endif
+                filt_err = ss_err[filt_high];
 
             // Was it better than the previous best?
             if (filt_err < (best_err - Bias))
@@ -438,4 +405,7 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
     }
 
     cm->filter_level = filt_best;
+
+    /* restore unfiltered frame pointer */
+    cm->frame_to_show = saved_frame;
 }
diff --git a/media/libvpx/vp8/encoder/quantize.c b/media/libvpx/vp8/encoder/quantize.c
index 503d241238d..d2aa7fe7244 100644
--- a/media/libvpx/vp8/encoder/quantize.c
+++ b/media/libvpx/vp8/encoder/quantize.c
@@ -62,7 +62,7 @@ void vp8_fast_quantize_b_c(BLOCK *b, BLOCKD *d)
             }
         }
     }
-    d->eob = eob + 1;
+    *d->eob = (char)(eob + 1);
 }
 
 #else
@@ -97,7 +97,7 @@ void vp8_fast_quantize_b_c(BLOCK *b, BLOCKD *d)
             eob = i;                                // last nonzero coeffs
         }
     }
-    d->eob = eob + 1;
+    *d->eob = (char)(eob + 1);
 }
 
 #endif
@@ -152,7 +152,7 @@ void vp8_regular_quantize_b(BLOCK *b, BLOCKD *d)
         }
     }
 
-    d->eob = eob + 1;
+    *d->eob = (char)(eob + 1);
 }
 
 /* Perform regular quantization, with unbiased rounding and no zero bin. */
@@ -210,7 +210,7 @@ void vp8_strict_quantize_b(BLOCK *b, BLOCKD *d)
         }
     }
 
-    d->eob = eob + 1;
+    *d->eob = (char)(eob + 1);
 }
 
 #else
@@ -264,7 +264,7 @@ void vp8_regular_quantize_b(BLOCK *b, BLOCKD *d)
         }
     }
 
-    d->eob = eob + 1;
+    *d->eob = (char)(eob + 1);
 }
 
 #endif
@@ -436,7 +436,8 @@ void vp8cx_init_quantizer(VP8_COMP *cpi)
     int quant_val;
     int Q;
 
-    int zbin_boost[16] = {0, 0, 8, 10, 12, 14, 16, 20, 24, 28, 32, 36, 40, 44, 44, 44};
+    int zbin_boost[16] = {0, 0, 8, 10, 12, 14, 16, 20, 24, 28, 32, 36, 40, 44,
+                          44, 44};
 
     for (Q = 0; Q < QINDEX_RANGE; Q++)
     {
@@ -469,36 +470,58 @@ void vp8cx_init_quantizer(VP8_COMP *cpi)
         cpi->zrun_zbin_boost_uv[Q][0] = (quant_val * zbin_boost[0]) >> 7;
 
         // all the ac values = ;
-        for (i = 1; i < 16; i++)
+        quant_val = vp8_ac_yquant(Q);
+        cpi->Y1quant_fast[Q][1] = (1 << 16) / quant_val;
+        invert_quant(cpi->sf.improved_quant, cpi->Y1quant[Q] + 1,
+                     cpi->Y1quant_shift[Q] + 1, quant_val);
+        cpi->Y1zbin[Q][1] = ((qzbin_factors[Q] * quant_val) + 64) >> 7;
+        cpi->Y1round[Q][1] = (qrounding_factors[Q] * quant_val) >> 7;
+        cpi->common.Y1dequant[Q][1] = quant_val;
+        cpi->zrun_zbin_boost_y1[Q][1] = (quant_val * zbin_boost[1]) >> 7;
+
+        quant_val = vp8_ac2quant(Q, cpi->common.y2ac_delta_q);
+        cpi->Y2quant_fast[Q][1] = (1 << 16) / quant_val;
+        invert_quant(cpi->sf.improved_quant, cpi->Y2quant[Q] + 1,
+                     cpi->Y2quant_shift[Q] + 1, quant_val);
+        cpi->Y2zbin[Q][1] = ((qzbin_factors_y2[Q] * quant_val) + 64) >> 7;
+        cpi->Y2round[Q][1] = (qrounding_factors_y2[Q] * quant_val) >> 7;
+        cpi->common.Y2dequant[Q][1] = quant_val;
+        cpi->zrun_zbin_boost_y2[Q][1] = (quant_val * zbin_boost[1]) >> 7;
+
+        quant_val = vp8_ac_uv_quant(Q, cpi->common.uvac_delta_q);
+        cpi->UVquant_fast[Q][1] = (1 << 16) / quant_val;
+        invert_quant(cpi->sf.improved_quant, cpi->UVquant[Q] + 1,
+                     cpi->UVquant_shift[Q] + 1, quant_val);
+        cpi->UVzbin[Q][1] = ((qzbin_factors[Q] * quant_val) + 64) >> 7;
+        cpi->UVround[Q][1] = (qrounding_factors[Q] * quant_val) >> 7;
+        cpi->common.UVdequant[Q][1] = quant_val;
+        cpi->zrun_zbin_boost_uv[Q][1] = (quant_val * zbin_boost[1]) >> 7;
+
+        for (i = 2; i < 16; i++)
         {
-            int rc = vp8_default_zig_zag1d[i];
+            cpi->Y1quant_fast[Q][i] = cpi->Y1quant_fast[Q][1];
+            cpi->Y1quant[Q][i] = cpi->Y1quant[Q][1];
+            cpi->Y1quant_shift[Q][i] = cpi->Y1quant_shift[Q][1];
+            cpi->Y1zbin[Q][i] = cpi->Y1zbin[Q][1];
+            cpi->Y1round[Q][i] = cpi->Y1round[Q][1];
+            cpi->zrun_zbin_boost_y1[Q][i] = (cpi->common.Y1dequant[Q][1] *
+                                             zbin_boost[i]) >> 7;
 
-            quant_val = vp8_ac_yquant(Q);
-            cpi->Y1quant_fast[Q][rc] = (1 << 16) / quant_val;
-            invert_quant(cpi->sf.improved_quant, cpi->Y1quant[Q] + rc,
-                         cpi->Y1quant_shift[Q] + rc, quant_val);
-            cpi->Y1zbin[Q][rc] = ((qzbin_factors[Q] * quant_val) + 64) >> 7;
-            cpi->Y1round[Q][rc] = (qrounding_factors[Q] * quant_val) >> 7;
-            cpi->common.Y1dequant[Q][rc] = quant_val;
-            cpi->zrun_zbin_boost_y1[Q][i] = (quant_val * zbin_boost[i]) >> 7;
+            cpi->Y2quant_fast[Q][i] = cpi->Y2quant_fast[Q][1];
+            cpi->Y2quant[Q][i] = cpi->Y2quant[Q][1];
+            cpi->Y2quant_shift[Q][i] = cpi->Y2quant_shift[Q][1];
+            cpi->Y2zbin[Q][i] = cpi->Y2zbin[Q][1];
+            cpi->Y2round[Q][i] = cpi->Y2round[Q][1];
+            cpi->zrun_zbin_boost_y2[Q][i] = (cpi->common.Y2dequant[Q][1] *
+                                             zbin_boost[i]) >> 7;
 
-            quant_val = vp8_ac2quant(Q, cpi->common.y2ac_delta_q);
-            cpi->Y2quant_fast[Q][rc] = (1 << 16) / quant_val;
-            invert_quant(cpi->sf.improved_quant, cpi->Y2quant[Q] + rc,
-                         cpi->Y2quant_shift[Q] + rc, quant_val);
-            cpi->Y2zbin[Q][rc] = ((qzbin_factors_y2[Q] * quant_val) + 64) >> 7;
-            cpi->Y2round[Q][rc] = (qrounding_factors_y2[Q] * quant_val) >> 7;
-            cpi->common.Y2dequant[Q][rc] = quant_val;
-            cpi->zrun_zbin_boost_y2[Q][i] = (quant_val * zbin_boost[i]) >> 7;
-
-            quant_val = vp8_ac_uv_quant(Q, cpi->common.uvac_delta_q);
-            cpi->UVquant_fast[Q][rc] = (1 << 16) / quant_val;
-            invert_quant(cpi->sf.improved_quant, cpi->UVquant[Q] + rc,
-                         cpi->UVquant_shift[Q] + rc, quant_val);
-            cpi->UVzbin[Q][rc] = ((qzbin_factors[Q] * quant_val) + 64) >> 7;
-            cpi->UVround[Q][rc] = (qrounding_factors[Q] * quant_val) >> 7;
-            cpi->common.UVdequant[Q][rc] = quant_val;
-            cpi->zrun_zbin_boost_uv[Q][i] = (quant_val * zbin_boost[i]) >> 7;
+            cpi->UVquant_fast[Q][i] = cpi->UVquant_fast[Q][1];
+            cpi->UVquant[Q][i] = cpi->UVquant[Q][1];
+            cpi->UVquant_shift[Q][i] = cpi->UVquant_shift[Q][1];
+            cpi->UVzbin[Q][i] = cpi->UVzbin[Q][1];
+            cpi->UVround[Q][i] = cpi->UVround[Q][1];
+            cpi->zrun_zbin_boost_uv[Q][i] = (cpi->common.UVdequant[Q][1] *
+                                             zbin_boost[i]) >> 7;
         }
     }
 }
@@ -565,8 +588,25 @@ void vp8cx_init_quantizer(VP8_COMP *cpi)
 }
 #endif
 
+#define ZBIN_EXTRA_Y \
+    (( cpi->common.Y1dequant[QIndex][1] *  \
+    ( cpi->zbin_over_quant +  \
+      cpi->zbin_mode_boost +  \
+      x->act_zbin_adj ) ) >> 7)
 
-void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x)
+#define ZBIN_EXTRA_UV \
+    (( cpi->common.UVdequant[QIndex][1] *  \
+    ( cpi->zbin_over_quant +  \
+      cpi->zbin_mode_boost +  \
+      x->act_zbin_adj ) ) >> 7)
+
+#define ZBIN_EXTRA_Y2 \
+    (( cpi->common.Y2dequant[QIndex][1] *  \
+    ( (cpi->zbin_over_quant / 2) +  \
+       cpi->zbin_mode_boost +  \
+       x->act_zbin_adj ) ) >> 7)
+
+void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x, int ok_to_skip)
 {
     int i;
     int QIndex;
@@ -590,62 +630,114 @@ void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x)
     else
         QIndex = cpi->common.base_qindex;
 
-    // Y
-    zbin_extra = ( cpi->common.Y1dequant[QIndex][1] *
-                   ( cpi->zbin_over_quant +
-                     cpi->zbin_mode_boost +
-                     x->act_zbin_adj ) ) >> 7;
-
-    for (i = 0; i < 16; i++)
+    /* This initialization should be called at least once. Use ok_to_skip to
+     * decide if it is ok to skip.
+     * Before encoding a frame, this function is always called with ok_to_skip
+     * =0, which means no skiping of calculations. The "last" values are
+     * initialized at that time.
+     */
+    if (!ok_to_skip || QIndex != x->q_index)
     {
-        x->block[i].quant = cpi->Y1quant[QIndex];
-        x->block[i].quant_fast = cpi->Y1quant_fast[QIndex];
-        x->block[i].quant_shift = cpi->Y1quant_shift[QIndex];
-        x->block[i].zbin = cpi->Y1zbin[QIndex];
-        x->block[i].round = cpi->Y1round[QIndex];
-        x->e_mbd.block[i].dequant = cpi->common.Y1dequant[QIndex];
-        x->block[i].zrun_zbin_boost = cpi->zrun_zbin_boost_y1[QIndex];
-        x->block[i].zbin_extra = (short)zbin_extra;
+
+        xd->dequant_y1_dc[0] = 1;
+        xd->dequant_y1[0] = cpi->common.Y1dequant[QIndex][0];
+        xd->dequant_y2[0] = cpi->common.Y2dequant[QIndex][0];
+        xd->dequant_uv[0] = cpi->common.UVdequant[QIndex][0];
+
+        for (i = 1; i < 16; i++)
+        {
+            xd->dequant_y1_dc[i] =
+            xd->dequant_y1[i] = cpi->common.Y1dequant[QIndex][1];
+            xd->dequant_y2[i] = cpi->common.Y2dequant[QIndex][1];
+            xd->dequant_uv[i] = cpi->common.UVdequant[QIndex][1];
+        }
+#if 1
+        /*TODO:  Remove dequant from BLOCKD.  This is a temporary solution until
+         * the quantizer code uses a passed in pointer to the dequant constants.
+         * This will also require modifications to the x86 and neon assembly.
+         * */
+        for (i = 0; i < 16; i++)
+            x->e_mbd.block[i].dequant = xd->dequant_y1; //cpi->common.Y1dequant[QIndex];
+        for (i = 16; i < 24; i++)
+            x->e_mbd.block[i].dequant = xd->dequant_uv; //cpi->common.UVdequant[QIndex];
+        x->e_mbd.block[24].dequant = xd->dequant_y2; //cpi->common.Y2dequant[QIndex];
+#endif
+
+        // Y
+        zbin_extra = ZBIN_EXTRA_Y;
+
+        for (i = 0; i < 16; i++)
+        {
+            x->block[i].quant = cpi->Y1quant[QIndex];
+            x->block[i].quant_fast = cpi->Y1quant_fast[QIndex];
+            x->block[i].quant_shift = cpi->Y1quant_shift[QIndex];
+            x->block[i].zbin = cpi->Y1zbin[QIndex];
+            x->block[i].round = cpi->Y1round[QIndex];
+            x->block[i].zrun_zbin_boost = cpi->zrun_zbin_boost_y1[QIndex];
+            x->block[i].zbin_extra = (short)zbin_extra;
+        }
+
+        // UV
+        zbin_extra = ZBIN_EXTRA_UV;
+
+        for (i = 16; i < 24; i++)
+        {
+            x->block[i].quant = cpi->UVquant[QIndex];
+            x->block[i].quant_fast = cpi->UVquant_fast[QIndex];
+            x->block[i].quant_shift = cpi->UVquant_shift[QIndex];
+            x->block[i].zbin = cpi->UVzbin[QIndex];
+            x->block[i].round = cpi->UVround[QIndex];
+            x->block[i].zrun_zbin_boost = cpi->zrun_zbin_boost_uv[QIndex];
+            x->block[i].zbin_extra = (short)zbin_extra;
+        }
+
+        // Y2
+        zbin_extra = ZBIN_EXTRA_Y2;
+
+        x->block[24].quant_fast = cpi->Y2quant_fast[QIndex];
+        x->block[24].quant = cpi->Y2quant[QIndex];
+        x->block[24].quant_shift = cpi->Y2quant_shift[QIndex];
+        x->block[24].zbin = cpi->Y2zbin[QIndex];
+        x->block[24].round = cpi->Y2round[QIndex];
+        x->block[24].zrun_zbin_boost = cpi->zrun_zbin_boost_y2[QIndex];
+        x->block[24].zbin_extra = (short)zbin_extra;
+
+        /* save this macroblock QIndex for vp8_update_zbin_extra() */
+        x->q_index = QIndex;
+
+        cpi->last_zbin_over_quant = cpi->zbin_over_quant;
+        cpi->last_zbin_mode_boost = cpi->zbin_mode_boost;
+        x->last_act_zbin_adj = x->act_zbin_adj;
+
+
+
     }
-
-    // UV
-    zbin_extra = ( cpi->common.UVdequant[QIndex][1] *
-                   ( cpi->zbin_over_quant +
-                     cpi->zbin_mode_boost +
-                     x->act_zbin_adj ) ) >> 7;
-
-    for (i = 16; i < 24; i++)
+    else if(cpi->last_zbin_over_quant != cpi->zbin_over_quant
+            || cpi->last_zbin_mode_boost != cpi->zbin_mode_boost
+            || x->last_act_zbin_adj != x->act_zbin_adj)
     {
-        x->block[i].quant = cpi->UVquant[QIndex];
-        x->block[i].quant_fast = cpi->UVquant_fast[QIndex];
-        x->block[i].quant_shift = cpi->UVquant_shift[QIndex];
-        x->block[i].zbin = cpi->UVzbin[QIndex];
-        x->block[i].round = cpi->UVround[QIndex];
-        x->e_mbd.block[i].dequant = cpi->common.UVdequant[QIndex];
-        x->block[i].zrun_zbin_boost = cpi->zrun_zbin_boost_uv[QIndex];
-        x->block[i].zbin_extra = (short)zbin_extra;
+        // Y
+        zbin_extra = ZBIN_EXTRA_Y;
+
+        for (i = 0; i < 16; i++)
+            x->block[i].zbin_extra = (short)zbin_extra;
+
+        // UV
+        zbin_extra = ZBIN_EXTRA_UV;
+
+        for (i = 16; i < 24; i++)
+            x->block[i].zbin_extra = (short)zbin_extra;
+
+        // Y2
+        zbin_extra = ZBIN_EXTRA_Y2;
+        x->block[24].zbin_extra = (short)zbin_extra;
+
+        cpi->last_zbin_over_quant = cpi->zbin_over_quant;
+        cpi->last_zbin_mode_boost = cpi->zbin_mode_boost;
+        x->last_act_zbin_adj = x->act_zbin_adj;
     }
-
-    // Y2
-    zbin_extra = ( cpi->common.Y2dequant[QIndex][1] *
-                   ( (cpi->zbin_over_quant / 2) +
-                     cpi->zbin_mode_boost +
-                     x->act_zbin_adj ) ) >> 7;
-
-    x->block[24].quant_fast = cpi->Y2quant_fast[QIndex];
-    x->block[24].quant = cpi->Y2quant[QIndex];
-    x->block[24].quant_shift = cpi->Y2quant_shift[QIndex];
-    x->block[24].zbin = cpi->Y2zbin[QIndex];
-    x->block[24].round = cpi->Y2round[QIndex];
-    x->e_mbd.block[24].dequant = cpi->common.Y2dequant[QIndex];
-    x->block[24].zrun_zbin_boost = cpi->zrun_zbin_boost_y2[QIndex];
-    x->block[24].zbin_extra = (short)zbin_extra;
-
-    /* save this macroblock QIndex for vp8_update_zbin_extra() */
-    x->q_index = QIndex;
 }
 
-
 void vp8_update_zbin_extra(VP8_COMP *cpi, MACROBLOCK *x)
 {
     int i;
@@ -653,35 +745,24 @@ void vp8_update_zbin_extra(VP8_COMP *cpi, MACROBLOCK *x)
     int zbin_extra;
 
     // Y
-    zbin_extra = ( cpi->common.Y1dequant[QIndex][1] *
-                   ( cpi->zbin_over_quant +
-                     cpi->zbin_mode_boost +
-                     x->act_zbin_adj ) ) >> 7;
+    zbin_extra = ZBIN_EXTRA_Y;
+
     for (i = 0; i < 16; i++)
-    {
         x->block[i].zbin_extra = (short)zbin_extra;
-    }
 
     // UV
-    zbin_extra = ( cpi->common.UVdequant[QIndex][1] *
-                   ( cpi->zbin_over_quant +
-                     cpi->zbin_mode_boost +
-                     x->act_zbin_adj ) ) >> 7;
+    zbin_extra = ZBIN_EXTRA_UV;
 
     for (i = 16; i < 24; i++)
-    {
         x->block[i].zbin_extra = (short)zbin_extra;
-    }
 
     // Y2
-    zbin_extra = ( cpi->common.Y2dequant[QIndex][1] *
-                   ( (cpi->zbin_over_quant / 2) +
-                     cpi->zbin_mode_boost +
-                     x->act_zbin_adj ) ) >> 7;
-
+    zbin_extra = ZBIN_EXTRA_Y2;
     x->block[24].zbin_extra = (short)zbin_extra;
 }
-
+#undef ZBIN_EXTRA_Y
+#undef ZBIN_EXTRA_UV
+#undef ZBIN_EXTRA_Y2
 
 void vp8cx_frame_init_quantizer(VP8_COMP *cpi)
 {
@@ -689,7 +770,7 @@ void vp8cx_frame_init_quantizer(VP8_COMP *cpi)
     cpi->zbin_mode_boost = 0;
 
     // MB level quantizer setup
-    vp8cx_mb_init_quantizer(cpi, &cpi->mb);
+    vp8cx_mb_init_quantizer(cpi, &cpi->mb, 0);
 }
 
 
@@ -731,4 +812,3 @@ void vp8_set_quantizer(struct VP8_COMP *cpi, int Q)
         vp8cx_init_quantizer(cpi);
 
 }
-
diff --git a/media/libvpx/vp8/encoder/quantize.h b/media/libvpx/vp8/encoder/quantize.h
index f1f0156d891..07b8813d1a7 100644
--- a/media/libvpx/vp8/encoder/quantize.h
+++ b/media/libvpx/vp8/encoder/quantize.h
@@ -86,7 +86,7 @@ struct VP8_COMP;
 extern void vp8_set_quantizer(struct VP8_COMP *cpi, int Q);
 extern void vp8cx_frame_init_quantizer(struct VP8_COMP *cpi);
 extern void vp8_update_zbin_extra(struct VP8_COMP *cpi, MACROBLOCK *x);
-extern void vp8cx_mb_init_quantizer(struct VP8_COMP *cpi, MACROBLOCK *x);
+extern void vp8cx_mb_init_quantizer(struct VP8_COMP *cpi, MACROBLOCK *x, int ok_to_skip);
 extern void vp8cx_init_quantizer(struct VP8_COMP *cpi);
 
 #endif
diff --git a/media/libvpx/vp8/encoder/ratectrl.c b/media/libvpx/vp8/encoder/ratectrl.c
index 46e1d9dd9ef..1c43c117185 100644
--- a/media/libvpx/vp8/encoder/ratectrl.c
+++ b/media/libvpx/vp8/encoder/ratectrl.c
@@ -28,7 +28,6 @@
 #define MAX_BPB_FACTOR          50
 
 extern const MB_PREDICTION_MODE vp8_mode_order[MAX_MODES];
-extern const MV_REFERENCE_FRAME vp8_ref_frame_order[MAX_MODES];
 
 
 
@@ -305,6 +304,8 @@ void vp8_setup_key_frame(VP8_COMP *cpi)
     // Setup for Key frame:
 
     vp8_default_coef_probs(& cpi->common);
+
+
     vp8_kf_default_bmode_probs(cpi->common.kf_bmode_prob);
 
     vpx_memcpy(cpi->common.fc.mvc, vp8_default_mv_context, sizeof(vp8_default_mv_context));
@@ -315,6 +316,12 @@ void vp8_setup_key_frame(VP8_COMP *cpi)
 
     vpx_memset(cpi->common.fc.pre_mvc, 0, sizeof(cpi->common.fc.pre_mvc));  //initialize pre_mvc to all zero.
 
+    // Make sure we initialize separate contexts for altref,gold, and normal.
+    // TODO shouldn't need 3 different copies of structure to do this!
+    vpx_memcpy(&cpi->lfc_a, &cpi->common.fc, sizeof(cpi->common.fc));
+    vpx_memcpy(&cpi->lfc_g, &cpi->common.fc, sizeof(cpi->common.fc));
+    vpx_memcpy(&cpi->lfc_n, &cpi->common.fc, sizeof(cpi->common.fc));
+
     //cpi->common.filter_level = 0;      // Reset every key frame.
     cpi->common.filter_level = cpi->common.base_qindex * 3 / 8 ;
 
@@ -325,8 +332,8 @@ void vp8_setup_key_frame(VP8_COMP *cpi)
     else
         cpi->frames_till_gf_update_due = cpi->goldfreq;
 
-    cpi->common.refresh_golden_frame = TRUE;
-    cpi->common.refresh_alt_ref_frame = TRUE;
+    cpi->common.refresh_golden_frame = 1;
+    cpi->common.refresh_alt_ref_frame = 1;
 }
 
 
@@ -436,7 +443,8 @@ static void calc_iframe_target_size(VP8_COMP *cpi)
 }
 
 
-//  Do the best we can to define the parameteres for the next GF based on what information we have available.
+//  Do the best we can to define the parameters for the next GF based on what
+// information we have available.
 static void calc_gf_params(VP8_COMP *cpi)
 {
     int Q = (cpi->oxcf.fixed_q < 0) ? cpi->last_q[INTER_FRAME] : cpi->oxcf.fixed_q;
@@ -463,7 +471,7 @@ static void calc_gf_params(VP8_COMP *cpi)
     if (cpi->pass != 2)
     {
         // Single Pass lagged mode: TBD
-        if (FALSE)
+        if (0)
         {
         }
 
@@ -590,14 +598,14 @@ static void calc_gf_params(VP8_COMP *cpi)
     if (cpi->pass != 2)
     {
         // For now Alt ref is not allowed except in 2 pass modes.
-        cpi->source_alt_ref_pending = FALSE;
+        cpi->source_alt_ref_pending = 0;
 
         /*if ( cpi->oxcf.fixed_q == -1)
         {
             if ( cpi->oxcf.play_alternate && (cpi->last_boost > (100 + (AF_THRESH*cpi->frames_till_gf_update_due)) ) )
-                cpi->source_alt_ref_pending = TRUE;
+                cpi->source_alt_ref_pending = 1;
             else
-                cpi->source_alt_ref_pending = FALSE;
+                cpi->source_alt_ref_pending = 0;
         }*/
     }
 }
@@ -607,6 +615,11 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
 {
     int min_frame_target;
     int Adjustment;
+    int old_per_frame_bandwidth = cpi->per_frame_bandwidth;
+
+    if ( cpi->current_layer > 0)
+        cpi->per_frame_bandwidth =
+            cpi->layer_context[cpi->current_layer].avg_frame_size_for_layer;
 
     min_frame_target = 0;
 
@@ -622,7 +635,7 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
 
 
     // Special alt reference frame case
-    if (cpi->common.refresh_alt_ref_frame)
+    if((cpi->common.refresh_alt_ref_frame) && (cpi->oxcf.number_of_layers == 1))
     {
         if (cpi->pass == 2)
         {
@@ -789,7 +802,7 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
                 // Decide whether or not we need to adjust the frame data rate target.
                 //
                 // If we are are below the optimal buffer fullness level and adherence
-                // to buffering contraints is important to the end useage then adjust
+                // to buffering constraints is important to the end usage then adjust
                 // the per frame target.
                 if ((cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER) &&
                     (cpi->buffer_level < cpi->oxcf.optimal_buffer_level))
@@ -812,12 +825,12 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
                     percent_low = 0;
 
                 // lower the target bandwidth for this frame.
-                cpi->this_frame_target -= (cpi->this_frame_target * percent_low)
-                                          / 200;
+                cpi->this_frame_target -=
+                        (cpi->this_frame_target * percent_low) / 200;
 
                 // Are we using allowing control of active_worst_allowed_q
                 // according to buffer level.
-                if (cpi->auto_worst_q)
+                if (cpi->auto_worst_q && cpi->ni_frames > 150)
                 {
                     int critical_buffer_level;
 
@@ -834,7 +847,7 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
                             (cpi->buffer_level < cpi->bits_off_target)
                             ? cpi->buffer_level : cpi->bits_off_target;
                     }
-                    // For local file playback short term buffering contraints
+                    // For local file playback short term buffering constraints
                     // are less of an issue
                     else
                     {
@@ -905,11 +918,11 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
                     percent_high = 0;
 
                 cpi->this_frame_target += (cpi->this_frame_target *
-                                           percent_high) / 200;
+                                          percent_high) / 200;
 
-
-                // Are we allowing control of active_worst_allowed_q according to bufferl level.
-                if (cpi->auto_worst_q)
+                // Are we allowing control of active_worst_allowed_q according
+                // to buffer level.
+                if (cpi->auto_worst_q && cpi->ni_frames > 150)
                 {
                     // When using the relaxed buffer model stick to the user specified value
                     cpi->active_worst_quality = cpi->ni_av_qi;
@@ -927,6 +940,8 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
             if (cpi->active_worst_quality <= cpi->active_best_quality)
                 cpi->active_worst_quality = cpi->active_best_quality + 1;
 
+            if(cpi->active_worst_quality > 127)
+                cpi->active_worst_quality = 127;
         }
         // Unbuffered mode (eg. video conferencing)
         else
@@ -967,7 +982,7 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
 #endif
             //vpx_log("Decoder: Drop frame due to bandwidth: %d \n",cpi->buffer_level, cpi->av_per_frame_bandwidth);
 
-            cpi->drop_frame = TRUE;
+            cpi->drop_frame = 1;
         }
 
 #if 0
@@ -975,7 +990,7 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
         else if ((cpi->buffer_level < cpi->oxcf.drop_frames_water_mark * cpi->oxcf.optimal_buffer_level / 100) &&
                  (cpi->drop_count < cpi->max_drop_count) && (cpi->pass == 0))
         {
-            cpi->drop_frame = TRUE;
+            cpi->drop_frame = 1;
         }
 
 #endif
@@ -984,6 +999,8 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
         {
             // Update the buffer level variable.
             cpi->bits_off_target += cpi->av_per_frame_bandwidth;
+            if (cpi->bits_off_target > cpi->oxcf.maximum_buffer_size)
+              cpi->bits_off_target = cpi->oxcf.maximum_buffer_size;
             cpi->buffer_level = cpi->bits_off_target;
         }
         else
@@ -1019,11 +1036,11 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
         {
             // For one pass throw a GF if recent frame intra useage is low or the GF useage is high
             if ((cpi->pass == 0) && (cpi->this_frame_percent_intra < 15 || gf_frame_useage >= 5))
-                cpi->common.refresh_golden_frame = TRUE;
+                cpi->common.refresh_golden_frame = 1;
 
             // Two pass GF descision
             else if (cpi->pass == 2)
-                cpi->common.refresh_golden_frame = TRUE;
+                cpi->common.refresh_golden_frame = 1;
         }
 
 #if 0
@@ -1041,7 +1058,7 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
 
 #endif
 
-        if (cpi->common.refresh_golden_frame == TRUE)
+        if (cpi->common.refresh_golden_frame == 1)
         {
 #if 0
 
@@ -1112,6 +1129,8 @@ static void calc_pframe_target_size(VP8_COMP *cpi)
 
         }
     }
+
+    cpi->per_frame_bandwidth = old_per_frame_bandwidth;
 }
 
 
@@ -1421,8 +1440,14 @@ void vp8_adjust_key_frame_context(VP8_COMP *cpi)
          * bits allocated than those following other gfs.
          */
         overspend = (cpi->projected_frame_size - cpi->per_frame_bandwidth);
-        cpi->kf_overspend_bits += overspend * 7 / 8;
-        cpi->gf_overspend_bits += overspend * 1 / 8;
+
+        if (cpi->oxcf.number_of_layers > 1)
+            cpi->kf_overspend_bits += overspend;
+        else
+        {
+            cpi->kf_overspend_bits += overspend * 7 / 8;
+            cpi->gf_overspend_bits += overspend * 1 / 8;
+        }
 
         /* Work out how much to try and recover per frame. */
         cpi->kf_bitrate_adjustment = cpi->kf_overspend_bits
@@ -1452,7 +1477,9 @@ void vp8_compute_frame_size_bounds(VP8_COMP *cpi, int *frame_under_shoot_limit,
         }
         else
         {
-            if (cpi->common.refresh_alt_ref_frame || cpi->common.refresh_golden_frame)
+            if (cpi->oxcf.number_of_layers > 1 ||
+                cpi->common.refresh_alt_ref_frame ||
+                cpi->common.refresh_golden_frame)
             {
                 *frame_over_shoot_limit  = cpi->this_frame_target * 9 / 8;
                 *frame_under_shoot_limit = cpi->this_frame_target * 7 / 8;
@@ -1516,7 +1543,7 @@ int vp8_pick_frame_size(VP8_COMP *cpi)
         // Check if we're dropping the frame:
         if (cpi->drop_frame)
         {
-            cpi->drop_frame = FALSE;
+            cpi->drop_frame = 0;
             cpi->drop_count++;
             return 0;
         }
diff --git a/media/libvpx/vp8/encoder/rdopt.c b/media/libvpx/vp8/encoder/rdopt.c
index 992df71c29e..67e8974cfb5 100644
--- a/media/libvpx/vp8/encoder/rdopt.c
+++ b/media/libvpx/vp8/encoder/rdopt.c
@@ -28,8 +28,7 @@
 #include "encodemb.h"
 #include "quantize.h"
 #include "vp8/common/idct.h"
-#include "vp8/common/g_common.h"
-#include "variance.h"
+#include "vp8/common/variance.h"
 #include "mcomp.h"
 #include "rdopt.h"
 #include "vpx_mem/vpx_mem.h"
@@ -43,7 +42,6 @@
 #endif
 
 
-extern void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x);
 extern void vp8_update_zbin_extra(VP8_COMP *cpi, MACROBLOCK *x);
 
 #define MAXF(a,b)            (((a) > (b)) ? (a) : (b))
@@ -101,36 +99,39 @@ const MB_PREDICTION_MODE vp8_mode_order[MAX_MODES] =
     B_PRED,
 };
 
-const MV_REFERENCE_FRAME vp8_ref_frame_order[MAX_MODES] =
+/* This table determines the search order in reference frame priority order,
+ * which may not necessarily match INTRA,LAST,GOLDEN,ARF
+ */
+const int vp8_ref_frame_order[MAX_MODES] =
 {
-    LAST_FRAME,
-    INTRA_FRAME,
+    1,
+    0,
 
-    LAST_FRAME,
-    LAST_FRAME,
+    1,
+    1,
 
-    GOLDEN_FRAME,
-    GOLDEN_FRAME,
+    2,
+    2,
 
-    ALTREF_FRAME,
-    ALTREF_FRAME,
+    3,
+    3,
 
-    GOLDEN_FRAME,
-    ALTREF_FRAME,
+    2,
+    3,
 
-    INTRA_FRAME,
-    INTRA_FRAME,
-    INTRA_FRAME,
+    0,
+    0,
+    0,
 
-    LAST_FRAME,
-    GOLDEN_FRAME,
-    ALTREF_FRAME,
+    1,
+    2,
+    3,
 
-    LAST_FRAME,
-    GOLDEN_FRAME,
-    ALTREF_FRAME,
+    1,
+    2,
+    3,
 
-    INTRA_FRAME,
+    0,
 };
 
 static void fill_token_costs(
@@ -286,18 +287,39 @@ void vp8_initialize_rd_consts(VP8_COMP *cpi, int Qvalue)
         }
     }
 
-    fill_token_costs(
-        cpi->mb.token_costs,
-        (const vp8_prob( *)[8][3][11]) cpi->common.fc.coef_probs
-    );
+    {
+      // build token cost array for the type of frame we have now
+      FRAME_CONTEXT *l = &cpi->lfc_n;
 
-    vp8_init_mode_costs(cpi);
+      if(cpi->common.refresh_alt_ref_frame)
+          l = &cpi->lfc_a;
+      else if(cpi->common.refresh_golden_frame)
+          l = &cpi->lfc_g;
+
+      fill_token_costs(
+          cpi->mb.token_costs,
+          (const vp8_prob( *)[8][3][11]) l->coef_probs
+      );
+      /*
+      fill_token_costs(
+          cpi->mb.token_costs,
+          (const vp8_prob( *)[8][3][11]) cpi->common.fc.coef_probs);
+      */
+
+
+      // TODO make these mode costs depend on last,alt or gold too.  (jbb)
+      vp8_init_mode_costs(cpi);
+
+      // TODO figure onnnnuut why making mv cost frame type dependent didn't help (jbb)
+      //vp8_build_component_cost_table(cpi->mb.mvcost, (const MV_CONTEXT *) l->mvc, flags);
+
+    }
 
 }
 
 void vp8_auto_select_speed(VP8_COMP *cpi)
 {
-    int milliseconds_for_compress = (int)(1000000 / cpi->oxcf.frame_rate);
+    int milliseconds_for_compress = (int)(1000000 / cpi->frame_rate);
 
     milliseconds_for_compress = milliseconds_for_compress * (16 - cpi->oxcf.cpu_used) / 16;
 
@@ -440,14 +462,23 @@ int VP8_UVSSE(MACROBLOCK *x, const vp8_variance_rtcd_vtable_t *rtcd)
 
     unsigned int sse1 = 0;
     unsigned int sse2 = 0;
-    int mv_row;
-    int mv_col;
+    int mv_row = x->e_mbd.mode_info_context->mbmi.mv.as_mv.row;
+    int mv_col = x->e_mbd.mode_info_context->mbmi.mv.as_mv.col;
     int offset;
     int pre_stride = x->e_mbd.block[16].pre_stride;
 
-    vp8_build_uvmvs(&x->e_mbd, 0);
-    mv_row = x->e_mbd.block[16].bmi.mv.as_mv.row;
-    mv_col = x->e_mbd.block[16].bmi.mv.as_mv.col;
+    if (mv_row < 0)
+        mv_row -= 1;
+    else
+        mv_row += 1;
+
+    if (mv_col < 0)
+        mv_col -= 1;
+    else
+        mv_col += 1;
+
+    mv_row /= 2;
+    mv_col /= 2;
 
     offset = (mv_row >> 3) * pre_stride + (mv_col >> 3);
     uptr = x->e_mbd.pre.u_buffer + offset;
@@ -476,7 +507,7 @@ int VP8_UVSSE(MACROBLOCK *x, const vp8_variance_rtcd_vtable_t *rtcd)
 static int cost_coeffs(MACROBLOCK *mb, BLOCKD *b, int type, ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l)
 {
     int c = !type;              /* start at coef 0, unless Y with Y2 */
-    int eob = b->eob;
+    int eob = (int)(*b->eob);
     int pt ;    /* surrounding block/prev coef predictor */
     int cost = 0;
     short *qcoeff_ptr = b->qcoeff;
@@ -544,7 +575,7 @@ static void macro_block_yrd( MACROBLOCK *mb,
     int d;
 
     ENCODEMB_INVOKE(rtcd, submby)( mb->src_diff, *(mb->block[0].base_src),
-                                   mb->e_mbd.predictor, mb->block[0].src_stride );
+        mb->block[0].src_stride,  mb->e_mbd.predictor, 16);
 
     // Fdct and building the 2nd order block
     for (beptr = mb->block; beptr < mb->block + 16; beptr += 2)
@@ -622,7 +653,8 @@ static int rd_pick_intra4x4block(
         rate = bmode_costs[mode];
 
         RECON_INVOKE(&cpi->rtcd.common->recon, intra4x4_predict)
-                     (b, mode, b->predictor);
+                     (*(b->base_dst) + b->dst, b->dst_stride,
+                      mode, b->predictor, 16);
         ENCODEMB_INVOKE(IF_RTCD(&cpi->rtcd.encodemb), subb)(be, b, 16);
         x->vp8_short_fdct4x4(be->src_diff, be->coeff, 32);
         x->quantize_b(be, b);
@@ -651,8 +683,8 @@ static int rd_pick_intra4x4block(
     }
     b->bmi.as_mode = (B_PREDICTION_MODE)(*best_mode);
 
-    IDCT_INVOKE(IF_RTCD(&cpi->rtcd.common->idct), idct16)(best_dqcoeff, b->diff, 32);
-    RECON_INVOKE(IF_RTCD(&cpi->rtcd.common->recon), recon)(best_predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
+    IDCT_INVOKE(IF_RTCD(&cpi->rtcd.common->idct), idct16)(best_dqcoeff,
+        best_predictor, 16, *(b->base_dst) + b->dst, b->dst_stride);
 
     return best_rd;
 }
@@ -715,7 +747,7 @@ static int rd_pick_intra4x4mby_modes(VP8_COMP *cpi, MACROBLOCK *mb, int *Rate,
         return INT_MAX;
 
     *Rate = cost;
-    *rate_y += tot_rate_y;
+    *rate_y = tot_rate_y;
     *Distortion = distortion;
 
     return RDCOST(mb->rdmult, mb->rddiv, cost, distortion);
@@ -786,11 +818,33 @@ static int rd_cost_mbuv(MACROBLOCK *mb)
 }
 
 
-static int vp8_rd_inter_uv(VP8_COMP *cpi, MACROBLOCK *x, int *rate, int *distortion, int fullpixel)
+static int rd_inter16x16_uv(VP8_COMP *cpi, MACROBLOCK *x, int *rate,
+                            int *distortion, int fullpixel)
 {
-    vp8_build_uvmvs(&x->e_mbd, fullpixel);
-    vp8_encode_inter16x16uvrd(IF_RTCD(&cpi->rtcd), x);
+    vp8_build_inter16x16_predictors_mbuv(&x->e_mbd);
+    ENCODEMB_INVOKE(IF_RTCD(&cpi->rtcd.encodemb), submbuv)(x->src_diff,
+        x->src.u_buffer, x->src.v_buffer, x->src.uv_stride,
+        &x->e_mbd.predictor[256], &x->e_mbd.predictor[320], 8);
 
+    vp8_transform_mbuv(x);
+    vp8_quantize_mbuv(x);
+
+    *rate       = rd_cost_mbuv(x);
+    *distortion = ENCODEMB_INVOKE(&cpi->rtcd.encodemb, mbuverr)(x) / 4;
+
+    return RDCOST(x->rdmult, x->rddiv, *rate, *distortion);
+}
+
+static int rd_inter4x4_uv(VP8_COMP *cpi, MACROBLOCK *x, int *rate,
+                          int *distortion, int fullpixel)
+{
+    vp8_build_inter4x4_predictors_mbuv(&x->e_mbd);
+    ENCODEMB_INVOKE(IF_RTCD(&cpi->rtcd.encodemb), submbuv)(x->src_diff,
+        x->src.u_buffer, x->src.v_buffer, x->src.uv_stride,
+        &x->e_mbd.predictor[256], &x->e_mbd.predictor[320], 8);
+
+    vp8_transform_mbuv(x);
+    vp8_quantize_mbuv(x);
 
     *rate       = rd_cost_mbuv(x);
     *distortion = ENCODEMB_INVOKE(&cpi->rtcd.encodemb, mbuverr)(x) / 4;
@@ -816,8 +870,8 @@ static void rd_pick_intra_mbuv_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate, int
         RECON_INVOKE(&cpi->rtcd.common->recon, build_intra_predictors_mbuv)
                      (&x->e_mbd);
         ENCODEMB_INVOKE(IF_RTCD(&cpi->rtcd.encodemb), submbuv)(x->src_diff,
-                      x->src.u_buffer, x->src.v_buffer, x->e_mbd.predictor,
-                      x->src.uv_stride);
+                      x->src.u_buffer, x->src.v_buffer, x->src.uv_stride,
+                      &x->e_mbd.predictor[256], &x->e_mbd.predictor[320], 8);
         vp8_transform_mbuv(x);
         vp8_quantize_mbuv(x);
 
@@ -1270,16 +1324,14 @@ static void rd_check_segment(VP8_COMP *cpi, MACROBLOCK *x,
         // store everything needed to come back to this!!
         for (i = 0; i < 16; i++)
         {
-            BLOCKD *bd = &x->e_mbd.block[i];
-
             bsi->mvs[i].as_mv = x->partition_info->bmi[i].mv.as_mv;
             bsi->modes[i] = x->partition_info->bmi[i].mode;
-            bsi->eobs[i] = bd->eob;
+            bsi->eobs[i] = x->e_mbd.eobs[i];
         }
     }
 }
 
-static __inline
+static
 void vp8_cal_step_param(int sr, int *sp)
 {
     int step = 0;
@@ -1332,8 +1384,8 @@ static int vp8_rd_pick_best_mbsegmentation(VP8_COMP *cpi, MACROBLOCK *x,
 
         if (bsi.segment_rd < best_rd)
         {
-            int col_min = (best_ref_mv->as_mv.col>>3) - MAX_FULL_PEL_VAL + ((best_ref_mv->as_mv.col & 7)?1:0);
-            int row_min = (best_ref_mv->as_mv.row>>3) - MAX_FULL_PEL_VAL + ((best_ref_mv->as_mv.row & 7)?1:0);
+            int col_min = ((best_ref_mv->as_mv.col+7)>>3) - MAX_FULL_PEL_VAL;
+            int row_min = ((best_ref_mv->as_mv.row+7)>>3) - MAX_FULL_PEL_VAL;
             int col_max = (best_ref_mv->as_mv.col>>3) + MAX_FULL_PEL_VAL;
             int row_max = (best_ref_mv->as_mv.row>>3) + MAX_FULL_PEL_VAL;
 
@@ -1403,7 +1455,7 @@ static int vp8_rd_pick_best_mbsegmentation(VP8_COMP *cpi, MACROBLOCK *x,
         BLOCKD *bd = &x->e_mbd.block[i];
 
         bd->bmi.mv.as_int = bsi.mvs[i].as_int;
-        bd->eob = bsi.eobs[i];
+        *bd->eob = bsi.eobs[i];
     }
 
     *returntotrate = bsi.r;
@@ -1431,57 +1483,6 @@ static int vp8_rd_pick_best_mbsegmentation(VP8_COMP *cpi, MACROBLOCK *x,
     return bsi.segment_rd;
 }
 
-static void insertsortmv(int arr[], int len)
-{
-    int i, j, k;
-
-    for ( i = 1 ; i <= len-1 ; i++ )
-    {
-        for ( j = 0 ; j < i ; j++ )
-        {
-            if ( arr[j] > arr[i] )
-            {
-                int temp;
-
-                temp = arr[i];
-
-                for ( k = i; k >j; k--)
-                    arr[k] = arr[k - 1] ;
-
-                arr[j] = temp ;
-            }
-        }
-    }
-}
-
-static void insertsortsad(int arr[],int idx[], int len)
-{
-    int i, j, k;
-
-    for ( i = 1 ; i <= len-1 ; i++ )
-    {
-        for ( j = 0 ; j < i ; j++ )
-        {
-            if ( arr[j] > arr[i] )
-            {
-                int temp, tempi;
-
-                temp = arr[i];
-                tempi = idx[i];
-
-                for ( k = i; k >j; k--)
-                {
-                    arr[k] = arr[k - 1] ;
-                    idx[k] = idx[k - 1];
-                }
-
-                arr[j] = temp ;
-                idx[j] = tempi;
-            }
-        }
-    }
-}
-
 //The improved MV prediction
 void vp8_mv_pred
 (
@@ -1714,7 +1715,10 @@ static void rd_update_mvcount(VP8_COMP *cpi, MACROBLOCK *x, int_mv *best_ref_mv)
     }
 }
 
-void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra)
+
+void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
+                            int recon_uvoffset, int *returnrate,
+                            int *returndistortion, int *returnintra)
 {
     BLOCK *b = &x->block[0];
     BLOCKD *d = &x->e_mbd.block[0];
@@ -1722,8 +1726,10 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
     union b_mode_info best_bmodes[16];
     MB_MODE_INFO best_mbmode;
     PARTITION_INFO best_partition;
+    int_mv best_ref_mv_sb[2];
+    int_mv mode_mv_sb[2][MB_MODE_COUNT];
     int_mv best_ref_mv;
-    int_mv mode_mv[MB_MODE_COUNT];
+    int_mv *mode_mv;
     MB_PREDICTION_MODE this_mode;
     int num00;
     int best_mode_index = 0;
@@ -1741,78 +1747,49 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
     int distortion_uv;
     int best_yrd = INT_MAX;
 
-    //int all_rds[MAX_MODES];        // Experimental debug code.
-    //int all_rates[MAX_MODES];
-    //int all_dist[MAX_MODES];
-    //int intermodecost[MAX_MODES];
-
     MB_PREDICTION_MODE uv_intra_mode;
     int_mv mvp;
     int near_sadidx[8] = {0, 1, 2, 3, 4, 5, 6, 7};
     int saddone=0;
     int sr=0;    //search range got from mv_pred(). It uses step_param levels. (0-7)
 
-    int_mv frame_nearest_mv[4];
-    int_mv frame_near_mv[4];
-    int_mv frame_best_ref_mv[4];
-    int frame_mdcounts[4][4];
-    int frame_lf_or_gf[4];
-    unsigned char *y_buffer[4];
-    unsigned char *u_buffer[4];
-    unsigned char *v_buffer[4];
+    unsigned char *plane[4][3];
+    int ref_frame_map[4];
+    int sign_bias = 0;
 
+    mode_mv = mode_mv_sb[sign_bias];
+    best_ref_mv.as_int = 0;
+    vpx_memset(mode_mv_sb, 0, sizeof(mode_mv_sb));
     vpx_memset(&best_mbmode, 0, sizeof(best_mbmode));
     vpx_memset(&best_bmodes, 0, sizeof(best_bmodes));
 
-    if (cpi->ref_frame_flags & VP8_LAST_FLAG)
+    /* Setup search priorities */
+    get_reference_search_order(cpi, ref_frame_map);
+
+    /* Check to see if there is at least 1 valid reference frame that we need
+     * to calculate near_mvs.
+     */
+    if (ref_frame_map[1] > 0)
     {
-        YV12_BUFFER_CONFIG *lst_yv12 = &cpi->common.yv12_fb[cpi->common.lst_fb_idx];
+        sign_bias = vp8_find_near_mvs_bias(&x->e_mbd,
+                                           x->e_mbd.mode_info_context,
+                                           mode_mv_sb,
+                                           best_ref_mv_sb,
+                                           mdcounts,
+                                           ref_frame_map[1],
+                                           cpi->common.ref_frame_sign_bias);
 
-        vp8_find_near_mvs(&x->e_mbd, x->e_mbd.mode_info_context, &frame_nearest_mv[LAST_FRAME], &frame_near_mv[LAST_FRAME],
-                          &frame_best_ref_mv[LAST_FRAME], frame_mdcounts[LAST_FRAME], LAST_FRAME, cpi->common.ref_frame_sign_bias);
-
-        y_buffer[LAST_FRAME] = lst_yv12->y_buffer + recon_yoffset;
-        u_buffer[LAST_FRAME] = lst_yv12->u_buffer + recon_uvoffset;
-        v_buffer[LAST_FRAME] = lst_yv12->v_buffer + recon_uvoffset;
-
-        frame_lf_or_gf[LAST_FRAME] = 0;
+        mode_mv = mode_mv_sb[sign_bias];
+        best_ref_mv.as_int = best_ref_mv_sb[sign_bias].as_int;
     }
 
-    if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
-    {
-        YV12_BUFFER_CONFIG *gld_yv12 = &cpi->common.yv12_fb[cpi->common.gld_fb_idx];
-
-        vp8_find_near_mvs(&x->e_mbd, x->e_mbd.mode_info_context, &frame_nearest_mv[GOLDEN_FRAME], &frame_near_mv[GOLDEN_FRAME],
-                          &frame_best_ref_mv[GOLDEN_FRAME], frame_mdcounts[GOLDEN_FRAME], GOLDEN_FRAME, cpi->common.ref_frame_sign_bias);
-
-        y_buffer[GOLDEN_FRAME] = gld_yv12->y_buffer + recon_yoffset;
-        u_buffer[GOLDEN_FRAME] = gld_yv12->u_buffer + recon_uvoffset;
-        v_buffer[GOLDEN_FRAME] = gld_yv12->v_buffer + recon_uvoffset;
-
-        frame_lf_or_gf[GOLDEN_FRAME] = 1;
-    }
-
-    if (cpi->ref_frame_flags & VP8_ALT_FLAG)
-    {
-        YV12_BUFFER_CONFIG *alt_yv12 = &cpi->common.yv12_fb[cpi->common.alt_fb_idx];
-
-        vp8_find_near_mvs(&x->e_mbd, x->e_mbd.mode_info_context, &frame_nearest_mv[ALTREF_FRAME], &frame_near_mv[ALTREF_FRAME],
-                          &frame_best_ref_mv[ALTREF_FRAME], frame_mdcounts[ALTREF_FRAME], ALTREF_FRAME, cpi->common.ref_frame_sign_bias);
-
-        y_buffer[ALTREF_FRAME] = alt_yv12->y_buffer + recon_yoffset;
-        u_buffer[ALTREF_FRAME] = alt_yv12->u_buffer + recon_uvoffset;
-        v_buffer[ALTREF_FRAME] = alt_yv12->v_buffer + recon_uvoffset;
-
-        frame_lf_or_gf[ALTREF_FRAME] = 1;
-    }
+    get_predictor_pointers(cpi, plane, recon_yoffset, recon_uvoffset);
 
     *returnintra = INT_MAX;
     cpi->mbs_tested_so_far++;          // Count of the number of MBs tested so far this frame
 
     x->skip = 0;
 
-    vpx_memset(mode_mv, 0, sizeof(mode_mv));
-
     x->e_mbd.mode_info_context->mbmi.ref_frame = INTRA_FRAME;
     rd_pick_intra_mbuv_mode(cpi, x, &uv_intra_rate, &uv_intra_rate_tokenonly, &uv_intra_distortion);
     uv_intra_mode = x->e_mbd.mode_info_context->mbmi.uv_mode;
@@ -1820,21 +1797,17 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
     for (mode_index = 0; mode_index < MAX_MODES; mode_index++)
     {
         int this_rd = INT_MAX;
-        int lf_or_gf = 0;           // Lat Frame (01) or gf/arf (1)
         int disable_skip = 0;
         int other_cost = 0;
-
-        // Experimental debug code.
-        // Record of rd values recorded for this MB. -1 indicates not measured
-        //all_rds[mode_index] = -1;
-        //all_rates[mode_index] = -1;
-        //all_dist[mode_index] = -1;
-        //intermodecost[mode_index] = -1;
+        int this_ref_frame = ref_frame_map[vp8_ref_frame_order[mode_index]];
 
         // Test best rd so far against threshold for trying this mode.
         if (best_rd <= cpi->rd_threshes[mode_index])
             continue;
 
+        if (this_ref_frame < 0)
+            continue;
+
         // These variables hold are rolling total cost and distortion for this mode
         rate2 = 0;
         distortion2 = 0;
@@ -1843,7 +1816,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
 
         x->e_mbd.mode_info_context->mbmi.mode = this_mode;
         x->e_mbd.mode_info_context->mbmi.uv_mode = DC_PRED;
-        x->e_mbd.mode_info_context->mbmi.ref_frame = vp8_ref_frame_order[mode_index];
+        x->e_mbd.mode_info_context->mbmi.ref_frame = this_ref_frame;
 
         // Only consider ZEROMV/ALTREF_FRAME for alt ref frame,
         // unless ARNR filtering is enabled in which case we want
@@ -1857,14 +1830,16 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
         /* everything but intra */
         if (x->e_mbd.mode_info_context->mbmi.ref_frame)
         {
-            x->e_mbd.pre.y_buffer = y_buffer[x->e_mbd.mode_info_context->mbmi.ref_frame];
-            x->e_mbd.pre.u_buffer = u_buffer[x->e_mbd.mode_info_context->mbmi.ref_frame];
-            x->e_mbd.pre.v_buffer = v_buffer[x->e_mbd.mode_info_context->mbmi.ref_frame];
-            mode_mv[NEARESTMV] = frame_nearest_mv[x->e_mbd.mode_info_context->mbmi.ref_frame];
-            mode_mv[NEARMV] = frame_near_mv[x->e_mbd.mode_info_context->mbmi.ref_frame];
-            best_ref_mv = frame_best_ref_mv[x->e_mbd.mode_info_context->mbmi.ref_frame];
-            vpx_memcpy(mdcounts, frame_mdcounts[x->e_mbd.mode_info_context->mbmi.ref_frame], sizeof(mdcounts));
-            lf_or_gf = frame_lf_or_gf[x->e_mbd.mode_info_context->mbmi.ref_frame];
+            x->e_mbd.pre.y_buffer = plane[this_ref_frame][0];
+            x->e_mbd.pre.u_buffer = plane[this_ref_frame][1];
+            x->e_mbd.pre.v_buffer = plane[this_ref_frame][2];
+
+            if (sign_bias != cpi->common.ref_frame_sign_bias[this_ref_frame])
+            {
+                sign_bias = cpi->common.ref_frame_sign_bias[this_ref_frame];
+                mode_mv = mode_mv_sb[sign_bias];
+                best_ref_mv.as_int = best_ref_mv_sb[sign_bias].as_int;
+            }
         }
 
         // Check to see if the testing frequency for this mode is at its max
@@ -1891,13 +1866,13 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
         // Experimental code. Special case for gf and arf zeromv modes. Increase zbin size to supress noise
         if (cpi->zbin_mode_boost_enabled)
         {
-            if ( vp8_ref_frame_order[mode_index] == INTRA_FRAME )
+            if ( this_ref_frame == INTRA_FRAME )
                 cpi->zbin_mode_boost = 0;
             else
             {
                 if (vp8_mode_order[mode_index] == ZEROMV)
                 {
-                    if (vp8_ref_frame_order[mode_index] != LAST_FRAME)
+                    if (this_ref_frame != LAST_FRAME)
                         cpi->zbin_mode_boost = GF_ZEROMV_ZBIN_BOOST;
                     else
                         cpi->zbin_mode_boost = LF_ZEROMV_ZBIN_BOOST;
@@ -1942,8 +1917,8 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
             int tmp_rd;
             int this_rd_thresh;
 
-            this_rd_thresh = (x->e_mbd.mode_info_context->mbmi.ref_frame == LAST_FRAME) ? cpi->rd_threshes[THR_NEWMV] : cpi->rd_threshes[THR_NEWA];
-            this_rd_thresh = (x->e_mbd.mode_info_context->mbmi.ref_frame == GOLDEN_FRAME) ? cpi->rd_threshes[THR_NEWG]: this_rd_thresh;
+            this_rd_thresh = (vp8_ref_frame_order[mode_index] == 1) ? cpi->rd_threshes[THR_NEW1] : cpi->rd_threshes[THR_NEW3];
+            this_rd_thresh = (vp8_ref_frame_order[mode_index] == 2) ? cpi->rd_threshes[THR_NEW2] : this_rd_thresh;
 
             tmp_rd = vp8_rd_pick_best_mbsegmentation(cpi, x, &best_ref_mv,
                                                      best_yrd, mdcounts,
@@ -1956,7 +1931,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
             if (tmp_rd < best_yrd)
             {
                 // Now work out UV cost and add it in
-                vp8_rd_inter_uv(cpi, x, &rate_uv, &distortion_uv, cpi->common.full_pixel);
+                rd_inter4x4_uv(cpi, x, &rate_uv, &distortion_uv, cpi->common.full_pixel);
                 rate2 += rate_uv;
                 distortion2 += distortion_uv;
             }
@@ -1997,8 +1972,8 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
             int sadpb = x->sadperbit16;
             int_mv mvp_full;
 
-            int col_min = (best_ref_mv.as_mv.col>>3) - MAX_FULL_PEL_VAL + ((best_ref_mv.as_mv.col & 7)?1:0);
-            int row_min = (best_ref_mv.as_mv.row>>3) - MAX_FULL_PEL_VAL + ((best_ref_mv.as_mv.row & 7)?1:0);
+            int col_min = ((best_ref_mv.as_mv.col+7)>>3) - MAX_FULL_PEL_VAL;
+            int row_min = ((best_ref_mv.as_mv.row+7)>>3) - MAX_FULL_PEL_VAL;
             int col_max = (best_ref_mv.as_mv.col>>3) + MAX_FULL_PEL_VAL;
             int row_max = (best_ref_mv.as_mv.row>>3) + MAX_FULL_PEL_VAL;
 
@@ -2147,7 +2122,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
                 continue;
 
             vp8_set_mbmode_and_mvs(x, this_mode, &mode_mv[this_mode]);
-            vp8_build_inter16x16_predictors_mby(&x->e_mbd);
+            vp8_build_inter16x16_predictors_mby(&x->e_mbd, x->e_mbd.predictor, 16);
 
             if (cpi->active_map_enabled && x->active_ptr[0] == 0) {
                 x->skip = 1;
@@ -2162,7 +2137,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
                 if(threshold < x->encode_breakout)
                     threshold = x->encode_breakout;
 
-                var = VARIANCE_INVOKE(&cpi->rtcd.variance, var16x16)
+                var = VARIANCE_INVOKE(&cpi->common.rtcd.variance, var16x16)
                         (*(b->base_src), b->src_stride,
                         x->e_mbd.predictor, 16, &sse);
 
@@ -2175,7 +2150,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
                         (sse /2 > var && sse-var < 64))
                     {
                         // Check u and v to make sure skip is ok
-                        int sse2=  VP8_UVSSE(x, IF_RTCD(&cpi->rtcd.variance));
+                        int sse2=  VP8_UVSSE(x, IF_RTCD(&cpi->common.rtcd.variance));
                         if (sse2 * 2 < threshold)
                         {
                             x->skip = 1;
@@ -2207,7 +2182,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
             distortion2 += distortion;
 
             // UV cost and distortion
-            vp8_rd_inter_uv(cpi, x, &rate_uv, &distortion_uv, cpi->common.full_pixel);
+            rd_inter16x16_uv(cpi, x, &rate_uv, &distortion_uv, cpi->common.full_pixel);
             rate2 += rate_uv;
             distortion2 += distortion_uv;
             break;
@@ -2242,7 +2217,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
 
                 for (i = 0; i <= 24; i++)
                 {
-                    tteob += x->e_mbd.block[i].eob;
+                    tteob += x->e_mbd.eobs[i];
                 }
 
                 if (tteob == 0)
@@ -2267,11 +2242,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
             this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2);
         }
 
-        // Experimental debug code.
-        //all_rds[mode_index] = this_rd;
-        //all_rates[mode_index] = rate2;
-        //all_dist[mode_index] = distortion2;
-
         // Keep record of best intra distortion
         if ((x->e_mbd.mode_info_context->mbmi.ref_frame == INTRA_FRAME) &&
             (this_rd < best_intra_rd) )
@@ -2372,7 +2342,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
         x->e_mbd.mode_info_context->mbmi.mv.as_int = 0;
         x->e_mbd.mode_info_context->mbmi.uv_mode = DC_PRED;
         x->e_mbd.mode_info_context->mbmi.mb_skip_coeff =
-                                        (cpi->common.mb_no_coeff_skip) ? 1 : 0;
+                                        (cpi->common.mb_no_coeff_skip);
         x->e_mbd.mode_info_context->mbmi.partitioning = 0;
 
         return;
@@ -2385,13 +2355,13 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
     if (best_mbmode.mode == B_PRED)
     {
         for (i = 0; i < 16; i++)
-          x->e_mbd.block[i].bmi.as_mode = best_bmodes[i].as_mode;
+            xd->mode_info_context->bmi[i].as_mode = best_bmodes[i].as_mode;
     }
 
     if (best_mbmode.mode == SPLITMV)
     {
         for (i = 0; i < 16; i++)
-            x->e_mbd.block[i].bmi.mv.as_int = best_bmodes[i].mv.as_int;
+            xd->mode_info_context->bmi[i].mv.as_int = best_bmodes[i].mv.as_int;
 
         vpx_memcpy(x->partition_info, &best_partition, sizeof(PARTITION_INFO));
 
@@ -2399,8 +2369,11 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
                                       x->partition_info->bmi[15].mv.as_int;
     }
 
-    rd_update_mvcount(cpi, x, &frame_best_ref_mv[xd->mode_info_context->mbmi.ref_frame]);
+    if (sign_bias
+        != cpi->common.ref_frame_sign_bias[xd->mode_info_context->mbmi.ref_frame])
+        best_ref_mv.as_int = best_ref_mv_sb[!sign_bias].as_int;
 
+    rd_update_mvcount(cpi, x, &best_ref_mv);
 }
 
 void vp8_rd_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate_)
diff --git a/media/libvpx/vp8/encoder/rdopt.h b/media/libvpx/vp8/encoder/rdopt.h
index 95134cb811f..db939f96c3e 100644
--- a/media/libvpx/vp8/encoder/rdopt.h
+++ b/media/libvpx/vp8/encoder/rdopt.h
@@ -14,10 +14,109 @@
 
 #define RDCOST(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) )
 
+static void insertsortmv(int arr[], int len)
+{
+    int i, j, k;
+
+    for ( i = 1 ; i <= len-1 ; i++ )
+    {
+        for ( j = 0 ; j < i ; j++ )
+        {
+            if ( arr[j] > arr[i] )
+            {
+                int temp;
+
+                temp = arr[i];
+
+                for ( k = i; k >j; k--)
+                    arr[k] = arr[k - 1] ;
+
+                arr[j] = temp ;
+            }
+        }
+    }
+}
+
+static void insertsortsad(int arr[],int idx[], int len)
+{
+    int i, j, k;
+
+    for ( i = 1 ; i <= len-1 ; i++ )
+    {
+        for ( j = 0 ; j < i ; j++ )
+        {
+            if ( arr[j] > arr[i] )
+            {
+                int temp, tempi;
+
+                temp = arr[i];
+                tempi = idx[i];
+
+                for ( k = i; k >j; k--)
+                {
+                    arr[k] = arr[k - 1] ;
+                    idx[k] = idx[k - 1];
+                }
+
+                arr[j] = temp ;
+                idx[j] = tempi;
+            }
+        }
+    }
+}
+
 extern void vp8_initialize_rd_consts(VP8_COMP *cpi, int Qvalue);
 extern void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra);
 extern void vp8_rd_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate);
 
+
+static void get_plane_pointers(const YV12_BUFFER_CONFIG *fb,
+                               unsigned char            *plane[3],
+                               unsigned int              recon_yoffset,
+                               unsigned int              recon_uvoffset)
+{
+    plane[0] = fb->y_buffer + recon_yoffset;
+    plane[1] = fb->u_buffer + recon_uvoffset;
+    plane[2] = fb->v_buffer + recon_uvoffset;
+}
+
+
+static void get_predictor_pointers(const VP8_COMP *cpi,
+                                       unsigned char  *plane[4][3],
+                                       unsigned int    recon_yoffset,
+                                       unsigned int    recon_uvoffset)
+{
+    if (cpi->ref_frame_flags & VP8_LAST_FLAG)
+        get_plane_pointers(&cpi->common.yv12_fb[cpi->common.lst_fb_idx],
+                           plane[LAST_FRAME], recon_yoffset, recon_uvoffset);
+
+    if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
+        get_plane_pointers(&cpi->common.yv12_fb[cpi->common.gld_fb_idx],
+                           plane[GOLDEN_FRAME], recon_yoffset, recon_uvoffset);
+
+    if (cpi->ref_frame_flags & VP8_ALT_FLAG)
+        get_plane_pointers(&cpi->common.yv12_fb[cpi->common.alt_fb_idx],
+                           plane[ALTREF_FRAME], recon_yoffset, recon_uvoffset);
+}
+
+
+static void get_reference_search_order(const VP8_COMP *cpi,
+                                           int             ref_frame_map[4])
+{
+    int i=0;
+
+    ref_frame_map[i++] = INTRA_FRAME;
+    if (cpi->ref_frame_flags & VP8_LAST_FLAG)
+        ref_frame_map[i++] = LAST_FRAME;
+    if (cpi->ref_frame_flags & VP8_GOLD_FLAG)
+        ref_frame_map[i++] = GOLDEN_FRAME;
+    if (cpi->ref_frame_flags & VP8_ALT_FLAG)
+        ref_frame_map[i++] = ALTREF_FRAME;
+    for(; i<4; i++)
+        ref_frame_map[i] = -1;
+}
+
+
 extern void vp8_mv_pred
 (
     VP8_COMP *cpi,
diff --git a/media/libvpx/vp8/encoder/temporal_filter.c b/media/libvpx/vp8/encoder/temporal_filter.c
index b9ade1c6cfa..545e4f2058a 100644
--- a/media/libvpx/vp8/encoder/temporal_filter.c
+++ b/media/libvpx/vp8/encoder/temporal_filter.c
@@ -22,7 +22,6 @@
 #include "ratectrl.h"
 #include "vp8/common/quant_common.h"
 #include "segmentation.h"
-#include "vp8/common/g_common.h"
 #include "vpx_scale/yv12extend.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vp8/common/swapyv12buffer.h"
@@ -98,7 +97,7 @@ void vp8_temporal_filter_apply_c
     unsigned short *count
 )
 {
-    int i, j, k;
+    unsigned int i, j, k;
     int modifier;
     int byte = 0;
 
@@ -186,7 +185,7 @@ static int vp8_temporal_filter_find_matching_mb_c
     if (cpi->Speed < 8)
     {
         step_param = cpi->sf.first_step +
-                    ((cpi->Speed > 5) ? 1 : 0);
+                    (cpi->Speed > 5);
         further_steps =
             (cpi->sf.max_step_search_steps - 1)-step_param;
     }
diff --git a/media/libvpx/vp8/encoder/tokenize.c b/media/libvpx/vp8/encoder/tokenize.c
index 15e7336b120..caa7d8a276e 100644
--- a/media/libvpx/vp8/encoder/tokenize.c
+++ b/media/libvpx/vp8/encoder/tokenize.c
@@ -108,15 +108,42 @@ static void tokenize2nd_order_b
     ENTROPY_CONTEXT * a;
     ENTROPY_CONTEXT * l;
     int band, rc, v, token;
+    int eob;
 
     b = x->block + 24;
     qcoeff_ptr = b->qcoeff;
     a = (ENTROPY_CONTEXT *)x->above_context + 8;
     l = (ENTROPY_CONTEXT *)x->left_context + 8;
-
+    eob = x->eobs[24];
     VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
 
-    for (c = 0; c < b->eob; c++)
+    if(!eob)
+    {
+        /* c = band for this case */
+        t->Token = DCT_EOB_TOKEN;
+        t->context_tree = cpi->common.fc.coef_probs [1] [0] [pt];
+        t->skip_eob_node = 0;
+
+        ++cpi->coef_counts       [1] [0] [pt] [DCT_EOB_TOKEN];
+        t++;
+        *tp = t;
+        *a = *l = 0;
+        return;
+    }
+
+    v = qcoeff_ptr[0];
+    t->Extra = vp8_dct_value_tokens_ptr[v].Extra;
+    token    = vp8_dct_value_tokens_ptr[v].Token;
+    t->Token = token;
+
+    t->context_tree = cpi->common.fc.coef_probs [1] [0] [pt];
+    t->skip_eob_node = 0;
+    ++cpi->coef_counts       [1] [0] [pt] [token];
+    pt = vp8_prev_token_class[token];
+    t++;
+    c = 1;
+
+    for (; c < eob; c++)
     {
         rc = vp8_default_zig_zag1d[c];
         band = vp8_coef_bands[c];
@@ -128,7 +155,7 @@ static void tokenize2nd_order_b
         t->Token = token;
         t->context_tree = cpi->common.fc.coef_probs [1] [band] [pt];
 
-        t->skip_eob_node = ((pt == 0) && (band > 0));
+        t->skip_eob_node = ((pt == 0));
 
         ++cpi->coef_counts       [1] [band] [pt] [token];
 
@@ -141,7 +168,7 @@ static void tokenize2nd_order_b
         t->Token = DCT_EOB_TOKEN;
         t->context_tree = cpi->common.fc.coef_probs [1] [band] [pt];
 
-        t->skip_eob_node = ((pt == 0) && (band > 0));
+        t->skip_eob_node = 0;
 
         ++cpi->coef_counts       [1] [band] [pt] [DCT_EOB_TOKEN];
 
@@ -149,8 +176,7 @@ static void tokenize2nd_order_b
     }
 
     *tp = t;
-    pt = (c != 0); /* 0 <-> all coeff data is zero */
-    *a = *l = pt;
+    *a = *l = 1;
 
 }
 
@@ -188,7 +214,34 @@ static void tokenize1st_order_b
 
         c = type ? 0 : 1;
 
-        for (; c < b->eob; c++)
+        if(c >= *b->eob)
+        {
+            /* c = band for this case */
+            t->Token = DCT_EOB_TOKEN;
+            t->context_tree = cpi->common.fc.coef_probs [type] [c] [pt];
+            t->skip_eob_node = 0;
+
+            ++cpi->coef_counts       [type] [c] [pt] [DCT_EOB_TOKEN];
+            t++;
+            *tp = t;
+            *a = *l = 0;
+            continue;
+        }
+
+        v = qcoeff_ptr[c];
+
+        t->Extra = vp8_dct_value_tokens_ptr[v].Extra;
+        token    = vp8_dct_value_tokens_ptr[v].Token;
+        t->Token = token;
+
+        t->context_tree = cpi->common.fc.coef_probs [type] [c] [pt];
+        t->skip_eob_node = 0;
+        ++cpi->coef_counts       [type] [c] [pt] [token];
+        pt = vp8_prev_token_class[token];
+        t++;
+        c++;
+
+        for (; c < *b->eob; c++)
         {
             rc = vp8_default_zig_zag1d[c];
             band = vp8_coef_bands[c];
@@ -200,9 +253,7 @@ static void tokenize1st_order_b
             t->Token = token;
             t->context_tree = cpi->common.fc.coef_probs [type] [band] [pt];
 
-            t->skip_eob_node = pt == 0 &&
-                ((band > 0 && type > 0) || (band > 1 && type == 0));
-
+            t->skip_eob_node = (pt == 0);
             ++cpi->coef_counts       [type] [band] [pt] [token];
 
             pt = vp8_prev_token_class[token];
@@ -214,18 +265,15 @@ static void tokenize1st_order_b
             t->Token = DCT_EOB_TOKEN;
             t->context_tree = cpi->common.fc.coef_probs [type] [band] [pt];
 
-            t->skip_eob_node = pt == 0 &&
-                ((band > 0 && type > 0) || (band > 1 && type == 0));
-
+            t->skip_eob_node = 0;
             ++cpi->coef_counts       [type] [band] [pt] [DCT_EOB_TOKEN];
 
             t++;
         }
         *tp = t;
-        pt = (c != !type); /* 0 <-> all coeff data is zero */
-        *a = *l = pt;
-
+        *a = *l = 1;
     }
+
     /* Chroma */
     for (block = 16; block < 24; block++, b++)
     {
@@ -237,7 +285,34 @@ static void tokenize1st_order_b
 
         VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
 
-        for (c = 0; c < b->eob; c++)
+        if(!(*b->eob))
+        {
+            /* c = band for this case */
+            t->Token = DCT_EOB_TOKEN;
+            t->context_tree = cpi->common.fc.coef_probs [2] [0] [pt];
+            t->skip_eob_node = 0;
+
+            ++cpi->coef_counts       [2] [0] [pt] [DCT_EOB_TOKEN];
+            t++;
+            *tp = t;
+            *a = *l = 0;
+            continue;
+        }
+
+        v = qcoeff_ptr[0];
+
+        t->Extra = vp8_dct_value_tokens_ptr[v].Extra;
+        token    = vp8_dct_value_tokens_ptr[v].Token;
+        t->Token = token;
+
+        t->context_tree = cpi->common.fc.coef_probs [2] [0] [pt];
+        t->skip_eob_node = 0;
+        ++cpi->coef_counts       [2] [0] [pt] [token];
+        pt = vp8_prev_token_class[token];
+        t++;
+        c = 1;
+
+        for (; c < *b->eob; c++)
         {
             rc = vp8_default_zig_zag1d[c];
             band = vp8_coef_bands[c];
@@ -249,7 +324,7 @@ static void tokenize1st_order_b
             t->Token = token;
             t->context_tree = cpi->common.fc.coef_probs [2] [band] [pt];
 
-            t->skip_eob_node = ((pt == 0) && (band > 0));
+            t->skip_eob_node = (pt == 0);
 
             ++cpi->coef_counts       [2] [band] [pt] [token];
 
@@ -262,17 +337,15 @@ static void tokenize1st_order_b
             t->Token = DCT_EOB_TOKEN;
             t->context_tree = cpi->common.fc.coef_probs [2] [band] [pt];
 
-            t->skip_eob_node = ((pt == 0) && (band > 0));
+            t->skip_eob_node = 0;
 
             ++cpi->coef_counts       [2] [band] [pt] [DCT_EOB_TOKEN];
 
             t++;
         }
         *tp = t;
-        pt = (c != 0); /* 0 <-> all coeff data is zero */
-        *a = *l = pt;
+        *a = *l = 1;
     }
-
 }
 
 
@@ -284,11 +357,11 @@ static int mb_is_skippable(MACROBLOCKD *x, int has_y2_block)
     if (has_y2_block)
     {
         for (i = 0; i < 16; i++)
-            skip &= (x->block[i].eob < 2);
+            skip &= (x->eobs[i] < 2);
     }
 
     for (; i < 24 + has_y2_block; i++)
-        skip &= (!x->block[i].eob);
+        skip &= (!x->eobs[i]);
 
     return skip;
 }
@@ -412,7 +485,7 @@ void vp8_tokenize_initialize()
 }
 
 
-static __inline void stuff2nd_order_b
+static void stuff2nd_order_b
 (
     TOKENEXTRA **tp,
     ENTROPY_CONTEXT *a,
@@ -436,29 +509,31 @@ static __inline void stuff2nd_order_b
 
 }
 
-static __inline void stuff1st_order_b
+static void stuff1st_order_b
 (
     TOKENEXTRA **tp,
     ENTROPY_CONTEXT *a,
     ENTROPY_CONTEXT *l,
+    int type,
     VP8_COMP *cpi
 )
 {
     int pt; /* near block/prev token context index */
+    int band;
     TOKENEXTRA *t = *tp;        /* store tokens starting here */
     VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
-
+    band = type ? 0 : 1;
     t->Token = DCT_EOB_TOKEN;
-    t->context_tree = cpi->common.fc.coef_probs [0] [1] [pt];
+    t->context_tree = cpi->common.fc.coef_probs [type] [band] [pt];
     t->skip_eob_node = 0;
-    ++cpi->coef_counts       [0] [1] [pt] [DCT_EOB_TOKEN];
+    ++cpi->coef_counts       [type] [band] [pt] [DCT_EOB_TOKEN];
     ++t;
     *tp = t;
     pt = 0; /* 0 <-> all coeff data is zero */
     *a = *l = pt;
 
 }
-static __inline
+static
 void stuff1st_order_buv
 (
     TOKENEXTRA **tp,
@@ -488,15 +563,19 @@ void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t)
     ENTROPY_CONTEXT * L = (ENTROPY_CONTEXT *)x->left_context;
     int plane_type;
     int b;
-
-    stuff2nd_order_b(t,
+    plane_type = 3;
+    if((x->mode_info_context->mbmi.mode != B_PRED
+                        && x->mode_info_context->mbmi.mode != SPLITMV))
+    {
+        stuff2nd_order_b(t,
                      A + vp8_block2above[24], L + vp8_block2left[24], cpi);
-    plane_type = 0;
+        plane_type = 0;
+    }
 
     for (b = 0; b < 16; b++)
         stuff1st_order_b(t,
                          A + vp8_block2above[b],
-                         L + vp8_block2left[b], cpi);
+                         L + vp8_block2left[b], plane_type, cpi);
 
     for (b = 16; b < 24; b++)
         stuff1st_order_buv(t,
diff --git a/media/libvpx/vp8/encoder/treewriter.h b/media/libvpx/vp8/encoder/treewriter.h
index c28a0fa370d..70e57a1aa07 100644
--- a/media/libvpx/vp8/encoder/treewriter.h
+++ b/media/libvpx/vp8/encoder/treewriter.h
@@ -42,7 +42,7 @@ typedef BOOL_CODER vp8_writer;
 
 /* Both of these return bits, not scaled bits. */
 
-static __inline unsigned int vp8_cost_branch(const unsigned int ct[2], vp8_prob p)
+static unsigned int vp8_cost_branch(const unsigned int ct[2], vp8_prob p)
 {
     /* Imitate existing calculation */
 
@@ -53,7 +53,7 @@ static __inline unsigned int vp8_cost_branch(const unsigned int ct[2], vp8_prob
 /* Small functions to write explicit values and tokens, as well as
    estimate their lengths. */
 
-static __inline void vp8_treed_write
+static void vp8_treed_write
 (
     vp8_writer *const w,
     vp8_tree t,
@@ -72,7 +72,7 @@ static __inline void vp8_treed_write
     }
     while (n);
 }
-static __inline void vp8_write_token
+static void vp8_write_token
 (
     vp8_writer *const w,
     vp8_tree t,
@@ -83,7 +83,7 @@ static __inline void vp8_write_token
     vp8_treed_write(w, t, p, x->value, x->Len);
 }
 
-static __inline int vp8_treed_cost(
+static int vp8_treed_cost(
     vp8_tree t,
     const vp8_prob *const p,
     int v,
@@ -103,7 +103,7 @@ static __inline int vp8_treed_cost(
 
     return c;
 }
-static __inline int vp8_cost_token
+static int vp8_cost_token
 (
     vp8_tree t,
     const vp8_prob *const p,
diff --git a/media/libvpx/vp8/encoder/x86/encodeopt.asm b/media/libvpx/vp8/encoder/x86/encodeopt.asm
index 9946294995c..7ec7d603c99 100644
--- a/media/libvpx/vp8/encoder/x86/encodeopt.asm
+++ b/media/libvpx/vp8/encoder/x86/encodeopt.asm
@@ -148,7 +148,7 @@ sym(vp8_mbblock_error_mmx_impl):
         pcmpeqw     mm1,        mm7
         mov         rcx,        16
 
-mberror_loop_mmx:
+.mberror_loop_mmx:
         movq        mm3,       [rsi]
         movq        mm4,       [rdi]
 
@@ -186,7 +186,7 @@ mberror_loop_mmx:
         add         rdi,        32
         sub         rcx,        1
 
-        jnz         mberror_loop_mmx
+        jnz         .mberror_loop_mmx
 
         movq        mm0,        mm2
         psrlq       mm2,        32
@@ -226,7 +226,7 @@ sym(vp8_mbblock_error_xmm_impl):
         pcmpeqw     xmm5,       xmm6
         mov         rcx,        16
 
-mberror_loop:
+.mberror_loop:
         movdqa      xmm0,       [rsi]
         movdqa      xmm1,       [rdi]
 
@@ -249,7 +249,7 @@ mberror_loop:
         paddd       xmm4,       xmm2
 
         paddd       xmm4,       xmm0
-        jnz         mberror_loop
+        jnz         .mberror_loop
 
         movdqa      xmm0,       xmm4
         punpckldq   xmm0,       xmm6
@@ -289,7 +289,7 @@ sym(vp8_mbuverror_mmx_impl):
         mov             rcx,        16
         pxor            mm7,        mm7
 
-mbuverror_loop_mmx:
+.mbuverror_loop_mmx:
 
         movq            mm1,        [rsi]
         movq            mm2,        [rdi]
@@ -313,7 +313,7 @@ mbuverror_loop_mmx:
         add             rdi,        16
 
         dec             rcx
-        jnz             mbuverror_loop_mmx
+        jnz             .mbuverror_loop_mmx
 
         movq            mm0,        mm7
         psrlq           mm7,        32
@@ -346,7 +346,7 @@ sym(vp8_mbuverror_xmm_impl):
         mov             rcx,        16
         pxor            xmm3,       xmm3
 
-mbuverror_loop:
+.mbuverror_loop:
 
         movdqa          xmm1,       [rsi]
         movdqa          xmm2,       [rdi]
@@ -360,7 +360,7 @@ mbuverror_loop:
         add             rdi,        16
 
         dec             rcx
-        jnz             mbuverror_loop
+        jnz             .mbuverror_loop
 
         pxor        xmm0,           xmm0
         movdqa      xmm1,           xmm3
diff --git a/media/libvpx/vp8/encoder/x86/quantize_sse2.asm b/media/libvpx/vp8/encoder/x86/quantize_sse2.asm
index 056b64c390f..7c249ff88b0 100644
--- a/media/libvpx/vp8/encoder/x86/quantize_sse2.asm
+++ b/media/libvpx/vp8/encoder/x86/quantize_sse2.asm
@@ -137,17 +137,17 @@ sym(vp8_regular_quantize_b_sse2):
     ; if (x >= zbin)
     sub         cx, WORD PTR[rdx]           ; x - zbin
     lea         rdx, [rdx + 2]              ; zbin_boost_ptr++
-    jl          rq_zigzag_loop_%1           ; x < zbin
+    jl          .rq_zigzag_loop_%1           ; x < zbin
 
     movsx       edi, WORD PTR[rsp + temp_qcoeff + %1 * 2]
 
     ; downshift by quant_shift[rc]
     movsx       cx, BYTE PTR[rax + %1]      ; quant_shift_ptr[rc]
     sar         edi, cl                     ; also sets Z bit
-    je          rq_zigzag_loop_%1           ; !y
+    je          .rq_zigzag_loop_%1           ; !y
     mov         WORD PTR[rsp + qcoeff + %1 * 2], di ;qcoeff_ptr[rc] = temp_qcoeff[rc]
     mov         rdx, [rsp + zrun_zbin_boost] ; reset to b->zrun_zbin_boost
-rq_zigzag_loop_%1:
+.rq_zigzag_loop_%1:
 %endmacro
 ; in vp8_default_zig_zag1d order: see vp8/common/entropy.c
 ZIGZAG_LOOP  0
@@ -194,6 +194,8 @@ ZIGZAG_LOOP 15
     movdqa      [rdi], xmm0        ; store dqcoeff
     movdqa      [rdi + 16], xmm1
 
+    mov         rcx, [rsi + vp8_blockd_eob]
+
     ; select the last value (in zig_zag order) for EOB
     pcmpeqw     xmm2, xmm6
     pcmpeqw     xmm3, xmm6
@@ -214,7 +216,8 @@ ZIGZAG_LOOP 15
     pmaxsw      xmm2, xmm3
     movd        eax, xmm2
     and         eax, 0xff
-    mov         [rsi + vp8_blockd_eob], eax
+
+    mov         BYTE PTR [rcx], al          ; store eob
 
     ; begin epilog
     add         rsp, stack_size
@@ -337,6 +340,8 @@ sym(vp8_fast_quantize_b_sse2):
 
     pmaxsw      xmm1, xmm5
 
+    mov         rcx, [rsi + vp8_blockd_eob]
+
     ; now down to 8
     pshufd      xmm5, xmm1, 00001110b
 
@@ -354,7 +359,8 @@ sym(vp8_fast_quantize_b_sse2):
 
     movd        eax, xmm1
     and         eax, 0xff
-    mov         [rsi + vp8_blockd_eob], eax
+
+    mov         BYTE PTR [rcx], al          ; store eob
 
     ; begin epilog
 %if ABI_IS_32BIT
diff --git a/media/libvpx/vp8/encoder/x86/quantize_sse4.asm b/media/libvpx/vp8/encoder/x86/quantize_sse4.asm
index 258899eedd9..70eac0c0fed 100644
--- a/media/libvpx/vp8/encoder/x86/quantize_sse4.asm
+++ b/media/libvpx/vp8/encoder/x86/quantize_sse4.asm
@@ -140,21 +140,21 @@ sym(vp8_regular_quantize_b_sse4):
     ; if (x >= zbin)
     sub         cx, WORD PTR[rdx]           ; x - zbin
     lea         rdx, [rdx + 2]              ; zbin_boost_ptr++
-    jl          rq_zigzag_loop_%1           ; x < zbin
+    jl          .rq_zigzag_loop_%1          ; x < zbin
 
     pextrw      edi, %3, %2                 ; y
 
     ; downshift by quant_shift[rc]
     pextrb      ecx, xmm5, %1               ; quant_shift[rc]
     sar         edi, cl                     ; also sets Z bit
-    je          rq_zigzag_loop_%1           ; !y
+    je          .rq_zigzag_loop_%1          ; !y
 %if ABI_IS_32BIT
     mov         WORD PTR[rsp + qcoeff + %1 *2], di
 %else
     pinsrw      %5, edi, %2                 ; qcoeff[rc]
 %endif
     mov         rdx, rax                    ; reset to b->zrun_zbin_boost
-rq_zigzag_loop_%1:
+.rq_zigzag_loop_%1:
 %endmacro
 ; in vp8_default_zig_zag1d order: see vp8/common/entropy.c
 ZIGZAG_LOOP  0, 0, xmm2, xmm6, xmm4
@@ -208,6 +208,8 @@ ZIGZAG_LOOP 15, 7, xmm3, xmm7, xmm8
     movdqa      [rdi], xmm0
     movdqa      [rdi + 16], xmm1
 
+    mov         rcx, [rsi + vp8_blockd_eob]
+
     ; select the last value (in zig_zag order) for EOB
     pxor        xmm6, xmm6
     pcmpeqw     xmm4, xmm6
@@ -225,7 +227,7 @@ ZIGZAG_LOOP 15, 7, xmm3, xmm7, xmm8
     add         eax, 1
     and         eax, edi
 
-    mov         [rsi + vp8_blockd_eob], eax
+    mov         BYTE PTR [rcx], al          ; store eob
 
     ; begin epilog
 %if ABI_IS_32BIT
diff --git a/media/libvpx/vp8/encoder/x86/quantize_ssse3.asm b/media/libvpx/vp8/encoder/x86/quantize_ssse3.asm
index 912007e02d7..e698e904c90 100644
--- a/media/libvpx/vp8/encoder/x86/quantize_ssse3.asm
+++ b/media/libvpx/vp8/encoder/x86/quantize_ssse3.asm
@@ -80,6 +80,9 @@ sym(vp8_fast_quantize_b_ssse3):
     mov         rdi, [rsi + vp8_blockd_dequant]
     mov         rcx, [rsi + vp8_blockd_dqcoeff]
 
+    movdqa      xmm2, xmm1                  ;store y for getting eob
+    movdqa      xmm3, xmm5
+
     pxor        xmm1, xmm0
     pxor        xmm5, xmm4
     psubw       xmm1, xmm0
@@ -88,34 +91,31 @@ sym(vp8_fast_quantize_b_ssse3):
     movdqa      [rax], xmm1
     movdqa      [rax + 16], xmm5
 
-    movdqa      xmm2, [rdi]
-    movdqa      xmm3, [rdi + 16]
+    movdqa      xmm0, [rdi]
+    movdqa      xmm4, [rdi + 16]
 
-    pxor        xmm4, xmm4
-    pmullw      xmm2, xmm1
-    pmullw      xmm3, xmm5
+    pmullw      xmm0, xmm1
+    pmullw      xmm4, xmm5
+    pxor        xmm1, xmm1
 
-    pcmpeqw     xmm1, xmm4                  ;non zero mask
-    pcmpeqw     xmm5, xmm4                  ;non zero mask
-    packsswb    xmm1, xmm5
-    pshufb      xmm1, [GLOBAL(zz_shuf)]
+    pcmpgtw     xmm2, xmm1                  ;calculate eob
+    pcmpgtw     xmm3, xmm1
+    packsswb    xmm2, xmm3
+    pshufb      xmm2, [GLOBAL(zz_shuf)]
 
-    pmovmskb    edx, xmm1
+    pmovmskb    edx, xmm2
 
-    xor         rdi, rdi
-    mov         eax, -1
-    xor         dx, ax                      ;flip the bits for bsr
-    bsr         eax, edx
+    movdqa      [rcx], xmm0                 ;store dqcoeff
+    movdqa      [rcx + 16], xmm4            ;store dqcoeff
+    mov         rcx, [rsi + vp8_blockd_eob]
 
-    movdqa      [rcx], xmm2                 ;store dqcoeff
-    movdqa      [rcx + 16], xmm3            ;store dqcoeff
-
-    sub         edi, edx                    ;check for all zeros in bit mask
-    sar         edi, 31                     ;0 or -1
+    bsr         eax, edx                    ;count 0
     add         eax, 1
-    and         eax, edi                    ;if the bit mask was all zero,
-                                            ;then eob = 0
-    mov         [rsi + vp8_blockd_eob], eax
+
+    cmp         edx, 0                      ;if all 0, eob=0
+    cmove       eax, edx
+
+    mov         BYTE PTR [rcx], al          ;store eob
 
     ; begin epilog
 %if ABI_IS_32BIT
diff --git a/media/libvpx/vp8/encoder/x86/subtract_mmx.asm b/media/libvpx/vp8/encoder/x86/subtract_mmx.asm
index a47e1f0d6ef..75e8aa3c2b9 100644
--- a/media/libvpx/vp8/encoder/x86/subtract_mmx.asm
+++ b/media/libvpx/vp8/encoder/x86/subtract_mmx.asm
@@ -73,85 +73,10 @@ sym(vp8_subtract_b_mmx_impl):
     pop         rbp
     ret
 
-;void vp8_subtract_mby_mmx(short *diff, unsigned char *src, unsigned char *pred, int stride)
+;void vp8_subtract_mby_mmx(short *diff, unsigned char *src, int src_stride,
+;unsigned char *pred, int pred_stride)
 global sym(vp8_subtract_mby_mmx)
 sym(vp8_subtract_mby_mmx):
-    push        rbp
-    mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 4
-    push rsi
-    push rdi
-    ; end prolog
-
-
-            mov         rsi,            arg(1) ;src
-            mov         rdi,            arg(0) ;diff
-
-            mov         rax,            arg(2) ;pred
-            movsxd      rdx,            dword ptr arg(3) ;stride
-
-            mov         rcx,            16
-            pxor        mm0,            mm0
-
-submby_loop:
-
-            movq        mm1,            [rsi]
-            movq        mm3,            [rax]
-
-            movq        mm2,            mm1
-            movq        mm4,            mm3
-
-            punpcklbw   mm1,            mm0
-            punpcklbw   mm3,            mm0
-
-            punpckhbw   mm2,            mm0
-            punpckhbw   mm4,            mm0
-
-            psubw       mm1,            mm3
-            psubw       mm2,            mm4
-
-            movq        [rdi],          mm1
-            movq        [rdi+8],        mm2
-
-
-            movq        mm1,            [rsi+8]
-            movq        mm3,            [rax+8]
-
-            movq        mm2,            mm1
-            movq        mm4,            mm3
-
-            punpcklbw   mm1,            mm0
-            punpcklbw   mm3,            mm0
-
-            punpckhbw   mm2,            mm0
-            punpckhbw   mm4,            mm0
-
-            psubw       mm1,            mm3
-            psubw       mm2,            mm4
-
-            movq        [rdi+16],       mm1
-            movq        [rdi+24],       mm2
-
-
-            add         rdi,            32
-            add         rax,            16
-
-            lea         rsi,            [rsi+rdx]
-
-            sub         rcx,            1
-            jnz         submby_loop
-
-    pop rdi
-    pop rsi
-    ; begin epilog
-    UNSHADOW_ARGS
-    pop         rbp
-    ret
-
-
-;void vp8_subtract_mbuv_mmx(short *diff, unsigned char *usrc, unsigned char *vsrc, unsigned char *pred, int stride)
-global sym(vp8_subtract_mbuv_mmx)
-sym(vp8_subtract_mbuv_mmx):
     push        rbp
     mov         rbp, rsp
     SHADOW_ARGS_TO_STACK 5
@@ -159,271 +84,137 @@ sym(vp8_subtract_mbuv_mmx):
     push rdi
     ; end prolog
 
-    ;short *udiff = diff + 256;
-    ;short *vdiff = diff + 320;
-    ;unsigned char *upred = pred + 256;
-    ;unsigned char *vpred = pred + 320;
+    mov         rdi,        arg(0)          ;diff
+    mov         rsi,        arg(1)          ;src
+    movsxd      rdx,        dword ptr arg(2);src_stride
+    mov         rax,        arg(3)          ;pred
+    push        rbx
+    movsxd      rbx,        dword ptr arg(4);pred_stride
 
-        ;unsigned char  *z    = usrc;
-        ;unsigned short *diff = udiff;
-        ;unsigned char  *Predictor= upred;
-
-            mov     rdi,        arg(0) ;diff
-            mov     rax,        arg(3) ;pred
-            mov     rsi,        arg(1) ;z = usrc
-            add     rdi,        256*2  ;diff = diff + 256 (shorts)
-            add     rax,        256    ;Predictor = pred + 256
-            movsxd  rdx,        dword ptr arg(4) ;stride;
-            pxor    mm7,        mm7
-
-            movq    mm0,        [rsi]
-            movq    mm1,        [rax]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-            movq    [rdi],      mm0
-            movq    [rdi+8],    mm3
+    pxor        mm0,        mm0
+    mov         rcx,        16
 
 
-            movq    mm0,        [rsi+rdx]
-            movq    mm1,        [rax+8]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-            movq    [rdi+16],   mm0
-            movq    [rdi+24],   mm3
+.submby_loop:
+    movq        mm1,        [rsi]
+    movq        mm3,        [rax]
 
-            movq    mm0,        [rsi+rdx*2]
-            movq    mm1,        [rax+16]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-            movq    [rdi+32],   mm0
-            movq    [rdi+40],   mm3
-            lea     rsi,        [rsi+rdx*2]
+    movq        mm2,        mm1
+    movq        mm4,        mm3
+
+    punpcklbw   mm1,        mm0
+    punpcklbw   mm3,        mm0
+
+    punpckhbw   mm2,        mm0
+    punpckhbw   mm4,        mm0
+
+    psubw       mm1,        mm3
+    psubw       mm2,        mm4
+
+    movq        [rdi],      mm1
+    movq        [rdi+8],    mm2
+
+    movq        mm1,        [rsi+8]
+    movq        mm3,        [rax+8]
+
+    movq        mm2,        mm1
+    movq        mm4,        mm3
+
+    punpcklbw   mm1,        mm0
+    punpcklbw   mm3,        mm0
+
+    punpckhbw   mm2,        mm0
+    punpckhbw   mm4,        mm0
+
+    psubw       mm1,        mm3
+    psubw       mm2,        mm4
+
+    movq        [rdi+16],   mm1
+    movq        [rdi+24],   mm2
+    add         rdi,        32
+    lea         rax,        [rax+rbx]
+    lea         rsi,        [rsi+rdx]
+    dec         rcx
+    jnz         .submby_loop
+
+    pop rbx
+    pop rdi
+    pop rsi
+    ; begin epilog
+    UNSHADOW_ARGS
+    pop         rbp
+    ret
 
 
-            movq    mm0,        [rsi+rdx]
-            movq    mm1,        [rax+24]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
+;vp8_subtract_mbuv_mmx(short *diff, unsigned char *usrc, unsigned char *vsrc,
+;                         int src_stride, unsigned char *upred,
+;                         unsigned char *vpred, int pred_stride)
 
-            movq    [rdi+48],   mm0
-            movq    [rdi+56],   mm3
+global sym(vp8_subtract_mbuv_mmx)
+sym(vp8_subtract_mbuv_mmx):
+    push        rbp
+    mov         rbp, rsp
+    SHADOW_ARGS_TO_STACK 7
+    push rsi
+    push rdi
+    ; end prolog
 
+    mov         rdi,        arg(0)          ;diff
+    mov         rsi,        arg(1)          ;usrc
+    movsxd      rdx,        dword ptr arg(3);src_stride;
+    mov         rax,        arg(4)          ;upred
+    add         rdi,        256*2           ;diff = diff + 256 (shorts)
+    mov         rcx,        8
+    push        rbx
+    movsxd      rbx,        dword ptr arg(6);pred_stride
 
-            add     rdi,        64
-            add     rax,        32
-            lea     rsi,        [rsi+rdx*2]
+    pxor        mm7,        mm7
 
+.submbu_loop:
+    movq        mm0,        [rsi]
+    movq        mm1,        [rax]
+    movq        mm3,        mm0
+    movq        mm4,        mm1
+    punpcklbw   mm0,        mm7
+    punpcklbw   mm1,        mm7
+    punpckhbw   mm3,        mm7
+    punpckhbw   mm4,        mm7
+    psubw       mm0,        mm1
+    psubw       mm3,        mm4
+    movq        [rdi],      mm0
+    movq        [rdi+8],    mm3
+    add         rdi, 16
+    add         rsi, rdx
+    add         rax, rbx
 
-            movq    mm0,        [rsi]
-            movq    mm1,        [rax]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-            movq    [rdi],      mm0
-            movq    [rdi+8],    mm3
+    dec         rcx
+    jnz         .submbu_loop
 
+    mov         rsi,        arg(2)          ;vsrc
+    mov         rax,        arg(5)          ;vpred
+    mov         rcx,        8
 
-            movq    mm0,        [rsi+rdx]
-            movq    mm1,        [rax+8]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-            movq    [rdi+16],   mm0
-            movq    [rdi+24],   mm3
+.submbv_loop:
+    movq        mm0,        [rsi]
+    movq        mm1,        [rax]
+    movq        mm3,        mm0
+    movq        mm4,        mm1
+    punpcklbw   mm0,        mm7
+    punpcklbw   mm1,        mm7
+    punpckhbw   mm3,        mm7
+    punpckhbw   mm4,        mm7
+    psubw       mm0,        mm1
+    psubw       mm3,        mm4
+    movq        [rdi],      mm0
+    movq        [rdi+8],    mm3
+    add         rdi, 16
+    add         rsi, rdx
+    add         rax, rbx
 
-            movq    mm0,        [rsi+rdx*2]
-            movq    mm1,        [rax+16]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-            movq    [rdi+32],   mm0
-            movq    [rdi+40],   mm3
-            lea     rsi,        [rsi+rdx*2]
-
-
-            movq    mm0,        [rsi+rdx]
-            movq    mm1,        [rax+24]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-
-            movq    [rdi+48],   mm0
-            movq    [rdi+56],   mm3
-
-        ;unsigned char  *z    = vsrc;
-        ;unsigned short *diff = vdiff;
-        ;unsigned char  *Predictor= vpred;
-
-            mov     rdi,        arg(0) ;diff
-            mov     rax,        arg(3) ;pred
-            mov     rsi,        arg(2) ;z = usrc
-            add     rdi,        320*2  ;diff = diff + 320 (shorts)
-            add     rax,        320    ;Predictor = pred + 320
-            movsxd  rdx,        dword ptr arg(4) ;stride;
-            pxor    mm7,        mm7
-
-            movq    mm0,        [rsi]
-            movq    mm1,        [rax]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-            movq    [rdi],      mm0
-            movq    [rdi+8],    mm3
-
-
-            movq    mm0,        [rsi+rdx]
-            movq    mm1,        [rax+8]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-            movq    [rdi+16],   mm0
-            movq    [rdi+24],   mm3
-
-            movq    mm0,        [rsi+rdx*2]
-            movq    mm1,        [rax+16]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-            movq    [rdi+32],   mm0
-            movq    [rdi+40],   mm3
-            lea     rsi,        [rsi+rdx*2]
-
-
-            movq    mm0,        [rsi+rdx]
-            movq    mm1,        [rax+24]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-
-            movq    [rdi+48],   mm0
-            movq    [rdi+56],   mm3
-
-
-            add     rdi,        64
-            add     rax,        32
-            lea     rsi,        [rsi+rdx*2]
-
-
-            movq    mm0,        [rsi]
-            movq    mm1,        [rax]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-            movq    [rdi],      mm0
-            movq    [rdi+8],    mm3
-
-
-            movq    mm0,        [rsi+rdx]
-            movq    mm1,        [rax+8]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-            movq    [rdi+16],   mm0
-            movq    [rdi+24],   mm3
-
-            movq    mm0,        [rsi+rdx*2]
-            movq    mm1,        [rax+16]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-            movq    [rdi+32],   mm0
-            movq    [rdi+40],   mm3
-            lea     rsi,        [rsi+rdx*2]
-
-
-            movq    mm0,        [rsi+rdx]
-            movq    mm1,        [rax+24]
-            movq    mm3,        mm0
-            movq    mm4,        mm1
-            punpcklbw   mm0,    mm7
-            punpcklbw   mm1,    mm7
-            punpckhbw   mm3,    mm7
-            punpckhbw   mm4,    mm7
-            psubw   mm0,        mm1
-            psubw   mm3,        mm4
-
-            movq    [rdi+48],   mm0
-            movq    [rdi+56],   mm3
+    dec         rcx
+    jnz         .submbv_loop
 
+    pop         rbx
     ; begin epilog
     pop rdi
     pop rsi
diff --git a/media/libvpx/vp8/encoder/x86/subtract_sse2.asm b/media/libvpx/vp8/encoder/x86/subtract_sse2.asm
index 95888f6be98..008e9c7d113 100644
--- a/media/libvpx/vp8/encoder/x86/subtract_sse2.asm
+++ b/media/libvpx/vp8/encoder/x86/subtract_sse2.asm
@@ -71,83 +71,10 @@ sym(vp8_subtract_b_sse2_impl):
     ret
 
 
-;void vp8_subtract_mby_sse2(short *diff, unsigned char *src, unsigned char *pred, int stride)
+;void vp8_subtract_mby_sse2(short *diff, unsigned char *src, int src_stride,
+;unsigned char *pred, int pred_stride)
 global sym(vp8_subtract_mby_sse2)
 sym(vp8_subtract_mby_sse2):
-    push        rbp
-    mov         rbp, rsp
-    SHADOW_ARGS_TO_STACK 4
-    SAVE_XMM 7
-    GET_GOT     rbx
-    push rsi
-    push rdi
-    ; end prolog
-
-            mov         rsi,            arg(1) ;src
-            mov         rdi,            arg(0) ;diff
-
-            mov         rax,            arg(2) ;pred
-            movsxd      rdx,            dword ptr arg(3) ;stride
-
-            mov         rcx,            8      ; do two lines at one time
-
-submby_loop:
-            movdqa      xmm0,           XMMWORD PTR [rsi]   ; src
-            movdqa      xmm1,           XMMWORD PTR [rax]   ; pred
-
-            movdqa      xmm2,           xmm0
-            psubb       xmm0,           xmm1
-
-            pxor        xmm1,           [GLOBAL(t80)]   ;convert to signed values
-            pxor        xmm2,           [GLOBAL(t80)]
-            pcmpgtb     xmm1,           xmm2            ; obtain sign information
-
-            movdqa      xmm2,    xmm0
-            movdqa      xmm3,    xmm1
-            punpcklbw   xmm0,    xmm1            ; put sign back to subtraction
-            punpckhbw   xmm2,    xmm3            ; put sign back to subtraction
-
-            movdqa      XMMWORD PTR [rdi],   xmm0
-            movdqa      XMMWORD PTR [rdi +16], xmm2
-
-            movdqa      xmm4,           XMMWORD PTR [rsi + rdx]
-            movdqa      xmm5,           XMMWORD PTR [rax + 16]
-
-            movdqa      xmm6,           xmm4
-            psubb       xmm4,           xmm5
-
-            pxor        xmm5,           [GLOBAL(t80)]   ;convert to signed values
-            pxor        xmm6,           [GLOBAL(t80)]
-            pcmpgtb     xmm5,           xmm6            ; obtain sign information
-
-            movdqa      xmm6,    xmm4
-            movdqa      xmm7,    xmm5
-            punpcklbw   xmm4,    xmm5            ; put sign back to subtraction
-            punpckhbw   xmm6,    xmm7            ; put sign back to subtraction
-
-            movdqa      XMMWORD PTR [rdi +32], xmm4
-            movdqa      XMMWORD PTR [rdi +48], xmm6
-
-            add         rdi,            64
-            add         rax,            32
-            lea         rsi,            [rsi+rdx*2]
-
-            sub         rcx,            1
-            jnz         submby_loop
-
-    pop rdi
-    pop rsi
-    ; begin epilog
-    RESTORE_GOT
-    RESTORE_XMM
-    UNSHADOW_ARGS
-    pop         rbp
-    ret
-
-
-;void vp8_subtract_mbuv_sse2(short *diff, unsigned char *usrc, unsigned char *vsrc, unsigned char *pred, int stride)
-global sym(vp8_subtract_mbuv_sse2)
-sym(vp8_subtract_mbuv_sse2):
     push        rbp
     mov         rbp, rsp
     SHADOW_ARGS_TO_STACK 5
@@ -156,192 +83,154 @@ sym(vp8_subtract_mbuv_sse2):
     push rdi
     ; end prolog
 
-            mov     rdi,        arg(0) ;diff
-            mov     rax,        arg(3) ;pred
-            mov     rsi,        arg(1) ;z = usrc
-            add     rdi,        256*2  ;diff = diff + 256 (shorts)
-            add     rax,        256    ;Predictor = pred + 256
-            movsxd  rdx,        dword ptr arg(4) ;stride;
-            lea     rcx,        [rdx + rdx*2]
+    mov         rdi,        arg(0)          ;diff
+    mov         rsi,        arg(1)          ;src
+    movsxd      rdx,        dword ptr arg(2);src_stride
+    mov         rax,        arg(3)          ;pred
+    movdqa      xmm4,       [GLOBAL(t80)]
+    push        rbx
+    mov         rcx,        8               ; do two lines at one time
+    movsxd      rbx,        dword ptr arg(4);pred_stride
 
-            ;u
-            ;line 0 1
-            movq       xmm0,    MMWORD PTR [rsi]  ; src
-            movq       xmm2,    MMWORD PTR [rsi+rdx]
-            movdqa     xmm1,    XMMWORD PTR [rax]  ; pred
-            punpcklqdq xmm0,    xmm2
+.submby_loop:
+    movdqa      xmm0,       [rsi]           ; src
+    movdqa      xmm1,       [rax]           ; pred
 
-            movdqa     xmm2,    xmm0
-            psubb      xmm0,    xmm1            ; subtraction with sign missed
+    movdqa      xmm2,       xmm0
+    psubb       xmm0,       xmm1
 
-            pxor       xmm1,    [GLOBAL(t80)]   ;convert to signed values
-            pxor       xmm2,    [GLOBAL(t80)]
-            pcmpgtb    xmm1,    xmm2            ; obtain sign information
+    pxor        xmm1,       xmm4            ;convert to signed values
+    pxor        xmm2,       xmm4
+    pcmpgtb     xmm1,       xmm2            ; obtain sign information
 
-            movdqa     xmm2,    xmm0
-            movdqa     xmm3,    xmm1
-            punpcklbw  xmm0,    xmm1            ; put sign back to subtraction
-            punpckhbw  xmm2,    xmm3            ; put sign back to subtraction
+    movdqa      xmm2,       xmm0
+    punpcklbw   xmm0,       xmm1            ; put sign back to subtraction
+    punpckhbw   xmm2,       xmm1            ; put sign back to subtraction
 
-            movdqa     XMMWORD PTR [rdi],   xmm0
-            movdqa     XMMWORD PTR [rdi +16],   xmm2
+    movdqa      xmm3,       [rsi + rdx]
+    movdqa      xmm5,       [rax + rbx]
 
-            ;line 2 3
-            movq       xmm0,    MMWORD PTR [rsi+rdx*2]  ; src
-            movq       xmm2,    MMWORD PTR [rsi+rcx]
-            movdqa     xmm1,    XMMWORD PTR [rax+16]  ; pred
-            punpcklqdq xmm0,    xmm2
+    lea         rsi,        [rsi+rdx*2]
+    lea         rax,        [rax+rbx*2]
 
-            movdqa     xmm2,    xmm0
-            psubb      xmm0,    xmm1            ; subtraction with sign missed
+    movdqa      [rdi],      xmm0
+    movdqa      [rdi +16],  xmm2
 
-            pxor       xmm1,    [GLOBAL(t80)]   ;convert to signed values
-            pxor       xmm2,    [GLOBAL(t80)]
-            pcmpgtb    xmm1,    xmm2            ; obtain sign information
+    movdqa      xmm1,       xmm3
+    psubb       xmm3,       xmm5
 
-            movdqa     xmm2,    xmm0
-            movdqa     xmm3,    xmm1
-            punpcklbw  xmm0,    xmm1            ; put sign back to subtraction
-            punpckhbw  xmm2,    xmm3            ; put sign back to subtraction
+    pxor        xmm5,       xmm4            ;convert to signed values
+    pxor        xmm1,       xmm4
+    pcmpgtb     xmm5,       xmm1            ; obtain sign information
 
-            movdqa     XMMWORD PTR [rdi + 32],   xmm0
-            movdqa     XMMWORD PTR [rdi + 48],   xmm2
+    movdqa      xmm1,       xmm3
+    punpcklbw   xmm3,       xmm5            ; put sign back to subtraction
+    punpckhbw   xmm1,       xmm5            ; put sign back to subtraction
 
-            ;line 4 5
-            lea        rsi,     [rsi + rdx*4]
+    movdqa      [rdi +32],  xmm3
+    movdqa      [rdi +48],  xmm1
 
-            movq       xmm0,    MMWORD PTR [rsi]  ; src
-            movq       xmm2,    MMWORD PTR [rsi+rdx]
-            movdqa     xmm1,    XMMWORD PTR [rax + 32]  ; pred
-            punpcklqdq xmm0,    xmm2
+    add         rdi,        64
+    dec         rcx
+    jnz         .submby_loop
 
-            movdqa     xmm2,    xmm0
-            psubb      xmm0,    xmm1            ; subtraction with sign missed
+    pop rbx
+    pop rdi
+    pop rsi
+    ; begin epilog
+    RESTORE_GOT
+    UNSHADOW_ARGS
+    pop         rbp
+    ret
 
-            pxor       xmm1,    [GLOBAL(t80)]   ;convert to signed values
-            pxor       xmm2,    [GLOBAL(t80)]
-            pcmpgtb    xmm1,    xmm2            ; obtain sign information
+;vp8_subtract_mbuv_sse2(short *diff, unsigned char *usrc, unsigned char *vsrc,
+;                         int src_stride, unsigned char *upred,
+;                         unsigned char *vpred, int pred_stride)
+global sym(vp8_subtract_mbuv_sse2)
+sym(vp8_subtract_mbuv_sse2):
+    push        rbp
+    mov         rbp, rsp
+    SHADOW_ARGS_TO_STACK 7
+    GET_GOT     rbx
+    push rsi
+    push rdi
+    ; end prolog
 
-            movdqa     xmm2,    xmm0
-            movdqa     xmm3,    xmm1
-            punpcklbw  xmm0,    xmm1            ; put sign back to subtraction
-            punpckhbw  xmm2,    xmm3            ; put sign back to subtraction
+    movdqa      xmm4,       [GLOBAL(t80)]
+    mov         rdi,        arg(0)          ;diff
+    mov         rsi,        arg(1)          ;usrc
+    movsxd      rdx,        dword ptr arg(3);src_stride;
+    mov         rax,        arg(4)          ;upred
+    add         rdi,        256*2           ;diff = diff + 256 (shorts)
+    mov         rcx,        4
+    push        rbx
+    movsxd      rbx,        dword ptr arg(6);pred_stride
 
-            movdqa     XMMWORD PTR [rdi + 64],   xmm0
-            movdqa     XMMWORD PTR [rdi + 80],   xmm2
+    ;u
+.submbu_loop:
+    movq        xmm0,       [rsi]           ; src
+    movq        xmm2,       [rsi+rdx]       ; src -- next line
+    movq        xmm1,       [rax]           ; pred
+    movq        xmm3,       [rax+rbx]       ; pred -- next line
+    lea         rsi,        [rsi + rdx*2]
+    lea         rax,        [rax + rbx*2]
 
-            ;line 6 7
-            movq       xmm0,    MMWORD PTR [rsi+rdx*2]  ; src
-            movq       xmm2,    MMWORD PTR [rsi+rcx]
-            movdqa     xmm1,    XMMWORD PTR [rax+ 48]  ; pred
-            punpcklqdq xmm0,    xmm2
+    punpcklqdq  xmm0,       xmm2
+    punpcklqdq  xmm1,       xmm3
 
-            movdqa     xmm2,    xmm0
-            psubb      xmm0,    xmm1            ; subtraction with sign missed
+    movdqa      xmm2,       xmm0
+    psubb       xmm0,       xmm1            ; subtraction with sign missed
 
-            pxor       xmm1,    [GLOBAL(t80)]   ;convert to signed values
-            pxor       xmm2,    [GLOBAL(t80)]
-            pcmpgtb    xmm1,    xmm2            ; obtain sign information
+    pxor        xmm1,       xmm4            ;convert to signed values
+    pxor        xmm2,       xmm4
+    pcmpgtb     xmm1,       xmm2            ; obtain sign information
 
-            movdqa     xmm2,    xmm0
-            movdqa     xmm3,    xmm1
-            punpcklbw  xmm0,    xmm1            ; put sign back to subtraction
-            punpckhbw  xmm2,    xmm3            ; put sign back to subtraction
+    movdqa      xmm2,       xmm0
+    movdqa      xmm3,       xmm1
+    punpcklbw   xmm0,       xmm1            ; put sign back to subtraction
+    punpckhbw   xmm2,       xmm3            ; put sign back to subtraction
 
-            movdqa     XMMWORD PTR [rdi + 96],   xmm0
-            movdqa     XMMWORD PTR [rdi + 112],  xmm2
+    movdqa      [rdi],      xmm0            ; store difference
+    movdqa      [rdi +16],  xmm2            ; store difference
+    add         rdi,        32
+    sub         rcx, 1
+    jnz         .submbu_loop
 
-            ;v
-            mov     rsi,        arg(2) ;z = vsrc
-            add     rdi,        64*2  ;diff = diff + 320 (shorts)
-            add     rax,        64    ;Predictor = pred + 320
+    mov         rsi,        arg(2)          ;vsrc
+    mov         rax,        arg(5)          ;vpred
+    mov         rcx,        4
 
-            ;line 0 1
-            movq       xmm0,    MMWORD PTR [rsi]  ; src
-            movq       xmm2,    MMWORD PTR [rsi+rdx]
-            movdqa     xmm1,    XMMWORD PTR [rax]  ; pred
-            punpcklqdq xmm0,    xmm2
+    ;v
+.submbv_loop:
+    movq        xmm0,       [rsi]           ; src
+    movq        xmm2,       [rsi+rdx]       ; src -- next line
+    movq        xmm1,       [rax]           ; pred
+    movq        xmm3,       [rax+rbx]       ; pred -- next line
+    lea         rsi,        [rsi + rdx*2]
+    lea         rax,        [rax + rbx*2]
 
-            movdqa     xmm2,    xmm0
-            psubb      xmm0,    xmm1            ; subtraction with sign missed
+    punpcklqdq  xmm0,       xmm2
+    punpcklqdq  xmm1,       xmm3
 
-            pxor       xmm1,    [GLOBAL(t80)]   ;convert to signed values
-            pxor       xmm2,    [GLOBAL(t80)]
-            pcmpgtb    xmm1,    xmm2            ; obtain sign information
+    movdqa      xmm2,       xmm0
+    psubb       xmm0,       xmm1            ; subtraction with sign missed
 
-            movdqa     xmm2,    xmm0
-            movdqa     xmm3,    xmm1
-            punpcklbw  xmm0,    xmm1            ; put sign back to subtraction
-            punpckhbw  xmm2,    xmm3            ; put sign back to subtraction
+    pxor        xmm1,       xmm4            ;convert to signed values
+    pxor        xmm2,       xmm4
+    pcmpgtb     xmm1,       xmm2            ; obtain sign information
 
-            movdqa     XMMWORD PTR [rdi],   xmm0
-            movdqa     XMMWORD PTR [rdi +16],   xmm2
+    movdqa      xmm2,       xmm0
+    movdqa      xmm3,       xmm1
+    punpcklbw   xmm0,       xmm1            ; put sign back to subtraction
+    punpckhbw   xmm2,       xmm3            ; put sign back to subtraction
 
-            ;line 2 3
-            movq       xmm0,    MMWORD PTR [rsi+rdx*2]  ; src
-            movq       xmm2,    MMWORD PTR [rsi+rcx]
-            movdqa     xmm1,    XMMWORD PTR [rax+16]  ; pred
-            punpcklqdq xmm0,    xmm2
-
-            movdqa     xmm2,    xmm0
-            psubb      xmm0,    xmm1            ; subtraction with sign missed
-
-            pxor       xmm1,    [GLOBAL(t80)]   ;convert to signed values
-            pxor       xmm2,    [GLOBAL(t80)]
-            pcmpgtb    xmm1,    xmm2            ; obtain sign information
-
-            movdqa     xmm2,    xmm0
-            movdqa     xmm3,    xmm1
-            punpcklbw  xmm0,    xmm1            ; put sign back to subtraction
-            punpckhbw  xmm2,    xmm3            ; put sign back to subtraction
-
-            movdqa     XMMWORD PTR [rdi + 32],   xmm0
-            movdqa     XMMWORD PTR [rdi + 48],   xmm2
-
-            ;line 4 5
-            lea        rsi,     [rsi + rdx*4]
-
-            movq       xmm0,    MMWORD PTR [rsi]  ; src
-            movq       xmm2,    MMWORD PTR [rsi+rdx]
-            movdqa     xmm1,    XMMWORD PTR [rax + 32]  ; pred
-            punpcklqdq xmm0,    xmm2
-
-            movdqa     xmm2,    xmm0
-            psubb      xmm0,    xmm1            ; subtraction with sign missed
-
-            pxor       xmm1,    [GLOBAL(t80)]   ;convert to signed values
-            pxor       xmm2,    [GLOBAL(t80)]
-            pcmpgtb    xmm1,    xmm2            ; obtain sign information
-
-            movdqa     xmm2,    xmm0
-            movdqa     xmm3,    xmm1
-            punpcklbw  xmm0,    xmm1            ; put sign back to subtraction
-            punpckhbw  xmm2,    xmm3            ; put sign back to subtraction
-
-            movdqa     XMMWORD PTR [rdi + 64],   xmm0
-            movdqa     XMMWORD PTR [rdi + 80],   xmm2
-
-            ;line 6 7
-            movq       xmm0,    MMWORD PTR [rsi+rdx*2]  ; src
-            movq       xmm2,    MMWORD PTR [rsi+rcx]
-            movdqa     xmm1,    XMMWORD PTR [rax+ 48]  ; pred
-            punpcklqdq xmm0,    xmm2
-
-            movdqa     xmm2,    xmm0
-            psubb      xmm0,    xmm1            ; subtraction with sign missed
-
-            pxor       xmm1,    [GLOBAL(t80)]   ;convert to signed values
-            pxor       xmm2,    [GLOBAL(t80)]
-            pcmpgtb    xmm1,    xmm2            ; obtain sign information
-
-            movdqa     xmm2,    xmm0
-            movdqa     xmm3,    xmm1
-            punpcklbw  xmm0,    xmm1            ; put sign back to subtraction
-            punpckhbw  xmm2,    xmm3            ; put sign back to subtraction
-
-            movdqa     XMMWORD PTR [rdi + 96],   xmm0
-            movdqa     XMMWORD PTR [rdi + 112],  xmm2
+    movdqa      [rdi],      xmm0            ; store difference
+    movdqa      [rdi +16],  xmm2            ; store difference
+    add         rdi,        32
+    sub         rcx, 1
+    jnz         .submbv_loop
 
+    pop         rbx
     ; begin epilog
     pop rdi
     pop rsi
diff --git a/media/libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm b/media/libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm
index b777ef5666c..b97c694391f 100644
--- a/media/libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm
+++ b/media/libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm
@@ -71,26 +71,26 @@ sym(vp8_temporal_filter_apply_sse2):
 
         lea         rcx,            [rdx + 16*16*1]
         cmp         dword ptr [rsp + block_size], 8
-        jne         temporal_filter_apply_load_16
+        jne         .temporal_filter_apply_load_16
         lea         rcx,            [rdx + 8*8*1]
 
-temporal_filter_apply_load_8:
+.temporal_filter_apply_load_8:
         movq        xmm0,           [rsi]  ; first row
         lea         rsi,            [rsi + rbp] ; += stride
         punpcklbw   xmm0,           xmm7   ; src[ 0- 7]
         movq        xmm1,           [rsi]  ; second row
         lea         rsi,            [rsi + rbp] ; += stride
         punpcklbw   xmm1,           xmm7   ; src[ 8-15]
-        jmp         temporal_filter_apply_load_finished
+        jmp         .temporal_filter_apply_load_finished
 
-temporal_filter_apply_load_16:
+.temporal_filter_apply_load_16:
         movdqa      xmm0,           [rsi]  ; src (frame1)
         lea         rsi,            [rsi + rbp] ; += stride
         movdqa      xmm1,           xmm0
         punpcklbw   xmm0,           xmm7   ; src[ 0- 7]
         punpckhbw   xmm1,           xmm7   ; src[ 8-15]
 
-temporal_filter_apply_load_finished:
+.temporal_filter_apply_load_finished:
         movdqa      xmm2,           [rdx]  ; predictor (frame2)
         movdqa      xmm3,           xmm2
         punpcklbw   xmm2,           xmm7   ; pred[ 0- 7]
@@ -176,13 +176,13 @@ temporal_filter_apply_load_finished:
         lea         rdi,            [rdi + 16*4] ; accumulator += 16*(sizeof(int))
 
         cmp         rdx,            rcx
-        je          temporal_filter_apply_epilog
+        je          .temporal_filter_apply_epilog
         pxor        xmm7,           xmm7   ; zero for extraction
         cmp         dword ptr [rsp + block_size], 16
-        je          temporal_filter_apply_load_16
-        jmp         temporal_filter_apply_load_8
+        je          .temporal_filter_apply_load_16
+        jmp         .temporal_filter_apply_load_8
 
-temporal_filter_apply_epilog:
+.temporal_filter_apply_epilog:
     ; begin epilog
     mov         rbp,            [rsp + rbp_backup]
     add         rsp,            stack_size
diff --git a/media/libvpx/vp8/encoder/x86/x86_csystemdependent.c b/media/libvpx/vp8/encoder/x86/x86_csystemdependent.c
index badb9f04451..b55b4c88106 100644
--- a/media/libvpx/vp8/encoder/x86/x86_csystemdependent.c
+++ b/media/libvpx/vp8/encoder/x86/x86_csystemdependent.c
@@ -9,9 +9,8 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/x86.h"
-#include "vp8/encoder/variance.h"
 #include "vp8/encoder/onyx_int.h"
 
 
@@ -37,17 +36,17 @@ void vp8_fast_quantize_b_mmx(BLOCK *b, BLOCKD *d)
     short *dqcoeff_ptr = d->dqcoeff;
     short *dequant_ptr = d->dequant;
 
-    d->eob = vp8_fast_quantize_b_impl_mmx(
-                 coeff_ptr,
-                 zbin_ptr,
-                 qcoeff_ptr,
-                 dequant_ptr,
-                 scan_mask,
+    *d->eob = (char)vp8_fast_quantize_b_impl_mmx(
+                                                 coeff_ptr,
+                                                 zbin_ptr,
+                                                 qcoeff_ptr,
+                                                 dequant_ptr,
+                                                 scan_mask,
 
-                 round_ptr,
-                 quant_ptr,
-                 dqcoeff_ptr
-             );
+                                                 round_ptr,
+                                                 quant_ptr,
+                                                 dqcoeff_ptr
+                                                 );
 }
 
 int vp8_mbblock_error_mmx_impl(short *coeff_ptr, short *dcoef_ptr, int dc);
@@ -111,29 +110,6 @@ void vp8_subtract_b_sse2(BLOCK *be, BLOCKD *bd, int pitch)
 
 #endif
 
-#if HAVE_SSSE3
-#if CONFIG_INTERNAL_STATS
-#if ARCH_X86_64
-typedef void ssimpf
-(
-    unsigned char *s,
-    int sp,
-    unsigned char *r,
-    int rp,
-    unsigned long *sum_s,
-    unsigned long *sum_r,
-    unsigned long *sum_sq_s,
-    unsigned long *sum_sq_r,
-    unsigned long *sum_sxr
-);
-
-extern ssimpf vp8_ssim_parms_16x16_sse3;
-extern ssimpf vp8_ssim_parms_8x8_sse3;
-#endif
-#endif
-#endif
-
-
 void vp8_arch_x86_encoder_init(VP8_COMP *cpi)
 {
 #if CONFIG_RUNTIME_CPU_DETECT
@@ -150,33 +126,6 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi)
 #if HAVE_MMX
     if (flags & HAS_MMX)
     {
-        cpi->rtcd.variance.sad16x16              = vp8_sad16x16_mmx;
-        cpi->rtcd.variance.sad16x8               = vp8_sad16x8_mmx;
-        cpi->rtcd.variance.sad8x16               = vp8_sad8x16_mmx;
-        cpi->rtcd.variance.sad8x8                = vp8_sad8x8_mmx;
-        cpi->rtcd.variance.sad4x4                = vp8_sad4x4_mmx;
-
-        cpi->rtcd.variance.var4x4                = vp8_variance4x4_mmx;
-        cpi->rtcd.variance.var8x8                = vp8_variance8x8_mmx;
-        cpi->rtcd.variance.var8x16               = vp8_variance8x16_mmx;
-        cpi->rtcd.variance.var16x8               = vp8_variance16x8_mmx;
-        cpi->rtcd.variance.var16x16              = vp8_variance16x16_mmx;
-
-        cpi->rtcd.variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_mmx;
-        cpi->rtcd.variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_mmx;
-        cpi->rtcd.variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_mmx;
-        cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_mmx;
-        cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_mmx;
-        cpi->rtcd.variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_mmx;
-        cpi->rtcd.variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_mmx;
-        cpi->rtcd.variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_mmx;
-        cpi->rtcd.variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_mmx;
-
-        cpi->rtcd.variance.mse16x16              = vp8_mse16x16_mmx;
-        cpi->rtcd.variance.getmbss               = vp8_get_mb_ss_mmx;
-
-        cpi->rtcd.variance.get4x4sse_cs          = vp8_get4x4sse_cs_mmx;
-
         cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_mmx;
         cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_mmx;
         cpi->rtcd.fdct.fast4x4                   = vp8_short_fdct4x4_mmx;
@@ -198,34 +147,6 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi)
 #if HAVE_SSE2
     if (flags & HAS_SSE2)
     {
-        cpi->rtcd.variance.sad16x16              = vp8_sad16x16_wmt;
-        cpi->rtcd.variance.sad16x8               = vp8_sad16x8_wmt;
-        cpi->rtcd.variance.sad8x16               = vp8_sad8x16_wmt;
-        cpi->rtcd.variance.sad8x8                = vp8_sad8x8_wmt;
-        cpi->rtcd.variance.sad4x4                = vp8_sad4x4_wmt;
-        cpi->rtcd.variance.copy32xn              = vp8_copy32xn_sse2;
-
-        cpi->rtcd.variance.var4x4                = vp8_variance4x4_wmt;
-        cpi->rtcd.variance.var8x8                = vp8_variance8x8_wmt;
-        cpi->rtcd.variance.var8x16               = vp8_variance8x16_wmt;
-        cpi->rtcd.variance.var16x8               = vp8_variance16x8_wmt;
-        cpi->rtcd.variance.var16x16              = vp8_variance16x16_wmt;
-
-        cpi->rtcd.variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_wmt;
-        cpi->rtcd.variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_wmt;
-        cpi->rtcd.variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_wmt;
-        cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_wmt;
-        cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_wmt;
-        cpi->rtcd.variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_wmt;
-        cpi->rtcd.variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_wmt;
-        cpi->rtcd.variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_wmt;
-        cpi->rtcd.variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_wmt;
-
-        cpi->rtcd.variance.mse16x16              = vp8_mse16x16_wmt;
-        cpi->rtcd.variance.getmbss               = vp8_get_mb_ss_sse2;
-
-        /* cpi->rtcd.variance.get4x4sse_cs  not implemented for wmt */;
-
         cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_sse2;
         cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_sse2;
         cpi->rtcd.fdct.fast4x4                   = vp8_short_fdct4x4_sse2;
@@ -246,25 +167,14 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi)
 #if !(CONFIG_REALTIME_ONLY)
         cpi->rtcd.temporal.apply                 = vp8_temporal_filter_apply_sse2;
 #endif
+
     }
 #endif
 
 #if HAVE_SSE3
     if (flags & HAS_SSE3)
     {
-        cpi->rtcd.variance.sad16x16              = vp8_sad16x16_sse3;
-        cpi->rtcd.variance.sad16x16x3            = vp8_sad16x16x3_sse3;
-        cpi->rtcd.variance.sad16x8x3             = vp8_sad16x8x3_sse3;
-        cpi->rtcd.variance.sad8x16x3             = vp8_sad8x16x3_sse3;
-        cpi->rtcd.variance.sad8x8x3              = vp8_sad8x8x3_sse3;
-        cpi->rtcd.variance.sad4x4x3              = vp8_sad4x4x3_sse3;
         cpi->rtcd.search.full_search             = vp8_full_search_sadx3;
-        cpi->rtcd.variance.sad16x16x4d           = vp8_sad16x16x4d_sse3;
-        cpi->rtcd.variance.sad16x8x4d            = vp8_sad16x8x4d_sse3;
-        cpi->rtcd.variance.sad8x16x4d            = vp8_sad8x16x4d_sse3;
-        cpi->rtcd.variance.sad8x8x4d             = vp8_sad8x8x4d_sse3;
-        cpi->rtcd.variance.sad4x4x4d             = vp8_sad4x4x4d_sse3;
-        cpi->rtcd.variance.copy32xn              = vp8_copy32xn_sse3;
         cpi->rtcd.search.diamond_search          = vp8_diamond_search_sadx4;
         cpi->rtcd.search.refining_search         = vp8_refining_search_sadx4;
     }
@@ -273,21 +183,7 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi)
 #if HAVE_SSSE3
     if (flags & HAS_SSSE3)
     {
-        cpi->rtcd.variance.sad16x16x3            = vp8_sad16x16x3_ssse3;
-        cpi->rtcd.variance.sad16x8x3             = vp8_sad16x8x3_ssse3;
-
-        cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_ssse3;
-        cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_ssse3;
-
         cpi->rtcd.quantize.fastquantb            = vp8_fast_quantize_b_ssse3;
-
-#if CONFIG_INTERNAL_STATS
-#if ARCH_X86_64
-        cpi->rtcd.variance.ssimpf_8x8            = vp8_ssim_parms_8x8_sse3;
-        cpi->rtcd.variance.ssimpf                = vp8_ssim_parms_16x16_sse3;
-#endif
-#endif
-
     }
 #endif
 
@@ -296,11 +192,6 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi)
 #if HAVE_SSE4_1
     if (flags & HAS_SSE4_1)
     {
-        cpi->rtcd.variance.sad16x16x8            = vp8_sad16x16x8_sse4;
-        cpi->rtcd.variance.sad16x8x8             = vp8_sad16x8x8_sse4;
-        cpi->rtcd.variance.sad8x16x8             = vp8_sad8x16x8_sse4;
-        cpi->rtcd.variance.sad8x8x8              = vp8_sad8x8x8_sse4;
-        cpi->rtcd.variance.sad4x4x8              = vp8_sad4x4x8_sse4;
         cpi->rtcd.search.full_search             = vp8_full_search_sadx8;
 
         cpi->rtcd.quantize.quantb                = vp8_regular_quantize_b_sse4;
diff --git a/media/libvpx/vp8/vp8_cx_iface.c b/media/libvpx/vp8/vp8_cx_iface.c
index ca4e505dcae..f2f376a7ca8 100644
--- a/media/libvpx/vp8/vp8_cx_iface.c
+++ b/media/libvpx/vp8/vp8_cx_iface.c
@@ -83,7 +83,7 @@ struct vpx_codec_alg_priv
     vpx_codec_enc_cfg_t     cfg;
     struct vp8_extracfg     vp8_cfg;
     VP8_CONFIG              oxcf;
-    VP8_PTR             cpi;
+    struct VP8_COMP        *cpi;
     unsigned char          *cx_data;
     unsigned int            cx_data_sz;
     vpx_image_t             preview_img;
@@ -137,7 +137,8 @@ update_error_state(vpx_codec_alg_priv_t                 *ctx,
 
 static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t      *ctx,
                                        const vpx_codec_enc_cfg_t *cfg,
-                                       const struct vp8_extracfg *vp8_cfg)
+                                       const struct vp8_extracfg *vp8_cfg,
+                                       int                        finalize)
 {
     RANGE_CHECK(cfg, g_w,                   1, 16383); /* 14 bits available */
     RANGE_CHECK(cfg, g_h,                   1, 16383); /* 14 bits available */
@@ -193,6 +194,9 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t      *ctx,
     RANGE_CHECK_HI(vp8_cfg, arnr_strength,   6);
     RANGE_CHECK(vp8_cfg, arnr_type,       1, 3);
     RANGE_CHECK(vp8_cfg, cq_level, 0, 63);
+    if(finalize && cfg->rc_end_usage == VPX_CQ)
+        RANGE_CHECK(vp8_cfg, cq_level,
+                    cfg->rc_min_quantizer, cfg->rc_max_quantizer);
 
 #if !(CONFIG_REALTIME_ONLY)
     if (cfg->g_pass == VPX_RC_LAST_PASS)
@@ -218,6 +222,25 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t      *ctx,
     }
 #endif
 
+    RANGE_CHECK(cfg, ts_number_layers, 1, 5);
+
+    if (cfg->ts_number_layers > 1)
+    {
+        int i;
+        RANGE_CHECK_HI(cfg, ts_periodicity, 16);
+
+        for (i=1; i<cfg->ts_number_layers; i++)
+            if (cfg->ts_target_bitrate[i] <= cfg->ts_target_bitrate[i-1])
+                ERROR("ts_target_bitrate entries are not strictly increasing");
+
+        RANGE_CHECK(cfg, ts_rate_decimator[cfg->ts_number_layers-1], 1, 1);
+        for (i=cfg->ts_number_layers-2; i>0; i--)
+            if (cfg->ts_rate_decimator[i-1] != 2*cfg->ts_rate_decimator[i])
+                ERROR("ts_rate_decimator factors are not powers of 2");
+
+        RANGE_CHECK_HI(cfg, ts_layer_id[i], cfg->ts_number_layers-1);
+    }
+
     return VPX_CODEC_OK;
 }
 
@@ -245,22 +268,17 @@ static vpx_codec_err_t validate_img(vpx_codec_alg_priv_t *ctx,
 
 static vpx_codec_err_t set_vp8e_config(VP8_CONFIG *oxcf,
                                        vpx_codec_enc_cfg_t cfg,
-                                       struct vp8_extracfg vp8_cfg)
+                                       struct vp8_extracfg vp8_cfg,
+                                       vpx_codec_priv_enc_mr_cfg_t *mr_cfg)
 {
     oxcf->multi_threaded         = cfg.g_threads;
     oxcf->Version               = cfg.g_profile;
 
     oxcf->Width                 = cfg.g_w;
     oxcf->Height                = cfg.g_h;
-    /* guess a frame rate if out of whack, use 30 */
-    oxcf->frame_rate             = (double)(cfg.g_timebase.den) / (double)(cfg.g_timebase.num);
+    oxcf->timebase              = cfg.g_timebase;
 
-    if (oxcf->frame_rate > 180)
-    {
-        oxcf->frame_rate = 30;
-    }
-
-    oxcf->error_resilient_mode    = cfg.g_error_resilient;
+    oxcf->error_resilient_mode = cfg.g_error_resilient;
 
     switch (cfg.g_pass)
     {
@@ -277,13 +295,13 @@ static vpx_codec_err_t set_vp8e_config(VP8_CONFIG *oxcf,
 
     if (cfg.g_pass == VPX_RC_FIRST_PASS)
     {
-        oxcf->allow_lag              = 0;
-        oxcf->lag_in_frames           = 0;
+        oxcf->allow_lag     = 0;
+        oxcf->lag_in_frames = 0;
     }
     else
     {
-        oxcf->allow_lag              = (cfg.g_lag_in_frames) > 0;
-        oxcf->lag_in_frames           = cfg.g_lag_in_frames;
+        oxcf->allow_lag     = (cfg.g_lag_in_frames) > 0;
+        oxcf->lag_in_frames = cfg.g_lag_in_frames;
     }
 
     oxcf->allow_df               = (cfg.rc_dropframe_thresh > 0);
@@ -295,59 +313,90 @@ static vpx_codec_err_t set_vp8e_config(VP8_CONFIG *oxcf,
 
     if (cfg.rc_end_usage == VPX_VBR)
     {
-        oxcf->end_usage          = USAGE_LOCAL_FILE_PLAYBACK;
+        oxcf->end_usage = USAGE_LOCAL_FILE_PLAYBACK;
     }
     else if (cfg.rc_end_usage == VPX_CBR)
     {
-        oxcf->end_usage          = USAGE_STREAM_FROM_SERVER;
+        oxcf->end_usage = USAGE_STREAM_FROM_SERVER;
     }
     else if (cfg.rc_end_usage == VPX_CQ)
     {
-        oxcf->end_usage          = USAGE_CONSTRAINED_QUALITY;
+        oxcf->end_usage = USAGE_CONSTRAINED_QUALITY;
     }
 
-    oxcf->target_bandwidth       = cfg.rc_target_bitrate;
+    oxcf->target_bandwidth         = cfg.rc_target_bitrate;
     oxcf->rc_max_intra_bitrate_pct = vp8_cfg.rc_max_intra_bitrate_pct;
 
-    oxcf->best_allowed_q          = cfg.rc_min_quantizer;
-    oxcf->worst_allowed_q         = cfg.rc_max_quantizer;
-    oxcf->cq_level                = vp8_cfg.cq_level;
+    oxcf->best_allowed_q           = cfg.rc_min_quantizer;
+    oxcf->worst_allowed_q          = cfg.rc_max_quantizer;
+    oxcf->cq_level                 = vp8_cfg.cq_level;
     oxcf->fixed_q = -1;
 
-    oxcf->under_shoot_pct         = cfg.rc_undershoot_pct;
-    oxcf->over_shoot_pct          = cfg.rc_overshoot_pct;
+    oxcf->under_shoot_pct          = cfg.rc_undershoot_pct;
+    oxcf->over_shoot_pct           = cfg.rc_overshoot_pct;
 
-    oxcf->maximum_buffer_size     = cfg.rc_buf_sz;
-    oxcf->starting_buffer_level   = cfg.rc_buf_initial_sz;
-    oxcf->optimal_buffer_level    = cfg.rc_buf_optimal_sz;
+    oxcf->maximum_buffer_size_in_ms   = cfg.rc_buf_sz;
+    oxcf->starting_buffer_level_in_ms = cfg.rc_buf_initial_sz;
+    oxcf->optimal_buffer_level_in_ms  = cfg.rc_buf_optimal_sz;
 
-    oxcf->two_pass_vbrbias        = cfg.rc_2pass_vbr_bias_pct;
+    oxcf->maximum_buffer_size      = cfg.rc_buf_sz;
+    oxcf->starting_buffer_level    = cfg.rc_buf_initial_sz;
+    oxcf->optimal_buffer_level     = cfg.rc_buf_optimal_sz;
+
+    oxcf->two_pass_vbrbias         = cfg.rc_2pass_vbr_bias_pct;
     oxcf->two_pass_vbrmin_section  = cfg.rc_2pass_vbr_minsection_pct;
     oxcf->two_pass_vbrmax_section  = cfg.rc_2pass_vbr_maxsection_pct;
 
-    oxcf->auto_key               = cfg.kf_mode == VPX_KF_AUTO
-                                   && cfg.kf_min_dist != cfg.kf_max_dist;
-    //oxcf->kf_min_dist         = cfg.kf_min_dis;
-    oxcf->key_freq               = cfg.kf_max_dist;
+    oxcf->auto_key                 = cfg.kf_mode == VPX_KF_AUTO
+                                       && cfg.kf_min_dist != cfg.kf_max_dist;
+    //oxcf->kf_min_dist            = cfg.kf_min_dis;
+    oxcf->key_freq                 = cfg.kf_max_dist;
+
+    oxcf->number_of_layers         = cfg.ts_number_layers;
+    oxcf->periodicity              = cfg.ts_periodicity;
+
+    if (oxcf->number_of_layers > 1)
+    {
+        memcpy (oxcf->target_bitrate, cfg.ts_target_bitrate,
+                          sizeof(cfg.ts_target_bitrate));
+        memcpy (oxcf->rate_decimator, cfg.ts_rate_decimator,
+                          sizeof(cfg.ts_rate_decimator));
+        memcpy (oxcf->layer_id, cfg.ts_layer_id, sizeof(cfg.ts_layer_id));
+    }
+
+#if CONFIG_MULTI_RES_ENCODING
+    /* When mr_cfg is NULL, oxcf->mr_total_resolutions and oxcf->mr_encoder_id
+     * are both memset to 0, which ensures the correct logic under this
+     * situation.
+     */
+    if(mr_cfg)
+    {
+        oxcf->mr_total_resolutions        = mr_cfg->mr_total_resolutions;
+        oxcf->mr_encoder_id               = mr_cfg->mr_encoder_id;
+        oxcf->mr_down_sampling_factor.num = mr_cfg->mr_down_sampling_factor.num;
+        oxcf->mr_down_sampling_factor.den = mr_cfg->mr_down_sampling_factor.den;
+        oxcf->mr_low_res_mode_info        = mr_cfg->mr_low_res_mode_info;
+    }
+#endif
 
     //oxcf->delete_first_pass_file = cfg.g_delete_firstpassfile;
     //strcpy(oxcf->first_pass_file, cfg.g_firstpass_file);
 
-    oxcf->cpu_used               =  vp8_cfg.cpu_used;
-    oxcf->encode_breakout        =  vp8_cfg.static_thresh;
-    oxcf->play_alternate         =  vp8_cfg.enable_auto_alt_ref;
-    oxcf->noise_sensitivity      =  vp8_cfg.noise_sensitivity;
-    oxcf->Sharpness             =  vp8_cfg.Sharpness;
-    oxcf->token_partitions       =  vp8_cfg.token_partitions;
+    oxcf->cpu_used               = vp8_cfg.cpu_used;
+    oxcf->encode_breakout        = vp8_cfg.static_thresh;
+    oxcf->play_alternate         = vp8_cfg.enable_auto_alt_ref;
+    oxcf->noise_sensitivity      = vp8_cfg.noise_sensitivity;
+    oxcf->Sharpness              = vp8_cfg.Sharpness;
+    oxcf->token_partitions       = vp8_cfg.token_partitions;
 
-    oxcf->two_pass_stats_in        =  cfg.rc_twopass_stats_in;
-    oxcf->output_pkt_list         =  vp8_cfg.pkt_list;
+    oxcf->two_pass_stats_in      = cfg.rc_twopass_stats_in;
+    oxcf->output_pkt_list        = vp8_cfg.pkt_list;
 
-    oxcf->arnr_max_frames = vp8_cfg.arnr_max_frames;
-    oxcf->arnr_strength =  vp8_cfg.arnr_strength;
-    oxcf->arnr_type =      vp8_cfg.arnr_type;
+    oxcf->arnr_max_frames        = vp8_cfg.arnr_max_frames;
+    oxcf->arnr_strength          = vp8_cfg.arnr_strength;
+    oxcf->arnr_type              = vp8_cfg.arnr_type;
 
-    oxcf->tuning = vp8_cfg.tuning;
+    oxcf->tuning                 = vp8_cfg.tuning;
 
     /*
         printf("Current VP8 Settings: \n");
@@ -402,12 +451,12 @@ static vpx_codec_err_t vp8e_set_config(vpx_codec_alg_priv_t       *ctx,
     if ((cfg->g_lag_in_frames > ctx->cfg.g_lag_in_frames))
         ERROR("Cannot increase lag_in_frames");
 
-    res = validate_config(ctx, cfg, &ctx->vp8_cfg);
+    res = validate_config(ctx, cfg, &ctx->vp8_cfg, 0);
 
     if (!res)
     {
         ctx->cfg = *cfg;
-        set_vp8e_config(&ctx->oxcf, ctx->cfg, ctx->vp8_cfg);
+        set_vp8e_config(&ctx->oxcf, ctx->cfg, ctx->vp8_cfg, NULL);
         vp8_change_config(ctx->cpi, &ctx->oxcf);
     }
 
@@ -468,26 +517,50 @@ static vpx_codec_err_t set_param(vpx_codec_alg_priv_t *ctx,
 
     }
 
-    res = validate_config(ctx, &ctx->cfg, &xcfg);
+    res = validate_config(ctx, &ctx->cfg, &xcfg, 0);
 
     if (!res)
     {
         ctx->vp8_cfg = xcfg;
-        set_vp8e_config(&ctx->oxcf, ctx->cfg, ctx->vp8_cfg);
+        set_vp8e_config(&ctx->oxcf, ctx->cfg, ctx->vp8_cfg, NULL);
         vp8_change_config(ctx->cpi, &ctx->oxcf);
     }
 
     return res;
 #undef MAP
 }
-static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx)
+
+static vpx_codec_err_t vp8e_mr_alloc_mem(const vpx_codec_enc_cfg_t *cfg,
+                                        void **mem_loc)
+{
+    vpx_codec_err_t res = 0;
+
+#if CONFIG_MULTI_RES_ENCODING
+    int mb_rows = ((cfg->g_w + 15) >>4);
+    int mb_cols = ((cfg->g_h + 15) >>4);
+
+    *mem_loc = calloc(mb_rows*mb_cols, sizeof(LOWER_RES_INFO));
+    if(!(*mem_loc))
+    {
+        free(*mem_loc);
+        res = VPX_CODEC_MEM_ERROR;
+    }
+    else
+        res = VPX_CODEC_OK;
+#endif
+
+    return res;
+}
+
+static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx,
+                                 vpx_codec_priv_enc_mr_cfg_t *mr_cfg)
 {
     vpx_codec_err_t        res = VPX_DEC_OK;
     struct vpx_codec_alg_priv *priv;
     vpx_codec_enc_cfg_t       *cfg;
     unsigned int               i;
 
-    VP8_PTR optr;
+    struct VP8_COMP *optr;
 
     if (!ctx->priv)
     {
@@ -515,7 +588,7 @@ static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx)
 
         cfg =  &ctx->priv->alg_priv->cfg;
 
-        /* Select the extra vp6 configuration table based on the current
+        /* Select the extra vp8 configuration table based on the current
          * usage value. If the current usage value isn't found, use the
          * values for usage case 0.
          */
@@ -528,7 +601,7 @@ static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx)
 
         priv->cx_data_sz = priv->cfg.g_w * priv->cfg.g_h * 3 / 2 * 2;
 
-        if (priv->cx_data_sz < 4096) priv->cx_data_sz = 4096;
+        if (priv->cx_data_sz < 32768) priv->cx_data_sz = 32768;
 
         priv->cx_data = malloc(priv->cx_data_sz);
 
@@ -541,13 +614,20 @@ static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx)
 
         vp8_initialize();
 
-        res = validate_config(priv, &priv->cfg, &priv->vp8_cfg);
+        res = validate_config(priv, &priv->cfg, &priv->vp8_cfg, 0);
 
         if (!res)
         {
+            if(mr_cfg)
+                ctx->priv->enc.total_encoders   = mr_cfg->mr_total_resolutions;
+            else
+                ctx->priv->enc.total_encoders   = 1;
+
             set_vp8e_config(&ctx->priv->alg_priv->oxcf,
                              ctx->priv->alg_priv->cfg,
-                             ctx->priv->alg_priv->vp8_cfg);
+                             ctx->priv->alg_priv->vp8_cfg,
+                             mr_cfg);
+
             optr = vp8_create_compressor(&ctx->priv->alg_priv->oxcf);
 
             if (!optr)
@@ -562,6 +642,11 @@ static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx)
 
 static vpx_codec_err_t vp8e_destroy(vpx_codec_alg_priv_t *ctx)
 {
+#if CONFIG_MULTI_RES_ENCODING
+    /* Free multi-encoder shared memory */
+    if (ctx->oxcf.mr_total_resolutions > 0 && (ctx->oxcf.mr_encoder_id == ctx->oxcf.mr_total_resolutions-1))
+        free(ctx->oxcf.mr_low_res_mode_info);
+#endif
 
     free(ctx->cx_data);
     vp8_remove_compressor(&ctx->cpi);
@@ -659,6 +744,9 @@ static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t  *ctx,
     if (img)
         res = validate_img(ctx, img);
 
+    if (!res)
+        res = validate_config(ctx, &ctx->cfg, &ctx->vp8_cfg, 1);
+
     pick_quickcompress_mode(ctx, duration, deadline);
     vpx_codec_pkt_list_init(&ctx->pkt_list);
 
@@ -729,6 +817,8 @@ static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t  *ctx,
         int64_t dst_time_stamp, dst_end_time_stamp;
         unsigned long size, cx_data_sz;
         unsigned char *cx_data;
+        unsigned char *cx_data_end;
+        int comp_data_state = 0;
 
         /* Set up internal flags */
         if (ctx->base.init_flags & VPX_CODEC_USE_PSNR)
@@ -761,11 +851,25 @@ static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t  *ctx,
 
         cx_data = ctx->cx_data;
         cx_data_sz = ctx->cx_data_sz;
+        cx_data_end = ctx->cx_data + cx_data_sz;
         lib_flags = 0;
 
-        while (cx_data_sz >= ctx->cx_data_sz / 2
-               && -1 != vp8_get_compressed_data(ctx->cpi, &lib_flags, &size, cx_data, &dst_time_stamp, &dst_end_time_stamp, !img))
+        while (cx_data_sz >= ctx->cx_data_sz / 2)
         {
+            comp_data_state = vp8_get_compressed_data(ctx->cpi,
+                                                  &lib_flags,
+                                                  &size,
+                                                  cx_data,
+                                                  cx_data_end,
+                                                  &dst_time_stamp,
+                                                  &dst_end_time_stamp,
+                                                  !img);
+
+            if(comp_data_state == VPX_CODEC_CORRUPT_FRAME)
+                return VPX_CODEC_CORRUPT_FRAME;
+            else if(comp_data_state == -1)
+                break;
+
             if (size)
             {
                 vpx_codec_pts_t    round, delta;
@@ -1137,12 +1241,18 @@ static vpx_codec_enc_cfg_map_t vp8e_usage_cfg_map[] =
         /* keyframing settings (kf) */
         VPX_KF_AUTO,        /* g_kfmode*/
         0,                  /* kf_min_dist */
-        9999,               /* kf_max_dist */
+        128,                /* kf_max_dist */
 
 #if VPX_ENCODER_ABI_VERSION == (1 + VPX_CODEC_ABI_VERSION)
         1,                  /* g_delete_first_pass_file */
         "vp8.fpf"           /* first pass filename */
 #endif
+
+        1,                  /* ts_number_layers */
+        {0},                /* ts_target_bitrate */
+        {0},                /* ts_rate_decimator */
+        0,                  /* ts_periodicity */
+        {0},                /* ts_layer_id */
     }},
     { -1, {NOT_IMPLEMENTED}}
 };
@@ -1176,6 +1286,7 @@ CODEC_INTERFACE(vpx_codec_vp8_cx) =
         vp8e_set_config,
         NOT_IMPLEMENTED,
         vp8e_get_preview,
+        vp8e_mr_alloc_mem,
     } /* encoder functions */
 };
 
@@ -1260,5 +1371,6 @@ vpx_codec_iface_t vpx_enc_vp8_algo =
         vp8e_set_config,
         NOT_IMPLEMENTED,
         vp8e_get_preview,
+        vp8e_mr_alloc_mem,
     } /* encoder functions */
 };
diff --git a/media/libvpx/vp8/vp8_dx_iface.c b/media/libvpx/vp8/vp8_dx_iface.c
index ad8cd5e9501..0a62d9717da 100644
--- a/media/libvpx/vp8/vp8_dx_iface.c
+++ b/media/libvpx/vp8/vp8_dx_iface.c
@@ -57,7 +57,7 @@ struct vpx_codec_alg_priv
     vp8_stream_info_t       si;
     int                     defer_alloc;
     int                     decoder_init;
-    VP8D_PTR                pbi;
+    struct VP8D_COMP       *pbi;
     int                     postproc_cfg_set;
     vp8_postproc_cfg_t      postproc_cfg;
 #if CONFIG_POSTPROC_VISUALIZER
@@ -181,9 +181,11 @@ static void vp8_finalize_mmaps(vpx_codec_alg_priv_t *ctx)
     /* nothing to clean up */
 }
 
-static vpx_codec_err_t vp8_init(vpx_codec_ctx_t *ctx)
+static vpx_codec_err_t vp8_init(vpx_codec_ctx_t *ctx,
+                                vpx_codec_priv_enc_mr_cfg_t *data)
 {
     vpx_codec_err_t        res = VPX_CODEC_OK;
+    (void) data;
 
     /* This function only allocates space for the vpx_codec_alg_priv_t
      * structure. More memory may be required at the time the stream
@@ -387,7 +389,7 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t  *ctx,
         if (!res)
         {
             VP8D_CONFIG oxcf;
-            VP8D_PTR optr;
+            struct VP8D_COMP* optr;
 
             vp8dx_initialize();
 
@@ -398,8 +400,8 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t  *ctx,
             oxcf.max_threads = ctx->cfg.threads;
             oxcf.error_concealment =
                     (ctx->base.init_flags & VPX_CODEC_USE_ERROR_CONCEALMENT);
-            oxcf.input_partition =
-                    (ctx->base.init_flags & VPX_CODEC_USE_INPUT_PARTITION);
+            oxcf.input_fragments =
+                    (ctx->base.init_flags & VPX_CODEC_USE_INPUT_FRAGMENTS);
 
             optr = vp8dx_create_decompressor(&oxcf);
 
@@ -410,7 +412,7 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t  *ctx,
                 && (ctx->base.init_flags & VPX_CODEC_USE_POSTPROC))
             {
                 ctx->postproc_cfg.post_proc_flag =
-                    VP8_DEBLOCK | VP8_DEMACROBLOCK;
+                    VP8_DEBLOCK | VP8_DEMACROBLOCK | VP8_MFQE;
                 ctx->postproc_cfg.deblocking_level = 4;
                 ctx->postproc_cfg.noise_level = 0;
             }
@@ -564,7 +566,7 @@ static vpx_codec_err_t vp8_xma_set_mmap(vpx_codec_ctx_t         *ctx,
     if (done && !res)
     {
         vp8_finalize_mmaps(ctx->priv->alg_priv);
-        res = ctx->iface->init(ctx);
+        res = ctx->iface->init(ctx, NULL);
     }
 
     return res;
@@ -698,6 +700,27 @@ static vpx_codec_err_t vp8_get_last_ref_updates(vpx_codec_alg_priv_t *ctx,
         return VPX_CODEC_INVALID_PARAM;
 }
 
+extern int vp8dx_references_buffer( VP8_COMMON *oci, int ref_frame );
+static vpx_codec_err_t vp8_get_last_ref_frame(vpx_codec_alg_priv_t *ctx,
+                                              int ctrl_id,
+                                              va_list args)
+{
+    int *ref_info = va_arg(args, int *);
+    VP8D_COMP *pbi = (VP8D_COMP *)ctx->pbi;
+    VP8_COMMON *oci = &pbi->common;
+
+    if (ref_info)
+    {
+        *ref_info =
+            (vp8dx_references_buffer( oci, ALTREF_FRAME )?VP8_ALTR_FRAME:0) |
+            (vp8dx_references_buffer( oci, GOLDEN_FRAME )?VP8_GOLD_FRAME:0) |
+            (vp8dx_references_buffer( oci, LAST_FRAME )?VP8_LAST_FRAME:0);
+
+        return VPX_CODEC_OK;
+    }
+    else
+        return VPX_CODEC_INVALID_PARAM;
+}
 
 static vpx_codec_err_t vp8_get_frame_corrupted(vpx_codec_alg_priv_t *ctx,
                                                int ctrl_id,
@@ -729,6 +752,7 @@ vpx_codec_ctrl_fn_map_t vp8_ctf_maps[] =
     {VP8_SET_DBG_DISPLAY_MV,        vp8_set_dbg_options},
     {VP8D_GET_LAST_REF_UPDATES,     vp8_get_last_ref_updates},
     {VP8D_GET_FRAME_CORRUPTED,      vp8_get_frame_corrupted},
+    {VP8D_GET_LAST_REF_USED,        vp8_get_last_ref_frame},
     { -1, NULL},
 };
 
@@ -741,7 +765,7 @@ CODEC_INTERFACE(vpx_codec_vp8_dx) =
     "WebM Project VP8 Decoder" VERSION_STRING,
     VPX_CODEC_INTERNAL_ABI_VERSION,
     VPX_CODEC_CAP_DECODER | VP8_CAP_POSTPROC | VP8_CAP_ERROR_CONCEALMENT |
-    VPX_CODEC_CAP_INPUT_PARTITION,
+    VPX_CODEC_CAP_INPUT_FRAGMENTS,
     /* vpx_codec_caps_t          caps; */
     vp8_init,         /* vpx_codec_init_fn_t       init; */
     vp8_destroy,      /* vpx_codec_destroy_fn_t    destroy; */
diff --git a/media/libvpx/vpx/internal/vpx_codec_internal.h b/media/libvpx/vpx/internal/vpx_codec_internal.h
index a1ff1921ea7..0703d6a4f2c 100644
--- a/media/libvpx/vpx/internal/vpx_codec_internal.h
+++ b/media/libvpx/vpx/internal/vpx_codec_internal.h
@@ -56,9 +56,10 @@
  * types, removing or reassigning enums, adding/removing/rearranging
  * fields to structures
  */
-#define VPX_CODEC_INTERNAL_ABI_VERSION (3) /**<\hideinitializer*/
+#define VPX_CODEC_INTERNAL_ABI_VERSION (4) /**<\hideinitializer*/
 
 typedef struct vpx_codec_alg_priv  vpx_codec_alg_priv_t;
+typedef struct vpx_codec_priv_enc_mr_cfg vpx_codec_priv_enc_mr_cfg_t;
 
 /*!\brief init function pointer prototype
  *
@@ -73,7 +74,8 @@ typedef struct vpx_codec_alg_priv  vpx_codec_alg_priv_t;
  * \retval #VPX_CODEC_MEM_ERROR
  *     Memory operation failed.
  */
-typedef vpx_codec_err_t (*vpx_codec_init_fn_t)(vpx_codec_ctx_t *ctx);
+typedef vpx_codec_err_t (*vpx_codec_init_fn_t)(vpx_codec_ctx_t *ctx,
+                                             vpx_codec_priv_enc_mr_cfg_t *data);
 
 /*!\brief destroy function pointer prototype
  *
@@ -264,6 +266,10 @@ typedef vpx_fixed_buf_t *
 typedef vpx_image_t *
 (*vpx_codec_get_preview_frame_fn_t)(vpx_codec_alg_priv_t   *ctx);
 
+typedef vpx_codec_err_t
+(*vpx_codec_enc_mr_get_mem_loc_fn_t)(const vpx_codec_enc_cfg_t     *cfg,
+                                   void **mem_loc);
+
 /*!\brief usage configuration mapping
  *
  * This structure stores the mapping between usage identifiers and
@@ -309,8 +315,9 @@ struct vpx_codec_iface
         vpx_codec_encode_fn_t              encode;        /**< \copydoc ::vpx_codec_encode_fn_t */
         vpx_codec_get_cx_data_fn_t         get_cx_data;   /**< \copydoc ::vpx_codec_get_cx_data_fn_t */
         vpx_codec_enc_config_set_fn_t      cfg_set;       /**< \copydoc ::vpx_codec_enc_config_set_fn_t */
-        vpx_codec_get_global_headers_fn_t  get_glob_hdrs; /**< \copydoc ::vpx_codec_enc_config_set_fn_t */
+        vpx_codec_get_global_headers_fn_t  get_glob_hdrs; /**< \copydoc ::vpx_codec_get_global_headers_fn_t */
         vpx_codec_get_preview_frame_fn_t   get_preview;   /**< \copydoc ::vpx_codec_get_preview_frame_fn_t */
+        vpx_codec_enc_mr_get_mem_loc_fn_t  mr_get_mem_loc;   /**< \copydoc ::vpx_codec_enc_mr_get_mem_loc_fn_t */
     } enc;
 };
 
@@ -353,9 +360,21 @@ struct vpx_codec_priv
         unsigned int                cx_data_pad_before;
         unsigned int                cx_data_pad_after;
         vpx_codec_cx_pkt_t          cx_data_pkt;
+        unsigned int                total_encoders;
     } enc;
 };
 
+/*
+ * Multi-resolution encoding internal configuration
+ */
+struct vpx_codec_priv_enc_mr_cfg
+{
+    unsigned int           mr_total_resolutions;
+    unsigned int           mr_encoder_id;
+    struct vpx_rational    mr_down_sampling_factor;
+    void*                  mr_low_res_mode_info;
+};
+
 #undef VPX_CTRL_USE_TYPE
 #define VPX_CTRL_USE_TYPE(id, typ) \
     static typ id##__value(va_list args) {return va_arg(args, typ);} \
diff --git a/media/libvpx/vpx/src/vpx_decoder.c b/media/libvpx/vpx/src/vpx_decoder.c
index 6e877b0670f..59a783dd9bf 100644
--- a/media/libvpx/vpx/src/vpx_decoder.c
+++ b/media/libvpx/vpx/src/vpx_decoder.c
@@ -39,8 +39,8 @@ vpx_codec_err_t vpx_codec_dec_init_ver(vpx_codec_ctx_t      *ctx,
     else if ((flags & VPX_CODEC_USE_ERROR_CONCEALMENT) &&
             !(iface->caps & VPX_CODEC_CAP_ERROR_CONCEALMENT))
         res = VPX_CODEC_INCAPABLE;
-    else if ((flags & VPX_CODEC_USE_INPUT_PARTITION) &&
-            !(iface->caps & VPX_CODEC_CAP_INPUT_PARTITION))
+    else if ((flags & VPX_CODEC_USE_INPUT_FRAGMENTS) &&
+            !(iface->caps & VPX_CODEC_CAP_INPUT_FRAGMENTS))
         res = VPX_CODEC_INCAPABLE;
     else if (!(iface->caps & VPX_CODEC_CAP_DECODER))
         res = VPX_CODEC_INCAPABLE;
@@ -56,7 +56,7 @@ vpx_codec_err_t vpx_codec_dec_init_ver(vpx_codec_ctx_t      *ctx,
 
         if (!(flags & VPX_CODEC_USE_XMA))
         {
-            res = ctx->iface->init(ctx);
+            res = ctx->iface->init(ctx, NULL);
 
             if (res)
             {
diff --git a/media/libvpx/vpx/src/vpx_encoder.c b/media/libvpx/vpx/src/vpx_encoder.c
index 5e86835ea05..03ddc62b289 100644
--- a/media/libvpx/vpx/src/vpx_encoder.c
+++ b/media/libvpx/vpx/src/vpx_encoder.c
@@ -51,7 +51,7 @@ vpx_codec_err_t vpx_codec_enc_init_ver(vpx_codec_ctx_t      *ctx,
         ctx->priv = NULL;
         ctx->init_flags = flags;
         ctx->config.enc = cfg;
-        res = ctx->iface->init(ctx);
+        res = ctx->iface->init(ctx, NULL);
 
         if (res)
         {
@@ -66,6 +66,85 @@ vpx_codec_err_t vpx_codec_enc_init_ver(vpx_codec_ctx_t      *ctx,
     return SAVE_STATUS(ctx, res);
 }
 
+vpx_codec_err_t vpx_codec_enc_init_multi_ver(vpx_codec_ctx_t      *ctx,
+                                             vpx_codec_iface_t    *iface,
+                                             vpx_codec_enc_cfg_t  *cfg,
+                                             int                   num_enc,
+                                             vpx_codec_flags_t     flags,
+                                             vpx_rational_t       *dsf,
+                                             int                   ver)
+{
+    vpx_codec_err_t res = 0;
+
+    if (ver != VPX_ENCODER_ABI_VERSION)
+        res = VPX_CODEC_ABI_MISMATCH;
+    else if (!ctx || !iface || !cfg || (num_enc > 16 || num_enc < 1))
+        res = VPX_CODEC_INVALID_PARAM;
+    else if (iface->abi_version != VPX_CODEC_INTERNAL_ABI_VERSION)
+        res = VPX_CODEC_ABI_MISMATCH;
+    else if (!(iface->caps & VPX_CODEC_CAP_ENCODER))
+        res = VPX_CODEC_INCAPABLE;
+    else if ((flags & VPX_CODEC_USE_XMA) && !(iface->caps & VPX_CODEC_CAP_XMA))
+        res = VPX_CODEC_INCAPABLE;
+    else if ((flags & VPX_CODEC_USE_PSNR)
+             && !(iface->caps & VPX_CODEC_CAP_PSNR))
+        res = VPX_CODEC_INCAPABLE;
+    else if ((flags & VPX_CODEC_USE_OUTPUT_PARTITION)
+             && !(iface->caps & VPX_CODEC_CAP_OUTPUT_PARTITION))
+        res = VPX_CODEC_INCAPABLE;
+    else
+    {
+        int i;
+        void *mem_loc = NULL;
+
+        if(!(res = iface->enc.mr_get_mem_loc(cfg, &mem_loc)))
+        {
+            for (i = 0; i < num_enc; i++)
+            {
+                vpx_codec_priv_enc_mr_cfg_t mr_cfg;
+
+                /* Validate down-sampling factor. */
+                if(dsf->num < 1 || dsf->num > 4096 || dsf->den < 1 ||
+                   dsf->den > dsf->num)
+                {
+                    res = VPX_CODEC_INVALID_PARAM;
+                    break;
+                }
+
+                mr_cfg.mr_low_res_mode_info = mem_loc;
+                mr_cfg.mr_total_resolutions = num_enc;
+                mr_cfg.mr_encoder_id = num_enc-1-i;
+                mr_cfg.mr_down_sampling_factor.num = dsf->num;
+                mr_cfg.mr_down_sampling_factor.den = dsf->den;
+
+                ctx->iface = iface;
+                ctx->name = iface->name;
+                ctx->priv = NULL;
+                ctx->init_flags = flags;
+                ctx->config.enc = cfg;
+                res = ctx->iface->init(ctx, &mr_cfg);
+
+                if (res)
+                {
+                    ctx->err_detail = ctx->priv ? ctx->priv->err_detail : NULL;
+                    vpx_codec_destroy(ctx);
+                }
+
+                if (ctx->priv)
+                    ctx->priv->iface = ctx->iface;
+
+                if (res)
+                    break;
+
+                ctx++;
+                cfg++;
+                dsf++;
+            }
+        }
+    }
+
+    return SAVE_STATUS(ctx, res);
+}
 
 
 vpx_codec_err_t  vpx_codec_enc_config_default(vpx_codec_iface_t    *iface,
@@ -123,7 +202,7 @@ vpx_codec_err_t  vpx_codec_encode(vpx_codec_ctx_t            *ctx,
                                   vpx_enc_frame_flags_t       flags,
                                   unsigned long               deadline)
 {
-    vpx_codec_err_t res;
+    vpx_codec_err_t res = 0;
 
     if (!ctx || (img && !duration))
         res = VPX_CODEC_INVALID_PARAM;
@@ -136,9 +215,37 @@ vpx_codec_err_t  vpx_codec_encode(vpx_codec_ctx_t            *ctx,
         /* Execute in a normalized floating point environment, if the platform
          * requires it.
          */
+        unsigned int num_enc =ctx->priv->enc.total_encoders;
+
         FLOATING_POINT_INIT();
-        res = ctx->iface->enc.encode(ctx->priv->alg_priv, img, pts,
-                                     duration, flags, deadline);
+
+        if (num_enc == 1)
+            res = ctx->iface->enc.encode(ctx->priv->alg_priv, img, pts,
+                                         duration, flags, deadline);
+        else
+        {
+            /* Multi-resolution encoding:
+             * Encode multi-levels in reverse order. For example,
+             * if mr_total_resolutions = 3, first encode level 2,
+             * then encode level 1, and finally encode level 0.
+             */
+            int i;
+
+            ctx += num_enc - 1;
+            if (img) img += num_enc - 1;
+
+            for (i = num_enc-1; i >= 0; i--)
+            {
+                if ((res = ctx->iface->enc.encode(ctx->priv->alg_priv, img, pts,
+                                                  duration, flags, deadline)))
+                    break;
+
+                ctx--;
+                if (img) img--;
+            }
+            ctx++;
+        }
+
         FLOATING_POINT_RESTORE();
     }
 
diff --git a/media/libvpx/vpx/src/vpx_image.c b/media/libvpx/vpx/src/vpx_image.c
index 7a4e2706251..336b6e29d9e 100644
--- a/media/libvpx/vpx/src/vpx_image.c
+++ b/media/libvpx/vpx/src/vpx_image.c
@@ -13,10 +13,42 @@
 #include <string.h>
 #include "vpx/vpx_image.h"
 
+#define ADDRESS_STORAGE_SIZE      sizeof(size_t)
+/*returns an addr aligned to the byte boundary specified by align*/
+#define align_addr(addr,align) (void*)(((size_t)(addr) + ((align) - 1)) & (size_t)-(align))
+
+/* Memalign code is copied from vpx_mem.c */
+static void *img_buf_memalign(size_t align, size_t size)
+{
+    void *addr,
+         * x = NULL;
+
+    addr = malloc(size + align - 1 + ADDRESS_STORAGE_SIZE);
+
+    if (addr)
+    {
+        x = align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE, (int)align);
+        /* save the actual malloc address */
+        ((size_t *)x)[-1] = (size_t)addr;
+    }
+
+    return x;
+}
+
+static void img_buf_free(void *memblk)
+{
+    if (memblk)
+    {
+        void *addr = (void *)(((size_t *)memblk)[-1]);
+        free(addr);
+    }
+}
+
 static vpx_image_t *img_alloc_helper(vpx_image_t  *img,
                                      vpx_img_fmt_t fmt,
                                      unsigned int  d_w,
                                      unsigned int  d_h,
+                                     unsigned int  buf_align,
                                      unsigned int  stride_align,
                                      unsigned char      *img_data)
 {
@@ -24,6 +56,14 @@ static vpx_image_t *img_alloc_helper(vpx_image_t  *img,
     unsigned int  h, w, s, xcs, ycs, bps;
     int           align;
 
+    /* Treat align==0 like align==1 */
+    if (!buf_align)
+        buf_align = 1;
+
+    /* Validate alignment (must be power of 2) */
+    if (buf_align & (buf_align - 1))
+        goto fail;
+
     /* Treat align==0 like align==1 */
     if (!stride_align)
         stride_align = 1;
@@ -119,7 +159,8 @@ static vpx_image_t *img_alloc_helper(vpx_image_t  *img,
 
     if (!img_data)
     {
-        img->img_data = malloc((fmt & VPX_IMG_FMT_PLANAR) ? h * w * bps / 8 : h * s);
+        img->img_data = img_buf_memalign(buf_align, ((fmt & VPX_IMG_FMT_PLANAR)?
+                                         h * s * bps / 8 : h * s));
         img->img_data_owner = 1;
     }
 
@@ -150,9 +191,9 @@ vpx_image_t *vpx_img_alloc(vpx_image_t  *img,
                            vpx_img_fmt_t fmt,
                            unsigned int  d_w,
                            unsigned int  d_h,
-                           unsigned int  stride_align)
+                           unsigned int  align)
 {
-    return img_alloc_helper(img, fmt, d_w, d_h, stride_align, NULL);
+    return img_alloc_helper(img, fmt, d_w, d_h, align, align, NULL);
 }
 
 vpx_image_t *vpx_img_wrap(vpx_image_t  *img,
@@ -162,7 +203,9 @@ vpx_image_t *vpx_img_wrap(vpx_image_t  *img,
                           unsigned int  stride_align,
                           unsigned char       *img_data)
 {
-    return img_alloc_helper(img, fmt, d_w, d_h, stride_align, img_data);
+    /* By setting buf_align = 1, we don't change buffer alignment in this
+     * function. */
+    return img_alloc_helper(img, fmt, d_w, d_h, 1, stride_align, img_data);
 }
 
 int vpx_img_set_rect(vpx_image_t  *img,
@@ -254,7 +297,7 @@ void vpx_img_free(vpx_image_t *img)
     if (img)
     {
         if (img->img_data && img->img_data_owner)
-            free(img->img_data);
+            img_buf_free(img->img_data);
 
         if (img->self_allocd)
             free(img);
diff --git a/media/libvpx/vpx/vp8.h b/media/libvpx/vpx/vp8.h
index 6fd2a334967..393b16194fb 100644
--- a/media/libvpx/vpx/vp8.h
+++ b/media/libvpx/vpx/vp8.h
@@ -62,7 +62,8 @@ enum vp8_postproc_level
     VP8_DEBUG_TXT_FRAME_INFO    = 1<<3, /**< print frame information */
     VP8_DEBUG_TXT_MBLK_MODES    = 1<<4, /**< print macro block modes over each macro block */
     VP8_DEBUG_TXT_DC_DIFF       = 1<<5, /**< print dc diff for each macro block */
-    VP8_DEBUG_TXT_RATE_INFO     = 1<<6  /**< print video rate info (encoder only) */
+    VP8_DEBUG_TXT_RATE_INFO     = 1<<6, /**< print video rate info (encoder only) */
+    VP8_MFQE                    = 1<<10
 };
 
 /*!\brief post process flags
diff --git a/media/libvpx/vpx/vp8cx.h b/media/libvpx/vpx/vp8cx.h
index 52752832c2d..0af631c3aaa 100644
--- a/media/libvpx/vpx/vp8cx.h
+++ b/media/libvpx/vpx/vp8cx.h
@@ -177,7 +177,7 @@ enum vp8e_enc_control_id
      * to a keyframe, set this to 450.
      *
      */
-    VP8E_SET_MAX_INTRA_BITRATE_PCT,
+    VP8E_SET_MAX_INTRA_BITRATE_PCT
 };
 
 /*!\brief vpx 1-D scaling mode
@@ -258,7 +258,7 @@ typedef enum
     VP8_ONE_TOKENPARTITION   = 0,
     VP8_TWO_TOKENPARTITION   = 1,
     VP8_FOUR_TOKENPARTITION  = 2,
-    VP8_EIGHT_TOKENPARTITION = 3,
+    VP8_EIGHT_TOKENPARTITION = 3
 } vp8e_token_partitions;
 
 
diff --git a/media/libvpx/vpx/vp8dx.h b/media/libvpx/vpx/vp8dx.h
index 1d9d53165ec..86610358cde 100644
--- a/media/libvpx/vpx/vp8dx.h
+++ b/media/libvpx/vpx/vp8dx.h
@@ -55,6 +55,11 @@ enum vp8_dec_control_id
     /** check if the indicated frame is corrupted */
     VP8D_GET_FRAME_CORRUPTED,
 
+    /** control function to get info on which reference frames were used
+     *  by the last decode
+     */
+    VP8D_GET_LAST_REF_USED,
+
     VP8_DECODER_CTRL_ID_MAX
 } ;
 
@@ -69,7 +74,7 @@ enum vp8_dec_control_id
 
 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_UPDATES,   int *)
 VPX_CTRL_USE_TYPE(VP8D_GET_FRAME_CORRUPTED,    int *)
-
+VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_USED,      int *)
 
 /*! @} - end defgroup vp8_decoder */
 
diff --git a/media/libvpx/vpx/vpx_decoder.h b/media/libvpx/vpx/vpx_decoder.h
index 0fc38c69f72..6d0dba86541 100644
--- a/media/libvpx/vpx/vpx_decoder.h
+++ b/media/libvpx/vpx/vpx_decoder.h
@@ -55,8 +55,8 @@ extern "C" {
 #define VPX_CODEC_CAP_POSTPROC   0x40000 /**< Can postprocess decoded frame */
 #define VPX_CODEC_CAP_ERROR_CONCEALMENT   0x80000 /**< Can conceal errors due to
                                                        packet loss */
-#define VPX_CODEC_CAP_INPUT_PARTITION   0x100000 /**< Can receive encoded frames
-                                                    one partition at a time */
+#define VPX_CODEC_CAP_INPUT_FRAGMENTS   0x100000 /**< Can receive encoded frames
+                                                    one fragment at a time */
 
     /*! \brief Initialization-time Feature Enabling
      *
@@ -68,9 +68,9 @@ extern "C" {
 #define VPX_CODEC_USE_POSTPROC   0x10000 /**< Postprocess decoded frame */
 #define VPX_CODEC_USE_ERROR_CONCEALMENT 0x20000 /**< Conceal errors in decoded
                                                      frames */
-#define VPX_CODEC_USE_INPUT_PARTITION   0x40000 /**< The input frame should be
+#define VPX_CODEC_USE_INPUT_FRAGMENTS   0x40000 /**< The input frame should be
                                                     passed to the decoder one
-                                                    partition at a time */
+                                                    fragment at a time */
 
     /*!\brief Stream properties
      *
@@ -189,11 +189,13 @@ extern "C" {
      * generated, as appropriate. Encoded data \ref MUST be passed in DTS (decode
      * time stamp) order. Frames produced will always be in PTS (presentation
      * time stamp) order.
-     * If the decoder is configured with VPX_CODEC_USE_INPUT_PARTITION enabled,
-     * data and data_sz must contain at most one encoded partition. When no more
-     * data is available, this function should be called with NULL as data and 0
-     * as data_sz. The memory passed to this function must be available until
-     * the frame has been decoded.
+     * If the decoder is configured with VPX_CODEC_USE_INPUT_FRAGMENTS enabled,
+     * data and data_sz can contain a fragment of the encoded frame. Fragment #n
+     * must contain at least partition #n, but can also contain subsequent
+     * partitions (#n+1 - #n+i), and if so, fragments #n+1, .., #n+i must be
+     * empty. When no more data is available, this function should be called
+     * with NULL as data and 0 as data_sz. The memory passed to this function
+     * must be available until the frame has been decoded.
      *
      * \param[in] ctx          Pointer to this instance's context
      * \param[in] data         Pointer to this block of new coded data. If
diff --git a/media/libvpx/vpx/vpx_encoder.h b/media/libvpx/vpx/vpx_encoder.h
index 4863dcd17ff..885ca229f96 100644
--- a/media/libvpx/vpx/vpx_encoder.h
+++ b/media/libvpx/vpx/vpx_encoder.h
@@ -32,6 +32,8 @@ extern "C" {
 #define VPX_ENCODER_H
 #include "vpx_codec.h"
 
+#define MAX_PERIODICITY 16
+#define MAX_LAYERS       5
 
     /*!\brief Current ABI version number
      *
@@ -41,7 +43,7 @@ extern "C" {
      * types, removing or reassigning enums, adding/removing/rearranging
      * fields to structures
      */
-#define VPX_ENCODER_ABI_VERSION (2 + VPX_CODEC_ABI_VERSION) /**<\hideinitializer*/
+#define VPX_ENCODER_ABI_VERSION (3 + VPX_CODEC_ABI_VERSION) /**<\hideinitializer*/
 
 
     /*! \brief Encoder capabilities bitfield
@@ -592,6 +594,46 @@ extern "C" {
          */
         unsigned int           kf_max_dist;
 
+        /*
+         * Temporal scalability settings (ts)
+         */
+
+        /*!\brief Number of coding layers
+         *
+         * This value specifies the number of coding layers to be used.
+         */
+        unsigned int           ts_number_layers;
+
+        /*!\brief Target bitrate for each layer
+         *
+         * These values specify the target coding bitrate for each coding layer.
+         */
+        unsigned int           ts_target_bitrate[MAX_LAYERS];
+
+        /*!\brief Frame rate decimation factor for each layer
+         *
+         * These values specify the frame rate decimation factors to apply
+         * to each layer.
+         */
+        unsigned int           ts_rate_decimator[MAX_LAYERS];
+
+        /*!\brief Length of the sequence defining frame layer membership
+         *
+         * This value specifies the length of the sequence that defines the
+         * membership of frames to layers. For example, if ts_periodicity=8 then
+         * frames are assigned to coding layers with a repeated sequence of
+         * length 8.
+         */
+        unsigned int           ts_periodicity;
+
+        /*!\brief Template defining the membership of frames to coding layers
+         *
+         * This array defines the membership of frames to coding layers. For a
+         * 2-layer encoding that assigns even numbered frames to one layer (0)
+         * and odd numbered frames to a second layer (1) with ts_periodicity=8,
+         * then ts_layer_id = (0,1,0,1,0,1,0,1).
+         */
+        unsigned int           ts_layer_id[MAX_PERIODICITY];
     } vpx_codec_enc_cfg_t; /**< alias for struct vpx_codec_enc_cfg */
 
 
@@ -632,6 +674,48 @@ extern "C" {
     vpx_codec_enc_init_ver(ctx, iface, cfg, flags, VPX_ENCODER_ABI_VERSION)
 
 
+    /*!\brief Initialize multi-encoder instance
+     *
+     * Initializes multi-encoder context using the given interface.
+     * Applications should call the vpx_codec_enc_init_multi convenience macro
+     * instead of this function directly, to ensure that the ABI version number
+     * parameter is properly initialized.
+     *
+     * In XMA mode (activated by setting VPX_CODEC_USE_XMA in the flags
+     * parameter), the storage pointed to by the cfg parameter must be
+     * kept readable and stable until all memory maps have been set.
+     *
+     * \param[in]    ctx     Pointer to this instance's context.
+     * \param[in]    iface   Pointer to the algorithm interface to use.
+     * \param[in]    cfg     Configuration to use, if known. May be NULL.
+     * \param[in]    num_enc Total number of encoders.
+     * \param[in]    flags   Bitfield of VPX_CODEC_USE_* flags
+     * \param[in]    dsf     Pointer to down-sampling factors.
+     * \param[in]    ver     ABI version number. Must be set to
+     *                       VPX_ENCODER_ABI_VERSION
+     * \retval #VPX_CODEC_OK
+     *     The decoder algorithm initialized.
+     * \retval #VPX_CODEC_MEM_ERROR
+     *     Memory allocation failed.
+     */
+    vpx_codec_err_t vpx_codec_enc_init_multi_ver(vpx_codec_ctx_t      *ctx,
+                                                 vpx_codec_iface_t    *iface,
+                                                 vpx_codec_enc_cfg_t  *cfg,
+                                                 int                   num_enc,
+                                                 vpx_codec_flags_t     flags,
+                                                 vpx_rational_t       *dsf,
+                                                 int                   ver);
+
+
+    /*!\brief Convenience macro for vpx_codec_enc_init_multi_ver()
+     *
+     * Ensures the ABI version parameter is properly set.
+     */
+#define vpx_codec_enc_init_multi(ctx, iface, cfg, num_enc, flags, dsf) \
+    vpx_codec_enc_init_multi_ver(ctx, iface, cfg, num_enc, flags, dsf, \
+                                 VPX_ENCODER_ABI_VERSION)
+
+
     /*!\brief Get a default configuration
      *
      * Initializes a encoder configuration structure with default values. Supports
@@ -737,7 +821,6 @@ extern "C" {
                                       vpx_enc_frame_flags_t       flags,
                                       unsigned long               deadline);
 
-
     /*!\brief Set compressed data output buffer
      *
      * Sets the buffer that the codec should output the compressed data
diff --git a/media/libvpx/vpx/vpx_image.h b/media/libvpx/vpx/vpx_image.h
index 8e08b364239..3e424470f69 100644
--- a/media/libvpx/vpx/vpx_image.h
+++ b/media/libvpx/vpx/vpx_image.h
@@ -160,7 +160,8 @@ extern "C" {
      * \param[in]    fmt       Format for the image
      * \param[in]    d_w       Width of the image
      * \param[in]    d_h       Height of the image
-     * \param[in]    align     Alignment, in bytes, of each row in the image.
+     * \param[in]    align     Alignment, in bytes, of the image buffer and
+     *                         each row in the image(stride).
      *
      * \return Returns a pointer to the initialized image descriptor. If the img
      *         parameter is non-null, the value of the img parameter will be
diff --git a/media/libvpx/vpx/vpx_integer.h b/media/libvpx/vpx/vpx_integer.h
index 46fbdf5fe2d..3d98fd7f7f0 100644
--- a/media/libvpx/vpx/vpx_integer.h
+++ b/media/libvpx/vpx/vpx_integer.h
@@ -31,16 +31,8 @@ typedef signed __int64   int64_t;
 typedef unsigned __int64 uint64_t;
 #endif
 
-#ifdef HAVE_ARMV6
-typedef unsigned int int_fast16_t;
-#else
-typedef signed short int_fast16_t;
-#endif
-typedef signed char int_fast8_t;
-typedef unsigned char uint_fast8_t;
-
 #ifndef _UINTPTR_T_DEFINED
-typedef unsigned int   uintptr_t;
+typedef size_t uintptr_t;
 #endif
 
 #else
diff --git a/media/libvpx/vpx_config.h b/media/libvpx/vpx_config.h
index 2539000e397..16aed1cb606 100644
--- a/media/libvpx/vpx_config.h
+++ b/media/libvpx/vpx_config.h
@@ -62,6 +62,8 @@
 #if defined(MOZ_VP8_ENCODER)
 #undef CONFIG_VP8_ENCODER
 #undef CONFIG_ENCODERS
+#undef CONFIG_MULTI_RES_ENCODING
 #define CONFIG_VP8_ENCODER 1
 #define CONFIG_ENCODERS 1
+#define CONFIG_MULTI_RES_ENCODING 1
 #endif
diff --git a/media/libvpx/vpx_config_arm-linux-gcc.c b/media/libvpx/vpx_config_arm-linux-gcc.c
index a9debfd70e2..0b25ed42875 100644
--- a/media/libvpx/vpx_config_arm-linux-gcc.c
+++ b/media/libvpx/vpx_config_arm-linux-gcc.c
@@ -1,2 +1,9 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 static const char* const cfg = "--target=armv7-linux-gcc --disable-vp8-encoder --disable-examples --disable-install-docs --enable-pic --enable-runtime-cpu-detect --enable-arm-asm-detok";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/media/libvpx/vpx_config_arm-linux-gcc.h b/media/libvpx/vpx_config_arm-linux-gcc.h
index b1873acb311..53a317cfc50 100644
--- a/media/libvpx/vpx_config_arm-linux-gcc.h
+++ b/media/libvpx/vpx_config_arm-linux-gcc.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
@@ -11,8 +18,6 @@
 #define HAVE_ARMV5TE 1
 #define HAVE_ARMV6 1
 #define HAVE_ARMV7 1
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
 #define HAVE_MIPS32 0
 #define HAVE_MMX 0
 #define HAVE_SSE 0
@@ -67,4 +72,6 @@
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
 #endif /* VPX_CONFIG_H */
diff --git a/media/libvpx/vpx_config_generic-gnu.c b/media/libvpx/vpx_config_generic-gnu.c
index f10b215ad8c..9268ec0d7f4 100644
--- a/media/libvpx/vpx_config_generic-gnu.c
+++ b/media/libvpx/vpx_config_generic-gnu.c
@@ -1,2 +1,9 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 static const char* const cfg = "--target=generic-gnu --disable-vp8-encoder --disable-examples --disable-install-docs --enable-pic";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/media/libvpx/vpx_config_generic-gnu.h b/media/libvpx/vpx_config_generic-gnu.h
index dacd9c7ff80..4350d35fa64 100644
--- a/media/libvpx/vpx_config_generic-gnu.h
+++ b/media/libvpx/vpx_config_generic-gnu.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
@@ -11,8 +18,6 @@
 #define HAVE_ARMV5TE 0
 #define HAVE_ARMV6 0
 #define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
 #define HAVE_MIPS32 0
 #define HAVE_MMX 0
 #define HAVE_SSE 0
@@ -67,4 +72,6 @@
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
 #endif /* VPX_CONFIG_H */
diff --git a/media/libvpx/vpx_config_x86-darwin9-gcc.asm b/media/libvpx/vpx_config_x86-darwin9-gcc.asm
index a64e54cd513..19f44d5ead2 100644
--- a/media/libvpx/vpx_config_x86-darwin9-gcc.asm
+++ b/media/libvpx/vpx_config_x86-darwin9-gcc.asm
@@ -7,8 +7,6 @@ ARCH_PPC64 equ 0
 HAVE_ARMV5TE equ 0
 HAVE_ARMV6 equ 0
 HAVE_ARMV7 equ 0
-HAVE_IWMMXT equ 0
-HAVE_IWMMXT2 equ 0
 HAVE_MIPS32 equ 0
 HAVE_MMX equ 1
 HAVE_SSE equ 1
@@ -63,3 +61,5 @@ CONFIG_STATIC equ 1
 CONFIG_SMALL equ 0
 CONFIG_POSTPROC_VISUALIZER equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_UNIT_TESTS equ 0
+CONFIG_MULTI_RES_ENCODING equ 0
diff --git a/media/libvpx/vpx_config_x86-darwin9-gcc.c b/media/libvpx/vpx_config_x86-darwin9-gcc.c
index 1bcb5656f2b..72a300b78b3 100644
--- a/media/libvpx/vpx_config_x86-darwin9-gcc.c
+++ b/media/libvpx/vpx_config_x86-darwin9-gcc.c
@@ -1,2 +1,9 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 static const char* const cfg = "--target=x86-darwin9-gcc --enable-pic --disable-examples --disable-vp8-encoder --disable-install-docs";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/media/libvpx/vpx_config_x86-darwin9-gcc.h b/media/libvpx/vpx_config_x86-darwin9-gcc.h
index 28dbbdeae5e..339c0f4fd2f 100644
--- a/media/libvpx/vpx_config_x86-darwin9-gcc.h
+++ b/media/libvpx/vpx_config_x86-darwin9-gcc.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
@@ -11,8 +18,6 @@
 #define HAVE_ARMV5TE 0
 #define HAVE_ARMV6 0
 #define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
 #define HAVE_MIPS32 0
 #define HAVE_MMX 1
 #define HAVE_SSE 1
@@ -67,4 +72,6 @@
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
 #endif /* VPX_CONFIG_H */
diff --git a/media/libvpx/vpx_config_x86-linux-gcc.asm b/media/libvpx/vpx_config_x86-linux-gcc.asm
index a64e54cd513..19f44d5ead2 100644
--- a/media/libvpx/vpx_config_x86-linux-gcc.asm
+++ b/media/libvpx/vpx_config_x86-linux-gcc.asm
@@ -7,8 +7,6 @@ ARCH_PPC64 equ 0
 HAVE_ARMV5TE equ 0
 HAVE_ARMV6 equ 0
 HAVE_ARMV7 equ 0
-HAVE_IWMMXT equ 0
-HAVE_IWMMXT2 equ 0
 HAVE_MIPS32 equ 0
 HAVE_MMX equ 1
 HAVE_SSE equ 1
@@ -63,3 +61,5 @@ CONFIG_STATIC equ 1
 CONFIG_SMALL equ 0
 CONFIG_POSTPROC_VISUALIZER equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_UNIT_TESTS equ 0
+CONFIG_MULTI_RES_ENCODING equ 0
diff --git a/media/libvpx/vpx_config_x86-linux-gcc.c b/media/libvpx/vpx_config_x86-linux-gcc.c
index f68e18f3e49..c2f3004525f 100644
--- a/media/libvpx/vpx_config_x86-linux-gcc.c
+++ b/media/libvpx/vpx_config_x86-linux-gcc.c
@@ -1,2 +1,9 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 static const char* const cfg = "--target=x86_64-linux-gcc --disable-vp8-encoder --disable-examples --disable-install-docs";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/media/libvpx/vpx_config_x86-linux-gcc.h b/media/libvpx/vpx_config_x86-linux-gcc.h
index 28dbbdeae5e..339c0f4fd2f 100644
--- a/media/libvpx/vpx_config_x86-linux-gcc.h
+++ b/media/libvpx/vpx_config_x86-linux-gcc.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
@@ -11,8 +18,6 @@
 #define HAVE_ARMV5TE 0
 #define HAVE_ARMV6 0
 #define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
 #define HAVE_MIPS32 0
 #define HAVE_MMX 1
 #define HAVE_SSE 1
@@ -67,4 +72,6 @@
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
 #endif /* VPX_CONFIG_H */
diff --git a/media/libvpx/vpx_config_x86-win32-vs8.asm b/media/libvpx/vpx_config_x86-win32-vs8.asm
index bb400ace376..c62719c4761 100644
--- a/media/libvpx/vpx_config_x86-win32-vs8.asm
+++ b/media/libvpx/vpx_config_x86-win32-vs8.asm
@@ -7,8 +7,6 @@ ARCH_PPC64 equ 0
 HAVE_ARMV5TE equ 0
 HAVE_ARMV6 equ 0
 HAVE_ARMV7 equ 0
-HAVE_IWMMXT equ 0
-HAVE_IWMMXT2 equ 0
 HAVE_MIPS32 equ 0
 HAVE_MMX equ 1
 HAVE_SSE equ 1
@@ -63,3 +61,5 @@ CONFIG_STATIC equ 1
 CONFIG_SMALL equ 0
 CONFIG_POSTPROC_VISUALIZER equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_UNIT_TESTS equ 0
+CONFIG_MULTI_RES_ENCODING equ 0
diff --git a/media/libvpx/vpx_config_x86-win32-vs8.c b/media/libvpx/vpx_config_x86-win32-vs8.c
index aff06fc7634..61848eb785e 100644
--- a/media/libvpx/vpx_config_x86-win32-vs8.c
+++ b/media/libvpx/vpx_config_x86-win32-vs8.c
@@ -1,2 +1,9 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 static const char* const cfg = "--target=x86-win32-vs8 --disable-vp8-encoder --disable-examples --disable-install-docs";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/media/libvpx/vpx_config_x86-win32-vs8.h b/media/libvpx/vpx_config_x86-win32-vs8.h
index 92c18162dd4..a337d122f98 100644
--- a/media/libvpx/vpx_config_x86-win32-vs8.h
+++ b/media/libvpx/vpx_config_x86-win32-vs8.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
@@ -11,8 +18,6 @@
 #define HAVE_ARMV5TE 0
 #define HAVE_ARMV6 0
 #define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
 #define HAVE_MIPS32 0
 #define HAVE_MMX 1
 #define HAVE_SSE 1
@@ -67,4 +72,6 @@
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
 #endif /* VPX_CONFIG_H */
diff --git a/media/libvpx/vpx_config_x86_64-darwin9-gcc.asm b/media/libvpx/vpx_config_x86_64-darwin9-gcc.asm
index 4bfc9bbfcac..18414d54437 100644
--- a/media/libvpx/vpx_config_x86_64-darwin9-gcc.asm
+++ b/media/libvpx/vpx_config_x86_64-darwin9-gcc.asm
@@ -7,8 +7,6 @@ ARCH_PPC64 equ 0
 HAVE_ARMV5TE equ 0
 HAVE_ARMV6 equ 0
 HAVE_ARMV7 equ 0
-HAVE_IWMMXT equ 0
-HAVE_IWMMXT2 equ 0
 HAVE_MIPS32 equ 0
 HAVE_MMX equ 1
 HAVE_SSE equ 1
@@ -63,3 +61,5 @@ CONFIG_STATIC equ 1
 CONFIG_SMALL equ 0
 CONFIG_POSTPROC_VISUALIZER equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_UNIT_TESTS equ 0
+CONFIG_MULTI_RES_ENCODING equ 0
diff --git a/media/libvpx/vpx_config_x86_64-darwin9-gcc.c b/media/libvpx/vpx_config_x86_64-darwin9-gcc.c
index c113cf1985f..cd0a781b522 100644
--- a/media/libvpx/vpx_config_x86_64-darwin9-gcc.c
+++ b/media/libvpx/vpx_config_x86_64-darwin9-gcc.c
@@ -1,2 +1,9 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 static const char* const cfg = "--target=x86_64-darwin9-gcc --enable-pic --disable-examples --disable-vp8-encoder --disable-install-docs";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/media/libvpx/vpx_config_x86_64-darwin9-gcc.h b/media/libvpx/vpx_config_x86_64-darwin9-gcc.h
index 56b9c3ec686..e0bacc4fe41 100644
--- a/media/libvpx/vpx_config_x86_64-darwin9-gcc.h
+++ b/media/libvpx/vpx_config_x86_64-darwin9-gcc.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
@@ -11,8 +18,6 @@
 #define HAVE_ARMV5TE 0
 #define HAVE_ARMV6 0
 #define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
 #define HAVE_MIPS32 0
 #define HAVE_MMX 1
 #define HAVE_SSE 1
@@ -67,4 +72,6 @@
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
 #endif /* VPX_CONFIG_H */
diff --git a/media/libvpx/vpx_config_x86_64-linux-gcc.asm b/media/libvpx/vpx_config_x86_64-linux-gcc.asm
index 4bfc9bbfcac..18414d54437 100644
--- a/media/libvpx/vpx_config_x86_64-linux-gcc.asm
+++ b/media/libvpx/vpx_config_x86_64-linux-gcc.asm
@@ -7,8 +7,6 @@ ARCH_PPC64 equ 0
 HAVE_ARMV5TE equ 0
 HAVE_ARMV6 equ 0
 HAVE_ARMV7 equ 0
-HAVE_IWMMXT equ 0
-HAVE_IWMMXT2 equ 0
 HAVE_MIPS32 equ 0
 HAVE_MMX equ 1
 HAVE_SSE equ 1
@@ -63,3 +61,5 @@ CONFIG_STATIC equ 1
 CONFIG_SMALL equ 0
 CONFIG_POSTPROC_VISUALIZER equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_UNIT_TESTS equ 0
+CONFIG_MULTI_RES_ENCODING equ 0
diff --git a/media/libvpx/vpx_config_x86_64-linux-gcc.c b/media/libvpx/vpx_config_x86_64-linux-gcc.c
index 3a01555bf08..3c7588a69e3 100644
--- a/media/libvpx/vpx_config_x86_64-linux-gcc.c
+++ b/media/libvpx/vpx_config_x86_64-linux-gcc.c
@@ -1,2 +1,9 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 static const char* const cfg = "--target=x86_64-linux-gcc --disable-vp8-encoder --disable-examples --disable-install-docs --enable-pic";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/media/libvpx/vpx_config_x86_64-linux-gcc.h b/media/libvpx/vpx_config_x86_64-linux-gcc.h
index 56b9c3ec686..e0bacc4fe41 100644
--- a/media/libvpx/vpx_config_x86_64-linux-gcc.h
+++ b/media/libvpx/vpx_config_x86_64-linux-gcc.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
@@ -11,8 +18,6 @@
 #define HAVE_ARMV5TE 0
 #define HAVE_ARMV6 0
 #define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
 #define HAVE_MIPS32 0
 #define HAVE_MMX 1
 #define HAVE_SSE 1
@@ -67,4 +72,6 @@
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
 #endif /* VPX_CONFIG_H */
diff --git a/media/libvpx/vpx_config_x86_64-win64-vs8.asm b/media/libvpx/vpx_config_x86_64-win64-vs8.asm
index 9da70d5555c..c0a26d7a2a1 100644
--- a/media/libvpx/vpx_config_x86_64-win64-vs8.asm
+++ b/media/libvpx/vpx_config_x86_64-win64-vs8.asm
@@ -7,8 +7,6 @@ ARCH_PPC64 equ 0
 HAVE_ARMV5TE equ 0
 HAVE_ARMV6 equ 0
 HAVE_ARMV7 equ 0
-HAVE_IWMMXT equ 0
-HAVE_IWMMXT2 equ 0
 HAVE_MIPS32 equ 0
 HAVE_MMX equ 1
 HAVE_SSE equ 1
@@ -63,3 +61,5 @@ CONFIG_STATIC equ 1
 CONFIG_SMALL equ 0
 CONFIG_POSTPROC_VISUALIZER equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_UNIT_TESTS equ 0
+CONFIG_MULTI_RES_ENCODING equ 0
diff --git a/media/libvpx/vpx_config_x86_64-win64-vs8.c b/media/libvpx/vpx_config_x86_64-win64-vs8.c
index a13c649a91c..b47aa9bdc73 100644
--- a/media/libvpx/vpx_config_x86_64-win64-vs8.c
+++ b/media/libvpx/vpx_config_x86_64-win64-vs8.c
@@ -1,2 +1,9 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 static const char* const cfg = "--target=x86_64-win64-vs8 --disable-vp8-encoder --disable-examples --disable-install-docs";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/media/libvpx/vpx_config_x86_64-win64-vs8.h b/media/libvpx/vpx_config_x86_64-win64-vs8.h
index 8b2dda97f02..6d95c1869c7 100644
--- a/media/libvpx/vpx_config_x86_64-win64-vs8.h
+++ b/media/libvpx/vpx_config_x86_64-win64-vs8.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
@@ -11,8 +18,6 @@
 #define HAVE_ARMV5TE 0
 #define HAVE_ARMV6 0
 #define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
 #define HAVE_MIPS32 0
 #define HAVE_MMX 1
 #define HAVE_SSE 1
@@ -67,4 +72,6 @@
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
 #endif /* VPX_CONFIG_H */
diff --git a/media/libvpx/vpx_mem/include/vpx_mem_intrnl.h b/media/libvpx/vpx_mem/include/vpx_mem_intrnl.h
index 6e261ba7f00..63c6b777c4c 100644
--- a/media/libvpx/vpx_mem/include/vpx_mem_intrnl.h
+++ b/media/libvpx/vpx_mem/include/vpx_mem_intrnl.h
@@ -11,7 +11,7 @@
 
 #ifndef __VPX_MEM_INTRNL_H__
 #define __VPX_MEM_INTRNL_H__
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 
 #ifndef CONFIG_MEM_MANAGER
 # if defined(VXWORKS)
diff --git a/media/libvpx/vpx_ports/arm.h b/media/libvpx/vpx_ports/arm.h
index 81af1f11ffe..525a7641f2f 100644
--- a/media/libvpx/vpx_ports/arm.h
+++ b/media/libvpx/vpx_ports/arm.h
@@ -12,7 +12,7 @@
 #ifndef VPX_PORTS_ARM_H
 #define VPX_PORTS_ARM_H
 #include <stdlib.h>
-#include "config.h"
+#include "vpx_config.h"
 
 /*ARMv5TE "Enhanced DSP" instructions.*/
 #define HAS_EDSP  0x01
diff --git a/media/libvpx/vpx_ports/arm_cpudetect.c b/media/libvpx/vpx_ports/arm_cpudetect.c
index 4109924cf3a..08496e4d032 100644
--- a/media/libvpx/vpx_ports/arm_cpudetect.c
+++ b/media/libvpx/vpx_ports/arm_cpudetect.c
@@ -100,6 +100,34 @@ int arm_cpu_caps(void)
 }
 
 #elif defined(__linux__)
+#if defined(__ANDROID__)
+#include <cpu-features.h>
+
+int arm_cpu_caps(void)
+{
+    int flags;
+    int mask;
+    uint64_t features;
+    if (!arm_cpu_env_flags(&flags))
+    {
+        return flags;
+    }
+    mask = arm_cpu_env_mask();
+    features = android_getCpuFeatures();
+
+#if defined(HAVE_ARMV5TE)
+    flags |= HAS_EDSP;
+#endif
+#if defined(HAVE_ARMV6)
+    flags |= HAS_MEDIA;
+#endif
+#if defined(HAVE_ARMV7)
+    if (features & ANDROID_CPU_ARM_FEATURE_NEON)
+        flags |= HAS_NEON;
+#endif
+    return flags & mask;
+}
+#else // !defined(__ANDROID__)
 #include <stdio.h>
 
 int arm_cpu_caps(void)
@@ -160,7 +188,7 @@ int arm_cpu_caps(void)
     }
     return flags & mask;
 }
-
+#endif // defined(__linux__)
 #elif !CONFIG_RUNTIME_CPU_DETECT
 
 int arm_cpu_caps(void)
diff --git a/media/libvpx/vpx_ports/x86.h b/media/libvpx/vpx_ports/x86.h
index 35005084b94..1341c7f4dc9 100644
--- a/media/libvpx/vpx_ports/x86.h
+++ b/media/libvpx/vpx_ports/x86.h
@@ -12,7 +12,7 @@
 #ifndef VPX_PORTS_X86_H
 #define VPX_PORTS_X86_H
 #include <stdlib.h>
-#include "config.h"
+#include "vpx_config.h"
 
 typedef enum
 {
diff --git a/media/libvpx/vpx_scale/arm/arm_scalesystemdependent.c b/media/libvpx/vpx_scale/arm/arm_scalesystemdependent.c
new file mode 100644
index 00000000000..a6ba5bd4373
--- /dev/null
+++ b/media/libvpx/vpx_scale/arm/arm_scalesystemdependent.c
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+
+#include "vpx_config.h"
+#include "vpx_ports/arm.h"
+#include "vpx_scale/vpxscale.h"
+#include "vpx_scale/yv12extend.h"
+
+void vp8_arch_arm_vpx_scale_init()
+{
+#if HAVE_ARMV7
+#if CONFIG_RUNTIME_CPU_DETECT
+    int flags = arm_cpu_caps();
+    if (flags & HAS_NEON)
+#endif
+    {
+        vp8_yv12_extend_frame_borders_ptr = vp8_yv12_extend_frame_borders_neon;
+        vp8_yv12_copy_y_ptr               = vp8_yv12_copy_y_neon;
+        vp8_yv12_copy_frame_ptr           = vp8_yv12_copy_frame_neon;
+    }
+#endif
+}
diff --git a/media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm b/media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm
new file mode 100644
index 00000000000..9189641b163
--- /dev/null
+++ b/media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm
@@ -0,0 +1,122 @@
+;
+;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+;
+;  Use of this source code is governed by a BSD-style license
+;  that can be found in the LICENSE file in the root of the source
+;  tree. An additional intellectual property rights grant can be found
+;  in the file PATENTS.  All contributing project authors may
+;  be found in the AUTHORS file in the root of the source tree.
+;
+
+
+    EXPORT  |vp8_yv12_copy_y_neon|
+
+    ARM
+    REQUIRE8
+    PRESERVE8
+
+    INCLUDE asm_com_offsets.asm
+
+    AREA ||.text||, CODE, READONLY, ALIGN=2
+
+;void vpxyv12_copy_y_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc)
+|vp8_yv12_copy_y_neon| PROC
+    push            {r4 - r11, lr}
+    vpush           {d8-d15}
+
+    ldr             r4, [r0, #yv12_buffer_config_y_height]
+    ldr             r5, [r0, #yv12_buffer_config_y_width]
+    ldr             r6, [r0, #yv12_buffer_config_y_stride]
+    ldr             r7, [r1, #yv12_buffer_config_y_stride]
+    ldr             r2, [r0, #yv12_buffer_config_y_buffer]       ;srcptr1
+    ldr             r3, [r1, #yv12_buffer_config_y_buffer]       ;dstptr1
+
+    ; copy two rows at one time
+    mov             lr, r4, lsr #1
+
+cp_src_to_dst_height_loop1
+    mov             r8, r2
+    mov             r9, r3
+    add             r10, r2, r6
+    add             r11, r3, r7
+    movs            r12, r5, lsr #7
+    ble             extra_copy_needed   ; y_width < 128
+
+cp_src_to_dst_width_loop1
+    vld1.8          {q0, q1}, [r8]!
+    vld1.8          {q8, q9}, [r10]!
+    vld1.8          {q2, q3}, [r8]!
+    vld1.8          {q10, q11}, [r10]!
+    vld1.8          {q4, q5}, [r8]!
+    vld1.8          {q12, q13}, [r10]!
+    vld1.8          {q6, q7}, [r8]!
+    vld1.8          {q14, q15}, [r10]!
+
+    subs            r12, r12, #1
+
+    vst1.8          {q0, q1}, [r9]!
+    vst1.8          {q8, q9}, [r11]!
+    vst1.8          {q2, q3}, [r9]!
+    vst1.8          {q10, q11}, [r11]!
+    vst1.8          {q4, q5}, [r9]!
+    vst1.8          {q12, q13}, [r11]!
+    vst1.8          {q6, q7}, [r9]!
+    vst1.8          {q14, q15}, [r11]!
+
+    bne             cp_src_to_dst_width_loop1
+
+    subs            lr, lr, #1
+    add             r2, r2, r6, lsl #1
+    add             r3, r3, r7, lsl #1
+
+    bne             cp_src_to_dst_height_loop1
+
+extra_copy_needed
+    ands            r10, r5, #0x7f                  ;check to see if extra copy is needed
+    sub             r11, r5, r10
+    ldr             r2, [r0, #yv12_buffer_config_y_buffer]       ;srcptr1
+    ldr             r3, [r1, #yv12_buffer_config_y_buffer]       ;dstptr1
+    bne             extra_cp_src_to_dst_width1
+end_of_cp_src_to_dst1
+
+    vpop            {d8 - d15}
+    pop             {r4-r11, pc}
+
+;=============================
+extra_cp_src_to_dst_width1
+    add             r2, r2, r11
+    add             r3, r3, r11
+    add             r0, r8, r6
+    add             r11, r9, r7
+
+    mov             lr, r4, lsr #1
+extra_cp_src_to_dst_height_loop1
+    mov             r8, r2
+    mov             r9, r3
+    add             r0, r8, r6
+    add             r11, r9, r7
+
+    mov             r12, r10
+
+extra_cp_src_to_dst_width_loop1
+    vld1.8          {q0}, [r8]!
+    vld1.8          {q1}, [r0]!
+
+    subs            r12, r12, #16
+
+    vst1.8          {q0}, [r9]!
+    vst1.8          {q1}, [r11]!
+    bne             extra_cp_src_to_dst_width_loop1
+
+    subs            lr, lr, #1
+
+    add             r2, r2, r6, lsl #1
+    add             r3, r3, r7, lsl #1
+
+    bne             extra_cp_src_to_dst_height_loop1
+
+    b               end_of_cp_src_to_dst1
+
+    ENDP
+
+    END
diff --git a/media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm b/media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm
new file mode 100644
index 00000000000..e55d076d984
--- /dev/null
+++ b/media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm
@@ -0,0 +1,233 @@
+;
+;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+;
+;  Use of this source code is governed by a BSD-style license
+;  that can be found in the LICENSE file in the root of the source
+;  tree. An additional intellectual property rights grant can be found
+;  in the file PATENTS.  All contributing project authors may
+;  be found in the AUTHORS file in the root of the source tree.
+;
+
+
+    EXPORT  |vp8_yv12_copy_frame_func_neon|
+    ARM
+    REQUIRE8
+    PRESERVE8
+
+    INCLUDE asm_com_offsets.asm
+
+    AREA ||.text||, CODE, READONLY, ALIGN=2
+
+;void vp8_yv12_copy_frame_func_neon(YV12_BUFFER_CONFIG *src_ybc,
+;                                   YV12_BUFFER_CONFIG *dst_ybc);
+
+|vp8_yv12_copy_frame_func_neon| PROC
+    push            {r4 - r11, lr}
+    vpush           {d8 - d15}
+
+    sub             sp, sp, #16
+
+    ;Copy Y plane
+    ldr             r8, [r0, #yv12_buffer_config_u_buffer]       ;srcptr1
+    ldr             r9, [r1, #yv12_buffer_config_u_buffer]       ;srcptr1
+    ldr             r10, [r0, #yv12_buffer_config_v_buffer]      ;srcptr1
+    ldr             r11, [r1, #yv12_buffer_config_v_buffer]      ;srcptr1
+
+    ldr             r4, [r0, #yv12_buffer_config_y_height]
+    ldr             r5, [r0, #yv12_buffer_config_y_width]
+    ldr             r6, [r0, #yv12_buffer_config_y_stride]
+    ldr             r7, [r1, #yv12_buffer_config_y_stride]
+    ldr             r2, [r0, #yv12_buffer_config_y_buffer]       ;srcptr1
+    ldr             r3, [r1, #yv12_buffer_config_y_buffer]       ;dstptr1
+
+    str             r8, [sp]
+    str             r9, [sp, #4]
+    str             r10, [sp, #8]
+    str             r11, [sp, #12]
+
+    ; copy two rows at one time
+    mov             lr, r4, lsr #1
+
+cp_src_to_dst_height_loop
+    mov             r8, r2
+    mov             r9, r3
+    add             r10, r2, r6
+    add             r11, r3, r7
+    movs            r12, r5, lsr #7
+    ble             extra_cp_needed   ; y_width < 128
+
+cp_src_to_dst_width_loop
+    vld1.8          {q0, q1}, [r8]!
+    vld1.8          {q8, q9}, [r10]!
+    vld1.8          {q2, q3}, [r8]!
+    vld1.8          {q10, q11}, [r10]!
+    vld1.8          {q4, q5}, [r8]!
+    vld1.8          {q12, q13}, [r10]!
+    vld1.8          {q6, q7}, [r8]!
+    vld1.8          {q14, q15}, [r10]!
+
+    subs            r12, r12, #1
+
+    vst1.8          {q0, q1}, [r9]!
+    vst1.8          {q8, q9}, [r11]!
+    vst1.8          {q2, q3}, [r9]!
+    vst1.8          {q10, q11}, [r11]!
+    vst1.8          {q4, q5}, [r9]!
+    vst1.8          {q12, q13}, [r11]!
+    vst1.8          {q6, q7}, [r9]!
+    vst1.8          {q14, q15}, [r11]!
+
+    bne             cp_src_to_dst_width_loop
+
+    subs            lr, lr, #1
+    add             r2, r2, r6, lsl #1
+    add             r3, r3, r7, lsl #1
+
+    bne             cp_src_to_dst_height_loop
+
+extra_cp_needed
+    ands            r10, r5, #0x7f                  ;check to see if extra copy is needed
+    sub             r11, r5, r10
+    ldr             r2, [r0, #yv12_buffer_config_y_buffer]       ;srcptr1
+    ldr             r3, [r1, #yv12_buffer_config_y_buffer]       ;dstptr1
+    bne             extra_cp_src_to_dst_width
+end_of_cp_src_to_dst
+
+;Copy U & V planes
+    ldr             r2, [sp]        ;srcptr1
+    ldr             r3, [sp, #4]        ;dstptr1
+    mov             r4, r4, lsr #1                  ;src uv_height
+    mov             r5, r5, lsr #1                  ;src uv_width
+    mov             r6, r6, lsr #1                  ;src uv_stride
+    mov             r7, r7, lsr #1                  ;dst uv_stride
+
+    mov             r1, #2
+
+cp_uv_loop
+
+    ;copy two rows at one time
+    mov             lr, r4, lsr #1
+
+cp_src_to_dst_height_uv_loop
+    mov             r8, r2
+    mov             r9, r3
+    add             r10, r2, r6
+    add             r11, r3, r7
+    movs            r12, r5, lsr #6
+    ble             extra_uv_cp_needed
+
+cp_src_to_dst_width_uv_loop
+    vld1.8          {q0, q1}, [r8]!
+    vld1.8          {q8, q9}, [r10]!
+    vld1.8          {q2, q3}, [r8]!
+    vld1.8          {q10, q11}, [r10]!
+
+    subs            r12, r12, #1
+
+    vst1.8          {q0, q1}, [r9]!
+    vst1.8          {q8, q9}, [r11]!
+    vst1.8          {q2, q3}, [r9]!
+    vst1.8          {q10, q11}, [r11]!
+
+    bne             cp_src_to_dst_width_uv_loop
+
+    subs            lr, lr, #1
+    add             r2, r2, r6, lsl #1
+    add             r3, r3, r7, lsl #1
+
+    bne             cp_src_to_dst_height_uv_loop
+
+extra_uv_cp_needed
+    ands            r10, r5, #0x3f                  ;check to see if extra copy is needed
+    sub             r11, r5, r10
+    ldr             r2, [sp]        ;srcptr1
+    ldr             r3, [sp, #4]        ;dstptr1
+    bne             extra_cp_src_to_dst_uv_width
+end_of_cp_src_to_dst_uv
+
+    subs            r1, r1, #1
+
+    addne               sp, sp, #8
+
+    ldrne               r2, [sp]        ;srcptr1
+    ldrne               r3, [sp, #4]        ;dstptr1
+
+    bne             cp_uv_loop
+
+    add             sp, sp, #8
+
+    vpop            {d8 - d15}
+    pop             {r4 - r11, pc}
+
+;=============================
+extra_cp_src_to_dst_width
+    add             r2, r2, r11
+    add             r3, r3, r11
+    add             r0, r8, r6
+    add             r11, r9, r7
+
+    mov             lr, r4, lsr #1
+extra_cp_src_to_dst_height_loop
+    mov             r8, r2
+    mov             r9, r3
+    add             r0, r8, r6
+    add             r11, r9, r7
+
+    mov             r12, r10
+
+extra_cp_src_to_dst_width_loop
+    vld1.8          {q0}, [r8]!
+    vld1.8          {q1}, [r0]!
+
+    subs            r12, r12, #16
+
+    vst1.8          {q0}, [r9]!
+    vst1.8          {q1}, [r11]!
+    bne             extra_cp_src_to_dst_width_loop
+
+    subs            lr, lr, #1
+
+    add             r2, r2, r6, lsl #1
+    add             r3, r3, r7, lsl #1
+
+    bne             extra_cp_src_to_dst_height_loop
+
+    b               end_of_cp_src_to_dst
+
+;=================================
+extra_cp_src_to_dst_uv_width
+    add             r2, r2, r11
+    add             r3, r3, r11
+    add             r0, r8, r6
+    add             r11, r9, r7
+
+    mov             lr, r4, lsr #1
+extra_cp_src_to_dst_height_uv_loop
+    mov             r8, r2
+    mov             r9, r3
+    add             r0, r8, r6
+    add             r11, r9, r7
+
+    mov             r12, r10
+
+extra_cp_src_to_dst_width_uv_loop
+    vld1.8          {d0}, [r8]!
+    vld1.8          {d1}, [r0]!
+
+    subs            r12, r12, #8
+
+    vst1.8          {d0}, [r9]!
+    vst1.8          {d1}, [r11]!
+    bne             extra_cp_src_to_dst_width_uv_loop
+
+    subs            lr, lr, #1
+
+    add             r2, r2, r6, lsl #1
+    add             r3, r3, r7, lsl #1
+
+    bne             extra_cp_src_to_dst_height_uv_loop
+
+    b               end_of_cp_src_to_dst_uv
+
+    ENDP
+    END
diff --git a/media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm b/media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm
deleted file mode 100644
index febccc2d846..00000000000
--- a/media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm
+++ /dev/null
@@ -1,500 +0,0 @@
-;
-;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-;
-;  Use of this source code is governed by a BSD-style license
-;  that can be found in the LICENSE file in the root of the source
-;  tree. An additional intellectual property rights grant can be found
-;  in the file PATENTS.  All contributing project authors may
-;  be found in the AUTHORS file in the root of the source tree.
-;
-
-
-    EXPORT  |vp8_yv12_copy_frame_yonly_neon|
-    EXPORT  |vp8_yv12_copy_frame_yonly_no_extend_frame_borders_neon|
-
-    ARM
-    REQUIRE8
-    PRESERVE8
-
-    INCLUDE asm_com_offsets.asm
-
-    AREA ||.text||, CODE, READONLY, ALIGN=2
-;void vpxyv12_copy_frame_yonly(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-; Note: this is VP8 function, which has border=32 and 16. Internal y_width and y_height
-; are always multiples of 16.
-
-|vp8_yv12_copy_frame_yonly_neon| PROC
-    push            {r4 - r11, lr}
-    vpush           {d8 - d15}
-
-    ldr             r4, [r0, #yv12_buffer_config_y_height]
-    ldr             r5, [r0, #yv12_buffer_config_y_width]
-    ldr             r6, [r0, #yv12_buffer_config_y_stride]
-    ldr             r7, [r1, #yv12_buffer_config_y_stride]
-    ldr             r2, [r0, #yv12_buffer_config_y_buffer]       ;srcptr1
-    ldr             r3, [r1, #yv12_buffer_config_y_buffer]       ;dstptr1
-
-    ; copy two rows at one time
-    mov             lr, r4, lsr #1
-
-cp_src_to_dst_height_loop
-    mov             r8, r2
-    mov             r9, r3
-    add             r10, r2, r6
-    add             r11, r3, r7
-    mov             r12, r5, lsr #7
-
-cp_src_to_dst_width_loop
-    vld1.8          {q0, q1}, [r8]!
-    vld1.8          {q8, q9}, [r10]!
-    vld1.8          {q2, q3}, [r8]!
-    vld1.8          {q10, q11}, [r10]!
-    vld1.8          {q4, q5}, [r8]!
-    vld1.8          {q12, q13}, [r10]!
-    vld1.8          {q6, q7}, [r8]!
-    vld1.8          {q14, q15}, [r10]!
-
-    subs            r12, r12, #1
-
-    vst1.8          {q0, q1}, [r9]!
-    vst1.8          {q8, q9}, [r11]!
-    vst1.8          {q2, q3}, [r9]!
-    vst1.8          {q10, q11}, [r11]!
-    vst1.8          {q4, q5}, [r9]!
-    vst1.8          {q12, q13}, [r11]!
-    vst1.8          {q6, q7}, [r9]!
-    vst1.8          {q14, q15}, [r11]!
-
-    bne             cp_src_to_dst_width_loop
-
-    subs            lr, lr, #1
-    add             r2, r2, r6, lsl #1
-    add             r3, r3, r7, lsl #1
-
-    bne             cp_src_to_dst_height_loop
-
-    ands            r10, r5, #0x7f                  ;check to see if extra copy is needed
-    sub             r11, r5, r10
-    ldr             r2, [r0, #yv12_buffer_config_y_buffer]       ;srcptr1
-    ldr             r3, [r1, #yv12_buffer_config_y_buffer]       ;dstptr1
-    bne             extra_cp_src_to_dst_width
-end_of_cp_src_to_dst
-
-
-    ;vpxyv12_extend_frame_borders_yonly
-    mov             r0, r1
-    ;Not need to load y_width, since: y_width = y_stride - 2*border
-    ldr             r3, [r0, #yv12_buffer_config_border]
-    ldr             r1, [r0, #yv12_buffer_config_y_buffer]       ;srcptr1
-    ldr             r4, [r0, #yv12_buffer_config_y_height]
-    ldr             lr, [r0, #yv12_buffer_config_y_stride]
-
-    cmp             r3, #16
-    beq             b16_extend_frame_borders
-
-;=======================
-b32_extend_frame_borders
-;border = 32
-;=======================
-;Border copy for Y plane
-;copy the left and right most columns out
-    sub             r5, r1, r3              ;destptr1
-    add             r6, r1, lr
-    sub             r6, r6, r3, lsl #1      ;destptr2
-    sub             r2, r6, #1              ;srcptr2
-
-    ;Do four rows at one time
-    mov             r12, r4, lsr #2
-
-copy_left_right_y
-    vld1.8          {d0[], d1[]}, [r1], lr
-    vld1.8          {d4[], d5[]}, [r2], lr
-    vld1.8          {d8[], d9[]}, [r1], lr
-    vld1.8          {d12[], d13[]}, [r2], lr
-    vld1.8          {d16[], d17[]},  [r1], lr
-    vld1.8          {d20[], d21[]}, [r2], lr
-    vld1.8          {d24[], d25[]}, [r1], lr
-    vld1.8          {d28[], d29[]}, [r2], lr
-
-    vmov            q1, q0
-    vmov            q3, q2
-    vmov            q5, q4
-    vmov            q7, q6
-    vmov            q9, q8
-    vmov            q11, q10
-    vmov            q13, q12
-    vmov            q15, q14
-
-    subs            r12, r12, #1
-
-    vst1.8          {q0, q1}, [r5], lr
-    vst1.8          {q2, q3}, [r6], lr
-    vst1.8          {q4, q5}, [r5], lr
-    vst1.8          {q6, q7}, [r6], lr
-    vst1.8          {q8, q9}, [r5], lr
-    vst1.8          {q10, q11}, [r6], lr
-    vst1.8          {q12, q13}, [r5], lr
-    vst1.8          {q14, q15}, [r6], lr
-
-    bne             copy_left_right_y
-
-;Now copy the top and bottom source lines into each line of the respective borders
-    ldr             r7, [r0, #yv12_buffer_config_y_buffer]       ;srcptr1
-    mul             r8, r3, lr
-
-    mov             r12, lr, lsr #7
-
-    sub             r6, r1, r3              ;destptr2
-    sub             r2, r6, lr              ;srcptr2
-    sub             r1, r7, r3              ;srcptr1
-    sub             r5, r1, r8              ;destptr1
-
-copy_top_bottom_y
-    vld1.8          {q0, q1}, [r1]!
-    vld1.8          {q8, q9}, [r2]!
-    vld1.8          {q2, q3}, [r1]!
-    vld1.8          {q10, q11}, [r2]!
-    vld1.8          {q4, q5}, [r1]!
-    vld1.8          {q12, q13}, [r2]!
-    vld1.8          {q6, q7}, [r1]!
-    vld1.8          {q14, q15}, [r2]!
-
-    mov             r7, r3
-
-top_bottom_32
-    subs            r7, r7, #1
-
-    vst1.8          {q0, q1}, [r5]!
-    vst1.8          {q8, q9}, [r6]!
-    vst1.8          {q2, q3}, [r5]!
-    vst1.8          {q10, q11}, [r6]!
-    vst1.8          {q4, q5}, [r5]!
-    vst1.8          {q12, q13}, [r6]!
-    vst1.8          {q6, q7}, [r5]!
-    vst1.8          {q14, q15}, [r6]!
-
-    add             r5, r5, lr
-    sub             r5, r5, #128
-    add             r6, r6, lr
-    sub             r6, r6, #128
-
-    bne             top_bottom_32
-
-    sub             r5, r1, r8
-    add             r6, r2, lr
-
-    subs            r12, r12, #1
-    bne             copy_top_bottom_y
-
-    mov             r7, lr, lsr #4              ;check to see if extra copy is needed
-    ands            r7, r7, #0x7
-    bne             extra_top_bottom_y
-end_of_border_copy_y
-
-    vpop            {d8 - d15}
-    pop             {r4 - r11, pc}
-
-;=====================
-;extra copy part for Y
-extra_top_bottom_y
-    vld1.8          {q0}, [r1]!
-    vld1.8          {q2}, [r2]!
-
-    mov             r9, r3, lsr #3
-
-extra_top_bottom_32
-    subs            r9, r9, #1
-
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    bne             extra_top_bottom_32
-
-    sub             r5, r1, r8
-    add             r6, r2, lr
-    subs            r7, r7, #1
-    bne             extra_top_bottom_y
-
-    b               end_of_border_copy_y
-
-
-;=======================
-b16_extend_frame_borders
-;border = 16
-;=======================
-;Border copy for Y plane
-;copy the left and right most columns out
-    sub             r5, r1, r3              ;destptr1
-    add             r6, r1, lr
-    sub             r6, r6, r3, lsl #1      ;destptr2
-    sub             r2, r6, #1              ;srcptr2
-
-    ;Do four rows at one time
-    mov             r12, r4, lsr #2
-
-copy_left_right_y_b16
-    vld1.8          {d0[], d1[]}, [r1], lr
-    vld1.8          {d4[], d5[]}, [r2], lr
-    vld1.8          {d8[], d9[]}, [r1], lr
-    vld1.8          {d12[], d13[]}, [r2], lr
-    vld1.8          {d16[], d17[]},  [r1], lr
-    vld1.8          {d20[], d21[]}, [r2], lr
-    vld1.8          {d24[], d25[]}, [r1], lr
-    vld1.8          {d28[], d29[]}, [r2], lr
-
-    subs            r12, r12, #1
-
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q4}, [r5], lr
-    vst1.8          {q6}, [r6], lr
-    vst1.8          {q8}, [r5], lr
-    vst1.8          {q10}, [r6], lr
-    vst1.8          {q12}, [r5], lr
-    vst1.8          {q14}, [r6], lr
-
-    bne             copy_left_right_y_b16
-
-;Now copy the top and bottom source lines into each line of the respective borders
-    ldr             r7, [r0, #yv12_buffer_config_y_buffer]       ;srcptr1
-    mul             r8, r3, lr
-
-    mov             r12, lr, lsr #7
-
-    sub             r6, r1, r3              ;destptr2
-    sub             r2, r6, lr              ;srcptr2
-    sub             r1, r7, r3              ;srcptr1
-    sub             r5, r1, r8              ;destptr1
-
-copy_top_bottom_y_b16
-    vld1.8          {q0, q1}, [r1]!
-    vld1.8          {q8, q9}, [r2]!
-    vld1.8          {q2, q3}, [r1]!
-    vld1.8          {q10, q11}, [r2]!
-    vld1.8          {q4, q5}, [r1]!
-    vld1.8          {q12, q13}, [r2]!
-    vld1.8          {q6, q7}, [r1]!
-    vld1.8          {q14, q15}, [r2]!
-
-    mov             r7, r3
-
-top_bottom_16_b16
-    subs            r7, r7, #1
-
-    vst1.8          {q0, q1}, [r5]!
-    vst1.8          {q8, q9}, [r6]!
-    vst1.8          {q2, q3}, [r5]!
-    vst1.8          {q10, q11}, [r6]!
-    vst1.8          {q4, q5}, [r5]!
-    vst1.8          {q12, q13}, [r6]!
-    vst1.8          {q6, q7}, [r5]!
-    vst1.8          {q14, q15}, [r6]!
-
-    add             r5, r5, lr
-    sub             r5, r5, #128
-    add             r6, r6, lr
-    sub             r6, r6, #128
-
-    bne             top_bottom_16_b16
-
-    sub             r5, r1, r8
-    add             r6, r2, lr
-
-    subs            r12, r12, #1
-    bne             copy_top_bottom_y_b16
-
-    mov             r7, lr, lsr #4              ;check to see if extra copy is needed
-    ands            r7, r7, #0x7
-    bne             extra_top_bottom_y_b16
-end_of_border_copy_y_b16
-
-    vpop            {d8 - d15}
-    pop             {r4 - r11, pc}
-
-;=====================
-;extra copy part for Y
-extra_top_bottom_y_b16
-    vld1.8          {q0}, [r1]!
-    vld1.8          {q2}, [r2]!
-
-    mov             r9, r3, lsr #3
-
-extra_top_bottom_16_b16
-    subs            r9, r9, #1
-
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    vst1.8          {q0}, [r5], lr
-    vst1.8          {q2}, [r6], lr
-    bne             extra_top_bottom_16_b16
-
-    sub             r5, r1, r8
-    add             r6, r2, lr
-    subs            r7, r7, #1
-    bne             extra_top_bottom_y_b16
-
-    b               end_of_border_copy_y_b16
-
-;=============================
-extra_cp_src_to_dst_width
-    add             r2, r2, r11
-    add             r3, r3, r11
-    add             r0, r8, r6
-    add             r11, r9, r7
-
-    mov             lr, r4, lsr #1
-extra_cp_src_to_dst_height_loop
-    mov             r8, r2
-    mov             r9, r3
-    add             r0, r8, r6
-    add             r11, r9, r7
-
-    mov             r12, r10
-
-extra_cp_src_to_dst_width_loop
-    vld1.8          {q0}, [r8]!
-    vld1.8          {q1}, [r0]!
-
-    subs            r12, r12, #16
-
-    vst1.8          {q0}, [r9]!
-    vst1.8          {q1}, [r11]!
-    bne             extra_cp_src_to_dst_width_loop
-
-    subs            lr, lr, #1
-
-    add             r2, r2, r6, lsl #1
-    add             r3, r3, r7, lsl #1
-
-    bne             extra_cp_src_to_dst_height_loop
-
-    b               end_of_cp_src_to_dst
-
-    ENDP
-
-;===========================================================
-;In vp8cx_pick_filter_level(), call vp8_yv12_copy_frame_yonly
-;without extend_frame_borders.
-|vp8_yv12_copy_frame_yonly_no_extend_frame_borders_neon| PROC
-    push            {r4 - r11, lr}
-    vpush           {d8-d15}
-
-    ldr             r4, [r0, #yv12_buffer_config_y_height]
-    ldr             r5, [r0, #yv12_buffer_config_y_width]
-    ldr             r6, [r0, #yv12_buffer_config_y_stride]
-    ldr             r7, [r1, #yv12_buffer_config_y_stride]
-    ldr             r2, [r0, #yv12_buffer_config_y_buffer]       ;srcptr1
-    ldr             r3, [r1, #yv12_buffer_config_y_buffer]       ;dstptr1
-
-    ; copy two rows at one time
-    mov             lr, r4, lsr #1
-
-cp_src_to_dst_height_loop1
-    mov             r8, r2
-    mov             r9, r3
-    add             r10, r2, r6
-    add             r11, r3, r7
-    mov             r12, r5, lsr #7
-
-cp_src_to_dst_width_loop1
-    vld1.8          {q0, q1}, [r8]!
-    vld1.8          {q8, q9}, [r10]!
-    vld1.8          {q2, q3}, [r8]!
-    vld1.8          {q10, q11}, [r10]!
-    vld1.8          {q4, q5}, [r8]!
-    vld1.8          {q12, q13}, [r10]!
-    vld1.8          {q6, q7}, [r8]!
-    vld1.8          {q14, q15}, [r10]!
-
-    subs            r12, r12, #1
-
-    vst1.8          {q0, q1}, [r9]!
-    vst1.8          {q8, q9}, [r11]!
-    vst1.8          {q2, q3}, [r9]!
-    vst1.8          {q10, q11}, [r11]!
-    vst1.8          {q4, q5}, [r9]!
-    vst1.8          {q12, q13}, [r11]!
-    vst1.8          {q6, q7}, [r9]!
-    vst1.8          {q14, q15}, [r11]!
-
-    bne             cp_src_to_dst_width_loop1
-
-    subs            lr, lr, #1
-    add             r2, r2, r6, lsl #1
-    add             r3, r3, r7, lsl #1
-
-    bne             cp_src_to_dst_height_loop1
-
-    ands            r10, r5, #0x7f                  ;check to see if extra copy is needed
-    sub             r11, r5, r10
-    ldr             r2, [r0, #yv12_buffer_config_y_buffer]       ;srcptr1
-    ldr             r3, [r1, #yv12_buffer_config_y_buffer]       ;dstptr1
-    bne             extra_cp_src_to_dst_width1
-end_of_cp_src_to_dst1
-
-    vpop            {d8 - d15}
-    pop             {r4-r11, pc}
-
-;=============================
-extra_cp_src_to_dst_width1
-    add             r2, r2, r11
-    add             r3, r3, r11
-    add             r0, r8, r6
-    add             r11, r9, r7
-
-    mov             lr, r4, lsr #1
-extra_cp_src_to_dst_height_loop1
-    mov             r8, r2
-    mov             r9, r3
-    add             r0, r8, r6
-    add             r11, r9, r7
-
-    mov             r12, r10
-
-extra_cp_src_to_dst_width_loop1
-    vld1.8          {q0}, [r8]!
-    vld1.8          {q1}, [r0]!
-
-    subs            r12, r12, #16
-
-    vst1.8          {q0}, [r9]!
-    vst1.8          {q1}, [r11]!
-    bne             extra_cp_src_to_dst_width_loop1
-
-    subs            lr, lr, #1
-
-    add             r2, r2, r6, lsl #1
-    add             r3, r3, r7, lsl #1
-
-    bne             extra_cp_src_to_dst_height_loop1
-
-    b               end_of_cp_src_to_dst1
-
-    ENDP
-
-    END
diff --git a/media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm b/media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm
new file mode 100644
index 00000000000..ebc4242b234
--- /dev/null
+++ b/media/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm
@@ -0,0 +1,308 @@
+;
+;  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+;
+;  Use of this source code is governed by a BSD-style license
+;  that can be found in the LICENSE file in the root of the source
+;  tree. An additional intellectual property rights grant can be found
+;  in the file PATENTS.  All contributing project authors may
+;  be found in the AUTHORS file in the root of the source tree.
+;
+
+
+    EXPORT  |vp8_yv12_extend_frame_borders_neon|
+    ARM
+    REQUIRE8
+    PRESERVE8
+
+    INCLUDE asm_com_offsets.asm
+
+    AREA ||.text||, CODE, READONLY, ALIGN=2
+;void vp8_yv12_extend_frame_borders_neon (YV12_BUFFER_CONFIG *ybf);
+; we depend on VP8BORDERINPIXELS being 32
+
+|vp8_yv12_extend_frame_borders_neon| PROC
+    push            {r4 - r10, lr}
+    vpush           {d8 - d15}
+
+    ; Border = 32
+    ldr             r3, [r0, #yv12_buffer_config_y_width]  ; plane_width
+    ldr             r1, [r0, #yv12_buffer_config_y_buffer] ; src_ptr1
+    ldr             r4, [r0, #yv12_buffer_config_y_height] ; plane_height
+    ldr             lr, [r0, #yv12_buffer_config_y_stride] ; plane_stride
+
+; Border copy for Y plane
+; copy the left and right most columns out
+    add             r6, r1, r3              ; dest_ptr2 = src_ptr2 + 1 (src_ptr1 + plane_width)
+    sub             r2, r6, #1              ; src_ptr2 = src_ptr1 + plane_width - 1
+    sub             r5, r1, #32             ; dest_ptr1 = src_ptr1 - Border
+
+    mov             r12, r4, lsr #2         ; plane_height / 4
+
+copy_left_right_y
+    vld1.8          {d0[], d1[]}, [r1], lr
+    vld1.8          {d4[], d5[]}, [r2], lr
+    vld1.8          {d8[], d9[]}, [r1], lr
+    vld1.8          {d12[], d13[]}, [r2], lr
+    vld1.8          {d16[], d17[]}, [r1], lr
+    vld1.8          {d20[], d21[]}, [r2], lr
+    vld1.8          {d24[], d25[]}, [r1], lr
+    vld1.8          {d28[], d29[]}, [r2], lr
+
+    vmov            q1, q0
+    vmov            q3, q2
+    vmov            q5, q4
+    vmov            q7, q6
+    vmov            q9, q8
+    vmov            q11, q10
+    vmov            q13, q12
+    vmov            q15, q14
+
+    subs            r12, r12, #1
+
+    vst1.8          {q0, q1}, [r5], lr
+    vst1.8          {q2, q3}, [r6], lr
+    vst1.8          {q4, q5}, [r5], lr
+    vst1.8          {q6, q7}, [r6], lr
+    vst1.8          {q8, q9}, [r5], lr
+    vst1.8          {q10, q11}, [r6], lr
+    vst1.8          {q12, q13}, [r5], lr
+    vst1.8          {q14, q15}, [r6], lr
+
+    bne             copy_left_right_y
+
+;Now copy the top and bottom source lines into each line of the respective borders
+    ldr             r1, [r0, #yv12_buffer_config_y_buffer] ; y_buffer
+    mul             r8, r4, lr              ; plane_height * plane_stride
+
+    ; copy width is plane_stride
+    movs            r12, lr, lsr #7         ; plane_stride / 128
+
+    sub             r1, r1, #32             ; src_ptr1 = y_buffer - Border
+    add             r6, r1, r8              ; dest_ptr2 = src_ptr2 - plane_stride (src_ptr1 + (plane_height * plane_stride))
+    sub             r2, r6, lr              ; src_ptr2 = src_ptr1 + (plane_height * plane_stride) - plane_stride
+    sub             r5, r1, lr, asl #5      ; dest_ptr1 = src_ptr1 - (Border * plane_stride)
+    ble             extra_y_copy_needed     ; plane stride < 128
+
+copy_top_bottom_y
+    vld1.8          {q0, q1}, [r1]!
+    vld1.8          {q8, q9}, [r2]!
+    vld1.8          {q2, q3}, [r1]!
+    vld1.8          {q10, q11}, [r2]!
+    vld1.8          {q4, q5}, [r1]!
+    vld1.8          {q12, q13}, [r2]!
+    vld1.8          {q6, q7}, [r1]!
+    vld1.8          {q14, q15}, [r2]!
+
+    mov             r7, #32                 ; Border
+
+top_bottom_32
+    subs            r7, r7, #1
+
+    vst1.8          {q0, q1}, [r5]!
+    vst1.8          {q8, q9}, [r6]!
+    vst1.8          {q2, q3}, [r5]!
+    vst1.8          {q10, q11}, [r6]!
+    vst1.8          {q4, q5}, [r5]!
+    vst1.8          {q12, q13}, [r6]!
+    vst1.8          {q6, q7}, [r5]!
+    vst1.8          {q14, q15}, [r6]!
+
+    add             r5, r5, lr              ; dest_ptr1 += plane_stride
+    sub             r5, r5, #128            ; dest_ptr1 -= 128
+    add             r6, r6, lr              ; dest_ptr2 += plane_stride
+    sub             r6, r6, #128            ; dest_ptr2 -= 128
+
+    bne             top_bottom_32
+
+    sub             r5, r1, lr, asl #5      ; src_ptr1 - (Border* plane_stride)
+    add             r6, r2, lr              ; src_ptr2 + plane_stride
+
+    subs            r12, r12, #1
+    bne             copy_top_bottom_y
+
+extra_y_copy_needed
+    mov             r7, lr, lsr #4          ; check to see if extra copy is needed
+    ands            r7, r7, #0x7
+    bne             extra_top_bottom_y
+end_of_border_copy_y
+
+;Border copy for U, V planes
+; Border = 16
+    ldr             r7, [r0, #yv12_buffer_config_u_buffer]  ; src_ptr1
+    ldr             lr, [r0, #yv12_buffer_config_uv_stride] ; plane_stride
+    ldr             r3, [r0, #yv12_buffer_config_uv_width]  ; plane_width
+    ldr             r4, [r0, #yv12_buffer_config_uv_height] ; plane_height
+
+    mov             r10, #2
+
+;copy the left and right most columns out
+border_copy_uv
+    mov             r1, r7                  ; src_ptr1 needs to be saved for second half of loop
+    sub             r5, r1, #16             ; dest_ptr1 = src_ptr1 - Border
+    add             r6, r1, r3              ; dest_ptr2 = src_ptr2 + 1 (src_ptr1 + plane_width)
+    sub             r2, r6, #1              ; src_ptr2 = src_ptr1 + plane_width - 1
+
+    mov             r12, r4, lsr #3         ; plane_height / 8
+
+copy_left_right_uv
+    vld1.8          {d0[], d1[]}, [r1], lr
+    vld1.8          {d2[], d3[]}, [r2], lr
+    vld1.8          {d4[], d5[]}, [r1], lr
+    vld1.8          {d6[], d7[]}, [r2], lr
+    vld1.8          {d8[], d9[]},  [r1], lr
+    vld1.8          {d10[], d11[]}, [r2], lr
+    vld1.8          {d12[], d13[]}, [r1], lr
+    vld1.8          {d14[], d15[]}, [r2], lr
+    vld1.8          {d16[], d17[]}, [r1], lr
+    vld1.8          {d18[], d19[]}, [r2], lr
+    vld1.8          {d20[], d21[]}, [r1], lr
+    vld1.8          {d22[], d23[]}, [r2], lr
+    vld1.8          {d24[], d25[]}, [r1], lr
+    vld1.8          {d26[], d27[]}, [r2], lr
+    vld1.8          {d28[], d29[]}, [r1], lr
+    vld1.8          {d30[], d31[]}, [r2], lr
+
+    subs            r12, r12, #1
+
+    vst1.8          {q0}, [r5], lr
+    vst1.8          {q1}, [r6], lr
+    vst1.8          {q2}, [r5], lr
+    vst1.8          {q3}, [r6], lr
+    vst1.8          {q4}, [r5], lr
+    vst1.8          {q5}, [r6], lr
+    vst1.8          {q6}, [r5], lr
+    vst1.8          {q7}, [r6], lr
+    vst1.8          {q8}, [r5], lr
+    vst1.8          {q9}, [r6], lr
+    vst1.8          {q10}, [r5], lr
+    vst1.8          {q11}, [r6], lr
+    vst1.8          {q12}, [r5], lr
+    vst1.8          {q13}, [r6], lr
+    vst1.8          {q14}, [r5], lr
+    vst1.8          {q15}, [r6], lr
+
+    bne             copy_left_right_uv
+
+;Now copy the top and bottom source lines into each line of the respective borders
+    mov             r1, r7
+    mul             r8, r4, lr              ; plane_height * plane_stride
+    movs            r12, lr, lsr #6         ; plane_stride / 64
+
+    sub             r1, r1, #16             ; src_ptr1 = u_buffer - Border
+    add             r6, r1, r8              ; dest_ptr2 = src_ptr2 + plane_stride (src_ptr1 + (plane_height * plane_stride)
+    sub             r2, r6, lr              ; src_ptr2 = src_ptr1 + (plane_height * plane_stride) - plane_stride
+    sub             r5, r1, lr, asl #4      ; dest_ptr1 = src_ptr1 - (Border * plane_stride)
+    ble             extra_uv_copy_needed    ; plane_stride < 64
+
+copy_top_bottom_uv
+    vld1.8          {q0, q1}, [r1]!
+    vld1.8          {q8, q9}, [r2]!
+    vld1.8          {q2, q3}, [r1]!
+    vld1.8          {q10, q11}, [r2]!
+
+    mov             r7, #16                 ; Border
+
+top_bottom_16
+    subs            r7, r7, #1
+
+    vst1.8          {q0, q1}, [r5]!
+    vst1.8          {q8, q9}, [r6]!
+    vst1.8          {q2, q3}, [r5]!
+    vst1.8          {q10, q11}, [r6]!
+
+    add             r5, r5, lr              ; dest_ptr1 += plane_stride
+    sub             r5, r5, #64
+    add             r6, r6, lr              ; dest_ptr2 += plane_stride
+    sub             r6, r6, #64
+
+    bne             top_bottom_16
+
+    sub             r5, r1, lr, asl #4      ; dest_ptr1 = src_ptr1 - (Border * plane_stride)
+    add             r6, r2, lr              ; dest_ptr2 = src_ptr2 + plane_stride
+
+    subs            r12, r12, #1
+    bne             copy_top_bottom_uv
+extra_uv_copy_needed
+    mov             r7, lr, lsr #3          ; check to see if extra copy is needed
+    ands            r7, r7, #0x7
+    bne             extra_top_bottom_uv
+
+end_of_border_copy_uv
+    subs            r10, r10, #1
+    ldrne           r7, [r0, #yv12_buffer_config_v_buffer] ; src_ptr1
+    bne             border_copy_uv
+
+    vpop            {d8 - d15}
+    pop             {r4 - r10, pc}
+
+;;;;;;;;;;;;;;;;;;;;;;
+extra_top_bottom_y
+    vld1.8          {q0}, [r1]!
+    vld1.8          {q2}, [r2]!
+
+    mov             r9, #4                  ; 32 >> 3
+
+extra_top_bottom_32
+    subs            r9, r9, #1
+
+    vst1.8          {q0}, [r5], lr
+    vst1.8          {q2}, [r6], lr
+    vst1.8          {q0}, [r5], lr
+    vst1.8          {q2}, [r6], lr
+    vst1.8          {q0}, [r5], lr
+    vst1.8          {q2}, [r6], lr
+    vst1.8          {q0}, [r5], lr
+    vst1.8          {q2}, [r6], lr
+    vst1.8          {q0}, [r5], lr
+    vst1.8          {q2}, [r6], lr
+    vst1.8          {q0}, [r5], lr
+    vst1.8          {q2}, [r6], lr
+    vst1.8          {q0}, [r5], lr
+    vst1.8          {q2}, [r6], lr
+    vst1.8          {q0}, [r5], lr
+    vst1.8          {q2}, [r6], lr
+    bne             extra_top_bottom_32
+
+    sub             r5, r1, lr, asl #5      ; src_ptr1 - (Border * plane_stride)
+    add             r6, r2, lr              ; src_ptr2 + plane_stride
+    subs            r7, r7, #1
+    bne             extra_top_bottom_y
+
+    b               end_of_border_copy_y
+
+extra_top_bottom_uv
+    vld1.8          {d0}, [r1]!
+    vld1.8          {d8}, [r2]!
+
+    mov             r9, #2                  ; 16 >> 3
+
+extra_top_bottom_16
+    subs            r9, r9, #1
+
+    vst1.8          {d0}, [r5], lr
+    vst1.8          {d8}, [r6], lr
+    vst1.8          {d0}, [r5], lr
+    vst1.8          {d8}, [r6], lr
+    vst1.8          {d0}, [r5], lr
+    vst1.8          {d8}, [r6], lr
+    vst1.8          {d0}, [r5], lr
+    vst1.8          {d8}, [r6], lr
+    vst1.8          {d0}, [r5], lr
+    vst1.8          {d8}, [r6], lr
+    vst1.8          {d0}, [r5], lr
+    vst1.8          {d8}, [r6], lr
+    vst1.8          {d0}, [r5], lr
+    vst1.8          {d8}, [r6], lr
+    vst1.8          {d0}, [r5], lr
+    vst1.8          {d8}, [r6], lr
+    bne             extra_top_bottom_16
+
+    sub             r5, r1, lr, asl #4      ; src_ptr1 - (Border * plane_stride)
+    add             r6, r2, lr              ; src_ptr2 + plane_stride
+    subs            r7, r7, #1
+    bne             extra_top_bottom_uv
+
+    b               end_of_border_copy_uv
+
+    ENDP
+    END
diff --git a/media/libvpx/vpx_scale/arm/neon/yv12extend_arm.c b/media/libvpx/vpx_scale/arm/neon/yv12extend_arm.c
new file mode 100644
index 00000000000..7529fc6347b
--- /dev/null
+++ b/media/libvpx/vpx_scale/arm/neon/yv12extend_arm.c
@@ -0,0 +1,25 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+
+#include "vpx_scale/yv12config.h"
+#include "vpx_mem/vpx_mem.h"
+#include "vpx_scale/vpxscale.h"
+
+extern void vp8_yv12_copy_frame_func_neon(YV12_BUFFER_CONFIG *src_ybc,
+                                          YV12_BUFFER_CONFIG *dst_ybc);
+
+void vp8_yv12_copy_frame_neon(YV12_BUFFER_CONFIG *src_ybc,
+                              YV12_BUFFER_CONFIG *dst_ybc)
+{
+    vp8_yv12_copy_frame_func_neon(src_ybc, dst_ybc);
+
+    vp8_yv12_extend_frame_borders_neon(dst_ybc);
+}
diff --git a/media/libvpx/vpx_scale/arm/yv12extend_arm.h b/media/libvpx/vpx_scale/arm/yv12extend_arm.h
new file mode 100644
index 00000000000..adfca812fc5
--- /dev/null
+++ b/media/libvpx/vpx_scale/arm/yv12extend_arm.h
@@ -0,0 +1,28 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+
+#ifndef YV12_EXTEND_ARM_H
+#define YV12_EXTEND_ARM_H
+
+#include "vpx_config.h"
+#include "vpx_scale/yv12config.h"
+
+#if HAVE_ARMV7
+    void vp8_yv12_extend_frame_borders_neon(YV12_BUFFER_CONFIG *ybf);
+
+    /* Copy Y,U,V buffer data from src to dst, filling border of dst as well. */
+    void vp8_yv12_copy_frame_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
+
+    /* Copy Y buffer data from src_ybc to dst_ybc without filling border data */
+    void vp8_yv12_copy_y_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
+#endif
+
+#endif /* YV12_EXTEND_ARM_H */
diff --git a/media/libvpx/vpx_scale/generic/scalesystemdependent.c b/media/libvpx/vpx_scale/generic/scalesystemdependent.c
index 926feb7cd14..24baef02cf2 100644
--- a/media/libvpx/vpx_scale/generic/scalesystemdependent.c
+++ b/media/libvpx/vpx_scale/generic/scalesystemdependent.c
@@ -9,22 +9,15 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_scale/vpxscale.h"
-
+#include "vpx_scale/yv12extend.h"
 
 void (*vp8_yv12_extend_frame_borders_ptr)(YV12_BUFFER_CONFIG *ybf);
-extern void vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf);
-
-void (*vp8_yv12_copy_frame_yonly_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-extern void vp8_yv12_copy_frame_yonly(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-
 void (*vp8_yv12_copy_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-extern void vp8_yv12_copy_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
+void (*vp8_yv12_copy_y_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
 
-/****************************************************************************
-*  Imports
-*****************************************************************************/
+extern void vp8_arch_arm_vpx_scale_init();
 
 /****************************************************************************
  *
@@ -71,8 +64,11 @@ void vp8_scale_machine_specific_config()
     vp8_horizontal_line_5_4_scale         = vp8cx_horizontal_line_5_4_scale_c;
 #endif
 
-    vp8_yv12_extend_frame_borders_ptr      = vp8_yv12_extend_frame_borders;
-    vp8_yv12_copy_frame_yonly_ptr          = vp8_yv12_copy_frame_yonly;
-    vp8_yv12_copy_frame_ptr           = vp8_yv12_copy_frame;
+    vp8_yv12_extend_frame_borders_ptr     = vp8_yv12_extend_frame_borders;
+    vp8_yv12_copy_y_ptr                   = vp8_yv12_copy_y_c;
+    vp8_yv12_copy_frame_ptr               = vp8_yv12_copy_frame;
 
+#if ARCH_ARM
+    vp8_arch_arm_vpx_scale_init();
+#endif
 }
diff --git a/media/libvpx/vpx_scale/generic/vpxscale.c b/media/libvpx/vpx_scale/generic/vpxscale.c
index 13c9122f0a9..29b1308765b 100644
--- a/media/libvpx/vpx_scale/generic/vpxscale.c
+++ b/media/libvpx/vpx_scale/generic/vpxscale.c
@@ -27,7 +27,6 @@
 /****************************************************************************
 *  Exports
 ****************************************************************************/
-#ifndef VPX_NO_GLOBALS
 void (*vp8_vertical_band_4_5_scale)(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width) = 0;
 void (*vp8_last_vertical_band_4_5_scale)(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width) = 0;
 void (*vp8_vertical_band_2_3_scale)(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width) = 0;
@@ -51,9 +50,6 @@ void (*vp8_vertical_band_2_1_scale_i)(unsigned char *source, unsigned int src_pi
 void (*vp8_horizontal_line_2_1_scale)(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width) = 0;
 void (*vp8_horizontal_line_5_3_scale)(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width) = 0;
 void (*vp8_horizontal_line_5_4_scale)(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width) = 0;
-#else
-# include "vpxscale_nofp.h"
-#endif
 
 typedef struct
 {
diff --git a/media/libvpx/vpx_scale/generic/yv12extend.c b/media/libvpx/vpx_scale/generic/yv12extend.c
index c087bdd78c9..b9125de0b89 100644
--- a/media/libvpx/vpx_scale/generic/yv12extend.c
+++ b/media/libvpx/vpx_scale/generic/yv12extend.c
@@ -259,8 +259,7 @@ vp8_yv12_copy_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc)
     vp8_yv12_extend_frame_borders_ptr(dst_ybc);
 }
 
-void
-vp8_yv12_copy_frame_yonly(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc)
+void vp8_yv12_copy_y_c(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc)
 {
     int row;
     unsigned char *source, *dest;
@@ -275,6 +274,4 @@ vp8_yv12_copy_frame_yonly(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_y
         source += src_ybc->y_stride;
         dest   += dst_ybc->y_stride;
     }
-
-    extend_frame_borders_yonly(dst_ybc);
 }
diff --git a/media/libvpx/vpx_scale/generic/yv12extend_generic.h b/media/libvpx/vpx_scale/generic/yv12extend_generic.h
new file mode 100644
index 00000000000..cc2a554c759
--- /dev/null
+++ b/media/libvpx/vpx_scale/generic/yv12extend_generic.h
@@ -0,0 +1,25 @@
+/*
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+
+#ifndef YV12_EXTEND_GENERIC_H
+#define YV12_EXTEND_GENERIC_H
+
+#include "vpx_scale/yv12config.h"
+
+    void vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf);
+
+    /* Copy Y,U,V buffer data from src to dst, filling border of dst as well. */
+    void vp8_yv12_copy_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
+
+    /* Copy Y buffer data from src_ybc to dst_ybc without filling border data */
+    void vp8_yv12_copy_y_c(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
+
+#endif /* YV12_EXTEND_GENERIC_H */
diff --git a/media/libvpx/vpx_scale/vpxscale.h b/media/libvpx/vpx_scale/vpxscale.h
index 86fc128dad4..1a4997c55d9 100644
--- a/media/libvpx/vpx_scale/vpxscale.h
+++ b/media/libvpx/vpx_scale/vpxscale.h
@@ -13,6 +13,7 @@
 #define VPXSCALE_H
 
 #include "vpx_scale/yv12config.h"
+#include "vpx_scale/yv12extend.h"
 void vp8cx_horizontal_line_4_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
 void vp8cx_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
 void vp8cx_last_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
@@ -60,19 +61,6 @@ extern void (*vp8_horizontal_line_2_1_scale)(const unsigned char *source, unsign
 extern void (*vp8_horizontal_line_5_3_scale)(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
 extern void (*vp8_horizontal_line_5_4_scale)(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
 
-void horizontal_line_4_5_scale_armv4(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
-void horizontal_line_2_3_scale_armv4(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
-void horizontal_line_3_5_scale_armv4(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
-void horizontal_line_3_4_scale_armv4(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
-void horizontal_line_1_2_scale_armv4(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
-void vertical_band_4_5_scale_armv4(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-void vertical_band_2_3_scale_armv4(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-void vertical_band_3_5_scale_armv4(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-void vertical_band_3_4_scale_armv4(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-void vertical_band_1_2_scale_armv4(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-
-
-extern void  dmachine_specific_config(int mmx_enabled, int xmm_enabled, int wmt_enabled);
 extern void vp8_yv12_scale_or_center
 (
     YV12_BUFFER_CONFIG *src_yuv_config,
@@ -99,16 +87,4 @@ extern void vp8_scale_frame
 );
 extern void vp8_scale_machine_specific_config(void);
 
-extern void (*vp8_yv12_extend_frame_borders_ptr)(YV12_BUFFER_CONFIG *ybf);
-extern void vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf);
-extern void vp8_yv12_extend_frame_borders_neon(YV12_BUFFER_CONFIG *ybf);
-
-extern void (*vp8_yv12_copy_frame_yonly_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-extern void vp8_yv12_copy_frame_yonly(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-extern void vp8_yv12_copy_frame_yonly_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-
-extern void (*vp8_yv12_copy_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-extern void vp8_yv12_copy_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-extern void vp8_yv12_copy_frame_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-
 #endif
diff --git a/media/libvpx/vpx_scale/yv12extend.h b/media/libvpx/vpx_scale/yv12extend.h
index 0c239b9d100..c8bf955409a 100644
--- a/media/libvpx/vpx_scale/yv12extend.h
+++ b/media/libvpx/vpx_scale/yv12extend.h
@@ -12,19 +12,26 @@
 #ifndef YV12_EXTEND_H
 #define YV12_EXTEND_H
 
+#include "vpx_config.h"
 #include "vpx_scale/yv12config.h"
+#include "vpx_scale/generic/yv12extend_generic.h"
+
+#if HAVE_ARMV7
+#include "vpx_scale/arm/yv12extend_arm.h"
+#endif
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-    void vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf);
+    extern void (*vp8_yv12_extend_frame_borders_ptr)(YV12_BUFFER_CONFIG *ybf);
 
     /* Copy Y,U,V buffer data from src to dst, filling border of dst as well. */
+    extern void (*vp8_yv12_copy_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
 
-    void vp8_yv12_copy_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-    void vp8_yv12_copy_frame_yonly(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
+    /* Copy Y buffer data from src_ybc to dst_ybc without filling border data */
+    extern void (*vp8_yv12_copy_y_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
 
 #ifdef __cplusplus
 }
diff --git a/media/libvpx/vpx_version.h b/media/libvpx/vpx_version.h
index 56cf88ca61d..800b1dcacc4 100644
--- a/media/libvpx/vpx_version.h
+++ b/media/libvpx/vpx_version.h
@@ -1,7 +1,7 @@
-#define VERSION_MAJOR  0
-#define VERSION_MINOR  9
-#define VERSION_PATCH  2
+#define VERSION_MAJOR  1
+#define VERSION_MINOR  0
+#define VERSION_PATCH  0
 #define VERSION_EXTRA  ""
 #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v0.9.2"
-#define VERSION_STRING      " v0.9.2"
+#define VERSION_STRING_NOSP "v1.0.0"
+#define VERSION_STRING      " v1.0.0"

From c131155e178e87f4a896886223b9232af64ef8cb Mon Sep 17 00:00:00 2001
From: Brian Smith <bsmith@mozilla.com>
Date: Sun, 29 Apr 2012 21:00:22 -0700
Subject: [PATCH 020/162] Bug 703834 - Part 1 - Factor TransportSecurityInfo
 base class out of nsNSSIOLayer, r=honzab

--HG--
rename : security/manager/ssl/src/nsNSSIOLayer.cpp => security/manager/ssl/src/TransportSecurityInfo.cpp
rename : security/manager/ssl/src/nsNSSIOLayer.h => security/manager/ssl/src/TransportSecurityInfo.h
---
 security/manager/ssl/src/Makefile.in          |    1 +
 .../ssl/src/SSLServerCertVerification.cpp     |    6 +-
 .../manager/ssl/src/TransportSecurityInfo.cpp | 1201 +++++++++++++++++
 .../manager/ssl/src/TransportSecurityInfo.h   |  194 +++
 .../manager/ssl/src/nsIdentityChecking.cpp    |    2 +-
 security/manager/ssl/src/nsNSSCallbacks.cpp   |    4 +-
 security/manager/ssl/src/nsNSSComponent.cpp   |    3 +
 security/manager/ssl/src/nsNSSIOLayer.cpp     | 1151 +---------------
 security/manager/ssl/src/nsNSSIOLayer.h       |  137 +-
 security/manager/ssl/src/nsNSSModule.cpp      |   14 +-
 10 files changed, 1432 insertions(+), 1281 deletions(-)
 create mode 100644 security/manager/ssl/src/TransportSecurityInfo.cpp
 create mode 100644 security/manager/ssl/src/TransportSecurityInfo.h

diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
index 5499dfb47e2..f0f9f978845 100644
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -67,6 +67,7 @@ CPPSRCS = 				\
 	nsNSSErrors.cpp			\
 	nsNSSIOLayer.cpp		\
 	SSLServerCertVerification.cpp   \
+	TransportSecurityInfo.cpp       \
 	nsSSLStatus.cpp		\
 	nsNSSModule.cpp			\
 	nsSSLSocketProvider.cpp		\
diff --git a/security/manager/ssl/src/SSLServerCertVerification.cpp b/security/manager/ssl/src/SSLServerCertVerification.cpp
index 41888059d6d..3bb1af29c27 100644
--- a/security/manager/ssl/src/SSLServerCertVerification.cpp
+++ b/security/manager/ssl/src/SSLServerCertVerification.cpp
@@ -958,12 +958,12 @@ AuthCertificate(nsNSSSocketInfo * socketInfo, CERTCertificate * cert)
     if (rv == SECSuccess) {
       // Certificate verification succeeded delete any potential record
       // of certificate error bits.
-      nsSSLIOLayerHelpers::mHostsWithCertErrors->RememberCertHasError(
-        socketInfo, nsnull, rv);
+      RememberCertErrorsTable::GetInstance().RememberCertHasError(socketInfo,
+                                                                  nsnull, rv);
     }
     else {
       // Certificate verification failed, update the status' bits.
-      nsSSLIOLayerHelpers::mHostsWithCertErrors->LookupCertErrorBits(
+      RememberCertErrorsTable::GetInstance().LookupCertErrorBits(
         socketInfo, status);
     }
 
diff --git a/security/manager/ssl/src/TransportSecurityInfo.cpp b/security/manager/ssl/src/TransportSecurityInfo.cpp
new file mode 100644
index 00000000000..c0baab53589
--- /dev/null
+++ b/security/manager/ssl/src/TransportSecurityInfo.cpp
@@ -0,0 +1,1201 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Brian Ryner <bryner@brianryner.com>
+ *   Javier Delgadillo <javi@netscape.com>
+ *   Kai Engert <kengert@redhat.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "TransportSecurityInfo.h"
+#include "nsNSSComponent.h"
+#include "nsIWebProgressListener.h"
+#include "nsNSSCertificate.h"
+#include "nsIX509CertValidity.h"
+#include "nsIDateTimeFormat.h"
+#include "nsDateTimeFormatCID.h"
+#include "nsICertOverrideService.h"
+#include "nsIObjectInputStream.h"
+#include "nsIObjectOutputStream.h"
+#include "nsNSSCertHelper.h"
+#include "nsNSSCleaner.h"
+#include "nsIProgrammingLanguage.h"
+#include "nsIArray.h"
+#include "PSMRunnable.h"
+
+#include "secerr.h"
+
+//#define DEBUG_SSL_VERBOSE //Enable this define to get minimal 
+                            //reports when doing SSL read/write
+                            
+//#define DUMP_BUFFER  //Enable this define along with
+                       //DEBUG_SSL_VERBOSE to dump SSL
+                       //read/write buffer to a log.
+                       //Uses PR_LOG except on Mac where
+                       //we always write out to our own
+                       //file.
+
+namespace {
+
+NSSCleanupAutoPtrClass(CERTCertificate, CERT_DestroyCertificate)
+
+static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
+
+} // unnamed namespace
+
+namespace mozilla { namespace psm {
+
+TransportSecurityInfo::TransportSecurityInfo()
+  : mMutex("TransportSecurityInfo::mMutex"),
+    mSecurityState(nsIWebProgressListener::STATE_IS_INSECURE),
+    mSubRequestsHighSecurity(0),
+    mSubRequestsLowSecurity(0),
+    mSubRequestsBrokenSecurity(0),
+    mSubRequestsNoSecurity(0),
+    mErrorCode(0),
+    mErrorMessageType(PlainErrorMessage),
+    mPort(0),
+    mIsCertIssuerBlacklisted(false)
+{
+}
+
+TransportSecurityInfo::~TransportSecurityInfo()
+{
+  nsNSSShutDownPreventionLock locker;
+  if (isAlreadyShutDown())
+    return;
+
+  shutdown(calledFromObject);
+}
+
+void
+TransportSecurityInfo::virtualDestroyNSSReference()
+{
+}
+
+NS_IMPL_THREADSAFE_ISUPPORTS6(TransportSecurityInfo,
+                              nsITransportSecurityInfo,
+                              nsIInterfaceRequestor,
+                              nsISSLStatusProvider,
+                              nsIAssociatedContentSecurity,
+                              nsISerializable,
+                              nsIClassInfo)
+
+nsresult
+TransportSecurityInfo::SetHostName(const char* host)
+{
+  mHostName.Adopt(host ? NS_strdup(host) : 0);
+  return NS_OK;
+}
+
+nsresult
+TransportSecurityInfo::GetHostName(char **host)
+{
+  *host = (mHostName) ? NS_strdup(mHostName) : nsnull;
+  return NS_OK;
+}
+
+nsresult
+TransportSecurityInfo::SetPort(PRInt32 aPort)
+{
+  mPort = aPort;
+  return NS_OK;
+}
+
+nsresult
+TransportSecurityInfo::GetPort(PRInt32 *aPort)
+{
+  *aPort = mPort;
+  return NS_OK;
+}
+
+PRErrorCode
+TransportSecurityInfo::GetErrorCode() const
+{
+  MutexAutoLock lock(mMutex);
+
+  return mErrorCode;
+}
+
+void
+TransportSecurityInfo::SetCanceled(PRErrorCode errorCode,
+                                   SSLErrorMessageType errorMessageType)
+{
+  MutexAutoLock lock(mMutex);
+
+  mErrorCode = errorCode;
+  mErrorMessageType = errorMessageType;
+  mErrorMessageCached.Truncate();
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::GetSecurityState(PRUint32* state)
+{
+  *state = mSecurityState;
+  return NS_OK;
+}
+
+nsresult
+TransportSecurityInfo::SetSecurityState(PRUint32 aState)
+{
+  mSecurityState = aState;
+  return NS_OK;
+}
+
+/* attribute unsigned long countSubRequestsHighSecurity; */
+NS_IMETHODIMP
+TransportSecurityInfo::GetCountSubRequestsHighSecurity(
+  PRInt32 *aSubRequestsHighSecurity)
+{
+  *aSubRequestsHighSecurity = mSubRequestsHighSecurity;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::SetCountSubRequestsHighSecurity(
+  PRInt32 aSubRequestsHighSecurity)
+{
+  mSubRequestsHighSecurity = aSubRequestsHighSecurity;
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute unsigned long countSubRequestsLowSecurity; */
+NS_IMETHODIMP
+TransportSecurityInfo::GetCountSubRequestsLowSecurity(
+  PRInt32 *aSubRequestsLowSecurity)
+{
+  *aSubRequestsLowSecurity = mSubRequestsLowSecurity;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::SetCountSubRequestsLowSecurity(
+  PRInt32 aSubRequestsLowSecurity)
+{
+  mSubRequestsLowSecurity = aSubRequestsLowSecurity;
+  return NS_OK;
+}
+
+/* attribute unsigned long countSubRequestsBrokenSecurity; */
+NS_IMETHODIMP
+TransportSecurityInfo::GetCountSubRequestsBrokenSecurity(
+  PRInt32 *aSubRequestsBrokenSecurity)
+{
+  *aSubRequestsBrokenSecurity = mSubRequestsBrokenSecurity;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::SetCountSubRequestsBrokenSecurity(
+  PRInt32 aSubRequestsBrokenSecurity)
+{
+  mSubRequestsBrokenSecurity = aSubRequestsBrokenSecurity;
+  return NS_OK;
+}
+
+/* attribute unsigned long countSubRequestsNoSecurity; */
+NS_IMETHODIMP
+TransportSecurityInfo::GetCountSubRequestsNoSecurity(
+  PRInt32 *aSubRequestsNoSecurity)
+{
+  *aSubRequestsNoSecurity = mSubRequestsNoSecurity;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::SetCountSubRequestsNoSecurity(
+  PRInt32 aSubRequestsNoSecurity)
+{
+  mSubRequestsNoSecurity = aSubRequestsNoSecurity;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::Flush()
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::GetShortSecurityDescription(PRUnichar** aText)
+{
+  if (mShortDesc.IsEmpty())
+    *aText = nsnull;
+  else {
+    *aText = ToNewUnicode(mShortDesc);
+    NS_ENSURE_TRUE(*aText, NS_ERROR_OUT_OF_MEMORY);
+  }
+  return NS_OK;
+}
+
+nsresult
+TransportSecurityInfo::SetShortSecurityDescription(const PRUnichar* aText)
+{
+  mShortDesc.Assign(aText);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::GetErrorMessage(PRUnichar** aText)
+{
+  NS_ENSURE_ARG_POINTER(aText);
+  *aText = nsnull;
+
+  if (!NS_IsMainThread()) {
+    NS_ERROR("nsNSSSocketInfo::GetErrorMessage called off the main thread");
+    return NS_ERROR_NOT_SAME_THREAD;
+  }
+
+  MutexAutoLock lock(mMutex);
+
+  nsresult rv = formatErrorMessage(lock);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  *aText = ToNewUnicode(mErrorMessageCached);
+  return *aText != nsnull ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
+static nsresult
+formatPlainErrorMessage(nsXPIDLCString const & host, PRInt32 port,
+                        PRErrorCode err, nsString &returnedMessage);
+
+static nsresult
+formatOverridableCertErrorMessage(nsISSLStatus & sslStatus,
+                                  PRErrorCode errorCodeToReport, 
+                                  const nsXPIDLCString & host, PRInt32 port,
+                                  nsString & returnedMessage);
+
+// XXX: uses nsNSSComponent string bundles off the main thread when called by
+//      nsNSSSocketInfo::Write(). When we remove the error message from the
+//      serialization of nsNSSSocketInfo (bug 697781) we can inline
+//      formatErrorMessage into GetErrorMessage().
+nsresult
+TransportSecurityInfo::formatErrorMessage(MutexAutoLock const & proofOfLock)
+{
+  if (mErrorCode == 0 || !mErrorMessageCached.IsEmpty()) {
+    return NS_OK;
+  }
+
+  nsresult rv;
+  NS_ConvertASCIItoUTF16 hostNameU(mHostName);
+  NS_ASSERTION(mErrorMessageType != OverridableCertErrorMessage || 
+                (mSSLStatus && mSSLStatus->mServerCert &&
+                 mSSLStatus->mHaveCertErrorBits),
+                "GetErrorMessage called for cert error without cert");
+  if (mErrorMessageType == OverridableCertErrorMessage && 
+      mSSLStatus && mSSLStatus->mServerCert) {
+    rv = formatOverridableCertErrorMessage(*mSSLStatus, mErrorCode,
+                                           mHostName, mPort,
+                                           mErrorMessageCached);
+  } else {
+    rv = formatPlainErrorMessage(mHostName, mPort, mErrorCode,
+                                 mErrorMessageCached);
+  }
+
+  if (NS_FAILED(rv)) {
+    mErrorMessageCached.Truncate();
+  }
+
+  return rv;
+}
+
+/* void getInterface (in nsIIDRef uuid, [iid_is (uuid), retval] out nsQIResult result); */
+NS_IMETHODIMP
+TransportSecurityInfo::GetInterface(const nsIID & uuid, void * *result)
+{
+  if (!NS_IsMainThread()) {
+    NS_ERROR("nsNSSSocketInfo::GetInterface called off the main thread");
+    return NS_ERROR_NOT_SAME_THREAD;
+  }
+
+  nsresult rv;
+  if (!mCallbacks) {
+    nsCOMPtr<nsIInterfaceRequestor> ir = new PipUIContext();
+    if (!ir)
+      return NS_ERROR_OUT_OF_MEMORY;
+
+    rv = ir->GetInterface(uuid, result);
+  } else {
+    rv = mCallbacks->GetInterface(uuid, result);
+  }
+  return rv;
+}
+
+static NS_DEFINE_CID(kNSSCertificateCID, NS_X509CERT_CID);
+#define TRANSPORTSECURITYINFOMAGIC { 0xa9863a23, 0x26b8, 0x4a9c, \
+  { 0x83, 0xf1, 0xe9, 0xda, 0xdb, 0x36, 0xb8, 0x30 } }
+static NS_DEFINE_CID(kTransportSecurityInfoMagic, TRANSPORTSECURITYINFOMAGIC);
+
+NS_IMETHODIMP
+TransportSecurityInfo::Write(nsIObjectOutputStream* stream)
+{
+  stream->WriteID(kTransportSecurityInfoMagic);
+
+  MutexAutoLock lock(mMutex);
+
+  nsRefPtr<nsSSLStatus> status = mSSLStatus;
+  nsCOMPtr<nsISerializable> certSerializable;
+
+  // Write a redundant copy of the certificate for backward compatibility
+  // with previous versions, which also unnecessarily wrote it.
+  //
+  // As we are reading the object our self, not using ReadObject, we have
+  // to store it here 'manually' as well, mimicking our object stream
+  // implementation.
+
+  if (status) {
+    nsCOMPtr<nsIX509Cert> cert = status->mServerCert;
+    certSerializable = do_QueryInterface(cert);
+
+    if (!certSerializable) {
+      NS_ERROR("certificate is missing or isn't serializable");
+      return NS_ERROR_UNEXPECTED;
+    }
+  } else {
+    NS_WARNING("Serializing nsNSSSocketInfo without mSSLStatus");
+  }
+
+  // Store the flag if there is the certificate present
+  stream->WriteBoolean(certSerializable);
+  if (certSerializable) {
+    stream->WriteID(kNSSCertificateCID);
+    stream->WriteID(NS_GET_IID(nsISupports));
+    certSerializable->Write(stream);
+  }
+
+  // Store the version number of the binary stream data format.
+  // The 0xFFFF0000 mask is included to the version number
+  // to distinguish version number from mSecurityState
+  // field stored in times before versioning has been introduced.
+  // This mask value has been chosen as mSecurityState could
+  // never be assigned such value.
+  PRUint32 version = 3;
+  stream->Write32(version | 0xFFFF0000);
+  stream->Write32(mSecurityState);
+  stream->WriteWStringZ(mShortDesc.get());
+
+  // XXX: uses nsNSSComponent string bundles off the main thread
+  nsresult rv = formatErrorMessage(lock); 
+  NS_ENSURE_SUCCESS(rv, rv);
+  stream->WriteWStringZ(mErrorMessageCached.get());
+
+  stream->WriteCompoundObject(NS_ISUPPORTS_CAST(nsISSLStatus*, status),
+                              NS_GET_IID(nsISupports), true);
+
+  stream->Write32((PRUint32)mSubRequestsHighSecurity);
+  stream->Write32((PRUint32)mSubRequestsLowSecurity);
+  stream->Write32((PRUint32)mSubRequestsBrokenSecurity);
+  stream->Write32((PRUint32)mSubRequestsNoSecurity);
+  return NS_OK;
+}
+
+static bool CheckUUIDEquals(PRUint32 m0,
+                            nsIObjectInputStream* stream,
+                            const nsCID& id)
+{
+  nsID tempID;
+  tempID.m0 = m0;
+  stream->Read16(&tempID.m1);
+  stream->Read16(&tempID.m2);
+  for (int i = 0; i < 8; ++i)
+    stream->Read8(&tempID.m3[i]);
+  return tempID.Equals(id);
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::Read(nsIObjectInputStream* stream)
+{
+  nsresult rv;
+
+  PRUint32 version;
+  bool certificatePresent;
+
+  // Check what we have here...
+  PRUint32 UUID_0;
+  stream->Read32(&UUID_0);
+  if (UUID_0 == kTransportSecurityInfoMagic.m0) {
+    // It seems this stream begins with our magic ID, check it really is there
+    if (!CheckUUIDEquals(UUID_0, stream, kTransportSecurityInfoMagic))
+      return NS_ERROR_FAILURE;
+
+    // OK, this seems to be our stream, now continue to check there is
+    // the certificate
+    stream->ReadBoolean(&certificatePresent);
+    stream->Read32(&UUID_0);
+  }
+  else {
+    // There is no magic, assume there is a certificate present as in versions
+    // prior to those with the magic didn't store that flag; we check the 
+    // certificate is present by cheking the CID then
+    certificatePresent = true;
+  }
+
+  if (certificatePresent && UUID_0 == kNSSCertificateCID.m0) {
+    // It seems there is the certificate CID present, check it now; we only
+    // have this single certificate implementation at this time.
+    if (!CheckUUIDEquals(UUID_0, stream, kNSSCertificateCID))
+      return NS_ERROR_FAILURE;
+
+    // OK, we have read the CID of the certificate, check the interface ID
+    nsID tempID;
+    stream->ReadID(&tempID);
+    if (!tempID.Equals(NS_GET_IID(nsISupports)))
+      return NS_ERROR_FAILURE;
+
+    nsCOMPtr<nsISerializable> serializable =
+        do_CreateInstance(kNSSCertificateCID, &rv);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    // This is the redundant copy of the certificate; just ignore it
+    serializable->Read(stream);
+
+    // We are done with reading the certificate, now read the version
+    // as we did before.
+    stream->Read32(&version);
+  }
+  else {
+    // There seems not to be the certificate present in the stream.
+    version = UUID_0;
+  }
+
+  MutexAutoLock lock(mMutex);
+
+  // If the version field we have just read is not masked with 0xFFFF0000
+  // then it is stored mSecurityState field and this is version 1 of
+  // the binary data stream format.
+  if ((version & 0xFFFF0000) == 0xFFFF0000) {
+    version &= ~0xFFFF0000;
+    stream->Read32(&mSecurityState);
+  }
+  else {
+    mSecurityState = version;
+    version = 1;
+  }
+  stream->ReadString(mShortDesc);
+  stream->ReadString(mErrorMessageCached);
+  mErrorCode = 0;
+
+  nsCOMPtr<nsISupports> obj;
+  stream->ReadObject(true, getter_AddRefs(obj));
+  
+  mSSLStatus = reinterpret_cast<nsSSLStatus*>(obj.get());
+
+  if (!mSSLStatus) {
+    NS_WARNING("deserializing nsNSSSocketInfo without mSSLStatus");
+  }
+
+  if (version >= 2) {
+    stream->Read32((PRUint32*)&mSubRequestsHighSecurity);
+    stream->Read32((PRUint32*)&mSubRequestsLowSecurity);
+    stream->Read32((PRUint32*)&mSubRequestsBrokenSecurity);
+    stream->Read32((PRUint32*)&mSubRequestsNoSecurity);
+  }
+  else {
+    mSubRequestsHighSecurity = 0;
+    mSubRequestsLowSecurity = 0;
+    mSubRequestsBrokenSecurity = 0;
+    mSubRequestsNoSecurity = 0;
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::GetInterfaces(PRUint32 *count, nsIID * **array)
+{
+  *count = 0;
+  *array = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::GetHelperForLanguage(PRUint32 language,
+                                            nsISupports **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::GetContractID(char * *aContractID)
+{
+  *aContractID = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::GetClassDescription(char * *aClassDescription)
+{
+  *aClassDescription = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::GetClassID(nsCID * *aClassID)
+{
+  *aClassID = (nsCID*) nsMemory::Alloc(sizeof(nsCID));
+  if (!*aClassID)
+    return NS_ERROR_OUT_OF_MEMORY;
+  return GetClassIDNoAlloc(*aClassID);
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::GetImplementationLanguage(
+  PRUint32 *aImplementationLanguage)
+{
+  *aImplementationLanguage = nsIProgrammingLanguage::CPLUSPLUS;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TransportSecurityInfo::GetFlags(PRUint32 *aFlags)
+{
+  *aFlags = 0;
+  return NS_OK;
+}
+
+static NS_DEFINE_CID(kNSSSocketInfoCID, TRANSPORTSECURITYINFO_CID);
+
+NS_IMETHODIMP
+TransportSecurityInfo::GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
+{
+  *aClassIDNoAlloc = kNSSSocketInfoCID;
+  return NS_OK;
+}
+
+nsresult
+TransportSecurityInfo::GetSSLStatus(nsISSLStatus** _result)
+{
+  NS_ENSURE_ARG_POINTER(_result);
+
+  *_result = mSSLStatus;
+  NS_IF_ADDREF(*_result);
+
+  return NS_OK;
+}
+
+nsresult
+TransportSecurityInfo::SetSSLStatus(nsSSLStatus *aSSLStatus)
+{
+  mSSLStatus = aSSLStatus;
+
+  return NS_OK;
+}
+
+/* Formats an error message for non-certificate-related SSL errors
+ * and non-overridable certificate errors (both are of type
+ * PlainErrormMessage). Use formatOverridableCertErrorMessage
+ * for overridable cert errors.
+ */
+static nsresult
+formatPlainErrorMessage(const nsXPIDLCString &host, PRInt32 port,
+                        PRErrorCode err, nsString &returnedMessage)
+{
+  const PRUnichar *params[1];
+  nsresult rv;
+
+  nsCOMPtr<nsINSSComponent> component = do_GetService(kNSSComponentCID, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (host.Length())
+  {
+    nsString hostWithPort;
+
+    // For now, hide port when it's 443 and we're reporting the error.
+    // In the future a better mechanism should be used
+    // to make a decision about showing the port number, possibly by requiring
+    // the context object to implement a specific interface.
+    // The motivation is that Mozilla browser would like to hide the port number
+    // in error pages in the common case.
+
+    hostWithPort.AssignASCII(host);
+    if (port != 443) {
+      hostWithPort.AppendLiteral(":");
+      hostWithPort.AppendInt(port);
+    }
+    params[0] = hostWithPort.get();
+
+    nsString formattedString;
+    rv = component->PIPBundleFormatStringFromName("SSLConnectionErrorPrefix", 
+                                                  params, 1, 
+                                                  formattedString);
+    if (NS_SUCCEEDED(rv))
+    {
+      returnedMessage.Append(formattedString);
+      returnedMessage.Append(NS_LITERAL_STRING("\n\n"));
+    }
+  }
+
+  nsString explanation;
+  rv = nsNSSErrors::getErrorMessageFromCode(err, component, explanation);
+  if (NS_SUCCEEDED(rv))
+    returnedMessage.Append(explanation);
+
+  return NS_OK;
+}
+
+static void
+AppendErrorTextUntrusted(PRErrorCode errTrust,
+                         const nsString &host,
+                         nsIX509Cert* ix509,
+                         nsINSSComponent *component,
+                         nsString &returnedMessage)
+{
+  const char *errorID = nsnull;
+  nsCOMPtr<nsIX509Cert3> cert3 = do_QueryInterface(ix509);
+  if (cert3) {
+    bool isSelfSigned;
+    if (NS_SUCCEEDED(cert3->GetIsSelfSigned(&isSelfSigned))
+        && isSelfSigned) {
+      errorID = "certErrorTrust_SelfSigned";
+    }
+  }
+
+  if (!errorID) {
+    switch (errTrust) {
+      case SEC_ERROR_UNKNOWN_ISSUER:
+      {
+        nsCOMPtr<nsIArray> chain;
+        ix509->GetChain(getter_AddRefs(chain));
+        PRUint32 length = 0;
+        if (chain && NS_FAILED(chain->GetLength(&length)))
+          length = 0;
+        if (length == 1)
+          errorID = "certErrorTrust_MissingChain";
+        else
+          errorID = "certErrorTrust_UnknownIssuer";
+        break;
+      }
+      case SEC_ERROR_INADEQUATE_KEY_USAGE:
+        // Should get an individual string in the future
+        // For now, use the same as CaInvalid
+      case SEC_ERROR_CA_CERT_INVALID:
+        errorID = "certErrorTrust_CaInvalid";
+        break;
+      case SEC_ERROR_UNTRUSTED_ISSUER:
+        errorID = "certErrorTrust_Issuer";
+        break;
+      case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
+        errorID = "certErrorTrust_ExpiredIssuer";
+        break;
+      case SEC_ERROR_UNTRUSTED_CERT:
+      default:
+        errorID = "certErrorTrust_Untrusted";
+        break;
+    }
+  }
+
+  nsString formattedString;
+  nsresult rv = component->GetPIPNSSBundleString(errorID, 
+                                                 formattedString);
+  if (NS_SUCCEEDED(rv))
+  {
+    returnedMessage.Append(formattedString);
+    returnedMessage.Append(NS_LITERAL_STRING("\n"));
+  }
+}
+
+// returns TRUE if SAN was used to produce names
+// return FALSE if nothing was produced
+// names => a single name or a list of names
+// multipleNames => whether multiple names were delivered
+static bool
+GetSubjectAltNames(CERTCertificate *nssCert,
+                   nsINSSComponent *component,
+                   nsString &allNames,
+                   PRUint32 &nameCount)
+{
+  allNames.Truncate();
+  nameCount = 0;
+
+  PRArenaPool *san_arena = nsnull;
+  SECItem altNameExtension = {siBuffer, NULL, 0 };
+  CERTGeneralName *sanNameList = nsnull;
+
+  nsresult rv;
+  rv = CERT_FindCertExtension(nssCert, SEC_OID_X509_SUBJECT_ALT_NAME,
+                              &altNameExtension);
+  if (rv != SECSuccess)
+    return false;
+
+  san_arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+  if (!san_arena)
+    return false;
+
+  sanNameList = CERT_DecodeAltNameExtension(san_arena, &altNameExtension);
+  if (!sanNameList)
+    return false;
+
+  SECITEM_FreeItem(&altNameExtension, false);
+
+  CERTGeneralName *current = sanNameList;
+  do {
+    nsAutoString name;
+    switch (current->type) {
+      case certDNSName:
+        name.AssignASCII((char*)current->name.other.data, current->name.other.len);
+        if (!allNames.IsEmpty()) {
+          allNames.Append(NS_LITERAL_STRING(" , "));
+        }
+        ++nameCount;
+        allNames.Append(name);
+        break;
+
+      case certIPAddress:
+        {
+          char buf[INET6_ADDRSTRLEN];
+          PRNetAddr addr;
+          if (current->name.other.len == 4) {
+            addr.inet.family = PR_AF_INET;
+            memcpy(&addr.inet.ip, current->name.other.data, current->name.other.len);
+            PR_NetAddrToString(&addr, buf, sizeof(buf));
+            name.AssignASCII(buf);
+          } else if (current->name.other.len == 16) {
+            addr.ipv6.family = PR_AF_INET6;
+            memcpy(&addr.ipv6.ip, current->name.other.data, current->name.other.len);
+            PR_NetAddrToString(&addr, buf, sizeof(buf));
+            name.AssignASCII(buf);
+          } else {
+            /* invalid IP address */
+          }
+          if (!name.IsEmpty()) {
+            if (!allNames.IsEmpty()) {
+              allNames.Append(NS_LITERAL_STRING(" , "));
+            }
+            ++nameCount;
+            allNames.Append(name);
+          }
+          break;
+        }
+
+      default: // all other types of names are ignored
+        break;
+    }
+    current = CERT_GetNextGeneralName(current);
+  } while (current != sanNameList); // double linked
+
+  PORT_FreeArena(san_arena, false);
+  return true;
+}
+
+static void
+AppendErrorTextMismatch(const nsString &host,
+                        nsIX509Cert* ix509,
+                        nsINSSComponent *component,
+                        nsString &returnedMessage)
+{
+  const PRUnichar *params[1];
+  nsresult rv;
+
+  CERTCertificate *nssCert = NULL;
+  CERTCertificateCleaner nssCertCleaner(nssCert);
+
+  nsCOMPtr<nsIX509Cert2> cert2 = do_QueryInterface(ix509, &rv);
+  if (cert2)
+    nssCert = cert2->GetCert();
+
+  if (!nssCert) {
+    // We are unable to extract the valid names, say "not valid for name".
+    params[0] = host.get();
+    nsString formattedString;
+    rv = component->PIPBundleFormatStringFromName("certErrorMismatch", 
+                                                  params, 1, 
+                                                  formattedString);
+    if (NS_SUCCEEDED(rv)) {
+      returnedMessage.Append(formattedString);
+      returnedMessage.Append(NS_LITERAL_STRING("\n"));
+    }
+    return;
+  }
+
+  nsString allNames;
+  PRUint32 nameCount = 0;
+  bool useSAN = false;
+
+  if (nssCert)
+    useSAN = GetSubjectAltNames(nssCert, component, allNames, nameCount);
+
+  if (!useSAN) {
+    char *certName = nsnull;
+    // currently CERT_FindNSStringExtension is not being exported by NSS.
+    // If it gets exported, enable the following line.
+    //   certName = CERT_FindNSStringExtension(nssCert, SEC_OID_NS_CERT_EXT_SSL_SERVER_NAME);
+    // However, it has been discussed to treat the extension as obsolete and ignore it.
+    if (!certName)
+      certName = CERT_GetCommonName(&nssCert->subject);
+    if (certName) {
+      ++nameCount;
+      allNames.AssignASCII(certName);
+      PORT_Free(certName);
+    }
+  }
+
+  if (nameCount > 1) {
+    nsString message;
+    rv = component->GetPIPNSSBundleString("certErrorMismatchMultiple", 
+                                          message);
+    if (NS_SUCCEEDED(rv)) {
+      returnedMessage.Append(message);
+      returnedMessage.Append(NS_LITERAL_STRING("\n  "));
+      returnedMessage.Append(allNames);
+      returnedMessage.Append(NS_LITERAL_STRING("  \n"));
+    }
+  }
+  else if (nameCount == 1) {
+    const PRUnichar *params[1];
+    params[0] = allNames.get();
+
+    nsString formattedString;
+    rv = component->PIPBundleFormatStringFromName("certErrorMismatchSingle2", 
+                                                  params, 1, 
+                                                  formattedString);
+    if (NS_SUCCEEDED(rv)) {
+      returnedMessage.Append(formattedString);
+      returnedMessage.Append(NS_LITERAL_STRING("\n"));
+    }
+  }
+  else { // nameCount == 0
+    nsString message;
+    nsresult rv = component->GetPIPNSSBundleString("certErrorMismatchNoNames",
+                                                   message);
+    if (NS_SUCCEEDED(rv)) {
+      returnedMessage.Append(message);
+      returnedMessage.Append(NS_LITERAL_STRING("\n"));
+    }
+  }
+}
+
+static void
+GetDateBoundary(nsIX509Cert* ix509,
+                nsString &formattedDate,
+                nsString &nowDate,
+                bool &trueExpired_falseNotYetValid)
+{
+  trueExpired_falseNotYetValid = true;
+  formattedDate.Truncate();
+
+  PRTime notAfter, notBefore, timeToUse;
+  nsCOMPtr<nsIX509CertValidity> validity;
+  nsresult rv;
+
+  rv = ix509->GetValidity(getter_AddRefs(validity));
+  if (NS_FAILED(rv))
+    return;
+
+  rv = validity->GetNotAfter(&notAfter);
+  if (NS_FAILED(rv))
+    return;
+
+  rv = validity->GetNotBefore(&notBefore);
+  if (NS_FAILED(rv))
+    return;
+
+  PRTime now = PR_Now();
+  if (LL_CMP(now, >, notAfter)) {
+    timeToUse = notAfter;
+  } else {
+    timeToUse = notBefore;
+    trueExpired_falseNotYetValid = false;
+  }
+
+  nsCOMPtr<nsIDateTimeFormat> dateTimeFormat(do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv));
+  if (NS_FAILED(rv))
+    return;
+
+  dateTimeFormat->FormatPRTime(nsnull, kDateFormatShort, 
+                               kTimeFormatNoSeconds, timeToUse, 
+                               formattedDate);
+  dateTimeFormat->FormatPRTime(nsnull, kDateFormatShort,
+                               kTimeFormatNoSeconds, now,
+                               nowDate);
+}
+
+static void
+AppendErrorTextTime(nsIX509Cert* ix509,
+                    nsINSSComponent *component,
+                    nsString &returnedMessage)
+{
+  nsAutoString formattedDate, nowDate;
+  bool trueExpired_falseNotYetValid;
+  GetDateBoundary(ix509, formattedDate, nowDate, trueExpired_falseNotYetValid);
+
+  const PRUnichar *params[2];
+  params[0] = formattedDate.get(); // might be empty, if helper function had a problem 
+  params[1] = nowDate.get();
+
+  const char *key = trueExpired_falseNotYetValid ? 
+                    "certErrorExpiredNow" : "certErrorNotYetValidNow";
+  nsresult rv;
+  nsString formattedString;
+  rv = component->PIPBundleFormatStringFromName(
+           key,
+           params, 
+           ArrayLength(params),
+           formattedString);
+  if (NS_SUCCEEDED(rv))
+  {
+    returnedMessage.Append(formattedString);
+    returnedMessage.Append(NS_LITERAL_STRING("\n"));
+  }
+}
+
+static void
+AppendErrorTextCode(PRErrorCode errorCodeToReport,
+                    nsINSSComponent *component,
+                    nsString &returnedMessage)
+{
+  const char *codeName = nsNSSErrors::getDefaultErrorStringName(errorCodeToReport);
+  if (codeName)
+  {
+    nsCString error_id(codeName);
+    ToLowerCase(error_id);
+    NS_ConvertASCIItoUTF16 idU(error_id);
+
+    const PRUnichar *params[1];
+    params[0] = idU.get();
+
+    nsString formattedString;
+    nsresult rv;
+    rv = component->PIPBundleFormatStringFromName("certErrorCodePrefix", 
+                                                  params, 1, 
+                                                  formattedString);
+    if (NS_SUCCEEDED(rv)) {
+      returnedMessage.Append(NS_LITERAL_STRING("\n"));
+      returnedMessage.Append(formattedString);
+      returnedMessage.Append(NS_LITERAL_STRING("\n"));
+    }
+    else {
+      returnedMessage.Append(NS_LITERAL_STRING(" ("));
+      returnedMessage.Append(idU);
+      returnedMessage.Append(NS_LITERAL_STRING(")"));
+    }
+  }
+}
+
+/* Formats an error message for overridable certificate errors (of type
+ * OverridableCertErrorMessage). Use formatPlainErrorMessage to format
+ * non-overridable cert errors and non-cert-related errors.
+ */
+static nsresult
+formatOverridableCertErrorMessage(nsISSLStatus & sslStatus,
+                                  PRErrorCode errorCodeToReport, 
+                                  const nsXPIDLCString & host, PRInt32 port,
+                                  nsString & returnedMessage)
+{
+  const PRUnichar *params[1];
+  nsresult rv;
+  nsAutoString hostWithPort;
+  nsAutoString hostWithoutPort;
+
+  // For now, hide port when it's 443 and we're reporting the error.
+  // In the future a better mechanism should be used
+  // to make a decision about showing the port number, possibly by requiring
+  // the context object to implement a specific interface.
+  // The motivation is that Mozilla browser would like to hide the port number
+  // in error pages in the common case.
+  
+  hostWithoutPort.AppendASCII(host);
+  if (port == 443) {
+    params[0] = hostWithoutPort.get();
+  } else {
+    hostWithPort.AppendASCII(host);
+    hostWithPort.Append(':');
+    hostWithPort.AppendInt(port);
+    params[0] = hostWithPort.get();
+  }
+
+  nsCOMPtr<nsINSSComponent> component = do_GetService(kNSSComponentCID, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  returnedMessage.Truncate();
+  rv = component->PIPBundleFormatStringFromName("certErrorIntro", params, 1,
+                                                returnedMessage);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  returnedMessage.Append(NS_LITERAL_STRING("\n\n"));
+
+  nsRefPtr<nsIX509Cert> ix509;
+  rv = sslStatus.GetServerCert(getter_AddRefs(ix509));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  bool isUntrusted;
+  rv = sslStatus.GetIsUntrusted(&isUntrusted);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (isUntrusted) {
+    AppendErrorTextUntrusted(errorCodeToReport, hostWithoutPort, ix509, 
+                             component, returnedMessage);
+  }
+
+  bool isDomainMismatch;
+  rv = sslStatus.GetIsDomainMismatch(&isDomainMismatch);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (isDomainMismatch) {
+    AppendErrorTextMismatch(hostWithoutPort, ix509, component, returnedMessage);
+  }
+
+  bool isNotValidAtThisTime;
+  rv = sslStatus.GetIsNotValidAtThisTime(&isNotValidAtThisTime);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (isNotValidAtThisTime) {
+    AppendErrorTextTime(ix509, component, returnedMessage);
+  }
+
+  AppendErrorTextCode(errorCodeToReport, component, returnedMessage);
+
+  return NS_OK;
+}
+
+// RememberCertErrorsTable
+
+/*static*/ RememberCertErrorsTable*
+RememberCertErrorsTable::sInstance = nsnull;
+
+RememberCertErrorsTable::RememberCertErrorsTable()
+  : mMutex("RememberCertErrorsTable::mMutex")
+{
+  mErrorHosts.Init(16);
+}
+
+static nsresult
+GetHostPortKey(TransportSecurityInfo* infoObject, nsCAutoString &result)
+{
+  nsresult rv;
+
+  result.Truncate();
+
+  nsXPIDLCString hostName;
+  rv = infoObject->GetHostName(getter_Copies(hostName));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  PRInt32 port;
+  rv = infoObject->GetPort(&port);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  result.Assign(hostName);
+  result.Append(':');
+  result.AppendInt(port);
+
+  return NS_OK;
+}
+
+void
+RememberCertErrorsTable::RememberCertHasError(TransportSecurityInfo* infoObject,
+                                              nsSSLStatus* status,
+                                              SECStatus certVerificationResult)
+{
+  nsresult rv;
+
+  nsCAutoString hostPortKey;
+  rv = GetHostPortKey(infoObject, hostPortKey);
+  if (NS_FAILED(rv))
+    return;
+
+  if (certVerificationResult != SECSuccess) {
+    NS_ASSERTION(status,
+        "Must have nsSSLStatus object when remembering flags");
+
+    if (!status)
+      return;
+
+    CertStateBits bits;
+    bits.mIsDomainMismatch = status->mIsDomainMismatch;
+    bits.mIsNotValidAtThisTime = status->mIsNotValidAtThisTime;
+    bits.mIsUntrusted = status->mIsUntrusted;
+
+    MutexAutoLock lock(mMutex);
+    mErrorHosts.Put(hostPortKey, bits);
+  }
+  else {
+    MutexAutoLock lock(mMutex);
+    mErrorHosts.Remove(hostPortKey);
+  }
+}
+
+void
+RememberCertErrorsTable::LookupCertErrorBits(TransportSecurityInfo* infoObject,
+                                             nsSSLStatus* status)
+{
+  // Get remembered error bits from our cache, because of SSL session caching
+  // the NSS library potentially hasn't notified us for this socket.
+  if (status->mHaveCertErrorBits)
+    // Rather do not modify bits if already set earlier
+    return;
+
+  nsresult rv;
+
+  nsCAutoString hostPortKey;
+  rv = GetHostPortKey(infoObject, hostPortKey);
+  if (NS_FAILED(rv))
+    return;
+
+  CertStateBits bits;
+  {
+    MutexAutoLock lock(mMutex);
+    if (!mErrorHosts.Get(hostPortKey, &bits))
+      // No record was found, this host had no cert errors
+      return;
+  }
+
+  // This host had cert errors, update the bits correctly
+  status->mHaveCertErrorBits = true;
+  status->mIsDomainMismatch = bits.mIsDomainMismatch;
+  status->mIsNotValidAtThisTime = bits.mIsNotValidAtThisTime;
+  status->mIsUntrusted = bits.mIsUntrusted;
+}
+
+void
+TransportSecurityInfo::SetStatusErrorBits(nsIX509Cert & cert,
+                                          PRUint32 collected_errors)
+{
+  MutexAutoLock lock(mMutex);
+
+  if (!mSSLStatus)
+    mSSLStatus = new nsSSLStatus();
+
+  mSSLStatus->mServerCert = &cert;
+
+  mSSLStatus->mHaveCertErrorBits = true;
+  mSSLStatus->mIsDomainMismatch = 
+    collected_errors & nsICertOverrideService::ERROR_MISMATCH;
+  mSSLStatus->mIsNotValidAtThisTime = 
+    collected_errors & nsICertOverrideService::ERROR_TIME;
+  mSSLStatus->mIsUntrusted = 
+    collected_errors & nsICertOverrideService::ERROR_UNTRUSTED;
+
+  RememberCertErrorsTable::GetInstance().RememberCertHasError(this,
+                                                              mSSLStatus,
+                                                              SECFailure);
+}
+
+} } // namespace mozilla::psm
diff --git a/security/manager/ssl/src/TransportSecurityInfo.h b/security/manager/ssl/src/TransportSecurityInfo.h
new file mode 100644
index 00000000000..a187ccb5687
--- /dev/null
+++ b/security/manager/ssl/src/TransportSecurityInfo.h
@@ -0,0 +1,194 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Brian Ryner <bryner@brianryner.com>
+ *   Kai Engert <kengert@redhat.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef _MOZILLA_PSM_TRANSPORTSECURITYINFO_H
+#define _MOZILLA_PSM_TRANSPORTSECURITYINFO_H
+
+#include "certt.h"
+#include "mozilla/Mutex.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsITransportSecurityInfo.h"
+#include "nsSSLStatus.h"
+#include "nsISSLStatusProvider.h"
+#include "nsIAssociatedContentSecurity.h"
+#include "nsNSSShutDown.h"
+#include "nsDataHashtable.h"
+
+namespace mozilla { namespace psm {
+
+enum SSLErrorMessageType {
+  OverridableCertErrorMessage  = 1, // for *overridable* certificate errors
+  PlainErrorMessage = 2             // all other errors (or "no error")
+};
+
+class TransportSecurityInfo : public nsITransportSecurityInfo,
+                              public nsIInterfaceRequestor,
+                              public nsISSLStatusProvider,
+                              public nsIAssociatedContentSecurity,
+                              public nsISerializable,
+                              public nsIClassInfo,
+                              public nsNSSShutDownObject,
+                              public nsOnPK11LogoutCancelObject
+{
+public:
+  TransportSecurityInfo();
+  virtual ~TransportSecurityInfo();
+  
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSITRANSPORTSECURITYINFO
+  NS_DECL_NSIINTERFACEREQUESTOR
+  NS_DECL_NSISSLSTATUSPROVIDER
+  NS_DECL_NSIASSOCIATEDCONTENTSECURITY
+  NS_DECL_NSISERIALIZABLE
+  NS_DECL_NSICLASSINFO
+
+  nsresult SetSecurityState(PRUint32 aState);
+  nsresult SetShortSecurityDescription(const PRUnichar *aText);
+
+  const char * GetHostName() const {
+    return mHostName.get();
+  }
+  nsresult GetHostName(char **aHostName);
+  nsresult SetHostName(const char *aHostName);
+
+  PRInt32 GetPort() const { return mPort; }
+  nsresult GetPort(PRInt32 *aPort);
+  nsresult SetPort(PRInt32 aPort);
+
+  PRErrorCode GetErrorCode() const;
+  void SetCanceled(PRErrorCode errorCode,
+                   ::mozilla::psm::SSLErrorMessageType errorMessageType);
+  
+  /* Set SSL Status values */
+  nsresult SetSSLStatus(nsSSLStatus *aSSLStatus);
+  nsSSLStatus* SSLStatus() { return mSSLStatus; }
+  void SetStatusErrorBits(nsIX509Cert & cert, PRUint32 collected_errors);
+
+  bool IsCertIssuerBlacklisted() const {
+    return mIsCertIssuerBlacklisted;
+  }
+  void SetCertIssuerBlacklisted() {
+    mIsCertIssuerBlacklisted = true;
+  }
+
+private:
+  mutable ::mozilla::Mutex mMutex;
+
+protected:
+  nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
+
+private:
+  PRUint32 mSecurityState;
+  PRInt32 mSubRequestsHighSecurity;
+  PRInt32 mSubRequestsLowSecurity;
+  PRInt32 mSubRequestsBrokenSecurity;
+  PRInt32 mSubRequestsNoSecurity;
+  nsString mShortDesc;
+
+  PRErrorCode mErrorCode;
+  ::mozilla::psm::SSLErrorMessageType mErrorMessageType;
+  nsString mErrorMessageCached;
+  nsresult formatErrorMessage(::mozilla::MutexAutoLock const & proofOfLock);
+
+  PRInt32 mPort;
+  nsXPIDLCString mHostName;
+  PRErrorCode mIsCertIssuerBlacklisted;
+
+  /* SSL Status */
+  nsRefPtr<nsSSLStatus> mSSLStatus;
+
+  virtual void virtualDestroyNSSReference();
+  void destructorSafeDestroyNSSReference();
+};
+
+class RememberCertErrorsTable
+{
+private:
+  RememberCertErrorsTable();
+
+  struct CertStateBits
+  {
+    bool mIsDomainMismatch;
+    bool mIsNotValidAtThisTime;
+    bool mIsUntrusted;
+  };
+  nsDataHashtableMT<nsCStringHashKey, CertStateBits> mErrorHosts;
+
+public:
+  void RememberCertHasError(TransportSecurityInfo * infoobject,
+                            nsSSLStatus * status,
+                            SECStatus certVerificationResult);
+  void LookupCertErrorBits(TransportSecurityInfo * infoObject,
+                           nsSSLStatus* status);
+
+  static nsresult Init()
+  {
+    sInstance = new RememberCertErrorsTable();
+    if (!sInstance->mErrorHosts.IsInitialized())
+      return NS_ERROR_OUT_OF_MEMORY;
+
+    return NS_OK;
+  }
+
+  static RememberCertErrorsTable & GetInstance()
+  {
+    MOZ_ASSERT(sInstance);
+    return *sInstance;
+  }
+
+  static void Cleanup()
+  {
+    delete sInstance;
+    sInstance = nsnull;
+  }
+private:
+  Mutex mMutex;
+
+  static RememberCertErrorsTable * sInstance;
+};
+
+} } // namespace mozilla::psm
+
+// 16786594-0296-4471-8096-8f84497ca428
+#define TRANSPORTSECURITYINFO_CID \
+{ 0x16786594, 0x0296, 0x4471, \
+    { 0x80, 0x96, 0x8f, 0x84, 0x49, 0x7c, 0xa4, 0x28 } }
+
+#endif /* _MOZILLA_PSM_TRANSPORTSECURITYINFO_H */
diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp
index 286fa8c7b97..053288566b1 100644
--- a/security/manager/ssl/src/nsIdentityChecking.cpp
+++ b/security/manager/ssl/src/nsIdentityChecking.cpp
@@ -47,7 +47,7 @@
 #include "cert.h"
 #include "base64.h"
 #include "nsNSSComponent.h"
-#include "nsNSSIOLayer.h"
+#include "nsSSLStatus.h"
 #include "nsNSSCertificate.h"
 #include "nsNSSCleaner.h"
 
diff --git a/security/manager/ssl/src/nsNSSCallbacks.cpp b/security/manager/ssl/src/nsNSSCallbacks.cpp
index 8589c2e0a2c..1c8541461dd 100644
--- a/security/manager/ssl/src/nsNSSCallbacks.cpp
+++ b/security/manager/ssl/src/nsNSSCallbacks.cpp
@@ -910,8 +910,8 @@ void PR_CALLBACK HandshakeCallback(PRFileDesc* fd, void* client_data) {
       infoObject->SetSSLStatus(status);
     }
 
-    nsSSLIOLayerHelpers::mHostsWithCertErrors->LookupCertErrorBits(
-      infoObject, status);
+    RememberCertErrorsTable::GetInstance().LookupCertErrorBits(infoObject,
+                                                               status);
 
     CERTCertificate *serverCert = SSL_PeerCertificate(fd);
     if (serverCert) {
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index 5204d759797..3969f3e4bd9 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -124,6 +124,7 @@ extern "C" {
 }
 
 using namespace mozilla;
+using namespace mozilla::psm;
 
 #ifdef PR_LOGGING
 PRLogModuleInfo* gPIPNSSLog = nsnull;
@@ -437,6 +438,7 @@ nsNSSComponent::~nsNSSComponent()
 
   ShutdownNSS();
   nsSSLIOLayerHelpers::Cleanup();
+  RememberCertErrorsTable::Cleanup();
   --mInstanceCount;
   delete mShutdownObjectList;
 
@@ -2028,6 +2030,7 @@ nsNSSComponent::Init()
     return rv;
   }
 
+  RememberCertErrorsTable::Init();
   nsSSLIOLayerHelpers::Init();
   char *unrestricted_hosts=nsnull;
   mPrefBranch->GetCharPref("security.ssl.renego_unrestricted_hosts", &unrestricted_hosts);
diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
index f846ee42074..cb4b2c33f0e 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -41,42 +41,22 @@
 
 #include "nsNSSComponent.h"
 #include "nsNSSIOLayer.h"
-#include "nsNSSCallbacks.h"
 
 #include "prlog.h"
 #include "prnetdb.h"
 #include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
-#include "nsIServiceManager.h"
-#include "nsIWebProgressListener.h"
-#include "nsIChannel.h"
-#include "nsNSSCertificate.h"
-#include "nsIX509CertValidity.h"
-#include "nsIDateTimeFormat.h"
-#include "nsDateTimeFormatCID.h"
 #include "nsIClientAuthDialogs.h"
 #include "nsClientAuthRemember.h"
-#include "nsICertOverrideService.h"
 #include "nsISSLErrorListener.h"
-#include "nsIObjectInputStream.h"
-#include "nsIObjectOutputStream.h"
 
-#include "nsXPIDLString.h"
-#include "nsReadableUtils.h"
-#include "nsCRT.h"
-#include "nsAutoPtr.h"
 #include "nsPrintfCString.h"
 #include "SSLServerCertVerification.h"
-#include "nsNSSShutDown.h"
-#include "nsSSLStatus.h"
 #include "nsNSSCertHelper.h"
 #include "nsNSSCleaner.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsISecureBrowserUI.h"
-#include "nsIClassInfoImpl.h"
-#include "nsIProgrammingLanguage.h"
-#include "nsIArray.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "PSMRunnable.h"
 
@@ -84,13 +64,8 @@
 #include "secerr.h"
 #include "sslerr.h"
 #include "secder.h"
-#include "secasn1.h"
-#include "certdb.h"
-#include "cert.h"
 #include "keyhi.h"
 
-#include "mozilla/Util.h"
-
 using namespace mozilla;
 using namespace mozilla::psm;
 
@@ -104,6 +79,7 @@ using namespace mozilla::psm;
                        //we always write out to our own
                        //file.
 
+namespace {
 
 NSSCleanupAutoPtrClass(CERTCertificate, CERT_DestroyCertificate)
 NSSCleanupAutoPtrClass(void, PR_FREEIF)
@@ -113,49 +89,17 @@ static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
 /* SSM_UserCertChoice: enum for cert choice info */
 typedef enum {ASK, AUTO} SSM_UserCertChoice;
 
+} // unnamed namespace
+
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gPIPNSSLog;
 #endif
 
-#if defined(DEBUG_SSL_VERBOSE) && defined (XP_MAC)
-
-#ifdef PR_LOG
-#undef PR_LOG
-#endif
-
-static PRFileDesc *gMyLogFile = nsnull;
-#define MAC_LOG_FILE "MAC PIPNSS Log File"
-
-void MyLogFunction(const char *fmt, ...)
-{
-  
-  va_list ap;
-  va_start(ap,fmt);
-  if (gMyLogFile == nsnull)
-    gMyLogFile = PR_Open(MAC_LOG_FILE, PR_WRONLY | PR_CREATE_FILE | PR_APPEND,
-                         0600);
-  if (!gMyLogFile)
-      return;
-  PR_vfprintf(gMyLogFile, fmt, ap);
-  va_end(ap);
-}
-
-#define PR_LOG(module,level,args) MyLogFunction args
-#endif
-
 nsNSSSocketInfo::nsNSSSocketInfo()
-  : mMutex("nsNSSSocketInfo::nsNSSSocketInfo"),
-    mFd(nsnull),
+  : mFd(nsnull),
     mCertVerificationState(before_cert_verification),
     mCertVerificationStarted(0),
     mCertVerificationEnded(0),
-    mSecurityState(nsIWebProgressListener::STATE_IS_INSECURE),
-    mSubRequestsHighSecurity(0),
-    mSubRequestsLowSecurity(0),
-    mSubRequestsBrokenSecurity(0),
-    mSubRequestsNoSecurity(0),
-    mErrorCode(0),
-    mErrorMessageType(PlainErrorMessage),
     mForSTARTTLS(false),
     mSSL3Enabled(false),
     mTLSEnabled(false),
@@ -165,8 +109,6 @@ nsNSSSocketInfo::nsNSSSocketInfo()
     mAllowTLSIntoleranceTimeout(true),
     mRememberClientAuthCertificate(false),
     mHandshakeStartTime(0),
-    mPort(0),
-    mIsCertIssuerBlacklisted(false),
     mNPNCompleted(false),
     mHandshakeCompleted(false),
     mJoined(false),
@@ -174,28 +116,9 @@ nsNSSSocketInfo::nsNSSSocketInfo()
 {
 }
 
-nsNSSSocketInfo::~nsNSSSocketInfo()
-{
-  nsNSSShutDownPreventionLock locker;
-  if (isAlreadyShutDown())
-    return;
-
-  shutdown(calledFromObject);
-}
-
-void nsNSSSocketInfo::virtualDestroyNSSReference()
-{
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS8(nsNSSSocketInfo,
-                              nsITransportSecurityInfo,
-                              nsISSLSocketControl,
-                              nsIInterfaceRequestor,
-                              nsISSLStatusProvider,
-                              nsIAssociatedContentSecurity,
-                              nsISerializable,
-                              nsIClassInfo,
-                              nsIClientAuthUserDecision)
+NS_IMPL_ISUPPORTS_INHERITED2(nsNSSSocketInfo, TransportSecurityInfo,
+                             nsISSLSocketControl,
+                             nsIClientAuthUserDecision)
 
 nsresult
 nsNSSSocketInfo::GetHandshakePending(bool *aHandshakePending)
@@ -211,53 +134,6 @@ nsNSSSocketInfo::SetHandshakePending(bool aHandshakePending)
   return NS_OK;
 }
 
-nsresult
-nsNSSSocketInfo::SetHostName(const char* host)
-{
-  mHostName.Adopt(host ? NS_strdup(host) : 0);
-  return NS_OK;
-}
-
-nsresult
-nsNSSSocketInfo::GetHostName(char **host)
-{
-  *host = (mHostName) ? NS_strdup(mHostName) : nsnull;
-  return NS_OK;
-}
-
-nsresult
-nsNSSSocketInfo::SetPort(PRInt32 aPort)
-{
-  mPort = aPort;
-  return NS_OK;
-}
-
-nsresult
-nsNSSSocketInfo::GetPort(PRInt32 *aPort)
-{
-  *aPort = mPort;
-  return NS_OK;
-}
-
-PRErrorCode
-nsNSSSocketInfo::GetErrorCode() const
-{
-  MutexAutoLock lock(mMutex);
-
-  return mErrorCode;
-}
-
-void
-nsNSSSocketInfo::SetCanceled(PRErrorCode errorCode,
-                             SSLErrorMessageType errorMessageType)
-{
-  MutexAutoLock lock(mMutex);
-
-  mErrorCode = errorCode;
-  mErrorMessageType = errorMessageType;
-  mErrorMessageCached.Truncate();
-}
-
 NS_IMETHODIMP nsNSSSocketInfo::GetRememberClientAuthCertificate(bool *aRememberClientAuthCertificate)
 {
   NS_ENSURE_ARG_POINTER(aRememberClientAuthCertificate);
@@ -333,109 +209,6 @@ getSecureBrowserUI(nsIInterfaceRequestor * callbacks,
   }
 }
 
-NS_IMETHODIMP
-nsNSSSocketInfo::GetSecurityState(PRUint32* state)
-{
-  *state = mSecurityState;
-  return NS_OK;
-}
-
-nsresult
-nsNSSSocketInfo::SetSecurityState(PRUint32 aState)
-{
-  mSecurityState = aState;
-  return NS_OK;
-}
-
-/* attribute unsigned long countSubRequestsHighSecurity; */
-NS_IMETHODIMP nsNSSSocketInfo::GetCountSubRequestsHighSecurity(PRInt32 *aSubRequestsHighSecurity)
-{
-  *aSubRequestsHighSecurity = mSubRequestsHighSecurity;
-  return NS_OK;
-}
-NS_IMETHODIMP nsNSSSocketInfo::SetCountSubRequestsHighSecurity(PRInt32 aSubRequestsHighSecurity)
-{
-  mSubRequestsHighSecurity = aSubRequestsHighSecurity;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute unsigned long countSubRequestsLowSecurity; */
-NS_IMETHODIMP nsNSSSocketInfo::GetCountSubRequestsLowSecurity(PRInt32 *aSubRequestsLowSecurity)
-{
-  *aSubRequestsLowSecurity = mSubRequestsLowSecurity;
-  return NS_OK;
-}
-NS_IMETHODIMP nsNSSSocketInfo::SetCountSubRequestsLowSecurity(PRInt32 aSubRequestsLowSecurity)
-{
-  mSubRequestsLowSecurity = aSubRequestsLowSecurity;
-  return NS_OK;
-}
-
-/* attribute unsigned long countSubRequestsBrokenSecurity; */
-NS_IMETHODIMP nsNSSSocketInfo::GetCountSubRequestsBrokenSecurity(PRInt32 *aSubRequestsBrokenSecurity)
-{
-  *aSubRequestsBrokenSecurity = mSubRequestsBrokenSecurity;
-  return NS_OK;
-}
-NS_IMETHODIMP nsNSSSocketInfo::SetCountSubRequestsBrokenSecurity(PRInt32 aSubRequestsBrokenSecurity)
-{
-  mSubRequestsBrokenSecurity = aSubRequestsBrokenSecurity;
-  return NS_OK;
-}
-
-/* attribute unsigned long countSubRequestsNoSecurity; */
-NS_IMETHODIMP nsNSSSocketInfo::GetCountSubRequestsNoSecurity(PRInt32 *aSubRequestsNoSecurity)
-{
-  *aSubRequestsNoSecurity = mSubRequestsNoSecurity;
-  return NS_OK;
-}
-NS_IMETHODIMP nsNSSSocketInfo::SetCountSubRequestsNoSecurity(PRInt32 aSubRequestsNoSecurity)
-{
-  mSubRequestsNoSecurity = aSubRequestsNoSecurity;
-  return NS_OK;
-}
-NS_IMETHODIMP nsNSSSocketInfo::Flush()
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSSocketInfo::GetShortSecurityDescription(PRUnichar** aText) {
-  if (mShortDesc.IsEmpty())
-    *aText = nsnull;
-  else {
-    *aText = ToNewUnicode(mShortDesc);
-    NS_ENSURE_TRUE(*aText, NS_ERROR_OUT_OF_MEMORY);
-  }
-  return NS_OK;
-}
-
-nsresult
-nsNSSSocketInfo::SetShortSecurityDescription(const PRUnichar* aText) {
-  mShortDesc.Assign(aText);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSSocketInfo::GetErrorMessage(PRUnichar** aText)
-{
-  NS_ENSURE_ARG_POINTER(aText);
-  *aText = nsnull;
-
-  if (!NS_IsMainThread()) {
-    NS_ERROR("nsNSSSocketInfo::GetErrorMessage called off the main thread");
-    return NS_ERROR_NOT_SAME_THREAD;
-  }
-
-  MutexAutoLock lock(mMutex);
-
-  nsresult rv = formatErrorMessage(lock);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  *aText = ToNewUnicode(mErrorMessageCached);
-  return *aText != nsnull ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
 void
 nsNSSSocketInfo::SetNegotiatedNPN(const char *value, PRUint32 length)
 {
@@ -465,7 +238,7 @@ nsNSSSocketInfo::JoinConnection(const nsACString & npnProtocol,
   *_retval = false;
 
   // Different ports may not be joined together
-  if (port != mPort)
+  if (port != GetPort())
     return NS_OK;
 
   // Make sure NPN has been completed and matches requested npnProtocol
@@ -474,7 +247,7 @@ nsNSSSocketInfo::JoinConnection(const nsACString & npnProtocol,
 
   // If this is the same hostname then the certicate status does not
   // need to be considered. They are joinable.
-  if (mHostName && hostname.Equals(mHostName)) {
+  if (GetHostName() && hostname.Equals(GetHostName())) {
     *_retval = true;
     return NS_OK;
   }
@@ -519,71 +292,6 @@ nsNSSSocketInfo::JoinConnection(const nsACString & npnProtocol,
   return NS_OK;
 }
 
-static nsresult
-formatPlainErrorMessage(nsXPIDLCString const & host, PRInt32 port,
-                        PRErrorCode err, nsString &returnedMessage);
-
-static nsresult
-formatOverridableCertErrorMessage(nsISSLStatus & sslStatus,
-                                  PRErrorCode errorCodeToReport, 
-                                  const nsXPIDLCString & host, PRInt32 port,
-                                  nsString & returnedMessage);
-
-// XXX: uses nsNSSComponent string bundles off the main thread when called by
-//      nsNSSSocketInfo::Write(). When we remove the error message from the
-//      serialization of nsNSSSocketInfo (bug 697781) we can inline
-//      formatErrorMessage into GetErrorMessage().
-nsresult
-nsNSSSocketInfo::formatErrorMessage(MutexAutoLock const & proofOfLock)
-{
-  if (mErrorCode == 0 || !mErrorMessageCached.IsEmpty()) {
-    return NS_OK;
-  }
-
-  nsresult rv;
-  NS_ConvertASCIItoUTF16 hostNameU(mHostName);
-  NS_ASSERTION(mErrorMessageType != OverridableCertErrorMessage || 
-                (mSSLStatus && mSSLStatus->mServerCert &&
-                 mSSLStatus->mHaveCertErrorBits),
-                "GetErrorMessage called for cert error without cert");
-  if (mErrorMessageType == OverridableCertErrorMessage && 
-      mSSLStatus && mSSLStatus->mServerCert) {
-    rv = formatOverridableCertErrorMessage(*mSSLStatus, mErrorCode,
-                                           mHostName, mPort,
-                                           mErrorMessageCached);
-  } else {
-    rv = formatPlainErrorMessage(mHostName, mPort, mErrorCode,
-                                 mErrorMessageCached);
-  }
-
-  if (NS_FAILED(rv)) {
-    mErrorMessageCached.Truncate();
-  }
-
-  return rv;
-}
-
-/* void getInterface (in nsIIDRef uuid, [iid_is (uuid), retval] out nsQIResult result); */
-NS_IMETHODIMP nsNSSSocketInfo::GetInterface(const nsIID & uuid, void * *result)
-{
-  if (!NS_IsMainThread()) {
-    NS_ERROR("nsNSSSocketInfo::GetInterface called off the main thread");
-    return NS_ERROR_NOT_SAME_THREAD;
-  }
-
-  nsresult rv;
-  if (!mCallbacks) {
-    nsCOMPtr<nsIInterfaceRequestor> ir = new PipUIContext();
-    if (!ir)
-      return NS_ERROR_OUT_OF_MEMORY;
-
-    rv = ir->GetInterface(uuid, result);
-  } else {
-    rv = mCallbacks->GetInterface(uuid, result);
-  }
-  return rv;
-}
-
 nsresult
 nsNSSSocketInfo::GetForSTARTTLS(bool* aForSTARTTLS)
 {
@@ -640,243 +348,6 @@ nsNSSSocketInfo::SetNPNList(nsTArray<nsCString> &protocolArray)
   return NS_OK;
 }
 
-static NS_DEFINE_CID(kNSSCertificateCID, NS_X509CERT_CID);
-#define NSSSOCKETINFOMAGIC { 0xa9863a23, 0x26b8, 0x4a9c, \
-  { 0x83, 0xf1, 0xe9, 0xda, 0xdb, 0x36, 0xb8, 0x30 } }
-static NS_DEFINE_CID(kNSSSocketInfoMagic, NSSSOCKETINFOMAGIC);
-
-NS_IMETHODIMP
-nsNSSSocketInfo::Write(nsIObjectOutputStream* stream) {
-  stream->WriteID(kNSSSocketInfoMagic);
-
-  MutexAutoLock lock(mMutex);
-
-  nsRefPtr<nsSSLStatus> status = mSSLStatus;
-  nsCOMPtr<nsISerializable> certSerializable;
-
-  // Write a redundant copy of the certificate for backward compatibility
-  // with previous versions, which also unnecessarily wrote it.
-  //
-  // As we are reading the object our self, not using ReadObject, we have
-  // to store it here 'manually' as well, mimicking our object stream
-  // implementation.
-
-  if (status) {
-    nsCOMPtr<nsIX509Cert> cert = status->mServerCert;
-    certSerializable = do_QueryInterface(cert);
-
-    if (!certSerializable) {
-      NS_ERROR("certificate is missing or isn't serializable");
-      return NS_ERROR_UNEXPECTED;
-    }
-  } else {
-    NS_WARNING("Serializing nsNSSSocketInfo without mSSLStatus");
-  }
-
-  // Store the flag if there is the certificate present
-  stream->WriteBoolean(certSerializable);
-  if (certSerializable) {
-    stream->WriteID(kNSSCertificateCID);
-    stream->WriteID(NS_GET_IID(nsISupports));
-    certSerializable->Write(stream);
-  }
-
-  // Store the version number of the binary stream data format.
-  // The 0xFFFF0000 mask is included to the version number
-  // to distinguish version number from mSecurityState
-  // field stored in times before versioning has been introduced.
-  // This mask value has been chosen as mSecurityState could
-  // never be assigned such value.
-  PRUint32 version = 3;
-  stream->Write32(version | 0xFFFF0000);
-  stream->Write32(mSecurityState);
-  stream->WriteWStringZ(mShortDesc.get());
-
-  // XXX: uses nsNSSComponent string bundles off the main thread
-  nsresult rv = formatErrorMessage(lock); 
-  NS_ENSURE_SUCCESS(rv, rv);
-  stream->WriteWStringZ(mErrorMessageCached.get());
-
-  stream->WriteCompoundObject(NS_ISUPPORTS_CAST(nsISSLStatus*, status),
-                              NS_GET_IID(nsISupports), true);
-
-  stream->Write32((PRUint32)mSubRequestsHighSecurity);
-  stream->Write32((PRUint32)mSubRequestsLowSecurity);
-  stream->Write32((PRUint32)mSubRequestsBrokenSecurity);
-  stream->Write32((PRUint32)mSubRequestsNoSecurity);
-  return NS_OK;
-}
-
-static bool CheckUUIDEquals(PRUint32 m0,
-                            nsIObjectInputStream* stream,
-                            const nsCID& id)
-{
-  nsID tempID;
-  tempID.m0 = m0;
-  stream->Read16(&tempID.m1);
-  stream->Read16(&tempID.m2);
-  for (int i = 0; i < 8; ++i)
-    stream->Read8(&tempID.m3[i]);
-  return tempID.Equals(id);
-}
-
-NS_IMETHODIMP
-nsNSSSocketInfo::Read(nsIObjectInputStream* stream) {
-  nsresult rv;
-
-  PRUint32 version;
-  bool certificatePresent;
-
-  // Check what we have here...
-  PRUint32 UUID_0;
-  stream->Read32(&UUID_0);
-  if (UUID_0 == kNSSSocketInfoMagic.m0) {
-    // It seems this stream begins with our magic ID, check it really is there
-    if (!CheckUUIDEquals(UUID_0, stream, kNSSSocketInfoMagic))
-      return NS_ERROR_FAILURE;
-
-    // OK, this seems to be our stream, now continue to check there is
-    // the certificate
-    stream->ReadBoolean(&certificatePresent);
-    stream->Read32(&UUID_0);
-  }
-  else {
-    // There is no magic, assume there is a certificate present as in versions
-    // prior to those with the magic didn't store that flag; we check the 
-    // certificate is present by cheking the CID then
-    certificatePresent = true;
-  }
-
-  if (certificatePresent && UUID_0 == kNSSCertificateCID.m0) {
-    // It seems there is the certificate CID present, check it now; we only
-    // have this single certificate implementation at this time.
-    if (!CheckUUIDEquals(UUID_0, stream, kNSSCertificateCID))
-      return NS_ERROR_FAILURE;
-
-    // OK, we have read the CID of the certificate, check the interface ID
-    nsID tempID;
-    stream->ReadID(&tempID);
-    if (!tempID.Equals(NS_GET_IID(nsISupports)))
-      return NS_ERROR_FAILURE;
-
-    nsCOMPtr<nsISerializable> serializable =
-        do_CreateInstance(kNSSCertificateCID, &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // This is the redundant copy of the certificate; just ignore it
-    serializable->Read(stream);
-
-    // We are done with reading the certificate, now read the version
-    // as we did before.
-    stream->Read32(&version);
-  }
-  else {
-    // There seems not to be the certificate present in the stream.
-    version = UUID_0;
-  }
-
-  MutexAutoLock lock(mMutex);
-
-  // If the version field we have just read is not masked with 0xFFFF0000
-  // then it is stored mSecurityState field and this is version 1 of
-  // the binary data stream format.
-  if ((version & 0xFFFF0000) == 0xFFFF0000) {
-    version &= ~0xFFFF0000;
-    stream->Read32(&mSecurityState);
-  }
-  else {
-    mSecurityState = version;
-    version = 1;
-  }
-  stream->ReadString(mShortDesc);
-  stream->ReadString(mErrorMessageCached);
-  mErrorCode = 0;
-
-  nsCOMPtr<nsISupports> obj;
-  stream->ReadObject(true, getter_AddRefs(obj));
-  
-  mSSLStatus = reinterpret_cast<nsSSLStatus*>(obj.get());
-
-  if (!mSSLStatus) {
-    NS_WARNING("deserializing nsNSSSocketInfo without mSSLStatus");
-  }
-
-  if (version >= 2) {
-    stream->Read32((PRUint32*)&mSubRequestsHighSecurity);
-    stream->Read32((PRUint32*)&mSubRequestsLowSecurity);
-    stream->Read32((PRUint32*)&mSubRequestsBrokenSecurity);
-    stream->Read32((PRUint32*)&mSubRequestsNoSecurity);
-  }
-  else {
-    mSubRequestsHighSecurity = 0;
-    mSubRequestsLowSecurity = 0;
-    mSubRequestsBrokenSecurity = 0;
-    mSubRequestsNoSecurity = 0;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSSocketInfo::GetInterfaces(PRUint32 *count, nsIID * **array)
-{
-  *count = 0;
-  *array = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSSocketInfo::GetHelperForLanguage(PRUint32 language, nsISupports **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSSocketInfo::GetContractID(char * *aContractID)
-{
-  *aContractID = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSSocketInfo::GetClassDescription(char * *aClassDescription)
-{
-  *aClassDescription = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSSocketInfo::GetClassID(nsCID * *aClassID)
-{
-  *aClassID = (nsCID*) nsMemory::Alloc(sizeof(nsCID));
-  if (!*aClassID)
-    return NS_ERROR_OUT_OF_MEMORY;
-  return GetClassIDNoAlloc(*aClassID);
-}
-
-NS_IMETHODIMP
-nsNSSSocketInfo::GetImplementationLanguage(PRUint32 *aImplementationLanguage)
-{
-  *aImplementationLanguage = nsIProgrammingLanguage::CPLUSPLUS;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSSocketInfo::GetFlags(PRUint32 *aFlags)
-{
-  *aFlags = 0;
-  return NS_OK;
-}
-
-static NS_DEFINE_CID(kNSSSocketInfoCID, NS_NSSSOCKETINFO_CID);
-
-NS_IMETHODIMP
-nsNSSSocketInfo::GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
-{
-  *aClassIDNoAlloc = kNSSSocketInfoCID;
-  return NS_OK;
-}
-
 nsresult nsNSSSocketInfo::ActivateSSL()
 {
   nsNSSShutDownPreventionLock locker;
@@ -988,23 +459,6 @@ nsNSSSocketInfo::SetCertVerificationResult(PRErrorCode errorCode,
   mCertVerificationState = after_cert_verification;
 }
 
-nsresult nsNSSSocketInfo::GetSSLStatus(nsISSLStatus** _result)
-{
-  NS_ENSURE_ARG_POINTER(_result);
-
-  *_result = mSSLStatus;
-  NS_IF_ADDREF(*_result);
-
-  return NS_OK;
-}
-
-nsresult nsNSSSocketInfo::SetSSLStatus(nsSSLStatus *aSSLStatus)
-{
-  mSSLStatus = aSSLStatus;
-
-  return NS_OK;
-}
-
 void nsNSSSocketInfo::SetHandshakeInProgress(bool aIsIn)
 {
   mHandshakeInProgress = aIsIn;
@@ -1077,474 +531,6 @@ void nsSSLIOLayerHelpers::Cleanup()
     delete mutex;
     mutex = nsnull;
   }
-
-  if (mHostsWithCertErrors) {
-    delete mHostsWithCertErrors;
-    mHostsWithCertErrors = nsnull;
-  }
-}
-
-/* Formats an error message for non-certificate-related SSL errors
- * and non-overridable certificate errors (both are of type
- * PlainErrormMessage). Use formatOverridableCertErrorMessage
- * for overridable cert errors.
- */
-static nsresult
-formatPlainErrorMessage(const nsXPIDLCString &host, PRInt32 port,
-                        PRErrorCode err, nsString &returnedMessage)
-{
-  const PRUnichar *params[1];
-  nsresult rv;
-
-  nsCOMPtr<nsINSSComponent> component = do_GetService(kNSSComponentCID, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (host.Length())
-  {
-    nsString hostWithPort;
-
-    // For now, hide port when it's 443 and we're reporting the error.
-    // In the future a better mechanism should be used
-    // to make a decision about showing the port number, possibly by requiring
-    // the context object to implement a specific interface.
-    // The motivation is that Mozilla browser would like to hide the port number
-    // in error pages in the common case.
-
-    hostWithPort.AssignASCII(host);
-    if (port != 443) {
-      hostWithPort.AppendLiteral(":");
-      hostWithPort.AppendInt(port);
-    }
-    params[0] = hostWithPort.get();
-
-    nsString formattedString;
-    rv = component->PIPBundleFormatStringFromName("SSLConnectionErrorPrefix", 
-                                                  params, 1, 
-                                                  formattedString);
-    if (NS_SUCCEEDED(rv))
-    {
-      returnedMessage.Append(formattedString);
-      returnedMessage.Append(NS_LITERAL_STRING("\n\n"));
-    }
-  }
-
-  nsString explanation;
-  rv = nsNSSErrors::getErrorMessageFromCode(err, component, explanation);
-  if (NS_SUCCEEDED(rv))
-    returnedMessage.Append(explanation);
-
-  return NS_OK;
-}
-
-static void
-AppendErrorTextUntrusted(PRErrorCode errTrust,
-                         const nsString &host,
-                         nsIX509Cert* ix509,
-                         nsINSSComponent *component,
-                         nsString &returnedMessage)
-{
-  const char *errorID = nsnull;
-  nsCOMPtr<nsIX509Cert3> cert3 = do_QueryInterface(ix509);
-  if (cert3) {
-    bool isSelfSigned;
-    if (NS_SUCCEEDED(cert3->GetIsSelfSigned(&isSelfSigned))
-        && isSelfSigned) {
-      errorID = "certErrorTrust_SelfSigned";
-    }
-  }
-
-  if (!errorID) {
-    switch (errTrust) {
-      case SEC_ERROR_UNKNOWN_ISSUER:
-      {
-        nsCOMPtr<nsIArray> chain;
-        ix509->GetChain(getter_AddRefs(chain));
-        PRUint32 length = 0;
-        if (chain && NS_FAILED(chain->GetLength(&length)))
-          length = 0;
-        if (length == 1)
-          errorID = "certErrorTrust_MissingChain";
-        else
-          errorID = "certErrorTrust_UnknownIssuer";
-        break;
-      }
-      case SEC_ERROR_INADEQUATE_KEY_USAGE:
-        // Should get an individual string in the future
-        // For now, use the same as CaInvalid
-      case SEC_ERROR_CA_CERT_INVALID:
-        errorID = "certErrorTrust_CaInvalid";
-        break;
-      case SEC_ERROR_UNTRUSTED_ISSUER:
-        errorID = "certErrorTrust_Issuer";
-        break;
-      case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
-        errorID = "certErrorTrust_ExpiredIssuer";
-        break;
-      case SEC_ERROR_UNTRUSTED_CERT:
-      default:
-        errorID = "certErrorTrust_Untrusted";
-        break;
-    }
-  }
-
-  nsString formattedString;
-  nsresult rv = component->GetPIPNSSBundleString(errorID, 
-                                                 formattedString);
-  if (NS_SUCCEEDED(rv))
-  {
-    returnedMessage.Append(formattedString);
-    returnedMessage.Append(NS_LITERAL_STRING("\n"));
-  }
-}
-
-// returns TRUE if SAN was used to produce names
-// return FALSE if nothing was produced
-// names => a single name or a list of names
-// multipleNames => whether multiple names were delivered
-static bool
-GetSubjectAltNames(CERTCertificate *nssCert,
-                   nsINSSComponent *component,
-                   nsString &allNames,
-                   PRUint32 &nameCount)
-{
-  allNames.Truncate();
-  nameCount = 0;
-
-  PRArenaPool *san_arena = nsnull;
-  SECItem altNameExtension = {siBuffer, NULL, 0 };
-  CERTGeneralName *sanNameList = nsnull;
-
-  nsresult rv;
-  rv = CERT_FindCertExtension(nssCert, SEC_OID_X509_SUBJECT_ALT_NAME,
-                              &altNameExtension);
-  if (rv != SECSuccess)
-    return false;
-
-  san_arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
-  if (!san_arena)
-    return false;
-
-  sanNameList = CERT_DecodeAltNameExtension(san_arena, &altNameExtension);
-  if (!sanNameList)
-    return false;
-
-  SECITEM_FreeItem(&altNameExtension, false);
-
-  CERTGeneralName *current = sanNameList;
-  do {
-    nsAutoString name;
-    switch (current->type) {
-      case certDNSName:
-        name.AssignASCII((char*)current->name.other.data, current->name.other.len);
-        if (!allNames.IsEmpty()) {
-          allNames.Append(NS_LITERAL_STRING(" , "));
-        }
-        ++nameCount;
-        allNames.Append(name);
-        break;
-
-      case certIPAddress:
-        {
-          char buf[INET6_ADDRSTRLEN];
-          PRNetAddr addr;
-          if (current->name.other.len == 4) {
-            addr.inet.family = PR_AF_INET;
-            memcpy(&addr.inet.ip, current->name.other.data, current->name.other.len);
-            PR_NetAddrToString(&addr, buf, sizeof(buf));
-            name.AssignASCII(buf);
-          } else if (current->name.other.len == 16) {
-            addr.ipv6.family = PR_AF_INET6;
-            memcpy(&addr.ipv6.ip, current->name.other.data, current->name.other.len);
-            PR_NetAddrToString(&addr, buf, sizeof(buf));
-            name.AssignASCII(buf);
-          } else {
-            /* invalid IP address */
-          }
-          if (!name.IsEmpty()) {
-            if (!allNames.IsEmpty()) {
-              allNames.Append(NS_LITERAL_STRING(" , "));
-            }
-            ++nameCount;
-            allNames.Append(name);
-          }
-          break;
-        }
-
-      default: // all other types of names are ignored
-        break;
-    }
-    current = CERT_GetNextGeneralName(current);
-  } while (current != sanNameList); // double linked
-
-  PORT_FreeArena(san_arena, false);
-  return true;
-}
-
-static void
-AppendErrorTextMismatch(const nsString &host,
-                        nsIX509Cert* ix509,
-                        nsINSSComponent *component,
-                        nsString &returnedMessage)
-{
-  const PRUnichar *params[1];
-  nsresult rv;
-
-  CERTCertificate *nssCert = NULL;
-  CERTCertificateCleaner nssCertCleaner(nssCert);
-
-  nsCOMPtr<nsIX509Cert2> cert2 = do_QueryInterface(ix509, &rv);
-  if (cert2)
-    nssCert = cert2->GetCert();
-
-  if (!nssCert) {
-    // We are unable to extract the valid names, say "not valid for name".
-    params[0] = host.get();
-    nsString formattedString;
-    rv = component->PIPBundleFormatStringFromName("certErrorMismatch", 
-                                                  params, 1, 
-                                                  formattedString);
-    if (NS_SUCCEEDED(rv)) {
-      returnedMessage.Append(formattedString);
-      returnedMessage.Append(NS_LITERAL_STRING("\n"));
-    }
-    return;
-  }
-
-  nsString allNames;
-  PRUint32 nameCount = 0;
-  bool useSAN = false;
-
-  if (nssCert)
-    useSAN = GetSubjectAltNames(nssCert, component, allNames, nameCount);
-
-  if (!useSAN) {
-    char *certName = nsnull;
-    // currently CERT_FindNSStringExtension is not being exported by NSS.
-    // If it gets exported, enable the following line.
-    //   certName = CERT_FindNSStringExtension(nssCert, SEC_OID_NS_CERT_EXT_SSL_SERVER_NAME);
-    // However, it has been discussed to treat the extension as obsolete and ignore it.
-    if (!certName)
-      certName = CERT_GetCommonName(&nssCert->subject);
-    if (certName) {
-      ++nameCount;
-      allNames.AssignASCII(certName);
-      PORT_Free(certName);
-    }
-  }
-
-  if (nameCount > 1) {
-    nsString message;
-    rv = component->GetPIPNSSBundleString("certErrorMismatchMultiple", 
-                                          message);
-    if (NS_SUCCEEDED(rv)) {
-      returnedMessage.Append(message);
-      returnedMessage.Append(NS_LITERAL_STRING("\n  "));
-      returnedMessage.Append(allNames);
-      returnedMessage.Append(NS_LITERAL_STRING("  \n"));
-    }
-  }
-  else if (nameCount == 1) {
-    const PRUnichar *params[1];
-    params[0] = allNames.get();
-
-    nsString formattedString;
-    rv = component->PIPBundleFormatStringFromName("certErrorMismatchSingle2", 
-                                                  params, 1, 
-                                                  formattedString);
-    if (NS_SUCCEEDED(rv)) {
-      returnedMessage.Append(formattedString);
-      returnedMessage.Append(NS_LITERAL_STRING("\n"));
-    }
-  }
-  else { // nameCount == 0
-    nsString message;
-    nsresult rv = component->GetPIPNSSBundleString("certErrorMismatchNoNames",
-                                                   message);
-    if (NS_SUCCEEDED(rv)) {
-      returnedMessage.Append(message);
-      returnedMessage.Append(NS_LITERAL_STRING("\n"));
-    }
-  }
-}
-
-static void
-GetDateBoundary(nsIX509Cert* ix509,
-                nsString &formattedDate,
-                nsString &nowDate,
-                bool &trueExpired_falseNotYetValid)
-{
-  trueExpired_falseNotYetValid = true;
-  formattedDate.Truncate();
-
-  PRTime notAfter, notBefore, timeToUse;
-  nsCOMPtr<nsIX509CertValidity> validity;
-  nsresult rv;
-
-  rv = ix509->GetValidity(getter_AddRefs(validity));
-  if (NS_FAILED(rv))
-    return;
-
-  rv = validity->GetNotAfter(&notAfter);
-  if (NS_FAILED(rv))
-    return;
-
-  rv = validity->GetNotBefore(&notBefore);
-  if (NS_FAILED(rv))
-    return;
-
-  PRTime now = PR_Now();
-  if (LL_CMP(now, >, notAfter)) {
-    timeToUse = notAfter;
-  } else {
-    timeToUse = notBefore;
-    trueExpired_falseNotYetValid = false;
-  }
-
-  nsCOMPtr<nsIDateTimeFormat> dateTimeFormat(do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv));
-  if (NS_FAILED(rv))
-    return;
-
-  dateTimeFormat->FormatPRTime(nsnull, kDateFormatShort, 
-                               kTimeFormatNoSeconds, timeToUse, 
-                               formattedDate);
-  dateTimeFormat->FormatPRTime(nsnull, kDateFormatShort,
-                               kTimeFormatNoSeconds, now,
-                               nowDate);
-}
-
-static void
-AppendErrorTextTime(nsIX509Cert* ix509,
-                    nsINSSComponent *component,
-                    nsString &returnedMessage)
-{
-  nsAutoString formattedDate, nowDate;
-  bool trueExpired_falseNotYetValid;
-  GetDateBoundary(ix509, formattedDate, nowDate, trueExpired_falseNotYetValid);
-
-  const PRUnichar *params[2];
-  params[0] = formattedDate.get(); // might be empty, if helper function had a problem 
-  params[1] = nowDate.get();
-
-  const char *key = trueExpired_falseNotYetValid ? 
-                    "certErrorExpiredNow" : "certErrorNotYetValidNow";
-  nsresult rv;
-  nsString formattedString;
-  rv = component->PIPBundleFormatStringFromName(
-           key,
-           params, 
-           ArrayLength(params),
-           formattedString);
-  if (NS_SUCCEEDED(rv))
-  {
-    returnedMessage.Append(formattedString);
-    returnedMessage.Append(NS_LITERAL_STRING("\n"));
-  }
-}
-
-static void
-AppendErrorTextCode(PRErrorCode errorCodeToReport,
-                    nsINSSComponent *component,
-                    nsString &returnedMessage)
-{
-  const char *codeName = nsNSSErrors::getDefaultErrorStringName(errorCodeToReport);
-  if (codeName)
-  {
-    nsCString error_id(codeName);
-    ToLowerCase(error_id);
-    NS_ConvertASCIItoUTF16 idU(error_id);
-
-    const PRUnichar *params[1];
-    params[0] = idU.get();
-
-    nsString formattedString;
-    nsresult rv;
-    rv = component->PIPBundleFormatStringFromName("certErrorCodePrefix", 
-                                                  params, 1, 
-                                                  formattedString);
-    if (NS_SUCCEEDED(rv)) {
-      returnedMessage.Append(NS_LITERAL_STRING("\n"));
-      returnedMessage.Append(formattedString);
-      returnedMessage.Append(NS_LITERAL_STRING("\n"));
-    }
-    else {
-      returnedMessage.Append(NS_LITERAL_STRING(" ("));
-      returnedMessage.Append(idU);
-      returnedMessage.Append(NS_LITERAL_STRING(")"));
-    }
-  }
-}
-
-/* Formats an error message for overridable certificate errors (of type
- * OverridableCertErrorMessage). Use formatPlainErrorMessage to format
- * non-overridable cert errors and non-cert-related errors.
- */
-static nsresult
-formatOverridableCertErrorMessage(nsISSLStatus & sslStatus,
-                                  PRErrorCode errorCodeToReport, 
-                                  const nsXPIDLCString & host, PRInt32 port,
-                                  nsString & returnedMessage)
-{
-  const PRUnichar *params[1];
-  nsresult rv;
-  nsAutoString hostWithPort;
-  nsAutoString hostWithoutPort;
-
-  // For now, hide port when it's 443 and we're reporting the error.
-  // In the future a better mechanism should be used
-  // to make a decision about showing the port number, possibly by requiring
-  // the context object to implement a specific interface.
-  // The motivation is that Mozilla browser would like to hide the port number
-  // in error pages in the common case.
-  
-  hostWithoutPort.AppendASCII(host);
-  if (port == 443) {
-    params[0] = hostWithoutPort.get();
-  } else {
-    hostWithPort.AppendASCII(host);
-    hostWithPort.Append(':');
-    hostWithPort.AppendInt(port);
-    params[0] = hostWithPort.get();
-  }
-
-  nsCOMPtr<nsINSSComponent> component = do_GetService(kNSSComponentCID, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  returnedMessage.Truncate();
-  rv = component->PIPBundleFormatStringFromName("certErrorIntro", params, 1,
-                                                returnedMessage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  returnedMessage.Append(NS_LITERAL_STRING("\n\n"));
-
-  nsRefPtr<nsIX509Cert> ix509;
-  rv = sslStatus.GetServerCert(getter_AddRefs(ix509));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool isUntrusted;
-  rv = sslStatus.GetIsUntrusted(&isUntrusted);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (isUntrusted) {
-    AppendErrorTextUntrusted(errorCodeToReport, hostWithoutPort, ix509, 
-                             component, returnedMessage);
-  }
-
-  bool isDomainMismatch;
-  rv = sslStatus.GetIsDomainMismatch(&isDomainMismatch);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (isDomainMismatch) {
-    AppendErrorTextMismatch(hostWithoutPort, ix509, component, returnedMessage);
-  }
-
-  bool isNotValidAtThisTime;
-  rv = sslStatus.GetIsNotValidAtThisTime(&isNotValidAtThisTime);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (isNotValidAtThisTime) {
-    AppendErrorTextTime(ix509, component, returnedMessage);
-  }
-
-  AppendErrorTextCode(errorCodeToReport, component, returnedMessage);
-
-  return NS_OK;
 }
 
 static void
@@ -1661,95 +647,6 @@ nsSSLIOLayerConnect(PRFileDesc* fd, const PRNetAddr* addr,
   return status;
 }
 
-// nsPSMRememberCertErrorsTable
-
-nsPSMRememberCertErrorsTable::nsPSMRememberCertErrorsTable()
-{
-  mErrorHosts.Init(16);
-}
-
-nsresult
-nsPSMRememberCertErrorsTable::GetHostPortKey(nsNSSSocketInfo* infoObject,
-                                             nsCAutoString &result)
-{
-  nsresult rv;
-
-  result.Truncate();
-
-  nsXPIDLCString hostName;
-  rv = infoObject->GetHostName(getter_Copies(hostName));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  PRInt32 port;
-  rv = infoObject->GetPort(&port);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  result.Assign(hostName);
-  result.Append(':');
-  result.AppendInt(port);
-
-  return NS_OK;
-}
-
-void
-nsPSMRememberCertErrorsTable::RememberCertHasError(nsNSSSocketInfo* infoObject,
-                                                   nsSSLStatus* status,
-                                                   SECStatus certVerificationResult)
-{
-  nsresult rv;
-
-  nsCAutoString hostPortKey;
-  rv = GetHostPortKey(infoObject, hostPortKey);
-  if (NS_FAILED(rv))
-    return;
-
-  if (certVerificationResult != SECSuccess) {
-    NS_ASSERTION(status,
-        "Must have nsSSLStatus object when remembering flags");
-
-    if (!status)
-      return;
-
-    CertStateBits bits;
-    bits.mIsDomainMismatch = status->mIsDomainMismatch;
-    bits.mIsNotValidAtThisTime = status->mIsNotValidAtThisTime;
-    bits.mIsUntrusted = status->mIsUntrusted;
-    mErrorHosts.Put(hostPortKey, bits);
-  }
-  else {
-    mErrorHosts.Remove(hostPortKey);
-  }
-}
-
-void
-nsPSMRememberCertErrorsTable::LookupCertErrorBits(nsNSSSocketInfo* infoObject,
-                                                  nsSSLStatus* status)
-{
-  // Get remembered error bits from our cache, because of SSL session caching
-  // the NSS library potentially hasn't notified us for this socket.
-  if (status->mHaveCertErrorBits)
-    // Rather do not modify bits if already set earlier
-    return;
-
-  nsresult rv;
-
-  nsCAutoString hostPortKey;
-  rv = GetHostPortKey(infoObject, hostPortKey);
-  if (NS_FAILED(rv))
-    return;
-
-  CertStateBits bits;
-  if (!mErrorHosts.Get(hostPortKey, &bits))
-    // No record was found, this host had no cert errors
-    return;
-
-  // This host had cert errors, update the bits correctly
-  status->mHaveCertErrorBits = true;
-  status->mIsDomainMismatch = bits.mIsDomainMismatch;
-  status->mIsNotValidAtThisTime = bits.mIsNotValidAtThisTime;
-  status->mIsUntrusted = bits.mIsUntrusted;
-}
-
 void
 nsSSLIOLayerHelpers::getSiteKey(nsNSSSocketInfo *socketInfo, nsCSubstring &key)
 {
@@ -2140,7 +1037,6 @@ PRIOMethods nsSSLIOLayerHelpers::nsSSLIOLayerMethods;
 Mutex *nsSSLIOLayerHelpers::mutex = nsnull;
 nsTHashtable<nsCStringHashKey> *nsSSLIOLayerHelpers::mTLSIntolerantSites = nsnull;
 nsTHashtable<nsCStringHashKey> *nsSSLIOLayerHelpers::mTLSTolerantSites = nsnull;
-nsPSMRememberCertErrorsTable *nsSSLIOLayerHelpers::mHostsWithCertErrors = nsnull;
 nsTHashtable<nsCStringHashKey> *nsSSLIOLayerHelpers::mRenegoUnrestrictedSites = nsnull;
 bool nsSSLIOLayerHelpers::mTreatUnsafeNegotiationAsBroken = false;
 PRInt32 nsSSLIOLayerHelpers::mWarnLevelMissingRFC5746 = 1;
@@ -2363,10 +1259,6 @@ nsresult nsSSLIOLayerHelpers::Init()
 
   mTreatUnsafeNegotiationAsBroken = false;
   
-  mHostsWithCertErrors = new nsPSMRememberCertErrorsTable();
-  if (!mHostsWithCertErrors || !mHostsWithCertErrors->mErrorHosts.IsInitialized())
-    return NS_ERROR_OUT_OF_MEMORY;
-
   return NS_OK;
 }
 
@@ -3448,29 +2340,6 @@ done:
   }
 }
 
-void
-nsNSSSocketInfo::SetStatusErrorBits(nsIX509Cert & cert,
-                                    PRUint32 collected_errors)
-{
-  MutexAutoLock lock(mMutex);
-
-  if (!mSSLStatus)
-    mSSLStatus = new nsSSLStatus();
-
-  mSSLStatus->mServerCert = &cert;
-
-  mSSLStatus->mHaveCertErrorBits = true;
-  mSSLStatus->mIsDomainMismatch = 
-    collected_errors & nsICertOverrideService::ERROR_MISMATCH;
-  mSSLStatus->mIsNotValidAtThisTime = 
-    collected_errors & nsICertOverrideService::ERROR_TIME;
-  mSSLStatus->mIsUntrusted = 
-    collected_errors & nsICertOverrideService::ERROR_UNTRUSTED;
-
-  nsSSLIOLayerHelpers::mHostsWithCertErrors->RememberCertHasError(
-    this, mSSLStatus, SECFailure);
-}
-
 static PRFileDesc*
 nsSSLIOLayerImportFD(PRFileDesc *fd,
                      nsNSSSocketInfo *infoObject,
diff --git a/security/manager/ssl/src/nsNSSIOLayer.h b/security/manager/ssl/src/nsNSSIOLayer.h
index 144e6bf0571..1b106f0972e 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.h
+++ b/security/manager/ssl/src/nsNSSIOLayer.h
@@ -41,67 +41,25 @@
 #ifndef _NSNSSIOLAYER_H
 #define _NSNSSIOLAYER_H
 
-#include "prtypes.h"
-#include "prio.h"
-#include "certt.h"
-#include "mozilla/Mutex.h"
-#include "nsString.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsITransportSecurityInfo.h"
+#include "TransportSecurityInfo.h"
 #include "nsISSLSocketControl.h"
-#include "nsSSLStatus.h"
-#include "nsISSLStatusProvider.h"
-#include "nsIAssociatedContentSecurity.h"
-#include "nsXPIDLString.h"
-#include "nsNSSShutDown.h"
 #include "nsIClientAuthDialogs.h"
 #include "nsAutoPtr.h"
 #include "nsNSSCertificate.h"
 #include "nsDataHashtable.h"
 #include "nsTHashtable.h"
 
-namespace mozilla {
-
-namespace psm {
-
-enum SSLErrorMessageType {
-  OverridableCertErrorMessage  = 1, // for *overridable* certificate errors
-  PlainErrorMessage = 2             // all other errors (or "no error")
-};
-
-} // namespace psm
-
-} // namespace mozilla
-
-class nsNSSSocketInfo : public nsITransportSecurityInfo,
+class nsNSSSocketInfo : public mozilla::psm::TransportSecurityInfo,
                         public nsISSLSocketControl,
-                        public nsIInterfaceRequestor,
-                        public nsISSLStatusProvider,
-                        public nsIAssociatedContentSecurity,
-                        public nsISerializable,
-                        public nsIClassInfo,
-                        public nsIClientAuthUserDecision,
-                        public nsNSSShutDownObject,
-                        public nsOnPK11LogoutCancelObject
+                        public nsIClientAuthUserDecision
 {
 public:
   nsNSSSocketInfo();
-  virtual ~nsNSSSocketInfo();
   
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSITRANSPORTSECURITYINFO
+  NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSISSLSOCKETCONTROL
-  NS_DECL_NSIINTERFACEREQUESTOR
-  NS_DECL_NSISSLSTATUSPROVIDER
-  NS_DECL_NSIASSOCIATEDCONTENTSECURITY
-  NS_DECL_NSISERIALIZABLE
-  NS_DECL_NSICLASSINFO
   NS_DECL_NSICLIENTAUTHUSERDECISION
-
-  nsresult SetSecurityState(PRUint32 aState);
-  nsresult SetShortSecurityDescription(const PRUnichar *aText);
-
+ 
   nsresult SetForSTARTTLS(bool aForSTARTTLS);
   nsresult GetForSTARTTLS(bool *aForSTARTTLS);
 
@@ -111,20 +69,7 @@ public:
   nsresult GetHandshakePending(bool *aHandshakePending);
   nsresult SetHandshakePending(bool aHandshakePending);
 
-  const char * GetHostName() const {
-    return mHostName.get();
-  }
-  nsresult GetHostName(char **aHostName);
-  nsresult SetHostName(const char *aHostName);
-
-  nsresult GetPort(PRInt32 *aPort);
-  nsresult SetPort(PRInt32 aPort);
-
   void GetPreviousCert(nsIX509Cert** _result);
-
-  PRErrorCode GetErrorCode() const;
-  void SetCanceled(PRErrorCode errorCode,
-                   ::mozilla::psm::SSLErrorMessageType errorMessageType);
   
   void SetHasCleartextPhase(bool aHasCleartextPhase);
   bool GetHasCleartextPhase();
@@ -135,23 +80,9 @@ public:
 
   void SetAllowTLSIntoleranceTimeout(bool aAllow);
 
-  nsresult RememberCAChain(CERTCertList *aCertList);
-
-  /* Set SSL Status values */
-  nsresult SetSSLStatus(nsSSLStatus *aSSLStatus);
-  nsSSLStatus* SSLStatus() { return mSSLStatus; }
-  void SetStatusErrorBits(nsIX509Cert & cert, PRUint32 collected_errors);
-
   PRStatus CloseSocketAndDestroy(
                 const nsNSSShutDownPreventionLock & proofOfLock);
   
-  bool IsCertIssuerBlacklisted() const {
-    return mIsCertIssuerBlacklisted;
-  }
-  void SetCertIssuerBlacklisted() {
-    mIsCertIssuerBlacklisted = true;
-  }
-
   void SetNegotiatedNPN(const char *value, PRUint32 length);
   void SetHandshakeCompleted() { mHandshakeCompleted = true; }
 
@@ -180,28 +111,13 @@ public:
   void SetSSL3Enabled(bool enabled) { mSSL3Enabled = enabled; }
   bool IsTLSEnabled() const { return mTLSEnabled; }
   void SetTLSEnabled(bool enabled) { mTLSEnabled = enabled; }
-protected:
-  mutable ::mozilla::Mutex mMutex;
-
-  nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
+private:
   PRFileDesc* mFd;
+
   CertVerificationState mCertVerificationState;
   PRIntervalTime mCertVerificationStarted;
   PRIntervalTime mCertVerificationEnded;
-  PRUint32 mSecurityState;
-  PRInt32 mSubRequestsHighSecurity;
-  PRInt32 mSubRequestsLowSecurity;
-  PRInt32 mSubRequestsBrokenSecurity;
-  PRInt32 mSubRequestsNoSecurity;
-  nsString mShortDesc;
 
-  PRErrorCode mErrorCode;
-  ::mozilla::psm::SSLErrorMessageType mErrorMessageType;
-  nsString mErrorMessageCached;
-  nsresult formatErrorMessage(::mozilla::MutexAutoLock const & proofOfLock);
-
-  bool mDocShellDependentStuffKnown;
-  bool mExternalErrorReporting; // DocShellDependent
   bool mForSTARTTLS;
   bool mSSL3Enabled;
   bool mTLSEnabled;
@@ -211,9 +127,6 @@ protected:
   bool mAllowTLSIntoleranceTimeout;
   bool mRememberClientAuthCertificate;
   PRIntervalTime mHandshakeStartTime;
-  PRInt32 mPort;
-  nsXPIDLCString mHostName;
-  PRErrorCode mIsCertIssuerBlacklisted;
 
   /* SSL Status */
   nsRefPtr<nsSSLStatus> mSSLStatus;
@@ -225,35 +138,6 @@ protected:
   bool      mHandshakeCompleted;
   bool      mJoined;
   bool      mSentClientCert;
-
-private:
-  virtual void virtualDestroyNSSReference();
-  void destructorSafeDestroyNSSReference();
-};
-
-class nsSSLStatus;
-class nsNSSSocketInfo;
-
-class nsPSMRememberCertErrorsTable
-{
-private:
-  struct CertStateBits
-  {
-    bool mIsDomainMismatch;
-    bool mIsNotValidAtThisTime;
-    bool mIsUntrusted;
-  };
-  nsDataHashtableMT<nsCStringHashKey, CertStateBits> mErrorHosts;
-  nsresult GetHostPortKey(nsNSSSocketInfo* infoObject, nsCAutoString& result);
-
-public:
-  friend class nsSSLIOLayerHelpers;
-  nsPSMRememberCertErrorsTable();
-  void RememberCertHasError(nsNSSSocketInfo* infoObject,
-                           nsSSLStatus* status,
-                           SECStatus certVerificationResult);
-  void LookupCertErrorBits(nsNSSSocketInfo* infoObject,
-                           nsSSLStatus* status);
 };
 
 class nsSSLIOLayerHelpers
@@ -269,7 +153,6 @@ public:
   static mozilla::Mutex *mutex;
   static nsTHashtable<nsCStringHashKey> *mTLSIntolerantSites;
   static nsTHashtable<nsCStringHashKey> *mTLSTolerantSites;
-  static nsPSMRememberCertErrorsTable* mHostsWithCertErrors;
 
   static nsTHashtable<nsCStringHashKey> *mRenegoUnrestrictedSites;
   static bool mTreatUnsafeNegotiationAsBroken;
@@ -316,10 +199,4 @@ nsresult nsSSLIOLayerAddToSocket(PRInt32 family,
 nsresult nsSSLIOLayerFreeTLSIntolerantSites();
 nsresult displayUnknownCertErrorAlert(nsNSSSocketInfo *infoObject, int error);
 
-// 16786594-0296-4471-8096-8f84497ca428
-#define NS_NSSSOCKETINFO_CID \
-{ 0x16786594, 0x0296, 0x4471, \
-    { 0x80, 0x96, 0x8f, 0x84, 0x49, 0x7c, 0xa4, 0x28 } }
-
-
 #endif /* _NSNSSIOLAYER_H */
diff --git a/security/manager/ssl/src/nsNSSModule.cpp b/security/manager/ssl/src/nsNSSModule.cpp
index 2972fb7f763..cf110e05c78 100644
--- a/security/manager/ssl/src/nsNSSModule.cpp
+++ b/security/manager/ssl/src/nsNSSModule.cpp
@@ -76,7 +76,7 @@
 #include "nsRandomGenerator.h"
 #include "nsRecentBadCerts.h"
 #include "nsSSLStatus.h"
-#include "nsNSSIOLayer.h"
+#include "TransportSecurityInfo.h"
 #include "NSSErrorsService.h"
 #include "nsNSSVersion.h"
 
@@ -211,6 +211,10 @@ _InstanceClassChrome##Constructor(nsISupports *aOuter, REFNSIID aIID,         \
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nssLoadingComponent, nsNSSComponent,
                                         Init)
 
+using namespace mozilla::psm;
+  
+namespace {
+
 // Use the special factory constructor for everything this module implements,
 // because all code could potentially require the NSS library.
 // Our factory constructor takes an additional boolean parameter.
@@ -250,7 +254,7 @@ NS_NSS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nssEnsure, nsCertOverrideService, Init)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsRandomGenerator)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nssEnsure, nsRecentBadCertsService, Init)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsureOnChromeOnly, nsSSLStatus)
-NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsureOnChromeOnly, nsNSSSocketInfo)
+NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsureOnChromeOnly, TransportSecurityInfo)
 
 typedef mozilla::psm::NSSErrorsService NSSErrorsService;
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(NSSErrorsService, Init)
@@ -289,7 +293,7 @@ NS_DEFINE_NAMED_CID(NS_CERTOVERRIDE_CID);
 NS_DEFINE_NAMED_CID(NS_RANDOMGENERATOR_CID);
 NS_DEFINE_NAMED_CID(NS_RECENTBADCERTS_CID);
 NS_DEFINE_NAMED_CID(NS_SSLSTATUS_CID);
-NS_DEFINE_NAMED_CID(NS_NSSSOCKETINFO_CID);
+NS_DEFINE_NAMED_CID(TRANSPORTSECURITYINFO_CID);
 NS_DEFINE_NAMED_CID(NS_NSSERRORSSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_NSSVERSION_CID);
 
@@ -327,7 +331,7 @@ static const mozilla::Module::CIDEntry kNSSCIDs[] = {
   { &kNS_RANDOMGENERATOR_CID, false, NULL, nsRandomGeneratorConstructor },
   { &kNS_RECENTBADCERTS_CID, false, NULL, nsRecentBadCertsServiceConstructor },
   { &kNS_SSLSTATUS_CID, false, NULL, nsSSLStatusConstructor },
-  { &kNS_NSSSOCKETINFO_CID, false, NULL, nsNSSSocketInfoConstructor },
+  { &kTRANSPORTSECURITYINFO_CID, false, NULL, TransportSecurityInfoConstructor },
   { &kNS_NSSERRORSSERVICE_CID, false, NULL, NSSErrorsServiceConstructor },
   { &kNS_NSSVERSION_CID, false, NULL, nsNSSVersionConstructor },
   { NULL }
@@ -390,4 +394,6 @@ static const mozilla::Module kNSSModule = {
   kNSSCategories
 };
 
+} // unnamed namespace
+
 NSMODULE_DEFN(NSS) = &kNSSModule;

From 85149f3e787face3b790f3271b5267f2844a3edf Mon Sep 17 00:00:00 2001
From: Brian Smith <bsmith@mozilla.com>
Date: Sun, 29 Apr 2012 21:00:29 -0700
Subject: [PATCH 021/162] Bug 703834 - Part 2 - Make SSLServerCertVerification
 use TransportSecurityInfo instead of nsNSSSocketInfo, r=honzab

---
 .../ssl/src/SSLServerCertVerification.cpp     | 147 +++++++++---------
 .../ssl/src/SSLServerCertVerification.h       |   5 -
 2 files changed, 77 insertions(+), 75 deletions(-)

diff --git a/security/manager/ssl/src/SSLServerCertVerification.cpp b/security/manager/ssl/src/SSLServerCertVerification.cpp
index 3bb1af29c27..6d9f02604f2 100644
--- a/security/manager/ssl/src/SSLServerCertVerification.cpp
+++ b/security/manager/ssl/src/SSLServerCertVerification.cpp
@@ -124,10 +124,11 @@
  *
  * SSLServerCertVerificationResult must be dispatched to the socket transport
  * thread because we must only call SSL_* functions on the socket transport
- * thread since they may do I/O, because many parts of nsNSSSocketInfo and
- * the PSM NSS I/O layer are not thread-safe, and because we need the event to
- * interrupt the PR_Poll that may waiting for I/O on the socket for which we
- * are validating the cert.
+ * thread since they may do I/O, because many parts of nsNSSSocketInfo (the
+ * subclass of TransportSecurityInfo used when validating certificates during
+ * an SSL handshake) and the PSM NSS I/O layer are not thread-safe, and because
+ * we need the event to interrupt the PR_Poll that may waiting for I/O on the
+ * socket for which we are validating the cert.
  */
 
 #include "SSLServerCertVerification.h"
@@ -216,7 +217,7 @@ void StopSSLServerCertVerificationThreads()
 
 namespace {
 
-// Dispatched to the STS thread to notify the socketInfo of the verification
+// Dispatched to the STS thread to notify the infoObject of the verification
 // result.
 //
 // This will cause the PR_Poll in the STS thread to return, so things work
@@ -227,14 +228,14 @@ class SSLServerCertVerificationResult : public nsRunnable
 public:
   NS_DECL_NSIRUNNABLE
 
-  SSLServerCertVerificationResult(nsNSSSocketInfo & socketInfo,
+  SSLServerCertVerificationResult(TransportSecurityInfo * infoObject,
                                   PRErrorCode errorCode,
                                   SSLErrorMessageType errorMessageType = 
                                       PlainErrorMessage);
 
   void Dispatch();
 private:
-  const nsRefPtr<nsNSSSocketInfo> mSocketInfo;
+  const nsRefPtr<TransportSecurityInfo> mInfoObject;
 public:
   const PRErrorCode mErrorCode;
   const SSLErrorMessageType mErrorMessageType;
@@ -245,7 +246,7 @@ class CertErrorRunnable : public SyncRunnableBase
  public:
   CertErrorRunnable(const void * fdForLogging,
                     nsIX509Cert * cert,
-                    nsNSSSocketInfo * infoObject,
+                    TransportSecurityInfo * infoObject,
                     PRErrorCode defaultErrorCodeToReport,
                     PRUint32 collectedErrors,
                     PRErrorCode errorCodeTrust,
@@ -267,7 +268,7 @@ private:
   
   const void * const mFdForLogging; // may become an invalid pointer; do not dereference
   const nsCOMPtr<nsIX509Cert> mCert;
-  const nsRefPtr<nsNSSSocketInfo> mInfoObject;
+  const nsRefPtr<TransportSecurityInfo> mInfoObject;
   const PRErrorCode mDefaultErrorCodeToReport;
   const PRUint32 mCollectedErrors;
   const PRErrorCode mErrorCodeTrust;
@@ -283,7 +284,7 @@ CertErrorRunnable::CheckCertOverrides()
 
   if (!NS_IsMainThread()) {
     NS_ERROR("CertErrorRunnable::CheckCertOverrides called off main thread");
-    return new SSLServerCertVerificationResult(*mInfoObject,
+    return new SSLServerCertVerificationResult(mInfoObject,
                                                mDefaultErrorCodeToReport);
   }
 
@@ -310,7 +311,7 @@ CertErrorRunnable::CheckCertOverrides()
                            &strictTransportSecurityEnabled);
   }
   if (NS_FAILED(nsrv)) {
-    return new SSLServerCertVerificationResult(*mInfoObject,
+    return new SSLServerCertVerificationResult(mInfoObject,
                                                mDefaultErrorCodeToReport);
   }
 
@@ -343,7 +344,7 @@ CertErrorRunnable::CheckCertOverrides()
       PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
              ("[%p][%p] All errors covered by override rules\n",
              mFdForLogging, this));
-      return new SSLServerCertVerificationResult(*mInfoObject, 0);
+      return new SSLServerCertVerificationResult(mInfoObject, 0);
     }
   } else {
     PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
@@ -359,15 +360,20 @@ CertErrorRunnable::CheckCertOverrides()
   // First, deliver the technical details of the broken SSL status.
 
   // Try to get a nsIBadCertListener2 implementation from the socket consumer.
-  nsCOMPtr<nsIInterfaceRequestor> cb;
-  mInfoObject->GetNotificationCallbacks(getter_AddRefs(cb));
-  if (cb) {
-    nsCOMPtr<nsIBadCertListener2> bcl = do_GetInterface(cb);
-    if (bcl) {
-      nsIInterfaceRequestor *csi = static_cast<nsIInterfaceRequestor*>(mInfoObject);
-      bool suppressMessage = false; // obsolete, ignored
-      nsrv = bcl->NotifyCertProblem(csi, mInfoObject->SSLStatus(),
-                                    hostWithPortString, &suppressMessage);
+  nsCOMPtr<nsISSLSocketControl> sslSocketControl = do_QueryInterface(
+    NS_ISUPPORTS_CAST(nsITransportSecurityInfo*, mInfoObject));
+  if (sslSocketControl) {
+    nsCOMPtr<nsIInterfaceRequestor> cb;
+    sslSocketControl->GetNotificationCallbacks(getter_AddRefs(cb));
+    if (cb) {
+      nsCOMPtr<nsIBadCertListener2> bcl = do_GetInterface(cb);
+      if (bcl) {
+        nsIInterfaceRequestor *csi
+          = static_cast<nsIInterfaceRequestor*>(mInfoObject);
+        bool suppressMessage = false; // obsolete, ignored
+        nsrv = bcl->NotifyCertProblem(csi, mInfoObject->SSLStatus(),
+                                      hostWithPortString, &suppressMessage);
+      }
     }
   }
 
@@ -386,7 +392,7 @@ CertErrorRunnable::CheckCertOverrides()
                                 : mErrorCodeExpired  ? mErrorCodeExpired
                                 : mDefaultErrorCodeToReport;
 
-  return new SSLServerCertVerificationResult(*mInfoObject, errorCodeToReport,
+  return new SSLServerCertVerificationResult(mInfoObject, errorCodeToReport,
                                              OverridableCertErrorMessage);
 }
 
@@ -404,11 +410,11 @@ CertErrorRunnable::RunOnTargetThread()
 // the CertErrorRunnable.
 CertErrorRunnable *
 CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
-                        nsNSSSocketInfo * socketInfo,
+                        TransportSecurityInfo * infoObject,
                         CERTCertificate * cert,
                         const void * fdForLogging)
 {
-  MOZ_ASSERT(socketInfo);
+  MOZ_ASSERT(infoObject);
   MOZ_ASSERT(cert);
   
   // cert was revoked, don't do anything else
@@ -467,7 +473,7 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
   if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
     srv = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), cert,
                                 true, certificateUsageSSLServer,
-                                PR_Now(), static_cast<void*>(socketInfo),
+                                PR_Now(), static_cast<void*>(infoObject),
                                 verify_log, NULL);
   }
   else {
@@ -478,7 +484,7 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
 
     srv = CERT_PKIXVerifyCert(cert, certificateUsageSSLServer,
                               survivingParams->GetRawPointerForNSS(),
-                              cvout, static_cast<void*>(socketInfo));
+                              cvout, static_cast<void*>(infoObject));
   }
 
   // We ignore the result code of the cert verification.
@@ -493,13 +499,13 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
 
   PRUint32 collected_errors = 0;
 
-  if (socketInfo->IsCertIssuerBlacklisted()) {
+  if (infoObject->IsCertIssuerBlacklisted()) {
     collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED;
     errorCodeTrust = defaultErrorCodeToReport;
   }
 
   // Check the name field against the desired hostname.
-  if (CERT_VerifyCertName(cert, socketInfo->GetHostName()) != SECSuccess) {
+  if (CERT_VerifyCertName(cert, infoObject->GetHostName()) != SECSuccess) {
     collected_errors |= nsICertOverrideService::ERROR_MISMATCH;
     errorCodeMismatch = SSL_ERROR_BAD_CERT_DOMAIN;
   }
@@ -549,11 +555,11 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
     return nsnull;
   }
 
-  socketInfo->SetStatusErrorBits(*nssCert, collected_errors);
+  infoObject->SetStatusErrorBits(*nssCert, collected_errors);
 
   return new CertErrorRunnable(fdForLogging, 
                                static_cast<nsIX509Cert*>(nssCert.get()),
-                               socketInfo, defaultErrorCodeToReport, 
+                               infoObject, defaultErrorCodeToReport, 
                                collected_errors, errorCodeTrust, 
                                errorCodeMismatch, errorCodeExpired);
 }
@@ -562,9 +568,9 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
 // socket transport service thread, which blocks the socket transport
 // service thread while it waits for the inner CertErrorRunnable to execute
 // CheckCertOverrides on the main thread. CheckCertOverrides must block events
-// on both of these threads because it calls nsNSSSocketInfo::GetInterface(), 
+// on both of these threads because it calls TransportSecurityInfo::GetInterface(), 
 // which may call nsHttpConnection::GetInterface() through
-// nsNSSSocketInfo::mCallbacks. nsHttpConnection::GetInterface must always
+// TransportSecurityInfo::mCallbacks. nsHttpConnection::GetInterface must always
 // execute on the main thread, with the socket transport service thread
 // blocked.
 class CertErrorRunnableRunnable : public nsRunnable
@@ -594,28 +600,28 @@ class SSLServerCertVerificationJob : public nsRunnable
 public:
   // Must be called only on the socket transport thread
   static SECStatus Dispatch(const void * fdForLogging,
-                            nsNSSSocketInfo * infoObject,
+                            TransportSecurityInfo * infoObject,
                             CERTCertificate * serverCert);
 private:
   NS_DECL_NSIRUNNABLE
 
   // Must be called only on the socket transport thread
   SSLServerCertVerificationJob(const void * fdForLogging,
-                               nsNSSSocketInfo & socketInfo, 
-                               CERTCertificate & cert);
+                               TransportSecurityInfo * infoObject, 
+                               CERTCertificate * cert);
   ~SSLServerCertVerificationJob();
 
   const void * const mFdForLogging;
-  const nsRefPtr<nsNSSSocketInfo> mSocketInfo;
+  const nsRefPtr<TransportSecurityInfo> mInfoObject;
   CERTCertificate * const mCert;
 };
 
 SSLServerCertVerificationJob::SSLServerCertVerificationJob(
-    const void * fdForLogging, nsNSSSocketInfo & socketInfo,
-    CERTCertificate & cert)
+    const void * fdForLogging, TransportSecurityInfo * infoObject,
+    CERTCertificate * cert)
   : mFdForLogging(fdForLogging)
-  , mSocketInfo(&socketInfo)
-  , mCert(CERT_DupCertificate(&cert))
+  , mInfoObject(infoObject)
+  , mCert(CERT_DupCertificate(cert))
 {
 }
 
@@ -820,11 +826,8 @@ BlockServerCertChangeForSpdy(nsNSSSocketInfo *infoObject,
 }
 
 SECStatus
-AuthCertificate(nsNSSSocketInfo * socketInfo, CERTCertificate * cert)
+AuthCertificate(TransportSecurityInfo * infoObject, CERTCertificate * cert)
 {
-  if (BlockServerCertChangeForSpdy(socketInfo, cert) != SECSuccess)
-    return SECFailure;
-
   if (cert->serialNumber.data &&
       cert->issuerName &&
       !strcmp(cert->issuerName, 
@@ -863,14 +866,14 @@ AuthCertificate(nsNSSSocketInfo * socketInfo, CERTCertificate * cert)
     }
   }
 
-  SECStatus rv = PSM_SSL_PKIX_AuthCertificate(cert, socketInfo,
-                                              socketInfo->GetHostName());
+  SECStatus rv = PSM_SSL_PKIX_AuthCertificate(cert, infoObject,
+                                              infoObject->GetHostName());
 
   // We want to remember the CA certs in the temp db, so that the application can find the
   // complete chain at any time it might need it.
   // But we keep only those CA certs in the temp db, that we didn't already know.
 
-  nsRefPtr<nsSSLStatus> status = socketInfo->SSLStatus();
+  nsRefPtr<nsSSLStatus> status = infoObject->SSLStatus();
   nsRefPtr<nsNSSCertificate> nsc;
 
   if (!status || !status->mServerCert) {
@@ -896,7 +899,7 @@ AuthCertificate(nsNSSSocketInfo * socketInfo, CERTCertificate * cert)
     }
       
     if (blacklistErrorCode != 0) {
-      socketInfo->SetCertIssuerBlacklisted();
+      infoObject->SetCertIssuerBlacklisted();
       PORT_SetError(blacklistErrorCode);
       rv = SECFailure;
     }
@@ -952,19 +955,19 @@ AuthCertificate(nsNSSSocketInfo * socketInfo, CERTCertificate * cert)
     // to the caller that contains at least the cert and its status.
     if (!status) {
       status = new nsSSLStatus();
-      socketInfo->SetSSLStatus(status);
+      infoObject->SetSSLStatus(status);
     }
 
     if (rv == SECSuccess) {
       // Certificate verification succeeded delete any potential record
       // of certificate error bits.
-      RememberCertErrorsTable::GetInstance().RememberCertHasError(socketInfo,
+      RememberCertErrorsTable::GetInstance().RememberCertHasError(infoObject,
                                                                   nsnull, rv);
     }
     else {
       // Certificate verification failed, update the status' bits.
       RememberCertErrorsTable::GetInstance().LookupCertErrorBits(
-        socketInfo, status);
+        infoObject, status);
     }
 
     if (status && !status->mServerCert) {
@@ -979,20 +982,19 @@ AuthCertificate(nsNSSSocketInfo * socketInfo, CERTCertificate * cert)
 
 /*static*/ SECStatus
 SSLServerCertVerificationJob::Dispatch(const void * fdForLogging,
-                                       nsNSSSocketInfo * socketInfo,
+                                       TransportSecurityInfo * infoObject,
                                        CERTCertificate * serverCert)
 {
   // Runs on the socket transport thread
-  if (!socketInfo || !serverCert) {
+  if (!infoObject || !serverCert) {
     NS_ERROR("Invalid parameters for SSL server cert validation");
     PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
     return SECFailure;
   }
   
   nsRefPtr<SSLServerCertVerificationJob> job
-    = new SSLServerCertVerificationJob(fdForLogging, *socketInfo, *serverCert);
+    = new SSLServerCertVerificationJob(fdForLogging, infoObject, serverCert);
 
-  socketInfo->SetCertVerificationWaiting();
   nsresult nrv;
   if (!gCertVerificationThreadPool) {
     nrv = NS_ERROR_NOT_INITIALIZED;
@@ -1003,7 +1005,7 @@ SSLServerCertVerificationJob::Dispatch(const void * fdForLogging,
     // We can't call SetCertVerificationResult here to change
     // mCertVerificationState because SetCertVerificationResult will call
     // libssl functions that acquire SSL locks that are already being held at
-    // this point. socketInfo->mCertVerificationState will be stuck at
+    // this point. infoObject->mCertVerificationState will be stuck at
     // waiting_for_cert_verification here, but that is OK because we already
     // have to be able to handle cases where we encounter non-cert errors while
     // in that state.
@@ -1024,21 +1026,21 @@ SSLServerCertVerificationJob::Run()
   // Runs on a cert verification thread
 
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
-          ("[%p] SSLServerCertVerificationJob::Run\n", mSocketInfo.get()));
+          ("[%p] SSLServerCertVerificationJob::Run\n", mInfoObject.get()));
 
   PRErrorCode error;
 
   nsNSSShutDownPreventionLock nssShutdownPrevention;
-  if (mSocketInfo->isAlreadyShutDown()) {
+  if (mInfoObject->isAlreadyShutDown()) {
     error = SEC_ERROR_USER_CANCELLED;
   } else {
     // Reset the error code here so we can detect if AuthCertificate fails to
     // set the error code if/when it fails.
     PR_SetError(0, 0); 
-    SECStatus rv = AuthCertificate(mSocketInfo, mCert);
+    SECStatus rv = AuthCertificate(mInfoObject, mCert);
     if (rv == SECSuccess) {
       nsRefPtr<SSLServerCertVerificationResult> restart 
-        = new SSLServerCertVerificationResult(*mSocketInfo, 0);
+        = new SSLServerCertVerificationResult(mInfoObject, 0);
       restart->Dispatch();
       return NS_OK;
     }
@@ -1046,7 +1048,7 @@ SSLServerCertVerificationJob::Run()
     error = PR_GetError();
     if (error != 0) {
       nsRefPtr<CertErrorRunnable> runnable = CreateCertErrorRunnable(
-              error, mSocketInfo, mCert, mFdForLogging);
+              error, mInfoObject, mCert, mFdForLogging);
       if (!runnable) {
         // CreateCertErrorRunnable set a new error code
         error = PR_GetError(); 
@@ -1083,7 +1085,7 @@ SSLServerCertVerificationJob::Run()
   }
 
   nsRefPtr<SSLServerCertVerificationResult> failure
-    = new SSLServerCertVerificationResult(*mSocketInfo, error);
+    = new SSLServerCertVerificationResult(mInfoObject, error);
   failure->Dispatch();
   return NS_OK;
 }
@@ -1109,15 +1111,17 @@ AuthCertificateHook(void *arg, PRFileDesc *fd, PRBool checkSig, PRBool isServer)
   // and many things in PSM assume that we are a client.
   NS_ASSERTION(!isServer, "AuthCertificateHook: isServer unexpectedly true");
 
-  if (!checkSig || isServer) {
+  nsNSSSocketInfo *socketInfo = static_cast<nsNSSSocketInfo*>(arg);
+  CERTCertificate *serverCert = SSL_PeerCertificate(fd);
+  CERTCertificateCleaner serverCertCleaner(serverCert);
+
+  if (!checkSig || isServer || !socketInfo || !serverCert) {
       PR_SetError(PR_INVALID_STATE_ERROR, 0);
       return SECFailure;
   }
       
-  CERTCertificate *serverCert = SSL_PeerCertificate(fd);
-  CERTCertificateCleaner serverCertCleaner(serverCert);
-
-  nsNSSSocketInfo *socketInfo = static_cast<nsNSSSocketInfo*>(arg);
+  if (BlockServerCertChangeForSpdy(socketInfo, serverCert) != SECSuccess)
+    return SECFailure;
 
   bool onSTSThread;
   nsresult nrv;
@@ -1138,6 +1142,7 @@ AuthCertificateHook(void *arg, PRFileDesc *fd, PRBool checkSig, PRBool isServer)
     // we need the socket transport thread to be free for our OCSP requests,
     // and we *want* to do certificate verification on a background thread
     // because of the performance benefits of doing so.
+    socketInfo->SetCertVerificationWaiting();
     SECStatus rv = SSLServerCertVerificationJob::Dispatch(
                         static_cast<const void *>(fd), socketInfo, serverCert);
     return rv;
@@ -1203,9 +1208,9 @@ AuthCertificateHook(void *arg, PRFileDesc *fd, PRBool checkSig, PRBool isServer)
 }
 
 SSLServerCertVerificationResult::SSLServerCertVerificationResult(
-        nsNSSSocketInfo & socketInfo, PRErrorCode errorCode,
+        TransportSecurityInfo * infoObject, PRErrorCode errorCode,
         SSLErrorMessageType errorMessageType)
-  : mSocketInfo(&socketInfo)
+  : mInfoObject(infoObject)
   , mErrorCode(errorCode)
   , mErrorMessageType(errorMessageType)
 {
@@ -1228,7 +1233,9 @@ NS_IMETHODIMP
 SSLServerCertVerificationResult::Run()
 {
   // TODO: Assert that we're on the socket transport thread
-  mSocketInfo->SetCertVerificationResult(mErrorCode, mErrorMessageType);
+  // XXX: This cast will be removed by the next patch
+  ((nsNSSSocketInfo *) mInfoObject.get())
+    ->SetCertVerificationResult(mErrorCode, mErrorMessageType);
   return NS_OK;
 }
 
diff --git a/security/manager/ssl/src/SSLServerCertVerification.h b/security/manager/ssl/src/SSLServerCertVerification.h
index 83b16db43eb..6cf620ce595 100644
--- a/security/manager/ssl/src/SSLServerCertVerification.h
+++ b/security/manager/ssl/src/SSLServerCertVerification.h
@@ -41,11 +41,6 @@
 #include "seccomon.h"
 #include "prio.h"
 
-typedef struct PRFileDesc PRFileDesc;
-typedef struct CERTCertificateStr CERTCertificate;
-class nsNSSSocketInfo;
-class nsNSSShutDownPreventionLock;
-
 namespace mozilla { namespace psm {
 
 SECStatus AuthCertificateHook(void *arg, PRFileDesc *fd, 

From 8d1c6006c1d0ba6e343173c27afd455f1682d015 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 30 Apr 2012 17:23:00 +1200
Subject: [PATCH 022/162] Bug 750163.
 MediaStreamGraphImpl::UpdateBufferSufficiencyState should skip tracks whose
 creation is pending --- there is no Track object for them yet. r=jesup

---
 content/media/MediaStreamGraph.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/content/media/MediaStreamGraph.cpp b/content/media/MediaStreamGraph.cpp
index 3c16391772e..29536ec2615 100644
--- a/content/media/MediaStreamGraph.cpp
+++ b/content/media/MediaStreamGraph.cpp
@@ -668,6 +668,13 @@ MediaStreamGraphImpl::UpdateBufferSufficiencyState(SourceMediaStream* aStream)
     MutexAutoLock lock(aStream->mMutex);
     for (PRUint32 i = 0; i < aStream->mUpdateTracks.Length(); ++i) {
       SourceMediaStream::TrackData* data = &aStream->mUpdateTracks[i];
+      if (data->mCommands & SourceMediaStream::TRACK_CREATE) {
+        // This track hasn't been created yet, so we have no sufficiency
+        // data. The track will be created in the next iteration of the
+        // control loop and then we'll fire insufficiency notifications
+        // if necessary.
+        continue;
+      }
       if (data->mCommands & SourceMediaStream::TRACK_END) {
         // This track will end, so no point in firing not-enough-data
         // callbacks.

From d2b421575584bb2cdf2a1093c2ab1753a8e6b5f4 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Sat, 31 Mar 2012 09:25:23 +0200
Subject: [PATCH 023/162] Bug 736066 - Build NSS object files more like the
 rest of the tree, and simplify security/manager/Makefile.in. r=ted

---
 security/manager/Makefile.in | 176 ++++++++++++++---------------------
 1 file changed, 68 insertions(+), 108 deletions(-)

diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
index 34cfea72784..40955577ac7 100644
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -184,9 +184,10 @@ ifdef NSS_DISABLE_DBM
 DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1
 endif
 ABS_topsrcdir   := $(call core_abspath,$(topsrcdir))
-ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
-DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT)
-endif
+# Hack to force NSS build system to use "normal" object directories
+DEFAULT_GMAKE_FLAGS += BUILD='$(MOZ_BUILD_ROOT)/security/$$(subst $(shell cd $(topsrcdir); pwd)/security/,,$$(CURDIR))'
+DEFAULT_GMAKE_FLAGS += BUILD_TREE='$$(BUILD)' OBJDIR='$$(BUILD)' DEPENDENCIES='$$(BUILD)/.deps' SINGLE_SHLIB_DIR='$$(BUILD)'
+DEFAULT_GMAKE_FLAGS += SOURCE_XP_DIR=$(ABS_DIST)
 ifndef MOZ_DEBUG
 DEFAULT_GMAKE_FLAGS += BUILD_OPT=1 OPT_CODE_SIZE=1
 endif
@@ -286,10 +287,6 @@ DEFAULT_GMAKE_FLAGS += XCFLAGS="$(CFLAGS)"
 DEFAULT_GMAKE_FLAGS += DARWIN_DYLIB_VERSIONS="-compatibility_version 1 -current_version 1 $(LDFLAGS)"
 endif
 
-SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile
-
-include $(topsrcdir)/config/rules.mk
-
 ifdef MOZ_NSS_PATCH
 # If we're applying a patch, we'll copy the NSS source to the objdir
 # and build it from there.
@@ -311,118 +308,81 @@ else
 NSS_SRCDIR = $(topsrcdir)
 endif
 
-dependclean export packages chrome::
-	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
-	$(MAKE) -C locales $@
-ifdef MOZ_XUL
-	$(MAKE) -C pki $@
+NSS_DIRS =
+ifndef NSS_DISABLE_DBM
+NSS_DIRS += dbm
+endif
+NSS_DIRS += \
+  nss/lib \
+  nss/cmd/lib \
+  nss/cmd/shlibsign \
+  $(NULL)
+
+ifdef ENABLE_TESTS
+NSS_DIRS += \
+  nss/cmd/certutil \
+  nss/cmd/pk12util \
+  nss/cmd/modutil \
+  $(NULL)
 endif
 
+ifndef MOZ_NATIVE_NSS
+define build_rules
 libs::
-ifndef MOZ_NATIVE_NSS
-ifndef NSS_DISABLE_DBM
-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/dbm $(DEFAULT_GMAKE_FLAGS) 
-endif
-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-ifdef ENABLE_TESTS
-# Need certutil binary for mochitest certificates generation
-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS)
-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS)
-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/modutil $(DEFAULT_GMAKE_FLAGS)
-endif
-ifndef ENABLE_TESTS # Just avoid secondary compile
-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
-endif
-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifeq ($(OS_ARCH), SunOS)
+	$$(NSSMAKE) -C $$(NSS_SRCDIR)/security/$(1) $$(DEFAULT_GMAKE_FLAGS)
+
+clean clobber clobber_all realclean distclean depend::
+	$$(NSSMAKE) -C $$(NSS_SRCDIR)/security/$(1) $$(DEFAULT_GMAKE_FLAGS) clean
+endef
+$(foreach dir,$(NSS_DIRS),$(eval $(call build_rules,$(dir))))
+
+NSS_LIBS = \
+  $(LOADABLE_ROOT_MODULE) \
+  $(SOFTOKEN3_LIB) \
+  $(NSSDBM3_LIB) \
+  $(NSS3_LIB) \
+  $(NSSUTIL3_LIB) \
+  $(SSL3_LIB) \
+  $(SMIME3_LIB) \
+  $(FREEBL_LIB) \
+  $(FREEBL_32INT_LIB) \
+  $(FREEBL_32FPU_LIB) \
+  $(FREEBL_32INT64_LIB) \
+  $(FREEBL_64INT_LIB) \
+  $(FREEBL_64FPU_LIB) \
+  $(NULL)
+
+define install_rules
+libs::
+ifeq ($(OS_ARCH)_$(1), SunOS_$(SOFTOKEN3_LIB))
 # has to use copy mode on Solaris, see #665509
-	$(NSINSTALL) -t -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
+	$$(NSINSTALL) -t -m 755 $$(DIST)/lib/$(1) $$(DIST)/bin
 else
-	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
+	$$(INSTALL) -m 755 $$(DIST)/lib/$(1) $$(DIST)/bin
 endif
-ifndef NSS_DISABLE_DBM
-	$(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin
-endif
-	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
+
+install::
+	$$(SYSINSTALL) -m 755 $$(DIST)/lib/$(1) $$(DESTDIR)$$(mozappdir)
+endef
+$(foreach lib,$(NSS_LIBS),$(eval $(call install_rules,$(lib))))
+
+libs::
 	$(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib
-ifdef HAVE_FREEBL_LIBS
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
-endif
-ifdef HAVE_FREEBL_LIBS_32
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
-endif
-ifdef HAVE_FREEBL_LIBS_32INT64
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
-endif
-ifdef HAVE_FREEBL_LIBS_64
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
-endif
-endif
-ifndef MOZ_NATIVE_NSS
 # NSS installs headers to dist/public and we want them in dist/include
 	$(NSINSTALL) -D $(DIST)/include/nss
 	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
 	  (cd $(DIST)/include && tar -xf -)
-endif
-	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
-	$(MAKE) -C locales $@
+
+endif # MOZ_NATIVE_NSS
+
+DIRS = \
+  boot \
+  ssl \
+  locales \
+  $(NULL)
+
 ifdef MOZ_XUL
-	$(MAKE) -C pki $@
+DIRS += pki
 endif
 
-check::
-	$(MAKE) -C ssl $@
-
-install::
-ifndef MOZ_NATIVE_NSS
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
-ifdef HAVE_FREEBL_LIBS
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
-endif
-ifdef HAVE_FREEBL_LIBS_32
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
-endif
-ifdef HAVE_FREEBL_LIBS_32INT64
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
-endif
-ifdef HAVE_FREEBL_LIBS_64
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
-endif
-endif
-	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
-	$(MAKE) -C locales $@
-ifdef MOZ_XUL
-	$(MAKE) -C pki $@
-endif
-
-clean clobber clobber_all realclean distclean depend::
-	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
-	$(MAKE) -C locales $@
-ifdef MOZ_XUL
-	$(MAKE) -C pki $@
-endif
-ifndef MOZ_NATIVE_NSS
-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
+include $(topsrcdir)/config/rules.mk

From baed0551b09c12ffad39eab7a1ecbccc72cca2ec Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Mon, 30 Apr 2012 08:03:59 +0200
Subject: [PATCH 024/162] Bug 748739 - Link stdc++compat as a static library,
 and always link it when STDCXX_COMPAT is enabled. r=ted

--HG--
rename : build/stdc++compat.cpp => build/unix/stdc++compat/stdc++compat.cpp
---
 allmakefiles.sh                               |  5 ++++
 build/unix/Makefile.in                        |  6 ++++-
 build/unix/elfhack/Makefile.in                |  1 -
 build/unix/stdc++compat/Makefile.in           | 27 +++++++++++++++++++
 .../{ => unix/stdc++compat}/stdc++compat.cpp  |  0
 config/Makefile.in                            |  4 +++
 config/config.mk                              |  3 +++
 config/rules.mk                               |  3 ---
 configure.in                                  |  2 +-
 dom/plugins/test/testplugin/Makefile.in       |  1 -
 js/src/config/config.mk                       |  3 +++
 js/src/config/rules.mk                        |  3 ---
 toolkit/crashreporter/client/Makefile.in      |  1 -
 .../src/tools/linux/dump_syms/Makefile.in     |  4 ---
 toolkit/crashreporter/test/Makefile.in        |  1 -
 toolkit/library/Makefile.in                   |  1 -
 xpcom/tests/Makefile.in                       |  5 ----
 17 files changed, 48 insertions(+), 22 deletions(-)
 create mode 100644 build/unix/stdc++compat/Makefile.in
 rename build/{ => unix/stdc++compat}/stdc++compat.cpp (100%)

diff --git a/allmakefiles.sh b/allmakefiles.sh
index 5ea54b0054c..09161e50a0c 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -89,6 +89,11 @@ if [ "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2" ]; then
   add_makefiles "
     build/unix/Makefile
   "
+  if [ "$STDCXX_COMPAT" ]; then
+    add_makefiles "
+      build/unix/stdc++compat/Makefile
+    "
+  fi
   if [ "$USE_ELF_HACK" ]; then
     add_makefiles "
       build/unix/elfhack/Makefile
diff --git a/build/unix/Makefile.in b/build/unix/Makefile.in
index 5c2dd565a9e..de8c96c30d5 100644
--- a/build/unix/Makefile.in
+++ b/build/unix/Makefile.in
@@ -47,8 +47,12 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE       = build
 
+ifdef STDCXX_COMPAT
+DIRS += stdc++compat
+endif
+
 ifdef USE_ELF_HACK
-DIRS = elfhack
+DIRS += elfhack
 endif
 
 TEST_DIRS = test
diff --git a/build/unix/elfhack/Makefile.in b/build/unix/elfhack/Makefile.in
index 331b41b912b..894928dc00f 100644
--- a/build/unix/elfhack/Makefile.in
+++ b/build/unix/elfhack/Makefile.in
@@ -54,7 +54,6 @@ VPATH += $(topsrcdir)/build
 HOST_CPPSRCS = \
   elf.cpp \
   elfhack.cpp \
-  $(STDCXX_COMPAT) \
   $(NULL)
 
 OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
diff --git a/build/unix/stdc++compat/Makefile.in b/build/unix/stdc++compat/Makefile.in
new file mode 100644
index 00000000000..c06e9451ad1
--- /dev/null
+++ b/build/unix/stdc++compat/Makefile.in
@@ -0,0 +1,27 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= build
+LIBRARY_NAME	= stdc++compat
+HOST_LIBRARY_NAME = host_stdc++compat
+FORCE_STATIC_LIB= 1
+STL_FLAGS =
+NO_EXPAND_LIBS = 1
+
+CPPSRCS = \
+  stdc++compat.cpp
+  $(NULL)
+
+HOST_CPPSRCS = $(CPPSRCS)
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS += -DMOZ_LIBSTDCXX_VERSION=$(MOZ_LIBSTDCXX_TARGET_VERSION)
diff --git a/build/stdc++compat.cpp b/build/unix/stdc++compat/stdc++compat.cpp
similarity index 100%
rename from build/stdc++compat.cpp
rename to build/unix/stdc++compat/stdc++compat.cpp
diff --git a/config/Makefile.in b/config/Makefile.in
index b51808d4ba3..262c0b4592e 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -49,6 +49,10 @@ include $(DEPTH)/config/autoconf.mk
 # headers, so that we can use it to set up the wrapped system headers.
 VISIBILITY_FLAGS =
 
+# STDCXX_COMPAT is not needed here, and will actually fail because
+# libstdc++-compat is not built yet.
+STDCXX_COMPAT =
+
 HOST_PROGRAM	= nsinstall$(HOST_BIN_SUFFIX)
 
 ifeq (WINNT,$(HOST_OS_ARCH))
diff --git a/config/config.mk b/config/config.mk
index 9ad21697a37..2d799f41eb2 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -789,6 +789,9 @@ ifdef STDCXX_COMPAT
 ifneq ($(OS_ARCH),Darwin)
 CHECK_STDCXX = objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo "TEST-UNEXPECTED-FAIL | | We don't want these libstdc++ symbols to be used:" && objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || exit 0
 endif
+
+EXTRA_LIBS += $(call EXPAND_LIBNAME_PATH,stdc++compat,$(DEPTH)/build/unix/stdc++compat)
+HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME_PATH,host_stdc++compat,$(DEPTH)/build/unix/stdc++compat)
 endif
 
 # autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including
diff --git a/config/rules.mk b/config/rules.mk
index c52223500a7..9fab64014b6 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -826,9 +826,6 @@ endif # NO_PROFILE_GUIDED_OPTIMIZE
 
 ##############################################
 
-stdc++compat.$(OBJ_SUFFIX): CXXFLAGS+=-DMOZ_LIBSTDCXX_VERSION=$(MOZ_LIBSTDCXX_TARGET_VERSION)
-host_stdc++compat.$(OBJ_SUFFIX): CXXFLAGS+=-DMOZ_LIBSTDCXX_VERSION=$(MOZ_LIBSTDCXX_HOST_VERSION)
-
 checkout:
 	$(MAKE) -C $(topsrcdir) -f client.mk checkout
 
diff --git a/configure.in b/configure.in
index f82bff0ca14..f2729c10868 100644
--- a/configure.in
+++ b/configure.in
@@ -7519,7 +7519,7 @@ dnl ========================================================
 STDCXX_COMPAT=
 MOZ_ARG_ENABLE_BOOL(stdcxx-compat,
 [  --enable-stdcxx-compat  Enable compatibility with older libstdc++],
-    STDCXX_COMPAT=stdc++compat.cpp)
+    STDCXX_COMPAT=1)
 
 AC_SUBST(STDCXX_COMPAT)
 
diff --git a/dom/plugins/test/testplugin/Makefile.in b/dom/plugins/test/testplugin/Makefile.in
index 4c2c6b77ef6..f2bb7ec6e8f 100644
--- a/dom/plugins/test/testplugin/Makefile.in
+++ b/dom/plugins/test/testplugin/Makefile.in
@@ -62,7 +62,6 @@ VPATH += $(topsrcdir)/build
 CPPSRCS   =  \
   nptest.cpp \
   nptest_utils.cpp \
-  $(STDCXX_COMPAT) \
   $(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 9ad21697a37..2d799f41eb2 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -789,6 +789,9 @@ ifdef STDCXX_COMPAT
 ifneq ($(OS_ARCH),Darwin)
 CHECK_STDCXX = objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo "TEST-UNEXPECTED-FAIL | | We don't want these libstdc++ symbols to be used:" && objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || exit 0
 endif
+
+EXTRA_LIBS += $(call EXPAND_LIBNAME_PATH,stdc++compat,$(DEPTH)/build/unix/stdc++compat)
+HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME_PATH,host_stdc++compat,$(DEPTH)/build/unix/stdc++compat)
 endif
 
 # autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index c52223500a7..9fab64014b6 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -826,9 +826,6 @@ endif # NO_PROFILE_GUIDED_OPTIMIZE
 
 ##############################################
 
-stdc++compat.$(OBJ_SUFFIX): CXXFLAGS+=-DMOZ_LIBSTDCXX_VERSION=$(MOZ_LIBSTDCXX_TARGET_VERSION)
-host_stdc++compat.$(OBJ_SUFFIX): CXXFLAGS+=-DMOZ_LIBSTDCXX_VERSION=$(MOZ_LIBSTDCXX_HOST_VERSION)
-
 checkout:
 	$(MAKE) -C $(topsrcdir) -f client.mk checkout
 
diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in
index 1038b638185..ce3c51ead16 100644
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -66,7 +66,6 @@ VPATH += $(topsrcdir)/build/
 
 CPPSRCS = \
   crashreporter.cpp \
-  $(STDCXX_COMPAT) \
   $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
index fed5791ab6a..791c7266d81 100644
--- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
@@ -61,8 +61,4 @@ HOST_LIBS += \
 # force C++ linking
 CPP_PROG_LINK = 1
 
-#XXX: bug 554854 causes us to be unable to run binaries on the build slaves
-# due to them having an older libstdc++
-HOST_LDFLAGS += -static
-
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
index 12553cd3b32..0002d815743 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -64,7 +64,6 @@ CPPSRCS = \
   logging.cc \
   minidump.cc \
   pathname_stripper.cc \
-  $(STDCXX_COMPAT) \
   $(NULL)
 
 LOCAL_INCLUDES += \
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 25ab5e43daa..b1e62b62527 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -28,7 +28,6 @@ MAKE_FRAMEWORK=1
 endif
 
 VPATH += $(topsrcdir)/build/
-CPPSRCS += $(STDCXX_COMPAT)
 
 ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
 CPPSRCS += dlldeps-xul.cpp
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index 6d30b0b45a9..7324464433f 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -205,8 +205,3 @@ check::
 	  $(DIST)/bin/TestRegistrationOrder$(BIN_SUFFIX) $(regOrderDir)
 
 GARBAGE += TestScriptable.h
-
-ifdef STDCXX_COMPAT
-TestCheckedInt: $(STDCXX_COMPAT:.cpp=.$(OBJ_SUFFIX))
-TestCheckedInt: LIBS += $(STDCXX_COMPAT:.cpp=.$(OBJ_SUFFIX))
-endif

From 9c4c9b3aa7c6dd37dc95442e2b6d6d0dab092451 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Mon, 30 Apr 2012 08:04:31 +0200
Subject: [PATCH 025/162] Bug 749548 - Only reference IE and Safari migrators
 in components manifest when they are installed. r=mak

---
 .../components/migration/src/BrowserProfileMigrators.manifest | 4 ++++
 browser/components/migration/src/Makefile.in                  | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
index 527771f5624..d7fec75e351 100644
--- a/browser/components/migration/src/BrowserProfileMigrators.manifest
+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
@@ -4,7 +4,11 @@ component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
 contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
 component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
 contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
+#ifdef HAS_IE_MIGRATOR
 component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
 contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
+#endif
+#ifdef HAS_SAFARI_MIGRATOR
 component {4b609ecf-60b2-4655-9df4-dc149e474da1} SafariProfileMigrator.js
 contract @mozilla.org/profile/migrator;1?app=browser&type=safari {4b609ecf-60b2-4655-9df4-dc149e474da1}
+#endif
diff --git a/browser/components/migration/src/Makefile.in b/browser/components/migration/src/Makefile.in
index 758a04f24ce..c6fc2dccd30 100644
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -60,14 +60,16 @@ CPPSRCS += nsIEHistoryEnumerator.cpp
 EXTRA_PP_COMPONENTS += IEProfileMigrator.js \
                        SafariProfileMigrator.js \
                        $(NULL)
+DEFINES += -DHAS_IE_MIGRATOR -DHAS_SAFARI_MIGRATOR
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \
                        $(NULL)
+DEFINES += -DHAS_SAFARI_MIGRATOR
 endif
 
-EXTRA_COMPONENTS = \
+EXTRA_PP_COMPONENTS += \
 	BrowserProfileMigrators.manifest \
 	$(NULL)
 

From 500b0b426bb62e09ab160355c7dd892f5a6fc57d Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Mon, 30 Apr 2012 08:05:05 +0200
Subject: [PATCH 026/162] Bug 749550 - Import dbg-client.jsm from
 resource://gre/ instead of resource:///. r=past

---
 toolkit/devtools/debugger/server/dbg-server.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/devtools/debugger/server/dbg-server.jsm b/toolkit/devtools/debugger/server/dbg-server.jsm
index c573ab2f5b0..c866ae69c4c 100644
--- a/toolkit/devtools/debugger/server/dbg-server.jsm
+++ b/toolkit/devtools/debugger/server/dbg-server.jsm
@@ -63,7 +63,7 @@ function loadSubScript(aURL)
   }
 }
 
-Cu.import("resource:///modules/devtools/dbg-client.jsm");
+Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
 
 // Load the debugging server in a sandbox with its own compartment.
 var systemPrincipal = Cc["@mozilla.org/systemprincipal;1"]

From 3bc3358968673fde8615de596d10601c7251cb8b Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Mon, 30 Apr 2012 08:05:34 +0200
Subject: [PATCH 027/162] Bug 749573 - Declare run-mozilla.sh and xpcshell as
 SDK_BINARY. r=ted

---
 build/unix/Makefile.in         | 2 ++
 js/xpconnect/shell/Makefile.in | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/unix/Makefile.in b/build/unix/Makefile.in
index de8c96c30d5..4cfad5dea1b 100644
--- a/build/unix/Makefile.in
+++ b/build/unix/Makefile.in
@@ -57,6 +57,8 @@ endif
 
 TEST_DIRS = test
 
+SDK_BINARY = run-mozilla.sh
+
 include $(topsrcdir)/config/rules.mk
 
 libs:: $(srcdir)/run-mozilla.sh
diff --git a/js/xpconnect/shell/Makefile.in b/js/xpconnect/shell/Makefile.in
index 24419e06faa..ff64c96347e 100644
--- a/js/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcshell
 PROGRAM		= xpcshell$(BIN_SUFFIX)
-
+SDK_BINARY	= $(PROGRAM)
 
 CPPSRCS		= xpcshell.cpp
 

From 0665e5b65cd6cf96a48352d8b29a8c2a0c211c5e Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Fri, 27 Apr 2012 13:52:21 -0400
Subject: [PATCH 028/162] Bug 748498 - Don't set tab URL on document start.
 r=mfinkle

---
 mobile/android/base/GeckoApp.java | 3 +--
 mobile/android/base/Tab.java      | 8 ++------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 2586a9ca203..851654ba4b5 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -1203,8 +1203,7 @@ abstract public class GeckoApp
         if (tab == null)
             return;
 
-        tab.updateURL(uri);
-        tab.setState(Tab.STATE_LOADING);
+        tab.setState("about:home".equals(uri) ? Tab.STATE_SUCCESS : Tab.STATE_LOADING);
         tab.updateSecurityMode("unknown");
         if (Tabs.getInstance().isSelectedTab(tab))
             getLayerController().getView().getRenderer().resetCheckerboard();
diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java
index 7a6ef89d38a..58bd868f6c2 100644
--- a/mobile/android/base/Tab.java
+++ b/mobile/android/base/Tab.java
@@ -130,7 +130,7 @@ public final class Tab {
         mContentType = "";
         mPluginViews = new ArrayList<View>();
         mPluginLayers = new HashMap<Object, Layer>();
-        setState(STATE_LOADING);
+        mState = "about:home".equals(url) ? STATE_SUCCESS : STATE_LOADING;
         mContentResolver = Tabs.getInstance().getContentResolver();
         mContentObserver = new ContentObserver(GeckoAppShell.getHandler()) {
             public void onChange(boolean selfChange) {
@@ -329,11 +329,7 @@ public final class Tab {
     }
 
     public void setState(int state) {
-        // Pages implemented in Java are not bound by Gecko state
-        if ("about:home".equals(mUrl))
-            mState = STATE_SUCCESS;
-        else
-            mState = state;
+        mState = state;
     }
 
     public int getState() {

From 3ac2653faf557232a7810fe574cba87d9fabaed9 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 30 Apr 2012 15:15:49 +1200
Subject: [PATCH 029/162] Bug 707577, Create a |fast-package| target on mobile,
 r=khuey

---
 mobile/xul/build.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mobile/xul/build.mk b/mobile/xul/build.mk
index 7d4db2d73b7..e2414878f47 100644
--- a/mobile/xul/build.mk
+++ b/mobile/xul/build.mk
@@ -70,6 +70,9 @@ installer:
 package:
 	@$(MAKE) -C mobile/xul/installer
 
+fast-package:
+	@MOZ_FAST_PACKAGE=1 $(MAKE) package
+
 install::
 	@echo "Mobile can't be installed directly."
 	@exit 1

From 2ddbd51d6411748dbac55e10e3de5a5ccc376762 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 30 Apr 2012 15:17:40 +1200
Subject: [PATCH 030/162] Bug 707578, Package.pm shouldn't copy older files,
 r=khuey,rstrong

---
 toolkit/mozapps/installer/Packager.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/toolkit/mozapps/installer/Packager.pm b/toolkit/mozapps/installer/Packager.pm
index cdf2a170cc6..500790962b7 100644
--- a/toolkit/mozapps/installer/Packager.pm
+++ b/toolkit/mozapps/installer/Packager.pm
@@ -323,6 +323,15 @@ sub do_copyfile
         print " copy\t$srcpath$srcname$srcsuffix =>\n\t\t$destpath$destname$destsuffix\n";
       }
     }
+
+    if (stat("$destpath$destname$destsuffix") &&
+        stat("$srcpath$srcname$srcsuffix")->mtime < stat("$destpath$destname$destsuffix")->mtime) {
+      if ( $debug >= 3 ) {
+        print "source file older than destination, do not copy\n";
+      }
+      return;
+    }
+
     unlink("$destpath$destname$destsuffix") if ( -e "$destpath$destname$destsuffix");
     # If source is a symbolic link pointing in the same directory, create a
     # symbolic link

From 77b7b2e6dc2e13d3795df6f5792db851ba9f9e24 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 30 Apr 2012 15:18:58 +1200
Subject: [PATCH 031/162] Bug 707579, xpt.py shouldn't try to generate
 destination file if inputs are all older, r=khuey

---
 xpcom/typelib/xpt/tools/xpt.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/xpcom/typelib/xpt/tools/xpt.py b/xpcom/typelib/xpt/tools/xpt.py
index f751782a6c1..3dce370283d 100644
--- a/xpcom/typelib/xpt/tools/xpt.py
+++ b/xpcom/typelib/xpt/tools/xpt.py
@@ -1321,12 +1321,25 @@ def xpt_dump(file):
 def xpt_link(dest, inputs):
     """
     Link all of the xpt files in |inputs| together and write the
-    result ot |dest|.
+    result to |dest|.
 
     """
+
     if not inputs:
         print >>sys.stderr, "Usage: xpt_link <destination file> <input files>"
         return
+
+    # Don't re-create dest if newer than the input files.
+    if os.path.exists(dest):
+      maxInputChange = 0;
+      for f in inputs:
+        s = os.stat(f).st_mtime
+        if s > maxInputChange:
+          maxInputChange = s
+      if maxInputChange < os.stat(dest).st_mtime:
+        print dest, " is already up-to-date."
+        return
+
     t1 = Typelib.read(inputs[0])
     for f in inputs[1:]:
         t2 = Typelib.read(f)

From 0856be0bd9d18b5c577ec75445800974b297f884 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 30 Apr 2012 15:19:58 +1200
Subject: [PATCH 032/162] Bug 707580, Do not remove some directories generated
 by |make package| when re-called, r=khuey

---
 toolkit/mozapps/installer/packager.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 4c63f18e8b0..1d91df4d6a5 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -778,16 +778,23 @@ ifdef USE_ELF_HACK
 endif
 
 stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
-	@rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
+	@rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
+ifndef MOZ_FAST_PACKAGE
+	@rm -rf $(DIST)/$(MOZ_PKG_DIR)
+endif
 # NOTE: this must be a tar now that dist links into the tree so that we
 # do not strip the binaries actually in the tree.
 	@echo "Creating package directory..."
-	@mkdir $(DIST)/$(MOZ_PKG_DIR)
+	if ! test -d $(DIST)/$(MOZ_PKG_DIR) ; then \
+		mkdir $(DIST)/$(MOZ_PKG_DIR); \
+	fi
 ifndef UNIVERSAL_BINARY
 # If UNIVERSAL_BINARY, the package will be made from an already-prepared
 # STAGEPATH
 ifdef MOZ_PKG_MANIFEST
+ifndef MOZ_FAST_PACKAGE
 	$(RM) -rf $(DIST)/xpt $(DIST)/manifests
+endif
 	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
 	  "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
 	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)

From e465719053132c32015f24e0ed2062f1c22b6a7c Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Mon, 30 Apr 2012 10:17:56 +0200
Subject: [PATCH 033/162] Fixup for bug 748739 for Linux PGO breakage.
 rs=edmorley

---
 build/unix/stdc++compat/Makefile.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/unix/stdc++compat/Makefile.in b/build/unix/stdc++compat/Makefile.in
index c06e9451ad1..9d9620abc9d 100644
--- a/build/unix/stdc++compat/Makefile.in
+++ b/build/unix/stdc++compat/Makefile.in
@@ -15,6 +15,7 @@ HOST_LIBRARY_NAME = host_stdc++compat
 FORCE_STATIC_LIB= 1
 STL_FLAGS =
 NO_EXPAND_LIBS = 1
+NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 CPPSRCS = \
   stdc++compat.cpp

From 7757151592f2b4fffc8e8dcd25fb487905cfd3c9 Mon Sep 17 00:00:00 2001
From: Andrzej Skalski <askalski@mozilla.com>
Date: Thu, 26 Apr 2012 20:25:33 +0200
Subject: [PATCH 034/162] Bug 716644 - expandoify accessible roles, r=tbsaunde

---
 accessible/public/nsIAccessibleRole.idl       |  11 +-
 accessible/src/atk/nsAccessibleWrap.cpp       |  39 +-
 accessible/src/atk/nsAccessibleWrap.h         |   5 +
 accessible/src/atk/nsMaiInterfaceText.cpp     |   5 +-
 accessible/src/atk/nsRoleMap.h                | 179 ----
 accessible/src/base/Role.h                    |  16 +-
 accessible/src/base/RoleMap.h                 | 920 ++++++++++++++++++
 .../src/base/nsAccessibilityService.cpp       |  14 +-
 accessible/src/base/nsAccessibilityService.h  | 136 ---
 accessible/src/mac/Makefile.in                |   1 -
 accessible/src/mac/mozAccessible.mm           |  19 +-
 accessible/src/mac/nsAccessibleWrap.h         |   2 +-
 accessible/src/mac/nsAccessibleWrap.mm        |   2 -
 accessible/src/mac/nsRoleMap.h                | 175 ----
 accessible/src/msaa/nsAccessibleWrap.cpp      |  59 +-
 accessible/src/msaa/nsRoleMap.h               | 467 ---------
 accessible/src/msaa/nsRootAccessibleWrap.cpp  |   2 +-
 17 files changed, 1034 insertions(+), 1018 deletions(-)
 delete mode 100644 accessible/src/atk/nsRoleMap.h
 create mode 100644 accessible/src/base/RoleMap.h
 delete mode 100644 accessible/src/mac/nsRoleMap.h
 delete mode 100644 accessible/src/msaa/nsRoleMap.h

diff --git a/accessible/public/nsIAccessibleRole.idl b/accessible/public/nsIAccessibleRole.idl
index e7282d9ee49..51592497740 100644
--- a/accessible/public/nsIAccessibleRole.idl
+++ b/accessible/public/nsIAccessibleRole.idl
@@ -40,11 +40,8 @@
 
 /**
  * Defines cross platform (Gecko) roles.
- *
- * @note - When adding a new role, be sure to also add it to nsRoleMap.h for
- *         each platform.
  */
-[scriptable, uuid(f134da65-39a8-4330-843c-5bd42780b34c)]
+[scriptable, uuid(50db5e86-9a45-4637-a5c3-4ff148c33270)]
 interface nsIAccessibleRole : nsISupports
 {
   /**
@@ -811,11 +808,5 @@ interface nsIAccessibleRole : nsISupports
    * An HTML definition <dd>
    */
   const unsigned long ROLE_DEFINITION = 128;
-
-  /**
-   * It's not role actually. This constant is important to help ensure
-   * nsRoleMap's are synchronized.
-   */
-  const unsigned long ROLE_LAST_ENTRY = 129;
 };
 
diff --git a/accessible/src/atk/nsAccessibleWrap.cpp b/accessible/src/atk/nsAccessibleWrap.cpp
index 81c03635635..b968b4b2543 100644
--- a/accessible/src/atk/nsAccessibleWrap.cpp
+++ b/accessible/src/atk/nsAccessibleWrap.cpp
@@ -53,7 +53,6 @@
 #include "nsString.h"
 #include "nsAutoPtr.h"
 #include "prprf.h"
-#include "nsRoleMap.h"
 #include "nsStateMap.h"
 #include "Relation.h"
 #include "States.h"
@@ -722,24 +721,20 @@ getDescriptionCB(AtkObject *aAtkObj)
 AtkRole
 getRoleCB(AtkObject *aAtkObj)
 {
-    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
-    if (!accWrap) {
-        return ATK_ROLE_INVALID;
-    }
+  nsAccessibleWrap* accWrap = GetAccessibleWrap(aAtkObj);
+  if (!accWrap)
+    return ATK_ROLE_INVALID;
 
 #ifdef DEBUG_A11Y
-    NS_ASSERTION(nsAccUtils::IsTextInterfaceSupportCorrect(accWrap),
-                 "Does not support nsIAccessibleText when it should");
+  NS_ASSERTION(nsAccUtils::IsTextInterfaceSupportCorrect(accWrap),
+      "Does not support nsIAccessibleText when it should");
 #endif
 
-    if (aAtkObj->role == ATK_ROLE_INVALID) {
-        // map to the actual value
-        PRUint32 atkRole = atkRoleMap[accWrap->Role()];
-        NS_ASSERTION(atkRoleMap[nsIAccessibleRole::ROLE_LAST_ENTRY] ==
-                     kROLE_ATK_LAST_ENTRY, "ATK role map skewed");
-        aAtkObj->role = static_cast<AtkRole>(atkRole);
-    }
+  if (aAtkObj->role != ATK_ROLE_INVALID)
     return aAtkObj->role;
+
+  return aAtkObj->role =
+    static_cast<AtkRole>(nsAccessibleWrap::AtkRoleFor(accWrap->Role()));
 }
 
 AtkAttributeSet*
@@ -1400,3 +1395,19 @@ nsAccessibleWrap::FireAtkShowHideEvent(AccEvent* aEvent,
     return NS_OK;
 }
 
+PRUint32
+nsAccessibleWrap::AtkRoleFor(role aRole)
+{
+#define ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role) \
+  case roles::geckoRole: \
+    return atkRole;
+
+  switch (aRole) {
+#include "RoleMap.h"
+    default:
+      MOZ_NOT_REACHED("Unknown role.");
+      return ATK_ROLE_UNKNOWN;
+  }
+
+#undef ROLE
+}
diff --git a/accessible/src/atk/nsAccessibleWrap.h b/accessible/src/atk/nsAccessibleWrap.h
index 6e4e200eb73..6b65cdcbcc2 100644
--- a/accessible/src/atk/nsAccessibleWrap.h
+++ b/accessible/src/atk/nsAccessibleWrap.h
@@ -116,6 +116,11 @@ public:
       return returnedString.get();
     }
 
+  /**
+   * Function mapping from cross platform roles to ATK roles.
+   */
+  inline static PRUint32 AtkRoleFor(mozilla::a11y::role aRole);
+
 protected:
     virtual nsresult FirePlatformEvent(AccEvent* aEvent);
 
diff --git a/accessible/src/atk/nsMaiInterfaceText.cpp b/accessible/src/atk/nsMaiInterfaceText.cpp
index 7ccb1e837d3..fb44a9f4d6d 100644
--- a/accessible/src/atk/nsMaiInterfaceText.cpp
+++ b/accessible/src/atk/nsMaiInterfaceText.cpp
@@ -42,7 +42,6 @@
 
 #include "nsHyperTextAccessible.h"
 #include "nsMai.h"
-#include "nsRoleMap.h"
 
 #include "nsIPersistentProperties2.h"
 
@@ -52,7 +51,7 @@ static void
 ConvertTexttoAsterisks(nsAccessibleWrap* accWrap, nsAString& aString)
 {
     // convert each char to "*" when it's "password text" 
-    PRUint32 atkRole = atkRoleMap[accWrap->NativeRole()];
+    PRUint32 atkRole = nsAccessibleWrap::AtkRoleFor(accWrap->NativeRole());
     if (atkRole == ATK_ROLE_PASSWORD_TEXT) {
         for (PRUint32 i = 0; i < aString.Length(); i++)
             aString.Replace(i, 1, NS_LITERAL_STRING("*"));
@@ -161,7 +160,7 @@ getCharacterAtOffsetCB(AtkText *aText, gint aOffset)
         accText->GetCharacterAtOffset(aOffset, &uniChar);
 
     // convert char to "*" when it's "password text" 
-    PRUint32 atkRole = atkRoleMap[accWrap->NativeRole()];
+    PRUint32 atkRole = nsAccessibleWrap::AtkRoleFor(accWrap->NativeRole());
     if (atkRole == ATK_ROLE_PASSWORD_TEXT)
         uniChar = '*';
 
diff --git a/accessible/src/atk/nsRoleMap.h b/accessible/src/atk/nsRoleMap.h
deleted file mode 100644
index 0ba389aee3d..00000000000
--- a/accessible/src/atk/nsRoleMap.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is IBM Corporation
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Gao, Ming (gaoming@cn.ibm.com)
- *   Aaron Leventhal (aleventh@us.ibm.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <atk/atk.h>
-#include "nsAccessibleWrap.h"
-
-const PRUint32 kROLE_ATK_LAST_ENTRY = 0xffffffff;
-
-// Map array from cross platform roles to  ATK roles
-static const PRUint32 atkRoleMap[] = {
-                                  // Cross Platform Roles       #
-    ATK_ROLE_UNKNOWN,             // roles::NOTHING              0
-    ATK_ROLE_UNKNOWN,             // roles::TITLEBAR             1
-    ATK_ROLE_MENU_BAR,            // roles::MENUBAR              2
-    ATK_ROLE_SCROLL_BAR,          // roles::SCROLLBAR            3
-    ATK_ROLE_UNKNOWN,             // roles::GRIP                 4
-    ATK_ROLE_UNKNOWN,             // roles::SOUND                5
-    ATK_ROLE_UNKNOWN,             // roles::CURSOR               6
-    ATK_ROLE_UNKNOWN,             // roles::CARET                7
-    ATK_ROLE_ALERT,               // roles::ALERT                8
-    ATK_ROLE_WINDOW,              // roles::WINDOW               9
-    ATK_ROLE_INTERNAL_FRAME,      // roles::INTERNAL_FRAME       10
-    ATK_ROLE_MENU,                // roles::MENUPOPUP            11
-    ATK_ROLE_MENU_ITEM,           // roles::MENUITEM             12
-    ATK_ROLE_TOOL_TIP,            // roles::TOOLTIP              13
-    ATK_ROLE_EMBEDDED,            // roles::APPLICATION          14
-    ATK_ROLE_DOCUMENT_FRAME,      // roles::DOCUMENT             15
-    ATK_ROLE_PANEL,               // roles::PANE                 16
-    ATK_ROLE_CHART,               // roles::CHART                17
-    ATK_ROLE_DIALOG,              // roles::DIALOG               18
-    ATK_ROLE_UNKNOWN,             // roles::BORDER               19
-    ATK_ROLE_PANEL,               // roles::GROUPING             20
-    ATK_ROLE_SEPARATOR,           // roles::SEPARATOR            21
-    ATK_ROLE_TOOL_BAR,            // roles::TOOLBAR              22
-    ATK_ROLE_STATUSBAR,           // roles::STATUSBAR            23
-    ATK_ROLE_TABLE,               // roles::TABLE                24
-    ATK_ROLE_COLUMN_HEADER,       // roles::COLUMNHEADER         25
-    ATK_ROLE_ROW_HEADER,          // roles::ROWHEADER            26
-    ATK_ROLE_UNKNOWN,             // roles::COLUMN               27
-    ATK_ROLE_LIST_ITEM,           // roles::ROW                  28
-    ATK_ROLE_TABLE_CELL,          // roles::CELL                 29
-    ATK_ROLE_LINK,                // roles::LINK                 30
-    ATK_ROLE_UNKNOWN,             // roles::HELPBALLOON          31
-    ATK_ROLE_IMAGE,               // roles::CHARACTER            32
-    ATK_ROLE_LIST,                // roles::LIST                 33
-    ATK_ROLE_LIST_ITEM,           // roles::LISTITEM             34
-    ATK_ROLE_TREE,                // roles::OUTLINE              35
-    ATK_ROLE_LIST_ITEM,           // roles::OUTLINEITEM          36
-    ATK_ROLE_PAGE_TAB,            // roles::PAGETAB              37
-    ATK_ROLE_SCROLL_PANE,         // roles::PROPERTYPAGE         38
-    ATK_ROLE_UNKNOWN,             // roles::INDICATOR            39
-    ATK_ROLE_IMAGE,               // roles::GRAPHIC              40
-    ATK_ROLE_UNKNOWN,             // roles::STATICTEXT           41
-    ATK_ROLE_UNKNOWN,             // roles::TEXT_LEAF            42
-    ATK_ROLE_PUSH_BUTTON,         // roles::PUSHBUTTON           43
-    ATK_ROLE_CHECK_BOX,           // roles::CHECKBUTTON          44
-    ATK_ROLE_RADIO_BUTTON,        // roles::RADIOBUTTON          45
-    ATK_ROLE_COMBO_BOX,           // roles::COMBOBOX             46
-    ATK_ROLE_COMBO_BOX,           // roles::DROPLIST             47
-    ATK_ROLE_PROGRESS_BAR,        // roles::PROGRESSBAR          48
-    ATK_ROLE_DIAL,                // roles::DIAL                 49
-    ATK_ROLE_UNKNOWN,             // roles::HOTKEYFIELD          50
-    ATK_ROLE_SLIDER,              // roles::SLIDER               51
-    ATK_ROLE_SPIN_BUTTON,         // roles::SPINBUTTON           52
-    ATK_ROLE_IMAGE,               // roles::DIAGRAM              53
-    ATK_ROLE_ANIMATION,           // roles::ANIMATION            54
-    ATK_ROLE_UNKNOWN,             // roles::EQUATION             55
-    ATK_ROLE_PUSH_BUTTON,         // roles::BUTTONDROPDOWN       56
-    ATK_ROLE_PUSH_BUTTON,         // roles::BUTTONMENU           57
-    ATK_ROLE_UNKNOWN,             // roles::BUTTONDROPDOWNGRID   58
-    ATK_ROLE_UNKNOWN,             // roles::WHITESPACE           59
-    ATK_ROLE_PAGE_TAB_LIST,       // roles::PAGETABLIST          60
-    ATK_ROLE_UNKNOWN,             // roles::CLOCK                61
-    ATK_ROLE_PUSH_BUTTON,         // roles::SPLITBUTTON          62
-    ATK_ROLE_UNKNOWN,             // roles::IPADDRESS            63
-    ATK_ROLE_ACCEL_LABEL,         // roles::ACCEL_LABEL          64
-    ATK_ROLE_ARROW,               // roles::ARROW                65
-    ATK_ROLE_CANVAS,              // roles::CANVAS               66
-    ATK_ROLE_CHECK_MENU_ITEM,     // roles::CHECK_MENU_ITEM      67
-    ATK_ROLE_COLOR_CHOOSER,       // roles::COLOR_CHOOSER        68
-    ATK_ROLE_DATE_EDITOR,         // roles::DATE_EDITOR          69
-    ATK_ROLE_DESKTOP_ICON,        // roles::DESKTOP_ICON         70
-    ATK_ROLE_DESKTOP_FRAME,       // roles::DESKTOP_FRAME        71
-    ATK_ROLE_DIRECTORY_PANE,      // roles::DIRECTORY_PANE       72
-    ATK_ROLE_FILE_CHOOSER,        // roles::FILE_CHOOSER         73
-    ATK_ROLE_FONT_CHOOSER,        // roles::FONT_CHOOSER         74
-    ATK_ROLE_FRAME,               // roles::CHROME_WINDOW        75
-    ATK_ROLE_GLASS_PANE,          // roles::GLASS_PANE           76
-    ATK_ROLE_HTML_CONTAINER,      // roles::HTML_CONTAINER       77
-    ATK_ROLE_ICON,                // roles::ICON                 78
-    ATK_ROLE_LABEL,               // roles::LABEL                79
-    ATK_ROLE_LAYERED_PANE,        // roles::LAYERED_PANE         80
-    ATK_ROLE_OPTION_PANE,         // roles::OPTION_PANE          81
-    ATK_ROLE_PASSWORD_TEXT,       // roles::PASSWORD_TEXT        82
-    ATK_ROLE_POPUP_MENU,          // roles::POPUP_MENU           83
-    ATK_ROLE_RADIO_MENU_ITEM,     // roles::RADIO_MENU_ITEM      84
-    ATK_ROLE_ROOT_PANE,           // roles::ROOT_PANE            85
-    ATK_ROLE_SCROLL_PANE,         // roles::SCROLL_PANE          86
-    ATK_ROLE_SPLIT_PANE,          // roles::SPLIT_PANE           87
-    ATK_ROLE_TABLE_COLUMN_HEADER, // roles::TABLE_COLUMN_HEADER  88
-    ATK_ROLE_TABLE_ROW_HEADER,    // roles::TABLE_ROW_HEADER     89
-    ATK_ROLE_TEAR_OFF_MENU_ITEM,  // roles::TEAR_OFF_MENU_ITEM   90
-    ATK_ROLE_TERMINAL,            // roles::TERMINAL             91
-    ATK_ROLE_TEXT,                // roles::TEXT_CONTAINER       92
-    ATK_ROLE_TOGGLE_BUTTON,       // roles::TOGGLE_BUTTON        93
-    ATK_ROLE_TREE_TABLE,          // roles::TREE_TABLE           94
-    ATK_ROLE_VIEWPORT,            // roles::VIEWPORT             95
-    ATK_ROLE_HEADER,              // roles::HEADER               96
-    ATK_ROLE_FOOTER,              // roles::FOOTER               97
-    ATK_ROLE_PARAGRAPH,           // roles::PARAGRAPH            98
-    ATK_ROLE_RULER,               // roles::RULER                99
-    ATK_ROLE_AUTOCOMPLETE,        // roles::AUTOCOMPLETE         100
-    ATK_ROLE_EDITBAR,             // roles::EDITBAR              101
-    ATK_ROLE_ENTRY,               // roles::ENTRY                102
-    ATK_ROLE_CAPTION,             // roles::CAPTION              103
-    ATK_ROLE_DOCUMENT_FRAME,      // roles::DOCUMENT_FRAME       104
-    ATK_ROLE_HEADING,             // roles::HEADING              105
-    ATK_ROLE_PAGE,                // roles::PAGE                 106
-    ATK_ROLE_SECTION,             // roles::SECTION              107
-    ATK_ROLE_REDUNDANT_OBJECT,    // roles::REDUNDANT_OBJECT     108
-    ATK_ROLE_FORM,                // roles::FORM                 109
-    ATK_ROLE_INPUT_METHOD_WINDOW, // roles::IME                  110
-    ATK_ROLE_APPLICATION,         // roles::APP_ROOT             111
-    ATK_ROLE_MENU,                // roles::PARENT_MENUITEM      112
-    ATK_ROLE_CALENDAR,            // roles::CALENDAR             113
-    ATK_ROLE_MENU,                // roles::COMBOBOX_LIST        114
-    ATK_ROLE_MENU_ITEM,           // roles::COMBOBOX_OPTION      115
-    ATK_ROLE_IMAGE,               // roles::IMAGE_MAP            116
-    ATK_ROLE_LIST_ITEM,           // roles::OPTION               117
-    ATK_ROLE_LIST_ITEM,           // roles::RICH_OPTION          118
-    ATK_ROLE_LIST,                // roles::LISTBOX              119
-    ATK_ROLE_UNKNOWN,             // roles::FLAT_EQUATION        120
-    ATK_ROLE_TABLE_CELL,          // roles::GRID_CELL            121
-    ATK_ROLE_PANEL,               // roles::EMBEDDED_OBJECT      122
-    ATK_ROLE_SECTION,             // roles::NOTE                 123
-    ATK_ROLE_PANEL,               // roles::FIGURE               124
-    ATK_ROLE_CHECK_BOX,           // roles::CHECK_RICH_OPTION    125
-    ATK_ROLE_LIST,                // roles::DEFINITION_LIST      126
-    ATK_ROLE_LIST_ITEM,           // roles::TERM                 127
-    ATK_ROLE_PARAGRAPH,           // roles::DEFINITION           128
-    kROLE_ATK_LAST_ENTRY          // roles::LAST_ENTRY
-};
-
diff --git a/accessible/src/base/Role.h b/accessible/src/base/Role.h
index 4351a00746a..3fadb8831a3 100644
--- a/accessible/src/base/Role.h
+++ b/accessible/src/base/Role.h
@@ -41,13 +41,16 @@
 #define _role_h_
 
 /**
- * Note: Make sure to update the localized role names when changing the list.
+ * @note Make sure to update the localized role names when changing the list.
+ * @note When adding a new role, be sure to also add it to base/RoleMap.h and
+ *       update nsIAccessibleRole.
  */
 
 namespace mozilla {
 namespace a11y {
 namespace roles {
-  enum Role {
+
+enum Role {
   /**
    * Used when accessible hans't strong defined role.
    */
@@ -812,15 +815,12 @@ namespace roles {
    * Represent a definition in a definition list (dd in HTML)
    */
   DEFINITION = 128,
+};
 
-  /**
-   * It's not role actually. This constant is important to help ensure
-   * nsRoleMap's are synchronized.
-   */
-  LAST_ENTRY = 129
-  };
 } // namespace role
+
 typedef enum mozilla::a11y::roles::Role role;
+
 } // namespace a11y
 } // namespace mozilla
 
diff --git a/accessible/src/base/RoleMap.h b/accessible/src/base/RoleMap.h
new file mode 100644
index 00000000000..1841dd3cbca
--- /dev/null
+++ b/accessible/src/base/RoleMap.h
@@ -0,0 +1,920 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Usage: declare the macro ROLE()with the following arguments:
+ * ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role)
+ */
+
+ROLE(NOTHING,
+     "nothing",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_UNKNOWN)
+
+ROLE(TITLEBAR,
+     "titlebar",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,  //Irrelevant on OS X; windows are always native.
+     ROLE_SYSTEM_TITLEBAR,
+     ROLE_SYSTEM_TITLEBAR)
+
+ROLE(MENUBAR,
+     "menubar",
+     ATK_ROLE_MENU_BAR,
+     NSAccessibilityMenuBarRole,  //Irrelevant on OS X; the menubar will always be native and on the top of the screen.
+     ROLE_SYSTEM_MENUBAR,
+     ROLE_SYSTEM_MENUBAR)
+
+ROLE(SCROLLBAR,
+     "scrollbar",
+     ATK_ROLE_SCROLL_BAR,
+     NSAccessibilityScrollBarRole,  //We might need to make this its own mozAccessible, to support the children objects (valueindicator, down/up buttons).
+     ROLE_SYSTEM_SCROLLBAR,
+     ROLE_SYSTEM_SCROLLBAR)
+
+ROLE(GRIP,
+     "grip",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilitySplitterRole,
+     ROLE_SYSTEM_GRIP,
+     ROLE_SYSTEM_GRIP)
+
+ROLE(SOUND,
+     "sound",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,  //Unused on OS X.
+     ROLE_SYSTEM_SOUND,
+     ROLE_SYSTEM_SOUND)
+
+ROLE(CURSOR,
+     "cursor",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,  //Unused on OS X.
+     ROLE_SYSTEM_CURSOR,
+     ROLE_SYSTEM_CURSOR)
+
+ROLE(CARET,
+     "caret",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,  //Unused on OS X.
+     ROLE_SYSTEM_CARET,
+     ROLE_SYSTEM_CARET)
+
+ROLE(ALERT,
+     "alert",
+     ATK_ROLE_ALERT,
+     NSAccessibilityWindowRole,
+     ROLE_SYSTEM_ALERT,
+     ROLE_SYSTEM_ALERT)
+
+ROLE(WINDOW,
+     "window",
+     ATK_ROLE_WINDOW,
+     NSAccessibilityWindowRole,  //Irrelevant on OS X; all window a11y is handled by the system.
+     ROLE_SYSTEM_WINDOW,
+     ROLE_SYSTEM_WINDOW)
+
+ROLE(INTERNAL_FRAME,
+     "internal frame",
+     ATK_ROLE_INTERNAL_FRAME,
+     NSAccessibilityScrollAreaRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_INTERNAL_FRAME)
+
+ROLE(MENUPOPUP,
+     "menupopup",
+     ATK_ROLE_MENU,
+     NSAccessibilityMenuRole,  //The parent of menuitems.
+     ROLE_SYSTEM_MENUPOPUP,
+     ROLE_SYSTEM_MENUPOPUP)
+
+ROLE(MENUITEM,
+     "menuitem",
+     ATK_ROLE_MENU_ITEM,
+     NSAccessibilityMenuItemRole,
+     ROLE_SYSTEM_MENUITEM,
+     ROLE_SYSTEM_MENUITEM)
+
+ROLE(TOOLTIP,
+     "tooltip",
+     ATK_ROLE_TOOL_TIP,
+     @"AXHelpTag",  //10.4+ only, so we re-define the constant.
+     ROLE_SYSTEM_TOOLTIP,
+     ROLE_SYSTEM_TOOLTIP)
+
+ROLE(APPLICATION,
+     "application",
+     ATK_ROLE_EMBEDDED,
+     NSAccessibilityGroupRole,  //Unused on OS X. the system will take care of this.
+     ROLE_SYSTEM_APPLICATION,
+     ROLE_SYSTEM_APPLICATION)
+
+ROLE(DOCUMENT,
+     "document",
+     ATK_ROLE_DOCUMENT_FRAME,
+     @"AXWebArea",
+     ROLE_SYSTEM_DOCUMENT,
+     ROLE_SYSTEM_DOCUMENT)
+
+/**
+ *  msaa comment:
+ *   We used to map to ROLE_SYSTEM_PANE, but JAWS would
+ *   not read the accessible name for the contaning pane.
+ *   However, JAWS will read the accessible name for a groupbox.
+ *   By mapping a PANE to a GROUPING, we get no undesirable effects,
+ *   but fortunately JAWS will then read the group's label,
+ *   when an inner control gets focused.
+ */
+ROLE(PANE,
+     "pane",
+     ATK_ROLE_PANEL,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_GROUPING,
+     ROLE_SYSTEM_GROUPING)
+
+ROLE(CHART,
+     "chart",
+     ATK_ROLE_CHART,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_CHART,
+     ROLE_SYSTEM_CHART)
+
+ROLE(DIALOG,
+     "dialog",
+     ATK_ROLE_DIALOG,
+     NSAccessibilityWindowRole,  //There's a dialog subrole.
+     ROLE_SYSTEM_DIALOG,
+     ROLE_SYSTEM_DIALOG)
+
+ROLE(BORDER,
+     "border",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,  //Unused on OS X.
+     ROLE_SYSTEM_BORDER,
+     ROLE_SYSTEM_BORDER)
+
+ROLE(GROUPING,
+     "grouping",
+     ATK_ROLE_PANEL,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_GROUPING,
+     ROLE_SYSTEM_GROUPING)
+
+ROLE(SEPARATOR,
+     "separator",
+     ATK_ROLE_SEPARATOR,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_SEPARATOR,
+     ROLE_SYSTEM_SEPARATOR)
+
+ROLE(TOOLBAR,
+     "toolbar",
+     ATK_ROLE_TOOL_BAR,
+     NSAccessibilityToolbarRole,
+     ROLE_SYSTEM_TOOLBAR,
+     ROLE_SYSTEM_TOOLBAR)
+
+ROLE(STATUSBAR,
+     "statusbar",
+     ATK_ROLE_STATUSBAR,
+     NSAccessibilityUnknownRole,  //Doesn't exist on OS X (a status bar is its parts; a progressbar, a label, etc.)
+     ROLE_SYSTEM_STATUSBAR,
+     ROLE_SYSTEM_STATUSBAR)
+
+ROLE(TABLE,
+     "table",
+     ATK_ROLE_TABLE,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_TABLE,
+     ROLE_SYSTEM_TABLE)
+
+ROLE(COLUMNHEADER,
+     "columnheader",
+     ATK_ROLE_COLUMN_HEADER,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_COLUMNHEADER,
+     ROLE_SYSTEM_COLUMNHEADER)
+
+ROLE(ROWHEADER,
+     "rowheader",
+     ATK_ROLE_ROW_HEADER,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_ROWHEADER,
+     ROLE_SYSTEM_ROWHEADER)
+
+ROLE(COLUMN,
+     "column",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityColumnRole,
+     ROLE_SYSTEM_COLUMN,
+     ROLE_SYSTEM_COLUMN)
+
+ROLE(ROW,
+     "row",
+     ATK_ROLE_LIST_ITEM,
+     NSAccessibilityRowRole,
+     ROLE_SYSTEM_ROW,
+     ROLE_SYSTEM_ROW)
+
+ROLE(CELL,
+     "cell",
+     ATK_ROLE_TABLE_CELL,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_CELL,
+     ROLE_SYSTEM_CELL)
+
+ROLE(LINK,
+     "link",
+     ATK_ROLE_LINK,
+     @"AXLink",  //10.4+ the attr first define in SDK 10.4, so we define it here too. ROLE_LINK
+     ROLE_SYSTEM_LINK,
+     ROLE_SYSTEM_LINK)
+
+ROLE(HELPBALLOON,
+     "helpballoon",
+     ATK_ROLE_UNKNOWN,
+     @"AXHelpTag",
+     ROLE_SYSTEM_HELPBALLOON,
+     ROLE_SYSTEM_HELPBALLOON)
+
+ROLE(CHARACTER,
+     "character",
+     ATK_ROLE_IMAGE,
+     NSAccessibilityUnknownRole,  //Unused on OS X.
+     ROLE_SYSTEM_CHARACTER,
+     ROLE_SYSTEM_CHARACTER)
+
+ROLE(LIST,
+     "list",
+     ATK_ROLE_LIST,
+     NSAccessibilityListRole,
+     ROLE_SYSTEM_LIST,
+     ROLE_SYSTEM_LIST)
+
+ROLE(LISTITEM,
+     "listitem",
+     ATK_ROLE_LIST_ITEM,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_LISTITEM,
+     ROLE_SYSTEM_LISTITEM)
+
+ROLE(OUTLINE,
+     "outline",
+     ATK_ROLE_TREE,
+     NSAccessibilityOutlineRole,
+     ROLE_SYSTEM_OUTLINE,
+     ROLE_SYSTEM_OUTLINE)
+
+ROLE(OUTLINEITEM,
+     "outlineitem",
+     ATK_ROLE_LIST_ITEM,
+     NSAccessibilityRowRole,  //XXX: use OutlineRow as subrole.
+     ROLE_SYSTEM_OUTLINEITEM,
+     ROLE_SYSTEM_OUTLINEITEM)
+
+ROLE(PAGETAB,
+     "pagetab",
+     ATK_ROLE_PAGE_TAB,
+     NSAccessibilityRadioButtonRole,
+     ROLE_SYSTEM_PAGETAB,
+     ROLE_SYSTEM_PAGETAB)
+
+ROLE(PROPERTYPAGE,
+     "propertypage",
+     ATK_ROLE_SCROLL_PANE,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_PROPERTYPAGE,
+     ROLE_SYSTEM_PROPERTYPAGE)
+
+ROLE(INDICATOR,
+     "indicator",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_INDICATOR,
+     ROLE_SYSTEM_INDICATOR)
+
+ROLE(GRAPHIC,
+     "graphic",
+     ATK_ROLE_IMAGE,
+     NSAccessibilityImageRole,
+     ROLE_SYSTEM_GRAPHIC,
+     ROLE_SYSTEM_GRAPHIC)
+
+ROLE(STATICTEXT,
+     "statictext",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityStaticTextRole,
+     ROLE_SYSTEM_STATICTEXT,
+     ROLE_SYSTEM_STATICTEXT)
+
+ROLE(TEXT_LEAF,
+     "text leaf",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityStaticTextRole,
+     ROLE_SYSTEM_TEXT,
+     ROLE_SYSTEM_TEXT)
+
+ROLE(PUSHBUTTON,
+     "pushbutton",
+     ATK_ROLE_PUSH_BUTTON,
+     NSAccessibilityButtonRole,
+     ROLE_SYSTEM_PUSHBUTTON,
+     ROLE_SYSTEM_PUSHBUTTON)
+
+ROLE(CHECKBUTTON,
+     "checkbutton",
+     ATK_ROLE_CHECK_BOX,
+     NSAccessibilityCheckBoxRole,
+     ROLE_SYSTEM_CHECKBUTTON,
+     ROLE_SYSTEM_CHECKBUTTON)
+
+ROLE(RADIOBUTTON,
+     "radiobutton",
+     ATK_ROLE_RADIO_BUTTON,
+     NSAccessibilityRadioButtonRole,
+     ROLE_SYSTEM_RADIOBUTTON,
+     ROLE_SYSTEM_RADIOBUTTON)
+
+ROLE(COMBOBOX,
+     "combobox",
+     ATK_ROLE_COMBO_BOX,
+     NSAccessibilityPopUpButtonRole,
+     ROLE_SYSTEM_COMBOBOX,
+     ROLE_SYSTEM_COMBOBOX)
+
+ROLE(DROPLIST,
+     "droplist",
+     ATK_ROLE_COMBO_BOX,
+     NSAccessibilityPopUpButtonRole,
+     ROLE_SYSTEM_DROPLIST,
+     ROLE_SYSTEM_DROPLIST)
+
+ROLE(PROGRESSBAR,
+     "progressbar",
+     ATK_ROLE_PROGRESS_BAR,
+     NSAccessibilityProgressIndicatorRole,
+     ROLE_SYSTEM_PROGRESSBAR,
+     ROLE_SYSTEM_PROGRESSBAR)
+
+ROLE(DIAL,
+     "dial",
+     ATK_ROLE_DIAL,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_DIAL,
+     ROLE_SYSTEM_DIAL)
+
+ROLE(HOTKEYFIELD,
+     "hotkeyfield",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_HOTKEYFIELD,
+     ROLE_SYSTEM_HOTKEYFIELD)
+
+ROLE(SLIDER,
+     "slider",
+     ATK_ROLE_SLIDER,
+     NSAccessibilitySliderRole,
+     ROLE_SYSTEM_SLIDER,
+     ROLE_SYSTEM_SLIDER)
+
+ROLE(SPINBUTTON,
+     "spinbutton",
+     ATK_ROLE_SPIN_BUTTON,
+     NSAccessibilityIncrementorRole,  //Subroles: Increment/Decrement.
+     ROLE_SYSTEM_SPINBUTTON,
+     ROLE_SYSTEM_SPINBUTTON)
+
+ROLE(DIAGRAM,
+     "diagram",
+     ATK_ROLE_IMAGE,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_DIAGRAM,
+     ROLE_SYSTEM_DIAGRAM)
+
+ROLE(ANIMATION,
+     "animation",
+     ATK_ROLE_ANIMATION,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_ANIMATION,
+     ROLE_SYSTEM_ANIMATION)
+
+ROLE(EQUATION,
+     "equation",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_EQUATION,
+     ROLE_SYSTEM_EQUATION)
+
+ROLE(BUTTONDROPDOWN,
+     "buttondropdown",
+     ATK_ROLE_PUSH_BUTTON,
+     NSAccessibilityPopUpButtonRole,
+     ROLE_SYSTEM_BUTTONDROPDOWN,
+     ROLE_SYSTEM_BUTTONDROPDOWN)
+
+ROLE(BUTTONMENU,
+     "buttonmenu",
+     ATK_ROLE_PUSH_BUTTON,
+     NSAccessibilityMenuButtonRole,
+     ROLE_SYSTEM_BUTTONMENU,
+     ROLE_SYSTEM_BUTTONMENU)
+
+ROLE(BUTTONDROPDOWNGRID,
+     "buttondropdowngrid",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_BUTTONDROPDOWNGRID,
+     ROLE_SYSTEM_BUTTONDROPDOWNGRID)
+
+ROLE(WHITESPACE,
+     "whitespace",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_WHITESPACE,
+     ROLE_SYSTEM_WHITESPACE)
+
+ROLE(PAGETABLIST,
+     "pagetablist",
+     ATK_ROLE_PAGE_TAB_LIST,
+     NSAccessibilityTabGroupRole,
+     ROLE_SYSTEM_PAGETABLIST,
+     ROLE_SYSTEM_PAGETABLIST)
+
+ROLE(CLOCK,
+     "clock",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,  //Unused on OS X
+     ROLE_SYSTEM_CLOCK,
+     ROLE_SYSTEM_CLOCK)
+
+ROLE(SPLITBUTTON,
+     "splitbutton",
+     ATK_ROLE_PUSH_BUTTON,
+     NSAccessibilityButtonRole,
+     ROLE_SYSTEM_SPLITBUTTON,
+     ROLE_SYSTEM_SPLITBUTTON)
+
+ROLE(IPADDRESS,
+     "ipaddress",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_IPADDRESS,
+     ROLE_SYSTEM_IPADDRESS)
+
+ROLE(ACCEL_LABEL,
+     "accel label",
+     ATK_ROLE_ACCEL_LABEL,
+     NSAccessibilityStaticTextRole,
+     ROLE_SYSTEM_STATICTEXT,
+     ROLE_SYSTEM_STATICTEXT)
+
+ROLE(ARROW,
+     "arrow",
+     ATK_ROLE_ARROW,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_INDICATOR,
+     ROLE_SYSTEM_INDICATOR)
+
+ROLE(CANVAS,
+     "canvas",
+     ATK_ROLE_CANVAS,
+     NSAccessibilityImageRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_CANVAS)
+
+ROLE(CHECK_MENU_ITEM,
+     "check menu item",
+     ATK_ROLE_CHECK_MENU_ITEM,
+     NSAccessibilityMenuItemRole,
+     ROLE_SYSTEM_MENUITEM,
+     IA2_ROLE_CHECK_MENU_ITEM)
+
+ROLE(COLOR_CHOOSER,
+     "color chooser",
+     ATK_ROLE_COLOR_CHOOSER,
+     NSAccessibilityColorWellRole,
+     ROLE_SYSTEM_DIALOG,
+     IA2_ROLE_COLOR_CHOOSER)
+
+ROLE(DATE_EDITOR,
+     "date editor",
+     ATK_ROLE_DATE_EDITOR,
+     NSAccessibilityUnknownRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_DATE_EDITOR)
+
+ROLE(DESKTOP_ICON,
+     "desktop icon",
+     ATK_ROLE_DESKTOP_ICON,
+     NSAccessibilityImageRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_DESKTOP_ICON)
+
+ROLE(DESKTOP_FRAME,
+     "desktop frame",
+     ATK_ROLE_DESKTOP_FRAME,
+     NSAccessibilityUnknownRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_DESKTOP_PANE)
+
+ROLE(DIRECTORY_PANE,
+     "directory pane",
+     ATK_ROLE_DIRECTORY_PANE,
+     NSAccessibilityBrowserRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_DIRECTORY_PANE)
+
+ROLE(FILE_CHOOSER,
+     "file chooser",
+     ATK_ROLE_FILE_CHOOSER,
+     NSAccessibilityUnknownRole,  //Unused on OS X
+     USE_ROLE_STRING,
+     IA2_ROLE_FILE_CHOOSER)
+
+ROLE(FONT_CHOOSER,
+     "font chooser",
+     ATK_ROLE_FONT_CHOOSER,
+     NSAccessibilityUnknownRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_FONT_CHOOSER)
+
+ROLE(CHROME_WINDOW,
+     "chrome window",
+     ATK_ROLE_FRAME,
+     NSAccessibilityUnknownRole,  //Unused on OS X
+     ROLE_SYSTEM_APPLICATION,
+     IA2_ROLE_FRAME)
+
+ROLE(GLASS_PANE,
+     "glass pane",
+     ATK_ROLE_GLASS_PANE,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_GLASS_PANE)
+
+ROLE(HTML_CONTAINER,
+     "html container",
+     ATK_ROLE_HTML_CONTAINER,
+     NSAccessibilityUnknownRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_UNKNOWN)
+
+ROLE(ICON,
+     "icon",
+     ATK_ROLE_ICON,
+     NSAccessibilityImageRole,
+     ROLE_SYSTEM_PUSHBUTTON,
+     IA2_ROLE_ICON)
+
+ROLE(LABEL,
+     "label",
+     ATK_ROLE_LABEL,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_STATICTEXT,
+     IA2_ROLE_LABEL)
+
+ROLE(LAYERED_PANE,
+     "layered pane",
+     ATK_ROLE_LAYERED_PANE,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_LAYERED_PANE)
+
+ROLE(OPTION_PANE,
+     "option pane",
+     ATK_ROLE_OPTION_PANE,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_OPTION_PANE)
+
+ROLE(PASSWORD_TEXT,
+     "password text",
+     ATK_ROLE_PASSWORD_TEXT,
+     NSAccessibilityTextFieldRole,
+     ROLE_SYSTEM_TEXT,
+     ROLE_SYSTEM_TEXT)
+
+ROLE(POPUP_MENU,
+     "popup menu",
+     ATK_ROLE_POPUP_MENU,
+     NSAccessibilityUnknownRole,  //Unused
+     ROLE_SYSTEM_MENUPOPUP,
+     ROLE_SYSTEM_MENUPOPUP)
+
+ROLE(RADIO_MENU_ITEM,
+     "radio menu item",
+     ATK_ROLE_RADIO_MENU_ITEM,
+     NSAccessibilityMenuItemRole,
+     ROLE_SYSTEM_MENUITEM,
+     IA2_ROLE_RADIO_MENU_ITEM)
+
+ROLE(ROOT_PANE,
+     "root pane",
+     ATK_ROLE_ROOT_PANE,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_ROOT_PANE)
+
+ROLE(SCROLL_PANE,
+     "scroll pane",
+     ATK_ROLE_SCROLL_PANE,
+     NSAccessibilityScrollAreaRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_SCROLL_PANE)
+
+ROLE(SPLIT_PANE,
+     "split pane",
+     ATK_ROLE_SPLIT_PANE,
+     NSAccessibilitySplitGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_SPLIT_PANE)
+
+ROLE(TABLE_COLUMN_HEADER,
+     "table column header",
+     ATK_ROLE_TABLE_COLUMN_HEADER,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_COLUMNHEADER,
+     ROLE_SYSTEM_COLUMNHEADER)
+
+ROLE(TABLE_ROW_HEADER,
+     "table row header",
+     ATK_ROLE_TABLE_ROW_HEADER,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_ROWHEADER,
+     ROLE_SYSTEM_ROWHEADER)
+
+ROLE(TEAR_OFF_MENU_ITEM,
+     "tear off menu item",
+     ATK_ROLE_TEAR_OFF_MENU_ITEM,
+     NSAccessibilityMenuItemRole,
+     ROLE_SYSTEM_MENUITEM,
+     IA2_ROLE_TEAR_OFF_MENU)
+
+ROLE(TERMINAL,
+     "terminal",
+     ATK_ROLE_TERMINAL,
+     NSAccessibilityUnknownRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_TERMINAL)
+
+ROLE(TEXT_CONTAINER,
+     "text container",
+     ATK_ROLE_TEXT,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_TEXT_FRAME)
+
+ROLE(TOGGLE_BUTTON,
+     "toggle button",
+     ATK_ROLE_TOGGLE_BUTTON,
+     NSAccessibilityButtonRole,
+     ROLE_SYSTEM_PUSHBUTTON,
+     IA2_ROLE_TOGGLE_BUTTON)
+
+ROLE(TREE_TABLE,
+     "tree table",
+     ATK_ROLE_TREE_TABLE,
+     NSAccessibilityTableRole,
+     ROLE_SYSTEM_OUTLINE,
+     ROLE_SYSTEM_OUTLINE)
+
+ROLE(VIEWPORT,
+     "viewport",
+     ATK_ROLE_VIEWPORT,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_PANE,
+     IA2_ROLE_VIEW_PORT)
+
+ROLE(HEADER,
+     "header",
+     ATK_ROLE_HEADER,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_HEADER)
+
+ROLE(FOOTER,
+     "footer",
+     ATK_ROLE_FOOTER,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_FOOTER)
+
+ROLE(PARAGRAPH,
+     "paragraph",
+     ATK_ROLE_PARAGRAPH,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_PARAGRAPH)
+
+ROLE(RULER,
+     "ruler",
+     ATK_ROLE_RULER,
+     @"AXRuler",  //10.4+ only, so we re-define the constant.
+     USE_ROLE_STRING,
+     IA2_ROLE_RULER)
+
+ROLE(AUTOCOMPLETE,
+     "autocomplete",
+     ATK_ROLE_AUTOCOMPLETE,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_COMBOBOX,
+     ROLE_SYSTEM_COMBOBOX)
+
+ROLE(EDITBAR,
+     "editbar",
+     ATK_ROLE_EDITBAR,
+     NSAccessibilityTextFieldRole,
+     ROLE_SYSTEM_TEXT,
+     IA2_ROLE_EDITBAR)
+
+ROLE(ENTRY,
+     "entry",
+     ATK_ROLE_ENTRY,
+     NSAccessibilityTextFieldRole,
+     ROLE_SYSTEM_TEXT,
+     ROLE_SYSTEM_TEXT)
+
+ROLE(CAPTION,
+     "caption",
+     ATK_ROLE_CAPTION,
+     NSAccessibilityStaticTextRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_CAPTION)
+
+ROLE(DOCUMENT_FRAME,
+     "document frame",
+     ATK_ROLE_DOCUMENT_FRAME,
+     NSAccessibilityScrollAreaRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_UNKNOWN)
+
+ROLE(HEADING,
+     "heading",
+     ATK_ROLE_HEADING,
+     @"AXHeading",
+     USE_ROLE_STRING,
+     IA2_ROLE_HEADING)
+
+ROLE(PAGE,
+     "page",
+     ATK_ROLE_PAGE,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_PAGE)
+
+ROLE(SECTION,
+     "section",
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_SECTION)
+
+ROLE(REDUNDANT_OBJECT,
+     "redundant object",
+     ATK_ROLE_REDUNDANT_OBJECT,
+     NSAccessibilityUnknownRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_REDUNDANT_OBJECT)
+
+ROLE(FORM,
+     "form",
+     ATK_ROLE_FORM,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_FORM)
+
+ROLE(IME,
+     "ime",
+     ATK_ROLE_INPUT_METHOD_WINDOW,
+     NSAccessibilityUnknownRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_INPUT_METHOD_WINDOW)
+
+ROLE(APP_ROOT,
+     "app root",
+     ATK_ROLE_APPLICATION,
+     NSAccessibilityUnknownRole,  //Unused on OS X
+     ROLE_SYSTEM_APPLICATION,
+     ROLE_SYSTEM_APPLICATION)
+
+ROLE(PARENT_MENUITEM,
+     "parent menuitem",
+     ATK_ROLE_MENU,
+     NSAccessibilityMenuItemRole,
+     ROLE_SYSTEM_MENUITEM,
+     ROLE_SYSTEM_MENUITEM)
+
+ROLE(CALENDAR,
+     "calendar",
+     ATK_ROLE_CALENDAR,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_CLIENT,
+     ROLE_SYSTEM_CLIENT)
+
+ROLE(COMBOBOX_LIST,
+     "combobox list",
+     ATK_ROLE_MENU,
+     NSAccessibilityMenuRole,
+     ROLE_SYSTEM_LIST,
+     ROLE_SYSTEM_LIST)
+
+ROLE(COMBOBOX_OPTION,
+     "combobox option",
+     ATK_ROLE_MENU_ITEM,
+     NSAccessibilityMenuItemRole,
+     ROLE_SYSTEM_LISTITEM,
+     ROLE_SYSTEM_LISTITEM)
+
+ROLE(IMAGE_MAP,
+     "image map",
+     ATK_ROLE_IMAGE,
+     NSAccessibilityImageRole,
+     ROLE_SYSTEM_GRAPHIC,
+     ROLE_SYSTEM_GRAPHIC)
+
+ROLE(OPTION,
+     "listbox option",
+     ATK_ROLE_LIST_ITEM,
+     NSAccessibilityRowRole,
+     ROLE_SYSTEM_LISTITEM,
+     ROLE_SYSTEM_LISTITEM)
+
+ROLE(RICH_OPTION,
+     "listbox rich option",
+     ATK_ROLE_LIST_ITEM,
+     NSAccessibilityRowRole,
+     ROLE_SYSTEM_LISTITEM,
+     ROLE_SYSTEM_LISTITEM)
+
+ROLE(LISTBOX,
+     "listbox",
+     ATK_ROLE_LIST,
+     NSAccessibilityListRole,
+     ROLE_SYSTEM_LIST,
+     ROLE_SYSTEM_LIST)
+
+ROLE(FLAT_EQUATION,
+     "flat equation",
+     ATK_ROLE_UNKNOWN,
+     NSAccessibilityUnknownRole,
+     ROLE_SYSTEM_EQUATION,
+     ROLE_SYSTEM_EQUATION)
+
+ROLE(GRID_CELL,
+     "gridcell",
+     ATK_ROLE_TABLE_CELL,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_CELL,
+     ROLE_SYSTEM_CELL)
+
+ROLE(EMBEDDED_OBJECT,
+     "embedded object",
+     ATK_ROLE_PANEL,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_EMBEDDED_OBJECT)
+
+ROLE(NOTE,
+     "note",
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_NOTE)
+
+ROLE(FIGURE,
+     "figure",
+     ATK_ROLE_PANEL,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_GROUPING,
+     ROLE_SYSTEM_GROUPING)
+
+ROLE(CHECK_RICH_OPTION,
+     "check rich option",
+     ATK_ROLE_CHECK_BOX,
+     NSAccessibilityCheckBoxRole,
+     ROLE_SYSTEM_CHECKBUTTON,
+     ROLE_SYSTEM_CHECKBUTTON)
+
+ROLE(DEFINITION_LIST,
+     "definitionlist",
+     ATK_ROLE_LIST,
+     NSAccessibilityListRole,
+     ROLE_SYSTEM_LIST,
+     ROLE_SYSTEM_LIST)
+
+ROLE(TERM,
+     "term",
+     ATK_ROLE_LIST_ITEM,
+     NSAccessibilityGroupRole,
+     ROLE_SYSTEM_LISTITEM,
+     ROLE_SYSTEM_LISTITEM)
+
+ROLE(DEFINITION,
+     "definition",
+     ATK_ROLE_PARAGRAPH,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_PARAGRAPH)
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 3dd35421c8d..e2b07b98a15 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -706,13 +706,19 @@ nsAccessibilityService::GetAccessibleFor(nsIDOMNode *aNode,
 NS_IMETHODIMP
 nsAccessibilityService::GetStringRole(PRUint32 aRole, nsAString& aString)
 {
-  if ( aRole >= ArrayLength(kRoleNames)) {
-    aString.AssignLiteral("unknown");
+#define ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role) \
+  case roles::geckoRole: \
+    CopyUTF8toUTF16(stringRole, aString); \
     return NS_OK;
+
+  switch (aRole) {
+#include "RoleMap.h"
+    default:
+      aString.AssignLiteral("unknown");
+      return NS_OK;
   }
 
-  CopyUTF8toUTF16(kRoleNames[aRole], aString);
-  return NS_OK;
+#undef ROLE
 }
 
 NS_IMETHODIMP
diff --git a/accessible/src/base/nsAccessibilityService.h b/accessible/src/base/nsAccessibilityService.h
index 979d67d7f68..d9f4462542d 100644
--- a/accessible/src/base/nsAccessibilityService.h
+++ b/accessible/src/base/nsAccessibilityService.h
@@ -295,142 +295,6 @@ GetAccService()
   return nsAccessibilityService::gAccessibilityService;
 }
 
-/**
- * Map nsIAccessibleRole constants to strings. Used by
- * nsIAccessibleRetrieval::getStringRole() method.
- */
-static const char kRoleNames[][20] = {
-  "nothing",             //ROLE_NOTHING
-  "titlebar",            //ROLE_TITLEBAR
-  "menubar",             //ROLE_MENUBAR
-  "scrollbar",           //ROLE_SCROLLBAR
-  "grip",                //ROLE_GRIP
-  "sound",               //ROLE_SOUND
-  "cursor",              //ROLE_CURSOR
-  "caret",               //ROLE_CARET
-  "alert",               //ROLE_ALERT
-  "window",              //ROLE_WINDOW
-  "internal frame",      //ROLE_INTERNAL_FRAME
-  "menupopup",           //ROLE_MENUPOPUP
-  "menuitem",            //ROLE_MENUITEM
-  "tooltip",             //ROLE_TOOLTIP
-  "application",         //ROLE_APPLICATION
-  "document",            //ROLE_DOCUMENT
-  "pane",                //ROLE_PANE
-  "chart",               //ROLE_CHART
-  "dialog",              //ROLE_DIALOG
-  "border",              //ROLE_BORDER
-  "grouping",            //ROLE_GROUPING
-  "separator",           //ROLE_SEPARATOR
-  "toolbar",             //ROLE_TOOLBAR
-  "statusbar",           //ROLE_STATUSBAR
-  "table",               //ROLE_TABLE
-  "columnheader",        //ROLE_COLUMNHEADER
-  "rowheader",           //ROLE_ROWHEADER
-  "column",              //ROLE_COLUMN
-  "row",                 //ROLE_ROW
-  "cell",                //ROLE_CELL
-  "link",                //ROLE_LINK
-  "helpballoon",         //ROLE_HELPBALLOON
-  "character",           //ROLE_CHARACTER
-  "list",                //ROLE_LIST
-  "listitem",            //ROLE_LISTITEM
-  "outline",             //ROLE_OUTLINE
-  "outlineitem",         //ROLE_OUTLINEITEM
-  "pagetab",             //ROLE_PAGETAB
-  "propertypage",        //ROLE_PROPERTYPAGE
-  "indicator",           //ROLE_INDICATOR
-  "graphic",             //ROLE_GRAPHIC
-  "statictext",          //ROLE_STATICTEXT
-  "text leaf",           //ROLE_TEXT_LEAF
-  "pushbutton",          //ROLE_PUSHBUTTON
-  "checkbutton",         //ROLE_CHECKBUTTON
-  "radiobutton",         //ROLE_RADIOBUTTON
-  "combobox",            //ROLE_COMBOBOX
-  "droplist",            //ROLE_DROPLIST
-  "progressbar",         //ROLE_PROGRESSBAR
-  "dial",                //ROLE_DIAL
-  "hotkeyfield",         //ROLE_HOTKEYFIELD
-  "slider",              //ROLE_SLIDER
-  "spinbutton",          //ROLE_SPINBUTTON
-  "diagram",             //ROLE_DIAGRAM
-  "animation",           //ROLE_ANIMATION
-  "equation",            //ROLE_EQUATION
-  "buttondropdown",      //ROLE_BUTTONDROPDOWN
-  "buttonmenu",          //ROLE_BUTTONMENU
-  "buttondropdowngrid",  //ROLE_BUTTONDROPDOWNGRID
-  "whitespace",          //ROLE_WHITESPACE
-  "pagetablist",         //ROLE_PAGETABLIST
-  "clock",               //ROLE_CLOCK
-  "splitbutton",         //ROLE_SPLITBUTTON
-  "ipaddress",           //ROLE_IPADDRESS
-  "accel label",         //ROLE_ACCEL_LABEL
-  "arrow",               //ROLE_ARROW
-  "canvas",              //ROLE_CANVAS
-  "check menu item",     //ROLE_CHECK_MENU_ITEM
-  "color chooser",       //ROLE_COLOR_CHOOSER
-  "date editor",         //ROLE_DATE_EDITOR
-  "desktop icon",        //ROLE_DESKTOP_ICON
-  "desktop frame",       //ROLE_DESKTOP_FRAME
-  "directory pane",      //ROLE_DIRECTORY_PANE
-  "file chooser",        //ROLE_FILE_CHOOSER
-  "font chooser",        //ROLE_FONT_CHOOSER
-  "chrome window",       //ROLE_CHROME_WINDOW
-  "glass pane",          //ROLE_GLASS_PANE
-  "html container",      //ROLE_HTML_CONTAINER
-  "icon",                //ROLE_ICON
-  "label",               //ROLE_LABEL
-  "layered pane",        //ROLE_LAYERED_PANE
-  "option pane",         //ROLE_OPTION_PANE
-  "password text",       //ROLE_PASSWORD_TEXT
-  "popup menu",          //ROLE_POPUP_MENU
-  "radio menu item",     //ROLE_RADIO_MENU_ITEM
-  "root pane",           //ROLE_ROOT_PANE
-  "scroll pane",         //ROLE_SCROLL_PANE
-  "split pane",          //ROLE_SPLIT_PANE
-  "table column header", //ROLE_TABLE_COLUMN_HEADER
-  "table row header",    //ROLE_TABLE_ROW_HEADER
-  "tear off menu item",  //ROLE_TEAR_OFF_MENU_ITEM
-  "terminal",            //ROLE_TERMINAL
-  "text container",      //ROLE_TEXT_CONTAINER
-  "toggle button",       //ROLE_TOGGLE_BUTTON
-  "tree table",          //ROLE_TREE_TABLE
-  "viewport",            //ROLE_VIEWPORT
-  "header",              //ROLE_HEADER
-  "footer",              //ROLE_FOOTER
-  "paragraph",           //ROLE_PARAGRAPH
-  "ruler",               //ROLE_RULER
-  "autocomplete",        //ROLE_AUTOCOMPLETE
-  "editbar",             //ROLE_EDITBAR
-  "entry",               //ROLE_ENTRY
-  "caption",             //ROLE_CAPTION
-  "document frame",      //ROLE_DOCUMENT_FRAME
-  "heading",             //ROLE_HEADING
-  "page",                //ROLE_PAGE
-  "section",             //ROLE_SECTION
-  "redundant object",    //ROLE_REDUNDANT_OBJECT
-  "form",                //ROLE_FORM
-  "ime",                 //ROLE_IME
-  "app root",            //ROLE_APP_ROOT
-  "parent menuitem",     //ROLE_PARENT_MENUITEM
-  "calendar",            //ROLE_CALENDAR
-  "combobox list",       //ROLE_COMBOBOX_LIST
-  "combobox option",     //ROLE_COMBOBOX_OPTION
-  "image map",           //ROLE_IMAGE_MAP
-  "listbox option",      //ROLE_OPTION
-  "listbox rich option", //ROLE_RICH_OPTION
-  "listbox",             //ROLE_LISTBOX
-  "flat equation",       //ROLE_FLAT_EQUATION
-  "gridcell",            //ROLE_GRID_CELL
-  "embedded object",     //ROLE_EMBEDDED_OBJECT
-  "note",                //ROLE_NOTE
-  "figure",              //ROLE_FIGURE
-  "check rich option",   //ROLE_CHECK_RICH_OPTION
-  "definitionlist",      //ROLE_DEFINITION_LIST
-  "term",                //ROLE_TERM
-  "definition"           //ROLE_DEFINITION
-};
-
 /**
  * Map nsIAccessibleEvents constants to strings. Used by
  * nsIAccessibleRetrieval::getStringEventType() method.
diff --git a/accessible/src/mac/Makefile.in b/accessible/src/mac/Makefile.in
index d735fd0a0dc..0849fd2bf45 100644
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@@ -80,7 +80,6 @@ EXPORTS = \
   mozAccessibleProtocol.h \
   mozActionElements.h \
   mozTextAccessible.h \
-  nsRoleMap.h \
   $(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
diff --git a/accessible/src/mac/mozAccessible.mm b/accessible/src/mac/mozAccessible.mm
index 37d3ebc771a..1085f425ee3 100644
--- a/accessible/src/mac/mozAccessible.mm
+++ b/accessible/src/mac/mozAccessible.mm
@@ -40,7 +40,6 @@
 
 #import "MacUtils.h"
 #import "mozView.h"
-#import "nsRoleMap.h"
 
 #include "Accessible-inl.h"
 #include "nsIAccessibleRelation.h"
@@ -121,10 +120,6 @@ GetNativeFromGeckoAccessible(nsIAccessible *anAccessible)
     mGeckoAccessible = geckoAccessible;
     mIsExpired = NO;
     mRole = geckoAccessible->Role();
-    
-    // Check for OS X "role skew"; the role constants in nsIAccessible.idl need to match the ones
-    // in nsRoleMap.h.
-    NS_ASSERTION([AXRoles[roles::LAST_ENTRY] isEqualToString:@"ROLE_LAST_ENTRY"], "Role skew in the role map!");
   }
    
   return self;
@@ -462,7 +457,19 @@ GetNativeFromGeckoAccessible(nsIAccessible *anAccessible)
   NS_ASSERTION(nsAccUtils::IsTextInterfaceSupportCorrect(mGeckoAccessible),
                "Does not support nsIAccessibleText when it should");
 #endif
-  return (NSString*) AXRoles[mRole];
+
+#define ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role) \
+  case roles::geckoRole: \
+    return macRole;
+
+  switch (mRole) {
+#include "RoleMap.h"
+    default:
+      NS_NOTREACHED("Unknown role.");
+      return NSAccessibilityUnknownRole;
+  }
+
+#undef ROLE
 }
 
 - (NSString*)subrole
diff --git a/accessible/src/mac/nsAccessibleWrap.h b/accessible/src/mac/nsAccessibleWrap.h
index d817c39efab..f3297aca36a 100644
--- a/accessible/src/mac/nsAccessibleWrap.h
+++ b/accessible/src/mac/nsAccessibleWrap.h
@@ -101,7 +101,7 @@ public: // construction, destruction
    */
   void GetUnignoredChildren(nsTArray<nsAccessible*>* aChildrenArray);
   nsAccessible* GetUnignoredParent() const;
-    
+
 protected:
 
   virtual nsresult FirePlatformEvent(AccEvent* aEvent);
diff --git a/accessible/src/mac/nsAccessibleWrap.mm b/accessible/src/mac/nsAccessibleWrap.mm
index f60be6f9746..b1bfbfe080e 100644
--- a/accessible/src/mac/nsAccessibleWrap.mm
+++ b/accessible/src/mac/nsAccessibleWrap.mm
@@ -39,8 +39,6 @@
 #include "nsDocAccessible.h"
 #include "nsObjCExceptions.h"
 
-#import "nsRoleMap.h"
-
 #include "Accessible-inl.h"
 #include "Role.h"
 
diff --git a/accessible/src/mac/nsRoleMap.h b/accessible/src/mac/nsRoleMap.h
deleted file mode 100644
index 7c86fbffce8..00000000000
--- a/accessible/src/mac/nsRoleMap.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: Objective-C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   HÃ¥kan Waara <hwaara@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#import <Cocoa/Cocoa.h>
-
-#include "nsIAccessible.h"
-
-static const NSString* AXRoles [] = {
-  NSAccessibilityUnknownRole,                   // roles::NOTHING              0
-  NSAccessibilityUnknownRole,                   // roles::TITLEBAR             1      Irrelevant on OS X; windows are always native.
-  NSAccessibilityScrollBarRole,                 // roles::SCROLLBAR            3      We might need to make this its own mozAccessible, to support the children objects (valueindicator, down/up buttons).
-  NSAccessibilityMenuBarRole,                   // roles::MENUBAR              2      Irrelevant on OS X; the menubar will always be native and on the top of the screen.
-  NSAccessibilitySplitterRole,                  // roles::GRIP                 4
-  NSAccessibilityUnknownRole,                   // roles::SOUND                5      Unused on OS X.
-  NSAccessibilityUnknownRole,                   // roles::CURSOR               6      Unused on OS X.
-  NSAccessibilityUnknownRole,                   // roles::CARET                7      Unused on OS X.
-  NSAccessibilityWindowRole,                    // roles::ALERT                8
-  NSAccessibilityWindowRole,                    // roles::WINDOW               9      Irrelevant on OS X; all window a11y is handled by the system.
-  NSAccessibilityScrollAreaRole,                // roles::INTERNAL_FRAME       10
-  NSAccessibilityMenuRole,                      // roles::MENUPOPUP            11     The parent of menuitems.
-  NSAccessibilityMenuItemRole,                  // roles::MENUITEM             12
-  @"AXHelpTag",                                 // roles::TOOLTIP              13     10.4+ only, so we re-define the constant.
-  NSAccessibilityGroupRole,                     // roles::APPLICATION          14     Unused on OS X. the system will take care of this.
-  @"AXWebArea",                                 // roles::DOCUMENT             15
-  NSAccessibilityGroupRole,                     // roles::PANE                 16
-  NSAccessibilityUnknownRole,                   // roles::CHART                17
-  NSAccessibilityWindowRole,                    // roles::DIALOG               18     There's a dialog subrole.
-  NSAccessibilityUnknownRole,                   // roles::BORDER               19     Unused on OS X.
-  NSAccessibilityGroupRole,                     // roles::GROUPING             20
-  NSAccessibilityUnknownRole,                   // roles::SEPARATOR            21
-  NSAccessibilityToolbarRole,                   // roles::TOOLBAR              22
-  NSAccessibilityUnknownRole,                   // roles::STATUSBAR            23     Doesn't exist on OS X (a status bar is its parts; a progressbar, a label, etc.)
-  NSAccessibilityGroupRole,                     // roles::TABLE                24
-  NSAccessibilityGroupRole,                     // roles::COLUMNHEADER         25
-  NSAccessibilityGroupRole,                     // roles::ROWHEADER            26
-  NSAccessibilityColumnRole,                    // roles::COLUMN               27
-  NSAccessibilityRowRole,                       // roles::ROW                  28
-  NSAccessibilityGroupRole,                     // roles::CELL                 29
-  @"AXLink",                                    // roles::LINK                 30     10.4+ the attr first define in SDK 10.4, so we define it here too. ROLE_LINK
-  @"AXHelpTag",                                 // roles::HELPBALLOON          31
-  NSAccessibilityUnknownRole,                   // roles::CHARACTER            32     Unused on OS X.
-  NSAccessibilityListRole,                      // roles::LIST                 33
-  NSAccessibilityGroupRole,                     // roles::LISTITEM             34
-  NSAccessibilityOutlineRole,                   // roles::OUTLINE              35
-  NSAccessibilityRowRole,                       // roles::OUTLINEITEM          36     XXX: use OutlineRow as subrole.
-  NSAccessibilityRadioButtonRole,               // roles::PAGETAB              37
-  NSAccessibilityGroupRole,                     // roles::PROPERTYPAGE         38
-  NSAccessibilityUnknownRole,                   // roles::INDICATOR            39
-  NSAccessibilityImageRole,                     // roles::GRAPHIC              40
-  NSAccessibilityStaticTextRole,                // roles::STATICTEXT           41
-  NSAccessibilityStaticTextRole,                // roles::TEXT_LEAF            42
-  NSAccessibilityButtonRole,                    // roles::PUSHBUTTON           43
-  NSAccessibilityCheckBoxRole,                  // roles::CHECKBUTTON          44
-  NSAccessibilityRadioButtonRole,               // roles::RADIOBUTTON          45
-  NSAccessibilityPopUpButtonRole,               // roles::COMBOBOX             46
-  NSAccessibilityPopUpButtonRole,               // roles::DROPLIST             47
-  NSAccessibilityProgressIndicatorRole,         // roles::PROGRESSBAR          48
-  NSAccessibilityUnknownRole,                   // roles::DIAL                 49
-  NSAccessibilityUnknownRole,                   // roles::HOTKEYFIELD          50
-  NSAccessibilitySliderRole,                    // roles::SLIDER               51
-  NSAccessibilityIncrementorRole,               // roles::SPINBUTTON           52     Subroles: Increment/Decrement.
-  NSAccessibilityUnknownRole,                   // roles::DIAGRAM              53
-  NSAccessibilityUnknownRole,                   // roles::ANIMATION            54
-  NSAccessibilityUnknownRole,                   // roles::EQUATION             55
-  NSAccessibilityPopUpButtonRole,               // roles::BUTTONDROPDOWN       56
-  NSAccessibilityMenuButtonRole,                // roles::BUTTONMENU           57
-  NSAccessibilityGroupRole,                     // roles::BUTTONDROPDOWNGRID   58
-  NSAccessibilityUnknownRole,                   // roles::WHITESPACE           59
-  NSAccessibilityTabGroupRole,                  // roles::PAGETABLIST          60
-  NSAccessibilityUnknownRole,                   // roles::CLOCK                61     Unused on OS X
-  NSAccessibilityButtonRole,                    // roles::SPLITBUTTON          62
-  NSAccessibilityUnknownRole,                   // roles::IPADDRESS            63
-  NSAccessibilityStaticTextRole,                // roles::ACCEL_LABEL          64
-  NSAccessibilityUnknownRole,                   // roles::ARROW                65
-  NSAccessibilityImageRole,                     // roles::CANVAS               66
-  NSAccessibilityMenuItemRole,                  // roles::CHECK_MENU_ITEM      67
-  NSAccessibilityColorWellRole,                 // roles::COLOR_CHOOSER        68
-  NSAccessibilityUnknownRole,                   // roles::DATE_EDITOR          69 
-  NSAccessibilityImageRole,                     // roles::DESKTOP_ICON         70
-  NSAccessibilityUnknownRole,                   // roles::DESKTOP_FRAME        71
-  NSAccessibilityBrowserRole,                   // roles::DIRECTORY_PANE       72
-  NSAccessibilityUnknownRole,                   // roles::FILE_CHOOSER         73     Unused on OS X
-  NSAccessibilityUnknownRole,                   // roles::FONT_CHOOSER         74
-  NSAccessibilityUnknownRole,                   // roles::CHROME_WINDOW        75     Unused on OS X
-  NSAccessibilityGroupRole,                     // roles::GLASS_PANE           76
-  NSAccessibilityUnknownRole,                   // roles::HTML_CONTAINER       77
-  NSAccessibilityImageRole,                     // roles::ICON                 78
-  NSAccessibilityGroupRole,                     // roles::LABEL                79
-  NSAccessibilityGroupRole,                     // roles::LAYERED_PANE         80
-  NSAccessibilityGroupRole,                     // roles::OPTION_PANE          81
-  NSAccessibilityTextFieldRole,                 // roles::PASSWORD_TEXT        82
-  NSAccessibilityUnknownRole,                   // roles::POPUP_MENU           83     Unused
-  NSAccessibilityMenuItemRole,                  // roles::RADIO_MENU_ITEM      84
-  NSAccessibilityGroupRole,                     // roles::ROOT_PANE            85
-  NSAccessibilityScrollAreaRole,                // roles::SCROLL_PANE          86
-  NSAccessibilitySplitGroupRole,                // roles::SPLIT_PANE           87
-  NSAccessibilityUnknownRole,                   // roles::TABLE_COLUMN_HEADER  88
-  NSAccessibilityUnknownRole,                   // roles::TABLE_ROW_HEADER     89
-  NSAccessibilityMenuItemRole,                  // roles::TEAR_OFF_MENU_ITEM   90
-  NSAccessibilityUnknownRole,                   // roles::TERMINAL             91
-  NSAccessibilityGroupRole,                     // roles::TEXT_CONTAINER       92
-  NSAccessibilityButtonRole,                    // roles::TOGGLE_BUTTON        93
-  NSAccessibilityTableRole,                     // roles::TREE_TABLE           94
-  NSAccessibilityUnknownRole,                   // roles::VIEWPORT             95
-  NSAccessibilityGroupRole,                     // roles::HEADER               96
-  NSAccessibilityGroupRole,                     // roles::FOOTER               97
-  NSAccessibilityGroupRole,                     // roles::PARAGRAPH            98
-  @"AXRuler",                                   // roles::RULER                99     10.4+ only, so we re-define the constant.
-  NSAccessibilityUnknownRole,                   // roles::AUTOCOMPLETE         100
-  NSAccessibilityTextFieldRole,                 // roles::EDITBAR              101
-  NSAccessibilityTextFieldRole,                 // roles::ENTRY                102
-  NSAccessibilityStaticTextRole,                // roles::CAPTION              103
-  NSAccessibilityScrollAreaRole,                // roles::DOCUMENT_FRAME       104
-  @"AXHeading",                                 // roles::HEADING              105
-  NSAccessibilityGroupRole,                     // roles::PAGE                 106
-  NSAccessibilityGroupRole,                     // roles::SECTION              107
-  NSAccessibilityUnknownRole,                   // roles::REDUNDANT_OBJECT     108
-  NSAccessibilityGroupRole,                     // roles::FORM                 109
-  NSAccessibilityUnknownRole,                   // roles::IME                  110
-  NSAccessibilityUnknownRole,                   // roles::APP_ROOT             111    Unused on OS X
-  NSAccessibilityMenuItemRole,                  // roles::PARENT_MENUITEM      112
-  NSAccessibilityGroupRole,                     // roles::CALENDAR             113
-  NSAccessibilityMenuRole,                      // roles::COMBOBOX_LIST        114
-  NSAccessibilityMenuItemRole,                  // roles::COMBOBOX_OPTION      115
-  NSAccessibilityImageRole,                     // roles::IMAGE_MAP            116
-  NSAccessibilityRowRole,                       // roles::OPTION               117
-  NSAccessibilityRowRole,                       // roles::RICH_OPTION          118
-  NSAccessibilityListRole,                      // roles::LISTBOX              119
-  NSAccessibilityUnknownRole,                   // roles::FLAT_EQUATION        120
-  NSAccessibilityGroupRole,                     // roles::GRID_CELL            121
-  NSAccessibilityGroupRole,                     // roles::EMBEDDED_OBJECT      122
-  NSAccessibilityGroupRole,                     // roles::NOTE                 123
-  NSAccessibilityGroupRole,                     // roles::FIGURE               124
-  NSAccessibilityCheckBoxRole,                  // roles::CHECK_RICH_OPTION    125
-  NSAccessibilityListRole,                      // roles::DEFINITION_LIST      126
-  NSAccessibilityGroupRole,                     // roles::TERM                 127
-  NSAccessibilityGroupRole,                     // roles::DEFINITION           128
-  @"ROLE_LAST_ENTRY"                            // roles::LAST_ENTRY                  Bogus role that will never be shown (just marks the end of this array)!
-};
diff --git a/accessible/src/msaa/nsAccessibleWrap.cpp b/accessible/src/msaa/nsAccessibleWrap.cpp
index ad376602b93..4831ecdefe1 100644
--- a/accessible/src/msaa/nsAccessibleWrap.cpp
+++ b/accessible/src/msaa/nsAccessibleWrap.cpp
@@ -52,6 +52,7 @@
 #include "nsIAccessibleRelation.h"
 
 #include "Accessible2_i.c"
+#include "AccessibleRole.h"
 #include "AccessibleStates.h"
 
 #include "nsIMutableArray.h"
@@ -65,12 +66,29 @@
 #include "nsTextFormatter.h"
 #include "nsIView.h"
 #include "nsIViewManager.h"
-#include "nsRoleMap.h"
 #include "nsEventMap.h"
 #include "nsArrayUtils.h"
 
+#include "OLEACC.H"
+
+using namespace mozilla;
 using namespace mozilla::a11y;
 
+const PRUint32 USE_ROLE_STRING = 0;
+
+#ifndef ROLE_SYSTEM_SPLITBUTTON
+const PRUint32 ROLE_SYSTEM_SPLITBUTTON  = 0x3e; // Not defined in all oleacc.h versions
+#endif
+
+#ifndef ROLE_SYSTEM_IPADDRESS
+const PRUint32 ROLE_SYSTEM_IPADDRESS = 0x3f; // Not defined in all oleacc.h versions
+#endif
+
+#ifndef ROLE_SYSTEM_OUTLINEBUTTON
+const PRUint32 ROLE_SYSTEM_OUTLINEBUTTON = 0x40; // Not defined in all oleacc.h versions
+#endif
+
+
 /* For documentation of the accessibility architecture,
  * see http://lxr.mozilla.org/seamonkey/source/accessible/accessible-docs.html
  */
@@ -374,15 +392,26 @@ __try {
                "Does not support nsIAccessibleText when it should");
 #endif
 
-  roles::Role role = xpAccessible->Role();
-  PRUint32 msaaRole = gWindowsRoleMap[role].msaaRole;
-  NS_ASSERTION(gWindowsRoleMap[roles::LAST_ENTRY].msaaRole == ROLE_WINDOWS_LAST_ENTRY,
-               "MSAA role map skewed");
+  a11y::role geckoRole = xpAccessible->Role();
+  PRUint32 msaaRole = 0;
+
+#define ROLE(_geckoRole, stringRole, atkRole, macRole, _msaaRole, ia2Role) \
+  case roles::_geckoRole: \
+    msaaRole = _msaaRole; \
+    break;
+
+  switch (geckoRole) {
+#include "RoleMap.h"
+    default:
+      MOZ_NOT_REACHED("Unknown role.");
+  };
+
+#undef ROLE
 
   // Special case, if there is a ROLE_ROW inside of a ROLE_TREE_TABLE, then call the MSAA role
   // a ROLE_OUTLINEITEM for consistency and compatibility.
   // We need this because ARIA has a role of "row" for both grid and treegrid
-  if (role == roles::ROW) {
+  if (geckoRole == roles::ROW) {
     nsAccessible* xpParent = Parent();
     if (xpParent && xpParent->Role() == roles::TREE_TABLE)
       msaaRole = ROLE_SYSTEM_OUTLINEITEM;
@@ -1202,15 +1231,23 @@ __try {
   if (IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
-  NS_ASSERTION(gWindowsRoleMap[roles::LAST_ENTRY].ia2Role == ROLE_WINDOWS_LAST_ENTRY,
-               "MSAA role map skewed");
+#define ROLE(_geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role) \
+  case roles::_geckoRole: \
+    *aRole = ia2Role; \
+    break;
 
-  roles::Role role = Role();
-  *aRole = gWindowsRoleMap[role].ia2Role;
+  a11y::role geckoRole = Role();
+  switch (geckoRole) {
+#include "RoleMap.h"
+    default:
+      MOZ_NOT_REACHED("Unknown role.");
+  };
+
+#undef ROLE
 
   // Special case, if there is a ROLE_ROW inside of a ROLE_TREE_TABLE, then call
   // the IA2 role a ROLE_OUTLINEITEM.
-  if (role == roles::ROW) {
+  if (geckoRole == roles::ROW) {
     nsAccessible* xpParent = Parent();
     if (xpParent && xpParent->Role() == roles::TREE_TABLE)
       *aRole = ROLE_SYSTEM_OUTLINEITEM;
diff --git a/accessible/src/msaa/nsRoleMap.h b/accessible/src/msaa/nsRoleMap.h
deleted file mode 100644
index f6ee3b73785..00000000000
--- a/accessible/src/msaa/nsRoleMap.h
+++ /dev/null
@@ -1,467 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is IBM Corporation
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Gao, Ming <gaoming@cn.ibm.com>
- *   Aaron Leventhal <aleventh@us.ibm.com>
- *   Alexander Surkov <surkov.alexander@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "OLEACC.H"
-#include "AccessibleRole.h"
-
-const PRUint32 USE_ROLE_STRING = 0;
-const PRUint32 ROLE_WINDOWS_LAST_ENTRY = 0xffffffff;
-
-#ifndef ROLE_SYSTEM_SPLITBUTTON
-const PRUint32 ROLE_SYSTEM_SPLITBUTTON  = 0x3e; // Not defined in all oleacc.h versions
-#endif
-
-#ifndef ROLE_SYSTEM_IPADDRESS
-const PRUint32 ROLE_SYSTEM_IPADDRESS = 0x3f; // Not defined in all oleacc.h versions
-#endif
-
-#ifndef ROLE_SYSTEM_OUTLINEBUTTON
-const PRUint32 ROLE_SYSTEM_OUTLINEBUTTON = 0x40; // Not defined in all oleacc.h versions
-#endif
-
-struct WindowsRoleMapItem
-{
-  PRUint32 msaaRole;
-  long ia2Role;
-};
-
-// Map array from cross platform roles to MSAA/IA2 roles
-static const WindowsRoleMapItem gWindowsRoleMap[] = {
-  // roles::NOTHING
-  { USE_ROLE_STRING, IA2_ROLE_UNKNOWN },
-
-  // roles::TITLEBAR
-  { ROLE_SYSTEM_TITLEBAR, ROLE_SYSTEM_TITLEBAR },
-
-  // roles::MENUBAR
-  { ROLE_SYSTEM_MENUBAR, ROLE_SYSTEM_MENUBAR },
-
-  // roles::SCROLLBAR
-  { ROLE_SYSTEM_SCROLLBAR, ROLE_SYSTEM_SCROLLBAR },
-
-  // roles::GRIP
-  { ROLE_SYSTEM_GRIP, ROLE_SYSTEM_GRIP },
-
-  // roles::SOUND
-  { ROLE_SYSTEM_SOUND, ROLE_SYSTEM_SOUND },
-
-  // roles::CURSOR
-  { ROLE_SYSTEM_CURSOR, ROLE_SYSTEM_CURSOR },
-
-  // roles::CARET
-  { ROLE_SYSTEM_CARET, ROLE_SYSTEM_CARET },
-
-  // roles::ALERT
-  { ROLE_SYSTEM_ALERT, ROLE_SYSTEM_ALERT },
-
-  // roles::WINDOW
-  { ROLE_SYSTEM_WINDOW, ROLE_SYSTEM_WINDOW },
-
-  // roles::INTERNAL_FRAME
-  { USE_ROLE_STRING, IA2_ROLE_INTERNAL_FRAME},
-
-  // roles::MENUPOPUP
-  { ROLE_SYSTEM_MENUPOPUP, ROLE_SYSTEM_MENUPOPUP },
-
-  // roles::MENUITEM
-  { ROLE_SYSTEM_MENUITEM, ROLE_SYSTEM_MENUITEM },
-
-  // roles::TOOLTIP
-  { ROLE_SYSTEM_TOOLTIP, ROLE_SYSTEM_TOOLTIP },
-
-  // roles::APPLICATION
-  { ROLE_SYSTEM_APPLICATION, ROLE_SYSTEM_APPLICATION },
-
-  // roles::DOCUMENT
-  { ROLE_SYSTEM_DOCUMENT, ROLE_SYSTEM_DOCUMENT },
-
-  // roles::PANE
-  // We used to map to ROLE_SYSTEM_PANE, but JAWS would
-  // not read the accessible name for the contaning pane.
-  // However, JAWS will read the accessible name for a groupbox.
-  // By mapping a PANE to a GROUPING, we get no undesirable effects,
-  // but fortunately JAWS will then read the group's label,
-  // when an inner control gets focused.
-  { ROLE_SYSTEM_GROUPING , ROLE_SYSTEM_GROUPING }, 
-
-  // roles::CHART
-  { ROLE_SYSTEM_CHART, ROLE_SYSTEM_CHART },
-
-  // roles::DIALOG
-  { ROLE_SYSTEM_DIALOG, ROLE_SYSTEM_DIALOG },
-
-  // roles::BORDER
-  { ROLE_SYSTEM_BORDER, ROLE_SYSTEM_BORDER },
-
-  // roles::GROUPING
-  { ROLE_SYSTEM_GROUPING, ROLE_SYSTEM_GROUPING },
-
-  // roles::SEPARATOR
-  { ROLE_SYSTEM_SEPARATOR, ROLE_SYSTEM_SEPARATOR },
-
-  // roles::TOOLBAR
-  { ROLE_SYSTEM_TOOLBAR, ROLE_SYSTEM_TOOLBAR },
-
-  // roles::STATUSBAR
-  { ROLE_SYSTEM_STATUSBAR, ROLE_SYSTEM_STATUSBAR },
-
-  // roles::TABLE
-  { ROLE_SYSTEM_TABLE, ROLE_SYSTEM_TABLE },
-
-  // roles::COLUMNHEADER,
-  { ROLE_SYSTEM_COLUMNHEADER, ROLE_SYSTEM_COLUMNHEADER },
-
-  // roles::ROWHEADER
-  { ROLE_SYSTEM_ROWHEADER, ROLE_SYSTEM_ROWHEADER },
-
-  // roles::COLUMN
-  { ROLE_SYSTEM_COLUMN, ROLE_SYSTEM_COLUMN },
-
-  // roles::ROW
-  { ROLE_SYSTEM_ROW, ROLE_SYSTEM_ROW },
-
-  // roles::CELL
-  { ROLE_SYSTEM_CELL, ROLE_SYSTEM_CELL },
-
-  // roles::LINK
-  { ROLE_SYSTEM_LINK, ROLE_SYSTEM_LINK },
-
-  // roles::HELPBALLOON
-  { ROLE_SYSTEM_HELPBALLOON, ROLE_SYSTEM_HELPBALLOON },
-
-  // roles::CHARACTER
-  { ROLE_SYSTEM_CHARACTER, ROLE_SYSTEM_CHARACTER },
-
-  // roles::LIST
-  { ROLE_SYSTEM_LIST, ROLE_SYSTEM_LIST },
-
-  // roles::LISTITEM
-  { ROLE_SYSTEM_LISTITEM, ROLE_SYSTEM_LISTITEM },
-
-  // roles::OUTLINE
-  { ROLE_SYSTEM_OUTLINE, ROLE_SYSTEM_OUTLINE },
-
-  // roles::OUTLINEITEM
-  { ROLE_SYSTEM_OUTLINEITEM, ROLE_SYSTEM_OUTLINEITEM },
-
-  // roles::PAGETAB
-  { ROLE_SYSTEM_PAGETAB, ROLE_SYSTEM_PAGETAB },
-
-  // roles::PROPERTYPAGE
-  { ROLE_SYSTEM_PROPERTYPAGE, ROLE_SYSTEM_PROPERTYPAGE },
-
-  // roles::INDICATOR
-  { ROLE_SYSTEM_INDICATOR, ROLE_SYSTEM_INDICATOR },
-
-  // roles::GRAPHIC
-  { ROLE_SYSTEM_GRAPHIC, ROLE_SYSTEM_GRAPHIC },
-
-  // roles::STATICTEXT
-  { ROLE_SYSTEM_STATICTEXT, ROLE_SYSTEM_STATICTEXT },
-
-  // roles::TEXT_LEAF
-  { ROLE_SYSTEM_TEXT, ROLE_SYSTEM_TEXT },
-
-  // roles::PUSHBUTTON
-  { ROLE_SYSTEM_PUSHBUTTON, ROLE_SYSTEM_PUSHBUTTON },
-
-  // roles::CHECKBUTTON
-  { ROLE_SYSTEM_CHECKBUTTON, ROLE_SYSTEM_CHECKBUTTON },
-
-  // roles::RADIOBUTTON
-  { ROLE_SYSTEM_RADIOBUTTON, ROLE_SYSTEM_RADIOBUTTON },
-
-  // roles::COMBOBOX
-  { ROLE_SYSTEM_COMBOBOX, ROLE_SYSTEM_COMBOBOX },
-
-  // roles::DROPLIST
-  { ROLE_SYSTEM_DROPLIST, ROLE_SYSTEM_DROPLIST },
-
-  // roles::PROGRESSBAR
-  { ROLE_SYSTEM_PROGRESSBAR, ROLE_SYSTEM_PROGRESSBAR },
-
-  // roles::DIAL
-  { ROLE_SYSTEM_DIAL, ROLE_SYSTEM_DIAL },
-
-  // roles::HOTKEYFIELD
-  { ROLE_SYSTEM_HOTKEYFIELD, ROLE_SYSTEM_HOTKEYFIELD },
-
-  // roles::SLIDER
-  { ROLE_SYSTEM_SLIDER, ROLE_SYSTEM_SLIDER },
-
-  // roles::SPINBUTTON
-  { ROLE_SYSTEM_SPINBUTTON, ROLE_SYSTEM_SPINBUTTON },
-
-  // roles::DIAGRAM
-  { ROLE_SYSTEM_DIAGRAM, ROLE_SYSTEM_DIAGRAM },
-
-  // roles::ANIMATION
-  { ROLE_SYSTEM_ANIMATION, ROLE_SYSTEM_ANIMATION },
-
-  // roles::EQUATION
-  { ROLE_SYSTEM_EQUATION, ROLE_SYSTEM_EQUATION },
-
-  // roles::BUTTONDROPDOWN
-  { ROLE_SYSTEM_BUTTONDROPDOWN, ROLE_SYSTEM_BUTTONDROPDOWN },
-
-  // roles::BUTTONMENU
-  { ROLE_SYSTEM_BUTTONMENU, ROLE_SYSTEM_BUTTONMENU },
-
-  // roles::BUTTONDROPDOWNGRID
-  { ROLE_SYSTEM_BUTTONDROPDOWNGRID, ROLE_SYSTEM_BUTTONDROPDOWNGRID },
-
-  // roles::WHITESPACE
-  { ROLE_SYSTEM_WHITESPACE, ROLE_SYSTEM_WHITESPACE },
-
-  // roles::PAGETABLIST
-  { ROLE_SYSTEM_PAGETABLIST, ROLE_SYSTEM_PAGETABLIST },
-
-  // roles::CLOCK
-  { ROLE_SYSTEM_CLOCK, ROLE_SYSTEM_CLOCK },
-
-  // roles::SPLITBUTTON
-  { ROLE_SYSTEM_SPLITBUTTON, ROLE_SYSTEM_SPLITBUTTON },
-
-  // roles::IPADDRESS
-  { ROLE_SYSTEM_IPADDRESS, ROLE_SYSTEM_IPADDRESS },
-
-  // Make up for Gecko roles that we don't have in MSAA or IA2. When in doubt
-  // map them to USE_ROLE_STRING (IA2_ROLE_UNKNOWN).
-
-  // roles::ACCEL_LABEL
-  { ROLE_SYSTEM_STATICTEXT, ROLE_SYSTEM_STATICTEXT },
-
-  // roles::ARROW
-  { ROLE_SYSTEM_INDICATOR, ROLE_SYSTEM_INDICATOR },
-
-  // roles::CANVAS
-  { USE_ROLE_STRING, IA2_ROLE_CANVAS },
-
-  // roles::CHECK_MENU_ITEM
-  { ROLE_SYSTEM_MENUITEM, IA2_ROLE_CHECK_MENU_ITEM },
-
-  // roles::COLOR_CHOOSER
-  { ROLE_SYSTEM_DIALOG, IA2_ROLE_COLOR_CHOOSER },
-
-  // roles::DATE_EDITOR
-  { USE_ROLE_STRING, IA2_ROLE_DATE_EDITOR },
-
-  // roles::DESKTOP_ICON
-  { USE_ROLE_STRING, IA2_ROLE_DESKTOP_ICON },
-
-  // roles::DESKTOP_FRAME
-  { USE_ROLE_STRING, IA2_ROLE_DESKTOP_PANE },
-
-  // roles::DIRECTORY_PANE
-  { USE_ROLE_STRING, IA2_ROLE_DIRECTORY_PANE },
-
-  // roles::FILE_CHOOSER
-  { USE_ROLE_STRING, IA2_ROLE_FILE_CHOOSER },
-
-  // roles::FONT_CHOOSER
-  { USE_ROLE_STRING, IA2_ROLE_FONT_CHOOSER },
-
-  // roles::CHROME_WINDOW
-  { ROLE_SYSTEM_APPLICATION, IA2_ROLE_FRAME },
-
-  // roles::GLASS_PANE
-  { USE_ROLE_STRING, IA2_ROLE_GLASS_PANE },
-
-  // roles::HTML_CONTAINER
-  { USE_ROLE_STRING, IA2_ROLE_UNKNOWN },
-
-  // roles::ICON
-  { ROLE_SYSTEM_PUSHBUTTON, IA2_ROLE_ICON },
-
-  // roles::LABEL
-  { ROLE_SYSTEM_STATICTEXT, IA2_ROLE_LABEL },
-
-  // roles::LAYERED_PANE
-  { USE_ROLE_STRING, IA2_ROLE_LAYERED_PANE },
-
-  // roles::OPTION_PANE
-  { USE_ROLE_STRING, IA2_ROLE_OPTION_PANE },
-
-  // roles::PASSWORD_TEXT
-  { ROLE_SYSTEM_TEXT, ROLE_SYSTEM_TEXT },
-
-  // roles::POPUP_MENU
-  { ROLE_SYSTEM_MENUPOPUP, ROLE_SYSTEM_MENUPOPUP },
-
-  // roles::RADIO_MENU_ITEM
-  { ROLE_SYSTEM_MENUITEM, IA2_ROLE_RADIO_MENU_ITEM },
-
-  // roles::ROOT_PANE
-  { USE_ROLE_STRING, IA2_ROLE_ROOT_PANE },
-
-  // roles::SCROLL_PANE
-  { USE_ROLE_STRING, IA2_ROLE_SCROLL_PANE },
-
-  // roles::SPLIT_PANE
-  { USE_ROLE_STRING, IA2_ROLE_SPLIT_PANE },
-
-  // roles::TABLE_COLUMN_HEADER
-  { ROLE_SYSTEM_COLUMNHEADER, ROLE_SYSTEM_COLUMNHEADER },
-
-  // roles::TABLE_ROW_HEADER
-  { ROLE_SYSTEM_ROWHEADER, ROLE_SYSTEM_ROWHEADER },
-
-  // roles::TEAR_OFF_MENU_ITEM
-  { ROLE_SYSTEM_MENUITEM, IA2_ROLE_TEAR_OFF_MENU },
-
-  // roles::TERMINAL
-  { USE_ROLE_STRING, IA2_ROLE_TERMINAL },
-
-  // roles::TEXT_CONTAINER
-  { USE_ROLE_STRING, IA2_ROLE_TEXT_FRAME },
-
-  // roles::TOGGLE_BUTTON
-  { ROLE_SYSTEM_PUSHBUTTON, IA2_ROLE_TOGGLE_BUTTON },
-
-  // roles::TREE_TABLE
-  { ROLE_SYSTEM_OUTLINE, ROLE_SYSTEM_OUTLINE },
-
-  // roles::VIEWPORT
-  { ROLE_SYSTEM_PANE, IA2_ROLE_VIEW_PORT },
-
-  // roles::HEADER
-  { USE_ROLE_STRING, IA2_ROLE_HEADER },
-
-  // roles::FOOTER
-  { USE_ROLE_STRING, IA2_ROLE_FOOTER },
-
-  // roles::PARAGRAPH
-  { USE_ROLE_STRING, IA2_ROLE_PARAGRAPH },
-
-  // roles::RULER
-  { USE_ROLE_STRING, IA2_ROLE_RULER },
-
-  // roles::AUTOCOMPLETE
-  { ROLE_SYSTEM_COMBOBOX, ROLE_SYSTEM_COMBOBOX },
-
-  // roles::EDITBAR
-  { ROLE_SYSTEM_TEXT, IA2_ROLE_EDITBAR },
-
-  // roles::ENTRY
-  { ROLE_SYSTEM_TEXT, ROLE_SYSTEM_TEXT },
-
-  // roles::CAPTION
-  { USE_ROLE_STRING, IA2_ROLE_CAPTION },
-
-  // roles::DOCUMENT_FRAME
-  { USE_ROLE_STRING, IA2_ROLE_UNKNOWN },
-
-  // roles::HEADING
-  { USE_ROLE_STRING, IA2_ROLE_HEADING },
-
-  // roles::PAGE
-  { USE_ROLE_STRING, IA2_ROLE_PAGE },
-
-  // roles::SECTION
-  { USE_ROLE_STRING, IA2_ROLE_SECTION },
-
-  // roles::REDUNDANT_OBJECT
-  { USE_ROLE_STRING, IA2_ROLE_REDUNDANT_OBJECT },
-
-  // roles::FORM
-  { USE_ROLE_STRING, IA2_ROLE_FORM },
-
-  // roles::IME
-  { USE_ROLE_STRING, IA2_ROLE_INPUT_METHOD_WINDOW },
-
-  // roles::APP_ROOT
-  { ROLE_SYSTEM_APPLICATION, ROLE_SYSTEM_APPLICATION },
-
-  // roles::PARENT_MENUITEM
-  { ROLE_SYSTEM_MENUITEM, ROLE_SYSTEM_MENUITEM },
-
-  // roles::CALENDAR
-  { ROLE_SYSTEM_CLIENT, ROLE_SYSTEM_CLIENT },
-
-  // roles::COMBOBOX_LIST
-  { ROLE_SYSTEM_LIST, ROLE_SYSTEM_LIST },
-
-  // roles::COMBOBOX_OPTION
-  { ROLE_SYSTEM_LISTITEM, ROLE_SYSTEM_LISTITEM },
-
-  // roles::IMAGE_MAP
-  { ROLE_SYSTEM_GRAPHIC, ROLE_SYSTEM_GRAPHIC },
-
-  // roles::OPTION 
-  { ROLE_SYSTEM_LISTITEM, ROLE_SYSTEM_LISTITEM },
-  
-  // roles::RICH_OPTION
-  { ROLE_SYSTEM_LISTITEM, ROLE_SYSTEM_LISTITEM },
-  
-  // roles::LISTBOX
-  { ROLE_SYSTEM_LIST, ROLE_SYSTEM_LIST },
-  
-  // roles::FLAT_EQUATION
-  { ROLE_SYSTEM_EQUATION, ROLE_SYSTEM_EQUATION },
-  
-  // roles::GRID_CELL
-  { ROLE_SYSTEM_CELL, ROLE_SYSTEM_CELL },
-
-  // roles::EMBEDDED_OBJECT
-  { USE_ROLE_STRING, IA2_ROLE_EMBEDDED_OBJECT },
-
-  // roles::NOTE
-  { USE_ROLE_STRING, IA2_ROLE_NOTE },
-
-  // roles::FIGURE
-  { ROLE_SYSTEM_GROUPING, ROLE_SYSTEM_GROUPING },
-
-  // roles::CHECK_RICH_OPTION
-  { ROLE_SYSTEM_CHECKBUTTON, ROLE_SYSTEM_CHECKBUTTON },
-
-  // roles::DEFINITION_LIST
-  { ROLE_SYSTEM_LIST, ROLE_SYSTEM_LIST },
-
-  // roles::TERM
-  { ROLE_SYSTEM_LISTITEM, ROLE_SYSTEM_LISTITEM },
-
-  // roles::DEFINITION
-  { USE_ROLE_STRING, IA2_ROLE_PARAGRAPH },
-
-  // roles::LAST_ENTRY
-  { ROLE_WINDOWS_LAST_ENTRY, ROLE_WINDOWS_LAST_ENTRY }
-};
-
diff --git a/accessible/src/msaa/nsRootAccessibleWrap.cpp b/accessible/src/msaa/nsRootAccessibleWrap.cpp
index 0910470ba5c..d362059c8ce 100644
--- a/accessible/src/msaa/nsRootAccessibleWrap.cpp
+++ b/accessible/src/msaa/nsRootAccessibleWrap.cpp
@@ -20,7 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Alexander Surkov <surkov.alexander@gmail.com> (origianl author)
+ *   Alexander Surkov <surkov.alexander@gmail.com> (original author)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),

From 9489b7bc3cc8a049f9d4e1cde5b9ba2b4ff8808b Mon Sep 17 00:00:00 2001
From: Brian Smith <bsmith@mozilla.com>
Date: Mon, 30 Apr 2012 02:11:09 -0700
Subject: [PATCH 035/162] Bug 703834 - Part 3 - Remove extraneous variable
 mSSLStatus that was unintentionally left over in nsNSSSocketInfo, r=me

--HG--
extra : rebase_source : 958bf51b6869318deeedd272f244d1b4b6f3e196
---
 security/manager/ssl/src/nsNSSIOLayer.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/security/manager/ssl/src/nsNSSIOLayer.h b/security/manager/ssl/src/nsNSSIOLayer.h
index 1b106f0972e..be3c66c0d87 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.h
+++ b/security/manager/ssl/src/nsNSSIOLayer.h
@@ -128,9 +128,6 @@ private:
   bool mRememberClientAuthCertificate;
   PRIntervalTime mHandshakeStartTime;
 
-  /* SSL Status */
-  nsRefPtr<nsSSLStatus> mSSLStatus;
-
   nsresult ActivateSSL();
 
   nsCString mNegotiatedNPN;

From ae48f03d251355dac1f11bc648fcc02850904c5e Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Mon, 30 Apr 2012 11:37:59 +0100
Subject: [PATCH 036/162] Backout e00bbdb439ed (bug 707579) for win64 make
 check failures

---
 xpcom/typelib/xpt/tools/xpt.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/xpcom/typelib/xpt/tools/xpt.py b/xpcom/typelib/xpt/tools/xpt.py
index 3dce370283d..f751782a6c1 100644
--- a/xpcom/typelib/xpt/tools/xpt.py
+++ b/xpcom/typelib/xpt/tools/xpt.py
@@ -1321,25 +1321,12 @@ def xpt_dump(file):
 def xpt_link(dest, inputs):
     """
     Link all of the xpt files in |inputs| together and write the
-    result to |dest|.
+    result ot |dest|.
 
     """
-
     if not inputs:
         print >>sys.stderr, "Usage: xpt_link <destination file> <input files>"
         return
-
-    # Don't re-create dest if newer than the input files.
-    if os.path.exists(dest):
-      maxInputChange = 0;
-      for f in inputs:
-        s = os.stat(f).st_mtime
-        if s > maxInputChange:
-          maxInputChange = s
-      if maxInputChange < os.stat(dest).st_mtime:
-        print dest, " is already up-to-date."
-        return
-
     t1 = Typelib.read(inputs[0])
     for f in inputs[1:]:
         t2 = Typelib.read(f)

From d3b4bb4ca43369df1ed866f9d3f7fccfffe960c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Mon, 30 Apr 2012 13:06:45 +0200
Subject: [PATCH 037/162] Bug 588909 - Replace Gecko/<date> with
 Gecko/<version> in UA string. r=bz sr=gerv

---
 browser/branding/official/configure.sh  | 1 -
 config/autoconf.mk.in                   | 1 -
 configure.in                            | 2 --
 netwerk/protocol/http/nsHttpHandler.cpp | 8 --------
 4 files changed, 12 deletions(-)

diff --git a/browser/branding/official/configure.sh b/browser/branding/official/configure.sh
index 4d3d2973770..55884683d15 100644
--- a/browser/branding/official/configure.sh
+++ b/browser/branding/official/configure.sh
@@ -1,2 +1 @@
 MOZ_APP_DISPLAYNAME=Firefox
-MOZ_UA_BUILDID=20100101
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 46af5074fbf..5b43f8faea5 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -60,7 +60,6 @@ MOZ_EXTENSION_MANAGER = @MOZ_EXTENSION_MANAGER@
 MOZ_APP_UA_NAME = @MOZ_APP_UA_NAME@
 MOZ_APP_VERSION = @MOZ_APP_VERSION@
 MOZ_APP_MAXVERSION = @MOZ_APP_MAXVERSION@
-MOZ_UA_BUILDID = @MOZ_UA_BUILDID@
 MOZ_MACBUNDLE_NAME = @MOZ_MACBUNDLE_NAME@
 MOZ_APP_STATIC_INI = @MOZ_APP_STATIC_INI@
 
diff --git a/configure.in b/configure.in
index f2729c10868..d49d37c74e3 100644
--- a/configure.in
+++ b/configure.in
@@ -8567,8 +8567,6 @@ AC_SUBST(MOZ_APP_MAXVERSION)
 AC_DEFINE_UNQUOTED(MOZ_UA_FIREFOX_VERSION, "$FIREFOX_VERSION")
 AC_DEFINE_UNQUOTED(FIREFOX_VERSION,$FIREFOX_VERSION)
 AC_SUBST(FIREFOX_VERSION)
-AC_DEFINE_UNQUOTED(MOZ_UA_BUILDID, "$MOZ_UA_BUILDID")
-AC_SUBST(MOZ_UA_BUILDID)
 
 # We can't use the static application.ini data when building against
 # a libxul SDK.
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 91ef8b52a09..f2a9a5b6c83 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -321,15 +321,7 @@ nsHttpHandler::Init()
     rv = InitConnectionMgr();
     if (NS_FAILED(rv)) return rv;
 
-#ifdef ANDROID
     mProductSub.AssignLiteral(MOZILLA_UAVERSION);
-#else
-    mProductSub.AssignLiteral(MOZ_UA_BUILDID);
-#endif
-    if (mProductSub.IsEmpty() && appInfo)
-        appInfo->GetPlatformBuildID(mProductSub);
-    if (mProductSub.Length() > 8)
-        mProductSub.SetLength(8);
 
     // Startup the http category
     // Bring alive the objects in the http-protocol-startup category

From 3d734535e29bf39787fc5125e212ba1871dd7cb1 Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Mon, 30 Apr 2012 14:10:48 -0400
Subject: [PATCH 038/162] Bug 749080 - Make AudioManager.cpp build again,
 r=cjones

---
 dom/system/gonk/AudioManager.cpp            |  13 +-
 media/libsydneyaudio/src/gonk/AudioSystem.h | 192 +++++++++++++++++++-
 2 files changed, 196 insertions(+), 9 deletions(-)

diff --git a/dom/system/gonk/AudioManager.cpp b/dom/system/gonk/AudioManager.cpp
index 0b0ad400e8b..4bcb36b3b06 100644
--- a/dom/system/gonk/AudioManager.cpp
+++ b/dom/system/gonk/AudioManager.cpp
@@ -216,9 +216,18 @@ AudioManager::GetForceForUse(PRInt32 aUsage, PRInt32* aForce) {
 
 void
 AudioManager::SetAudioRoute(int aRoutes) {
-  audio_io_handle_t handle = AudioSystem::getOutput(AudioSystem::SYSTEM);
+  audio_io_handle_t handle = 0;
+  if (static_cast<
+      audio_io_handle_t (*)(AudioSystem::stream_type, uint32_t, uint32_t, uint32_t, AudioSystem::output_flags)
+      >(AudioSystem::getOutput)) {
+    handle = AudioSystem::getOutput((AudioSystem::stream_type)AudioSystem::SYSTEM);
+  } else if (static_cast<
+             audio_io_handle_t (*)(audio_stream_type_t, uint32_t, uint32_t, uint32_t, audio_policy_output_flags_t)
+             >(AudioSystem::getOutput)) {
+    handle = AudioSystem::getOutput((audio_stream_type_t)AudioSystem::SYSTEM);
+  }
   
   String8 cmd;
-  cmd.appendFormat("%s=%d", AudioParameter::keyRouting, GetRoutingMode(aRoutes));
+  cmd.appendFormat("routing=%d", GetRoutingMode(aRoutes));
   AudioSystem::setParameters(handle, cmd);
 }
diff --git a/media/libsydneyaudio/src/gonk/AudioSystem.h b/media/libsydneyaudio/src/gonk/AudioSystem.h
index 28b2819fd13..77b56dfa483 100644
--- a/media/libsydneyaudio/src/gonk/AudioSystem.h
+++ b/media/libsydneyaudio/src/gonk/AudioSystem.h
@@ -22,6 +22,14 @@
 #include "IAudioFlinger.h"
 
 #ifndef VANILLA_ANDROID
+/* request to open a direct output with get_output() (by opposition to
+ * sharing an output with other AudioTracks)
+ */
+typedef enum {
+    AUDIO_POLICY_OUTPUT_FLAG_INDIRECT = 0x0,
+    AUDIO_POLICY_OUTPUT_FLAG_DIRECT = 0x1
+} audio_policy_output_flags_t;
+
 /* device categories used for audio_policy->set_force_use() */
 typedef enum {
     AUDIO_POLICY_FORCE_NONE,
@@ -54,6 +62,166 @@ typedef enum {
     AUDIO_POLICY_FORCE_USE_CNT,
     AUDIO_POLICY_FORCE_USE_MAX = AUDIO_POLICY_FORCE_USE_CNT - 1,
 } audio_policy_force_use_t;
+
+typedef enum {
+    AUDIO_STREAM_DEFAULT          = -1,
+    AUDIO_STREAM_VOICE_CALL       = 0,
+    AUDIO_STREAM_SYSTEM           = 1,
+    AUDIO_STREAM_RING             = 2,
+    AUDIO_STREAM_MUSIC            = 3,
+    AUDIO_STREAM_ALARM            = 4,
+    AUDIO_STREAM_NOTIFICATION     = 5,
+    AUDIO_STREAM_BLUETOOTH_SCO    = 6,
+    AUDIO_STREAM_ENFORCED_AUDIBLE = 7, /* Sounds that cannot be muted by user and must be routed to speaker */
+    AUDIO_STREAM_DTMF             = 8,
+    AUDIO_STREAM_TTS              = 9,
+
+    AUDIO_STREAM_CNT,
+    AUDIO_STREAM_MAX              = AUDIO_STREAM_CNT - 1,
+} audio_stream_type_t;
+
+/* PCM sub formats */
+typedef enum {
+    AUDIO_FORMAT_PCM_SUB_16_BIT          = 0x1, /* DO NOT CHANGE - PCM signed 16 bits */
+    AUDIO_FORMAT_PCM_SUB_8_BIT           = 0x2, /* DO NOT CHANGE - PCM unsigned 8 bits */
+    AUDIO_FORMAT_PCM_SUB_32_BIT          = 0x3, /* PCM signed .31 fixed point */
+    AUDIO_FORMAT_PCM_SUB_8_24_BIT        = 0x4, /* PCM signed 7.24 fixed point */
+} audio_format_pcm_sub_fmt_t;
+
+/* Audio format consists in a main format field (upper 8 bits) and a sub format
+ * field (lower 24 bits).
+ *
+ * The main format indicates the main codec type. The sub format field
+ * indicates options and parameters for each format. The sub format is mainly
+ * used for record to indicate for instance the requested bitrate or profile.
+ * It can also be used for certain formats to give informations not present in
+ * the encoded audio stream (e.g. octet alignement for AMR).
+ */
+typedef enum {
+    AUDIO_FORMAT_INVALID             = 0xFFFFFFFFUL,
+    AUDIO_FORMAT_DEFAULT             = 0,
+    AUDIO_FORMAT_PCM                 = 0x00000000UL, /* DO NOT CHANGE */
+    AUDIO_FORMAT_MP3                 = 0x01000000UL,
+    AUDIO_FORMAT_AMR_NB              = 0x02000000UL,
+    AUDIO_FORMAT_AMR_WB              = 0x03000000UL,
+    AUDIO_FORMAT_AAC                 = 0x04000000UL,
+    AUDIO_FORMAT_HE_AAC_V1           = 0x05000000UL,
+    AUDIO_FORMAT_HE_AAC_V2           = 0x06000000UL,
+    AUDIO_FORMAT_VORBIS              = 0x07000000UL,
+    AUDIO_FORMAT_MAIN_MASK           = 0xFF000000UL,
+    AUDIO_FORMAT_SUB_MASK            = 0x00FFFFFFUL,
+
+    /* Aliases */
+    AUDIO_FORMAT_PCM_16_BIT          = (AUDIO_FORMAT_PCM |
+                                        AUDIO_FORMAT_PCM_SUB_16_BIT),
+    AUDIO_FORMAT_PCM_8_BIT           = (AUDIO_FORMAT_PCM |
+                                        AUDIO_FORMAT_PCM_SUB_8_BIT),
+    AUDIO_FORMAT_PCM_32_BIT          = (AUDIO_FORMAT_PCM |
+                                        AUDIO_FORMAT_PCM_SUB_32_BIT),
+    AUDIO_FORMAT_PCM_8_24_BIT        = (AUDIO_FORMAT_PCM |
+                                        AUDIO_FORMAT_PCM_SUB_8_24_BIT),
+} audio_format_t;
+
+typedef enum {
+    /* output channels */
+    AUDIO_CHANNEL_OUT_FRONT_LEFT            = 0x1,
+    AUDIO_CHANNEL_OUT_FRONT_RIGHT           = 0x2,
+    AUDIO_CHANNEL_OUT_FRONT_CENTER          = 0x4,
+    AUDIO_CHANNEL_OUT_LOW_FREQUENCY         = 0x8,
+    AUDIO_CHANNEL_OUT_BACK_LEFT             = 0x10,
+    AUDIO_CHANNEL_OUT_BACK_RIGHT            = 0x20,
+    AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER  = 0x40,
+    AUDIO_CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x80,
+    AUDIO_CHANNEL_OUT_BACK_CENTER           = 0x100,
+    AUDIO_CHANNEL_OUT_SIDE_LEFT             = 0x200,
+    AUDIO_CHANNEL_OUT_SIDE_RIGHT            = 0x400,
+    AUDIO_CHANNEL_OUT_TOP_CENTER            = 0x800,
+    AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT        = 0x1000,
+    AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER      = 0x2000,
+    AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT       = 0x4000,
+    AUDIO_CHANNEL_OUT_TOP_BACK_LEFT         = 0x8000,
+    AUDIO_CHANNEL_OUT_TOP_BACK_CENTER       = 0x10000,
+    AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT        = 0x20000,
+
+    AUDIO_CHANNEL_OUT_MONO     = AUDIO_CHANNEL_OUT_FRONT_LEFT,
+    AUDIO_CHANNEL_OUT_STEREO   = (AUDIO_CHANNEL_OUT_FRONT_LEFT |
+                                  AUDIO_CHANNEL_OUT_FRONT_RIGHT),
+    AUDIO_CHANNEL_OUT_QUAD     = (AUDIO_CHANNEL_OUT_FRONT_LEFT |
+                                  AUDIO_CHANNEL_OUT_FRONT_RIGHT |
+                                  AUDIO_CHANNEL_OUT_BACK_LEFT |
+                                  AUDIO_CHANNEL_OUT_BACK_RIGHT),
+    AUDIO_CHANNEL_OUT_SURROUND = (AUDIO_CHANNEL_OUT_FRONT_LEFT |
+                                  AUDIO_CHANNEL_OUT_FRONT_RIGHT |
+                                  AUDIO_CHANNEL_OUT_FRONT_CENTER |
+                                  AUDIO_CHANNEL_OUT_BACK_CENTER),
+    AUDIO_CHANNEL_OUT_5POINT1  = (AUDIO_CHANNEL_OUT_FRONT_LEFT |
+                                  AUDIO_CHANNEL_OUT_FRONT_RIGHT |
+                                  AUDIO_CHANNEL_OUT_FRONT_CENTER |
+                                  AUDIO_CHANNEL_OUT_LOW_FREQUENCY |
+                                  AUDIO_CHANNEL_OUT_BACK_LEFT |
+                                  AUDIO_CHANNEL_OUT_BACK_RIGHT),
+    // matches the correct AudioFormat.CHANNEL_OUT_7POINT1_SURROUND definition for 7.1
+    AUDIO_CHANNEL_OUT_7POINT1  = (AUDIO_CHANNEL_OUT_FRONT_LEFT |
+                                  AUDIO_CHANNEL_OUT_FRONT_RIGHT |
+                                  AUDIO_CHANNEL_OUT_FRONT_CENTER |
+                                  AUDIO_CHANNEL_OUT_LOW_FREQUENCY |
+                                  AUDIO_CHANNEL_OUT_BACK_LEFT |
+                                  AUDIO_CHANNEL_OUT_BACK_RIGHT |
+                                  AUDIO_CHANNEL_OUT_SIDE_LEFT |
+                                  AUDIO_CHANNEL_OUT_SIDE_RIGHT),
+    AUDIO_CHANNEL_OUT_ALL      = (AUDIO_CHANNEL_OUT_FRONT_LEFT |
+                                  AUDIO_CHANNEL_OUT_FRONT_RIGHT |
+                                  AUDIO_CHANNEL_OUT_FRONT_CENTER |
+                                  AUDIO_CHANNEL_OUT_LOW_FREQUENCY |
+                                  AUDIO_CHANNEL_OUT_BACK_LEFT |
+                                  AUDIO_CHANNEL_OUT_BACK_RIGHT |
+                                  AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER |
+                                  AUDIO_CHANNEL_OUT_FRONT_RIGHT_OF_CENTER |
+                                  AUDIO_CHANNEL_OUT_BACK_CENTER|
+                                  AUDIO_CHANNEL_OUT_SIDE_LEFT|
+                                  AUDIO_CHANNEL_OUT_SIDE_RIGHT|
+                                  AUDIO_CHANNEL_OUT_TOP_CENTER|
+                                  AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT|
+                                  AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER|
+                                  AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT|
+                                  AUDIO_CHANNEL_OUT_TOP_BACK_LEFT|
+                                  AUDIO_CHANNEL_OUT_TOP_BACK_CENTER|
+                                  AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT),
+
+    /* input channels */
+    AUDIO_CHANNEL_IN_LEFT            = 0x4,
+    AUDIO_CHANNEL_IN_RIGHT           = 0x8,
+    AUDIO_CHANNEL_IN_FRONT           = 0x10,
+    AUDIO_CHANNEL_IN_BACK            = 0x20,
+    AUDIO_CHANNEL_IN_LEFT_PROCESSED  = 0x40,
+    AUDIO_CHANNEL_IN_RIGHT_PROCESSED = 0x80,
+    AUDIO_CHANNEL_IN_FRONT_PROCESSED = 0x100,
+    AUDIO_CHANNEL_IN_BACK_PROCESSED  = 0x200,
+    AUDIO_CHANNEL_IN_PRESSURE        = 0x400,
+    AUDIO_CHANNEL_IN_X_AXIS          = 0x800,
+    AUDIO_CHANNEL_IN_Y_AXIS          = 0x1000,
+    AUDIO_CHANNEL_IN_Z_AXIS          = 0x2000,
+    AUDIO_CHANNEL_IN_VOICE_UPLINK    = 0x4000,
+    AUDIO_CHANNEL_IN_VOICE_DNLINK    = 0x8000,
+
+    AUDIO_CHANNEL_IN_MONO   = AUDIO_CHANNEL_IN_FRONT,
+    AUDIO_CHANNEL_IN_STEREO = (AUDIO_CHANNEL_IN_LEFT | AUDIO_CHANNEL_IN_RIGHT),
+    AUDIO_CHANNEL_IN_ALL    = (AUDIO_CHANNEL_IN_LEFT |
+                               AUDIO_CHANNEL_IN_RIGHT |
+                               AUDIO_CHANNEL_IN_FRONT |
+                               AUDIO_CHANNEL_IN_BACK|
+                               AUDIO_CHANNEL_IN_LEFT_PROCESSED |
+                               AUDIO_CHANNEL_IN_RIGHT_PROCESSED |
+                               AUDIO_CHANNEL_IN_FRONT_PROCESSED |
+                               AUDIO_CHANNEL_IN_BACK_PROCESSED|
+                               AUDIO_CHANNEL_IN_PRESSURE |
+                               AUDIO_CHANNEL_IN_X_AXIS |
+                               AUDIO_CHANNEL_IN_Y_AXIS |
+                               AUDIO_CHANNEL_IN_Z_AXIS |
+                               AUDIO_CHANNEL_IN_VOICE_UPLINK |
+                               AUDIO_CHANNEL_IN_VOICE_DNLINK),
+} audio_channels_t;
+
 #endif
 
 namespace android {
@@ -397,18 +565,28 @@ public:
 #ifdef VANILLA_ANDROID
     static status_t setForceUse(force_use usage, forced_config config);
     static forced_config getForceUse(force_use usage);
-#else
-    static status_t setForceUse(force_use usage, forced_config config) __attribute__((weak));
-    static forced_config getForceUse(force_use usage) __attribute__((weak));
-
-    static status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config) __attribute__((weak));
-    static audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage) __attribute__((weak));
-#endif
     static audio_io_handle_t getOutput(stream_type stream,
                                         uint32_t samplingRate = 0,
                                         uint32_t format = FORMAT_DEFAULT,
                                         uint32_t channels = CHANNEL_OUT_STEREO,
                                         output_flags flags = OUTPUT_FLAG_INDIRECT);
+#else
+    static status_t setForceUse(force_use usage, forced_config config) __attribute__((weak));
+    static forced_config getForceUse(force_use usage) __attribute__((weak));
+    static audio_io_handle_t getOutput(stream_type stream,
+                                        uint32_t samplingRate = 0,
+                                        uint32_t format = FORMAT_DEFAULT,
+                                        uint32_t channels = CHANNEL_OUT_STEREO,
+                                        output_flags flags = OUTPUT_FLAG_INDIRECT) __attribute__((weak));
+
+    static status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config) __attribute__((weak));
+    static audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage) __attribute__((weak));
+    static audio_io_handle_t getOutput(audio_stream_type_t stream,
+                                        uint32_t samplingRate = 0,
+                                        uint32_t format = AUDIO_FORMAT_DEFAULT,
+                                        uint32_t channels = AUDIO_CHANNEL_OUT_STEREO,
+                                        audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_INDIRECT) __attribute__((weak));
+#endif
     static status_t startOutput(audio_io_handle_t output,
                                 AudioSystem::stream_type stream,
                                 int session = 0);

From 7834c8f256ceb12c508a0ff8b88e1dc1c058705f Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Mon, 30 Apr 2012 14:10:48 -0400
Subject: [PATCH 039/162] Bug 749661 - Workaround yaffs2 readdir bug, r=dougt

---
 xpcom/io/nsLocalFileUnix.cpp | 53 +++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index 57cef5438eb..885159a266a 100644
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -165,8 +165,16 @@ nsDirEnumeratorUnix : public nsISimpleEnumerator,
     DIR           *mDir;
     struct dirent *mEntry;
     nsCString      mParentPath;
+#ifdef ANDROID
+    off_t          mNextOffset;
+#endif
 };
 
+#ifdef ANDROID
+#define YAFFS2_MAGIC 0x5941FF53
+static uint32_t sFSMagic = 0;
+#endif
+
 nsDirEnumeratorUnix::nsDirEnumeratorUnix() :
                          mDir(nsnull), 
                          mEntry(nsnull)
@@ -192,6 +200,22 @@ nsDirEnumeratorUnix::Init(nsLocalFile *parent, bool resolveSymlinks /*ignored*/)
     if (NS_FAILED(parent->GetNativePath(mParentPath)))
         return NS_ERROR_FAILURE;
 
+#ifdef ANDROID
+    mNextOffset = -1;
+    if (!sFSMagic) {
+        struct STATFS fs;
+        if (!STATFS("/data", &fs)) {
+            sFSMagic = fs.f_type;
+            if (sFSMagic == YAFFS2_MAGIC) {
+                printf_stderr("Using YAFFS2 workarounds");
+            }
+        } else {
+            printf_stderr("Could not determine the fs of /data");
+            sFSMagic = 0xFFFFFFFF;
+        }
+    }
+#endif
+
     mDir = opendir(dirPath.get());
     if (!mDir)
         return NSRESULT_FOR_ERRNO();
@@ -221,6 +245,25 @@ nsDirEnumeratorUnix::GetNext(nsISupports **_retval)
 NS_IMETHODIMP
 nsDirEnumeratorUnix::GetNextEntry()
 {
+#ifdef ANDROID
+    /* Workaround yaffs2 bug
+     *
+     * This is only used on Android if /data is a yaffs2 partition.
+     * However, this workaround would apply to any linux system
+     * unlucky enough to be using yaffs2.
+     *
+     * yaffs2 may reset the offset on readdir calls if we've done something
+     * to a file in the directory since the last call.
+     * This can end up in an infinite loop.
+     */
+    if (sFSMagic == YAFFS2_MAGIC && mNextOffset >= 0) {
+        // Let yaffs2 clobber the offset
+        mEntry = readdir(mDir);
+        // And then set the right offset we cached from last time
+        lseek(dirfd(mDir), mNextOffset, SEEK_SET);
+    }
+#endif
+
     do {
         errno = 0;
         mEntry = readdir(mDir);
@@ -234,6 +277,14 @@ nsDirEnumeratorUnix::GetNextEntry()
             (mEntry->d_name[1] == '\0'    ||   // .\0
             (mEntry->d_name[1] == '.'     &&
             mEntry->d_name[2] == '\0')));      // ..\0
+
+#ifdef ANDROID
+    // Save the correct offset for the next entry
+    if (sFSMagic == YAFFS2_MAGIC) {
+        mNextOffset = lseek(dirfd(mDir), 0, SEEK_CUR);
+    }
+#endif
+
     return NS_OK;
 }
 
@@ -991,7 +1042,7 @@ nsLocalFile::Remove(bool recursive)
             rv = file->Remove(recursive);
 
 #ifdef ANDROID
-            // See bug 580434 - Bionic gives us just deleted files
+            // See bug 580434 - Yaffs2 gives us just deleted files
             if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST)
                 continue;
 #endif

From 3ed06ef75b6bdcc6289c779e0b6e9c3a9a621431 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Mon, 30 Apr 2012 12:58:25 -0700
Subject: [PATCH 040/162] Bug 749727 - Ensure that each Fennec channel runs its
 password content provider in a different process. r=blassey,
 a=blocking-fennec

---
 mobile/android/base/AndroidManifest.xml.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index d4c52adb3b0..5ec2c95c9dd 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -185,10 +185,15 @@
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.browser"
                   android:permission="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"/>
 
+        <!--
+          Ensure that passwords provider runs in its own process. (Bug 718760.)
+          Process name is per-application to avoid loading CPs from multiple
+          Fennec versions into the same process. (Bug 749727.)
+          -->
         <provider android:name="@ANDROID_PACKAGE_NAME@.db.PasswordsProvider"
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.passwords"
                   android:permission="@ANDROID_PACKAGE_NAME@.permissions.PASSWORD_PROVIDER"
-                  android:process="org.mozilla.gecko.PasswordsProvider"/>
+                  android:process="@ANDROID_PACKAGE_NAME@.PasswordsProvider"/>
 
         <provider android:name="@ANDROID_PACKAGE_NAME@.db.FormHistoryProvider"
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.formhistory"

From 78143fe0936d87faeb825cdd9528ce1462ae8eea Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Mon, 30 Apr 2012 16:46:37 -0400
Subject: [PATCH 041/162] Backed out changeset 3812e7c1b642 (Bug 749661) for
 bustage on Android, r=red

---
 xpcom/io/nsLocalFileUnix.cpp | 53 +-----------------------------------
 1 file changed, 1 insertion(+), 52 deletions(-)

diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index 885159a266a..57cef5438eb 100644
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -165,16 +165,8 @@ nsDirEnumeratorUnix : public nsISimpleEnumerator,
     DIR           *mDir;
     struct dirent *mEntry;
     nsCString      mParentPath;
-#ifdef ANDROID
-    off_t          mNextOffset;
-#endif
 };
 
-#ifdef ANDROID
-#define YAFFS2_MAGIC 0x5941FF53
-static uint32_t sFSMagic = 0;
-#endif
-
 nsDirEnumeratorUnix::nsDirEnumeratorUnix() :
                          mDir(nsnull), 
                          mEntry(nsnull)
@@ -200,22 +192,6 @@ nsDirEnumeratorUnix::Init(nsLocalFile *parent, bool resolveSymlinks /*ignored*/)
     if (NS_FAILED(parent->GetNativePath(mParentPath)))
         return NS_ERROR_FAILURE;
 
-#ifdef ANDROID
-    mNextOffset = -1;
-    if (!sFSMagic) {
-        struct STATFS fs;
-        if (!STATFS("/data", &fs)) {
-            sFSMagic = fs.f_type;
-            if (sFSMagic == YAFFS2_MAGIC) {
-                printf_stderr("Using YAFFS2 workarounds");
-            }
-        } else {
-            printf_stderr("Could not determine the fs of /data");
-            sFSMagic = 0xFFFFFFFF;
-        }
-    }
-#endif
-
     mDir = opendir(dirPath.get());
     if (!mDir)
         return NSRESULT_FOR_ERRNO();
@@ -245,25 +221,6 @@ nsDirEnumeratorUnix::GetNext(nsISupports **_retval)
 NS_IMETHODIMP
 nsDirEnumeratorUnix::GetNextEntry()
 {
-#ifdef ANDROID
-    /* Workaround yaffs2 bug
-     *
-     * This is only used on Android if /data is a yaffs2 partition.
-     * However, this workaround would apply to any linux system
-     * unlucky enough to be using yaffs2.
-     *
-     * yaffs2 may reset the offset on readdir calls if we've done something
-     * to a file in the directory since the last call.
-     * This can end up in an infinite loop.
-     */
-    if (sFSMagic == YAFFS2_MAGIC && mNextOffset >= 0) {
-        // Let yaffs2 clobber the offset
-        mEntry = readdir(mDir);
-        // And then set the right offset we cached from last time
-        lseek(dirfd(mDir), mNextOffset, SEEK_SET);
-    }
-#endif
-
     do {
         errno = 0;
         mEntry = readdir(mDir);
@@ -277,14 +234,6 @@ nsDirEnumeratorUnix::GetNextEntry()
             (mEntry->d_name[1] == '\0'    ||   // .\0
             (mEntry->d_name[1] == '.'     &&
             mEntry->d_name[2] == '\0')));      // ..\0
-
-#ifdef ANDROID
-    // Save the correct offset for the next entry
-    if (sFSMagic == YAFFS2_MAGIC) {
-        mNextOffset = lseek(dirfd(mDir), 0, SEEK_CUR);
-    }
-#endif
-
     return NS_OK;
 }
 
@@ -1042,7 +991,7 @@ nsLocalFile::Remove(bool recursive)
             rv = file->Remove(recursive);
 
 #ifdef ANDROID
-            // See bug 580434 - Yaffs2 gives us just deleted files
+            // See bug 580434 - Bionic gives us just deleted files
             if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST)
                 continue;
 #endif

From d6db27d5de02fd1b96746b3c6234807d75946abc Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Tue, 1 May 2012 00:16:31 +0300
Subject: [PATCH 042/162] Followup for Bug 716644, r=trev.saunders

---
 accessible/src/atk/nsAccessibleWrap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accessible/src/atk/nsAccessibleWrap.h b/accessible/src/atk/nsAccessibleWrap.h
index 6b65cdcbcc2..5797032b7e8 100644
--- a/accessible/src/atk/nsAccessibleWrap.h
+++ b/accessible/src/atk/nsAccessibleWrap.h
@@ -119,7 +119,7 @@ public:
   /**
    * Function mapping from cross platform roles to ATK roles.
    */
-  inline static PRUint32 AtkRoleFor(mozilla::a11y::role aRole);
+  static PRUint32 AtkRoleFor(mozilla::a11y::role aRole);
 
 protected:
     virtual nsresult FirePlatformEvent(AccEvent* aEvent);

From 7632f6ec864b9d11536283eb329ec99da50e8f90 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Mon, 30 Apr 2012 16:28:18 -0700
Subject: [PATCH 043/162] Back out 23b86b775f6f (bug 749727) for Android Talos
 bustage on a CLOSED TREE

---
 mobile/android/base/AndroidManifest.xml.in | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 5ec2c95c9dd..d4c52adb3b0 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -185,15 +185,10 @@
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.browser"
                   android:permission="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"/>
 
-        <!--
-          Ensure that passwords provider runs in its own process. (Bug 718760.)
-          Process name is per-application to avoid loading CPs from multiple
-          Fennec versions into the same process. (Bug 749727.)
-          -->
         <provider android:name="@ANDROID_PACKAGE_NAME@.db.PasswordsProvider"
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.passwords"
                   android:permission="@ANDROID_PACKAGE_NAME@.permissions.PASSWORD_PROVIDER"
-                  android:process="@ANDROID_PACKAGE_NAME@.PasswordsProvider"/>
+                  android:process="org.mozilla.gecko.PasswordsProvider"/>
 
         <provider android:name="@ANDROID_PACKAGE_NAME@.db.FormHistoryProvider"
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.formhistory"

From 4cc46769317988842be85da514373ce383c74f52 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Thu, 19 Apr 2012 12:28:13 -0700
Subject: [PATCH 044/162] Bug 746703 - Set targetSdkVersion to 14 in
 AndroidManifest.xml to disable legacy menu button [r=blassey, a=android-only]

---
 mobile/android/base/AndroidManifest.xml.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index d4c52adb3b0..033c16eccb9 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -10,7 +10,7 @@
 #endif
       >
     <uses-sdk android:minSdkVersion="8"
-              android:targetSdkVersion="11"/>
+              android:targetSdkVersion="14"/>
 
 #include ../sync/manifests/SyncAndroidManifest_permissions.xml.in
 
@@ -58,7 +58,7 @@
 
         <activity android:name="App"
                   android:label="@MOZ_APP_DISPLAYNAME@"
-                  android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation"
+                  android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                   android:windowSoftInputMode="stateUnspecified|adjustResize"
                   android:launchMode="singleTask"
                   android:theme="@style/Gecko.App">
@@ -165,7 +165,7 @@
 
         <activity android:name="org.mozilla.gecko.AwesomeBar"
                   android:theme="@style/Gecko.Light.AwesomeBar"
-                  android:configChanges="orientation"
+                  android:configChanges="orientation|screenSize"
                   android:windowSoftInputMode="stateAlwaysVisible|adjustResize"/>
 
         <activity android:name="org.mozilla.gecko.TabsTray"

From 6d5668589ac15a3f8cf80089f306998c6bd09857 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Fri, 27 Apr 2012 09:22:06 +0200
Subject: [PATCH 045/162] Bug 539095 - Expose high-res timers to web content
 (performance.now()). r=bz, sr=smaug

--HG--
extra : transplant_source : o%9F%061%D4%B5%7D%5C%FB%95%5D%16%27%DEKU%EC%21%3AR
---
 dom/base/nsDOMNavigationTiming.h              |  6 +++++
 dom/base/nsPerformance.cpp                    |  8 +++++++
 dom/interfaces/base/domstubs.idl              |  1 +
 dom/interfaces/base/nsIDOMPerformance.idl     |  6 +++--
 dom/tests/mochitest/general/Makefile.in       |  1 +
 .../general/test_performance_now.html         | 23 +++++++++++++++++++
 js/xpconnect/src/dom_quickstubs.qsconf        |  5 ++++
 7 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 dom/tests/mochitest/general/test_performance_now.html

diff --git a/dom/base/nsDOMNavigationTiming.h b/dom/base/nsDOMNavigationTiming.h
index 3b54cc0f9e3..5bbeacf0e65 100644
--- a/dom/base/nsDOMNavigationTiming.h
+++ b/dom/base/nsDOMNavigationTiming.h
@@ -95,6 +95,12 @@ public:
   nsresult TimeStampToDOMOrFetchStart(mozilla::TimeStamp aStamp, 
                                       DOMTimeMilliSec* aResult);
 
+  inline DOMHighResTimeStamp TimeStampToDOMHighRes(mozilla::TimeStamp aStamp)
+  {
+    mozilla::TimeDuration duration = aStamp - mNavigationStartTimeStamp;
+    return duration.ToMilliseconds();
+  }
+
 private:
   nsDOMNavigationTiming(const nsDOMNavigationTiming &){};
   ~nsDOMNavigationTiming();
diff --git a/dom/base/nsPerformance.cpp b/dom/base/nsPerformance.cpp
index 5f40340a313..bb151c001b7 100644
--- a/dom/base/nsPerformance.cpp
+++ b/dom/base/nsPerformance.cpp
@@ -319,3 +319,11 @@ nsPerformance::GetNavigation(nsIDOMPerformanceNavigation** aNavigation)
   NS_IF_ADDREF(*aNavigation = mNavigation);
   return NS_OK;
 }
+
+NS_IMETHODIMP
+nsPerformance::Now(DOMHighResTimeStamp* aNow)
+{
+  *aNow = mDOMTiming->TimeStampToDOMHighRes(mozilla::TimeStamp::Now());
+  return NS_OK;
+}
+
diff --git a/dom/interfaces/base/domstubs.idl b/dom/interfaces/base/domstubs.idl
index 26091974430..943d2211916 100644
--- a/dom/interfaces/base/domstubs.idl
+++ b/dom/interfaces/base/domstubs.idl
@@ -47,6 +47,7 @@ class nsWrapperCache;
 
 typedef unsigned long long DOMTimeStamp;
 typedef unsigned long long DOMTimeMilliSec;
+typedef double DOMHighResTimeStamp;
 
 // Core
 interface nsIDOMAttr;
diff --git a/dom/interfaces/base/nsIDOMPerformance.idl b/dom/interfaces/base/nsIDOMPerformance.idl
index 242f26fd394..db2552dffff 100644
--- a/dom/interfaces/base/nsIDOMPerformance.idl
+++ b/dom/interfaces/base/nsIDOMPerformance.idl
@@ -37,14 +37,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsISupports.idl"
+#include "domstubs.idl"
 interface nsIDOMPerformanceTiming;
 interface nsIDOMPerformanceNavigation;
 
-[scriptable, uuid(446faf26-000b-4e66-a5fd-ae37c5ed6beb)]
+[scriptable, uuid(ac274ec8-ee9f-44ef-b2f0-b13c22225a98)]
 interface nsIDOMPerformance : nsISupports
 {
   readonly attribute nsIDOMPerformanceTiming timing;
   readonly attribute nsIDOMPerformanceNavigation navigation;
+
+  DOMHighResTimeStamp now();
 };
 
diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in
index cc9afdda4ff..0d2fb57f6c8 100644
--- a/dom/tests/mochitest/general/Makefile.in
+++ b/dom/tests/mochitest/general/Makefile.in
@@ -76,6 +76,7 @@ _TEST_FILES = \
 		test_focus_legend_noparent.html \
 		file_clonewrapper.html \
 		file_moving_nodeList.html \
+		test_performance_now.html \
 		$(NULL)
 
 _CHROME_FILES = \
diff --git a/dom/tests/mochitest/general/test_performance_now.html b/dom/tests/mochitest/general/test_performance_now.html
new file mode 100644
index 00000000000..a1364c64277
--- /dev/null
+++ b/dom/tests/mochitest/general/test_performance_now.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for High Resolution Timer</title>
+  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+  <script>
+    ok(window.performance);
+    ok(typeof window.performance.now == 'function');
+    var n = window.performance.now();
+    ok(n >= 0);
+    ok(window.performance.now() >= n);
+    SimpleTest.waitForExplicitFinish();
+    setTimeout(function() {
+      ok(window.performance.now() > n);
+      SimpleTest.finish();
+    }, 20);
+  </script>
+</body>
+</html>
diff --git a/js/xpconnect/src/dom_quickstubs.qsconf b/js/xpconnect/src/dom_quickstubs.qsconf
index deb079df57e..03e7025b99a 100644
--- a/js/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/xpconnect/src/dom_quickstubs.qsconf
@@ -468,6 +468,11 @@ members = [
     'nsIIndexedDatabaseUsageCallback.*',
     'nsIIndexedDatabaseManager.*',
 
+    # Performance
+    'nsIDOMPerformance.*',
+    'nsIDOMPerformanceTiming.*',
+    'nsIDOMPerformanceNavigation.*',
+
     'nsIDOMDOMError.*',
     ]
 

From 5f2f1f1d4616da28f8b7d121635c0e14f19e5f72 Mon Sep 17 00:00:00 2001
From: Arjun <junky.argonaut@gmail.com>
Date: Fri, 27 Apr 2012 16:56:49 +0900
Subject: [PATCH 046/162] Bug 740750 - Use nsITreeView* instead of
 nsCOMPtr<nsITreeView> for XUL tree accessibles, r=surkov

---
 accessible/src/xul/nsXULTreeAccessible.cpp     | 13 ++++++-------
 accessible/src/xul/nsXULTreeAccessible.h       |  4 ++--
 accessible/src/xul/nsXULTreeGridAccessible.cpp |  2 --
 accessible/src/xul/nsXULTreeGridAccessible.h   |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/accessible/src/xul/nsXULTreeAccessible.cpp b/accessible/src/xul/nsXULTreeAccessible.cpp
index 9417329b4c4..d4d8f03f6c7 100644
--- a/accessible/src/xul/nsXULTreeAccessible.cpp
+++ b/accessible/src/xul/nsXULTreeAccessible.cpp
@@ -71,10 +71,13 @@ nsXULTreeAccessible::
   mFlags |= eXULTreeAccessible;
 
   mTree = nsCoreUtils::GetTreeBoxObject(aContent);
-  if (mTree)
-    mTree->GetView(getter_AddRefs(mTreeView));
+  NS_ASSERTION(mTree, "Can't get mTree!\n");
 
-  NS_ASSERTION(mTree && mTreeView, "Can't get mTree or mTreeView!\n");
+  if (mTree) {
+    nsCOMPtr<nsITreeView> treeView;
+    mTree->GetView(getter_AddRefs(treeView));
+    mTreeView = treeView;
+  }
 
   nsIContent* parentContent = mContent->GetParent();
   if (parentContent) {
@@ -95,14 +98,12 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULTreeAccessible)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXULTreeAccessible,
                                                   nsAccessible)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTree)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTreeView)
   CycleCollectorTraverseCache(tmp->mAccessibleCache, &cb);
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsXULTreeAccessible,
                                                 nsAccessible)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTree)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTreeView)
   ClearCache(tmp->mAccessibleCache);
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
@@ -739,13 +740,11 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULTreeItemAccessibleBase)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXULTreeItemAccessibleBase,
                                                   nsAccessible)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTree)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTreeView)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsXULTreeItemAccessibleBase,
                                                 nsAccessible)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTree)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTreeView)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsXULTreeItemAccessibleBase)
diff --git a/accessible/src/xul/nsXULTreeAccessible.h b/accessible/src/xul/nsXULTreeAccessible.h
index 6d35794dd3d..a1bba9c42ca 100644
--- a/accessible/src/xul/nsXULTreeAccessible.h
+++ b/accessible/src/xul/nsXULTreeAccessible.h
@@ -143,7 +143,7 @@ protected:
   virtual already_AddRefed<nsAccessible> CreateTreeItemAccessible(PRInt32 aRow);
 
   nsCOMPtr<nsITreeBoxObject> mTree;
-  nsCOMPtr<nsITreeView> mTreeView;
+  nsITreeView* mTreeView;
   nsAccessibleHashtable mAccessibleCache;
 };
 
@@ -244,7 +244,7 @@ protected:
   void GetCellName(nsITreeColumn* aColumn, nsAString& aName);
 
   nsCOMPtr<nsITreeBoxObject> mTree;
-  nsCOMPtr<nsITreeView> mTreeView;
+  nsITreeView* mTreeView;
   PRInt32 mRow;
 };
 
diff --git a/accessible/src/xul/nsXULTreeGridAccessible.cpp b/accessible/src/xul/nsXULTreeGridAccessible.cpp
index 6cad495a1c2..c7f47ac009e 100644
--- a/accessible/src/xul/nsXULTreeGridAccessible.cpp
+++ b/accessible/src/xul/nsXULTreeGridAccessible.cpp
@@ -818,14 +818,12 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULTreeGridCellAccessible)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXULTreeGridCellAccessible,
                                                   nsLeafAccessible)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTree)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTreeView)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mColumn)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsXULTreeGridCellAccessible,
                                                 nsLeafAccessible)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTree)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTreeView)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mColumn)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
diff --git a/accessible/src/xul/nsXULTreeGridAccessible.h b/accessible/src/xul/nsXULTreeGridAccessible.h
index c769113bbbb..234c4c5c86a 100644
--- a/accessible/src/xul/nsXULTreeGridAccessible.h
+++ b/accessible/src/xul/nsXULTreeGridAccessible.h
@@ -210,7 +210,7 @@ protected:
   enum { eAction_Click = 0 };
 
   nsCOMPtr<nsITreeBoxObject> mTree;
-  nsCOMPtr<nsITreeView> mTreeView;
+  nsITreeView* mTreeView;
 
   PRInt32 mRow;
   nsCOMPtr<nsITreeColumn> mColumn;

From 211dd005320880e1daf1b5204375bae376c38794 Mon Sep 17 00:00:00 2001
From: Mark Capella <markcapella@twcny.rr.com>
Date: Fri, 27 Apr 2012 17:11:03 +0900
Subject: [PATCH 047/162] Bug 746990 - crash in nsXULTreeAccessible::Value,
 r=surkov

---
 accessible/src/xul/nsXULTreeAccessible.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/accessible/src/xul/nsXULTreeAccessible.cpp b/accessible/src/xul/nsXULTreeAccessible.cpp
index d4d8f03f6c7..67715840da8 100644
--- a/accessible/src/xul/nsXULTreeAccessible.cpp
+++ b/accessible/src/xul/nsXULTreeAccessible.cpp
@@ -146,10 +146,11 @@ nsXULTreeAccessible::NativeState()
 void
 nsXULTreeAccessible::Value(nsString& aValue)
 {
-  // Return the value is the first selected child.
-
   aValue.Truncate();
+  if (!mTreeView)
+    return;
 
+  // Return the value is the first selected child.
   nsCOMPtr<nsITreeSelection> selection;
   mTreeView->GetSelection(getter_AddRefs(selection));
   if (!selection)

From b67dee3a5b39cb8fcb217646870a00881a6a8277 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Fri, 27 Apr 2012 17:07:40 +0900
Subject: [PATCH 048/162] Bug 747303 - Android/x86 shouldn't check ALSA.
 r=khuey

---
 configure.in | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index 40c3f2e3136..008ee4c4cd3 100644
--- a/configure.in
+++ b/configure.in
@@ -5835,14 +5835,10 @@ dnl = Check alsa availability on Linux if using sydneyaudio
 dnl ========================================================
 
 dnl If using sydneyaudio with Linux, ensure that the alsa library is available
-if test -n "$MOZ_SYDNEYAUDIO"; then
-   case "$target_os" in
-linux*)
-      PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
+if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then
+    PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
          [echo "$MOZ_ALSA_PKG_ERRORS"
           AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
-      ;;
-   esac
 fi
 
 dnl ========================================================

From c6706b1d8a5bb6c006c8f0e843440e7b4762abaa Mon Sep 17 00:00:00 2001
From: John Daggett <jdaggett@mozilla.com>
Date: Fri, 27 Apr 2012 17:26:41 +0900
Subject: [PATCH 049/162] Bug 749139. Set build-on-fly flag on non-SFNT font
 type. r=jkew

---
 gfx/thebes/gfxGDIFontList.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gfx/thebes/gfxGDIFontList.cpp b/gfx/thebes/gfxGDIFontList.cpp
index ba92cd42197..16f3cbde714 100644
--- a/gfx/thebes/gfxGDIFontList.cpp
+++ b/gfx/thebes/gfxGDIFontList.cpp
@@ -229,6 +229,7 @@ GDIFontEntry::ReadCMAP()
         mFontType != GFX_FONT_TYPE_TRUETYPE) 
     {
         mCharacterMap = new gfxCharacterMap();
+        mCharacterMap->mBuildOnTheFly = true;
         return NS_ERROR_FAILURE;
     }
 

From fa2f68a3732626989ee820e4c9d3c4196424d9dd Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Fri, 27 Apr 2012 10:38:14 +0200
Subject: [PATCH 050/162] Bug 640904 - Check for null window globals within
 PreCreate hooks and assert IsClosedOrClosing(). r=peterv,smaug

---
 dom/base/nsDOMClassInfo.cpp | 62 ++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 035ddd60380..c9ca767e9ca 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -535,6 +535,8 @@ using mozilla::dom::indexedDB::IDBWrapperCache;
 #include "DOMError.h"
 #include "DOMRequest.h"
 
+#include "mozilla/Likely.h"
+
 #undef None // something included above defines this preprocessor symbol, maybe Xlib headers
 #include "WebGLContext.h"
 
@@ -1968,6 +1970,23 @@ WrapNativeParent(JSContext *cx, JSObject *scope, nsISupports *native,
   return NS_OK;
 }
 
+// Helper to handle torn-down inner windows.
+static inline nsresult
+SetParentToWindow(nsGlobalWindow *win, JSObject **parent)
+{
+  MOZ_ASSERT(win);
+  MOZ_ASSERT(win->IsInnerWindow());
+  *parent = win->FastGetGlobalJSObject();
+
+  if (MOZ_UNLIKELY(!*parent)) {
+    // The only known case where this can happen is when the inner window has
+    // been torn down. See bug 691178 comment 11.
+    MOZ_ASSERT(win->IsClosedOrClosing());
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
 // static
 
 nsISupports *
@@ -4629,8 +4648,9 @@ nsDOMClassInfo::PreCreate(nsISupports *nativeObj, JSContext *cx,
   }
 
   if (piwin->IsOuterWindow()) {
-    *parentObj = ((nsGlobalWindow *)piwin.get())->
-      GetCurrentInnerWindowInternal()->GetGlobalJSObject();
+    nsGlobalWindow *win = ((nsGlobalWindow *)piwin.get())->
+                            GetCurrentInnerWindowInternal();
+    return SetParentToWindow(win, parentObj);
   }
 
   return NS_OK;
@@ -5165,20 +5185,15 @@ nsWindowSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
   nsGlobalWindow *win = nsGlobalWindow::FromSupports(nativeObj);
   NS_ASSERTION(win->IsInnerWindow(), "Should be inner window.");
 
-  JSObject *winObj = win->FastGetGlobalJSObject();
-  if (!winObj) {
+  // We sometimes get a disconnected window during file api test. :-(
+  if (!win->GetOuterWindowInternal())
+    return NS_ERROR_FAILURE;
 
-    // See bug 691178 comment 11 for why this is necessary.
-    if (win->IsClosedOrClosing())
-      return NS_ERROR_FAILURE;
-
-    NS_ASSERTION(win->GetOuterWindowInternal()->IsCreatingInnerWindow(),
-                 "should have a JS object by this point");
+  // If we're bootstrapping, we don't have a JS object yet.
+  if (win->GetOuterWindowInternal()->IsCreatingInnerWindow())
     return NS_OK;
-  }
 
-  *parentObj = winObj;
-  return NS_OK;
+  return SetParentToWindow(win, parentObj);
 }
 
 // This JS class piggybacks on nsHTMLDocumentSH::ReleaseDocument()...
@@ -6029,8 +6044,7 @@ nsDOMConstructor::PreCreate(JSContext *cx, JSObject *globalObj, JSObject **paren
   }
 
   nsGlobalWindow *win = static_cast<nsGlobalWindow *>(owner.get());
-  *parentObj = win->FastGetGlobalJSObject();
-  return NS_OK;
+  return SetParentToWindow(win, parentObj);
 }
 
 nsresult
@@ -7480,7 +7494,7 @@ nsLocationSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
   }
 
   *parentObj = sgo->GetGlobalJSObject();
-  return NS_OK;
+  return *parentObj ? NS_OK : NS_ERROR_FAILURE;
 }
 
 // DOM Navigator helper
@@ -7579,14 +7593,7 @@ nsNavigatorSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
 
     return NS_ERROR_UNEXPECTED;
   }
-
-  JSObject *global = win->GetGlobalJSObject();
-
-  if (global) {
-    *parentObj = global;
-  }
-
-  return NS_OK;
+  return SetParentToWindow(win, parentObj);
 }
 
 // DOM Node helper
@@ -7853,7 +7860,7 @@ nsEventTargetSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
 
   *parentObj = native_parent ? native_parent->GetGlobalJSObject() : globalObj;
 
-  return NS_OK;
+  return *parentObj ? NS_OK : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
@@ -10005,9 +10012,8 @@ nsHistorySH::PreCreate(nsISupports *nativeObj, JSContext *cx,
     NS_WARNING("refusing to create history object in the wrong scope");
     return NS_ERROR_FAILURE;
   }
-
-  *parentObj = static_cast<nsGlobalWindow *>(innerWindow.get())->FastGetGlobalJSObject();
-  return NS_OK;
+  return SetParentToWindow(static_cast<nsGlobalWindow *>(innerWindow.get()),
+                           parentObj);
 }
 
 NS_IMETHODIMP

From 2a95b98250bf535ac0f8b5e0873e5ac48de157da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hub=20Figui=C3=A8re?= <hfiguiere@mozilla.com>
Date: Wed, 25 Apr 2012 15:59:14 -0700
Subject: [PATCH 051/162] Bug 733513 - Enable accessibility by default on Mac.
 r=ted

---
 configure.in | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/configure.in b/configure.in
index 008ee4c4cd3..09cd5023da6 100644
--- a/configure.in
+++ b/configure.in
@@ -4609,15 +4609,7 @@ MOZ_USE_NATIVE_POPUP_WINDOWS=
 MOZ_ANDROID_HISTORY=
 MOZ_WEBSMS_BACKEND=
 MOZ_GRAPHITE=1
-
-case "${target}" in
-*darwin*)
-    ACCESSIBILITY=
-    ;;
-*)
-    ACCESSIBILITY=1
-    ;;
-esac
+ACCESSIBILITY=1
 
 case "$target_os" in
     mingw*)
@@ -5550,10 +5542,9 @@ AC_DEFINE(IBMBIDI)
 
 dnl ========================================================
 dnl accessibility support on by default on all platforms
-dnl except OS X.
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(accessibility,
-[  --disable-accessibility Disable accessibility support (off by default on OS X)],
+[  --disable-accessibility Disable accessibility support],
     ACCESSIBILITY=,
     ACCESSIBILITY=1 )
 if test "$ACCESSIBILITY"; then

From 8fc6a4f1be58f83ade5248c708cd0344e50dda4e Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Fri, 27 Apr 2012 11:40:05 +0200
Subject: [PATCH 052/162] Bug 745762 - double-conversion.h fails to compile on
 mingw r=jwalden

---
 mfbt/double-conversion/add-mfbt-api-markers.patch | 15 ---------------
 mfbt/double-conversion/double-conversion.h        |  4 ++--
 mfbt/double-conversion/update.sh                  |  2 +-
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/mfbt/double-conversion/add-mfbt-api-markers.patch b/mfbt/double-conversion/add-mfbt-api-markers.patch
index d3cb1daa874..b98ec744e9f 100644
--- a/mfbt/double-conversion/add-mfbt-api-markers.patch
+++ b/mfbt/double-conversion/add-mfbt-api-markers.patch
@@ -19,21 +19,6 @@ index f98edae..e536a01 100644
  
    // Computes the shortest string of digits that correctly represent the input
    // number. Depending on decimal_in_shortest_low and decimal_in_shortest_high
-@@ -154,12 +155,12 @@ class DoubleToStringConverter {
-   // Returns true if the conversion succeeds. The conversion always succeeds
-   // except when the input value is special and no infinity_symbol or
-   // nan_symbol has been given to the constructor.
--  bool ToShortest(double value, StringBuilder* result_builder) const {
-+  MFBT_API(bool) ToShortest(double value, StringBuilder* result_builder) const {
-     return ToShortestIeeeNumber(value, result_builder, SHORTEST);
-   }
- 
-   // Same as ToShortest, but for single-precision floats.
--  bool ToShortestSingle(float value, StringBuilder* result_builder) const {
-+  MFBT_API(bool) ToShortestSingle(float value, StringBuilder* result_builder) const {
-     return ToShortestIeeeNumber(value, result_builder, SHORTEST_SINGLE);
-   }
- 
 @@ -197,7 +198,7 @@ class DoubleToStringConverter {
    // The last two conditions imply that the result will never contain more than
    // 1 + kMaxFixedDigitsBeforePoint + 1 + kMaxFixedDigitsAfterPoint characters
diff --git a/mfbt/double-conversion/double-conversion.h b/mfbt/double-conversion/double-conversion.h
index 3401c1e9c7a..0e7226da80f 100644
--- a/mfbt/double-conversion/double-conversion.h
+++ b/mfbt/double-conversion/double-conversion.h
@@ -155,12 +155,12 @@ class DoubleToStringConverter {
   // Returns true if the conversion succeeds. The conversion always succeeds
   // except when the input value is special and no infinity_symbol or
   // nan_symbol has been given to the constructor.
-  MFBT_API(bool) ToShortest(double value, StringBuilder* result_builder) const {
+  bool ToShortest(double value, StringBuilder* result_builder) const {
     return ToShortestIeeeNumber(value, result_builder, SHORTEST);
   }
 
   // Same as ToShortest, but for single-precision floats.
-  MFBT_API(bool) ToShortestSingle(float value, StringBuilder* result_builder) const {
+  bool ToShortestSingle(float value, StringBuilder* result_builder) const {
     return ToShortestIeeeNumber(value, result_builder, SHORTEST_SINGLE);
   }
 
diff --git a/mfbt/double-conversion/update.sh b/mfbt/double-conversion/update.sh
index 5f56df9cc83..3630ab7292b 100755
--- a/mfbt/double-conversion/update.sh
+++ b/mfbt/double-conversion/update.sh
@@ -13,4 +13,4 @@ cp $1/src/*.h ./
 cp $1/src/*.cc ./
 
 patch -p3 < add-mfbt-api-markers.patch
-patch -p3 < useStandardInteger.patch
+patch -p3 < use-StandardInteger.patch

From 344a980406b18dbab96ec5c17115e912e1058841 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Wed, 25 Apr 2012 09:45:01 +0800
Subject: [PATCH 053/162] Bug 721020 - [New Tab Page] Add telemetry probes
 r=ttaubert

---
 browser/modules/NewTabUtils.jsm               | 44 +++++++++++++++++++
 .../telemetry/TelemetryHistograms.h           |  7 +++
 2 files changed, 51 insertions(+)

diff --git a/browser/modules/NewTabUtils.jsm b/browser/modules/NewTabUtils.jsm
index 27b13e46196..3da4a11c17a 100644
--- a/browser/modules/NewTabUtils.jsm
+++ b/browser/modules/NewTabUtils.jsm
@@ -27,6 +27,9 @@ const PREF_NEWTAB_ENABLED = "browser.newtabpage.enabled";
 // The maximum number of results we want to retrieve from history.
 const HISTORY_RESULTS_LIMIT = 100;
 
+// The gather telemetry topic.
+const TOPIC_GATHER_TELEMETRY = "gather-telemetry";
+
 /**
  * Singleton that provides storage functionality.
  */
@@ -585,6 +588,47 @@ let Links = {
                                          Ci.nsISupportsWeakReference])
 };
 
+/**
+ * Singleton used to collect telemetry data.
+ *
+ */
+let Telemetry = {
+  /**
+   * Initializes object.
+   */
+  init: function Telemetry_init() {
+    Services.obs.addObserver(this, TOPIC_GATHER_TELEMETRY, false);
+  },
+
+  /**
+   * Collects data.
+   */
+  _collect: function Telemetry_collect() {
+    let probes = [
+      { histogram: "NEWTAB_PAGE_ENABLED",
+        value: AllPages.enabled },
+      { histogram: "NEWTAB_PAGE_PINNED_SITES_COUNT",
+        value: PinnedLinks.links.length },
+      { histogram: "NEWTAB_PAGE_BLOCKED_SITES_COUNT",
+        value: Object.keys(BlockedLinks.links).length }
+    ];
+
+    probes.forEach(function Telemetry_collect_forEach(aProbe) {
+      Services.telemetry.getHistogramById(aProbe.histogram)
+        .add(aProbe.value);
+    });
+  },
+
+  /**
+   * Listens for gather telemetry topic.
+   */
+  observe: function Telemetry_observe(aSubject, aTopic, aData) {
+    this._collect();
+  }
+};
+
+Telemetry.init();
+
 /**
  * Singleton that provides the public API of this JSM.
  */
diff --git a/toolkit/components/telemetry/TelemetryHistograms.h b/toolkit/components/telemetry/TelemetryHistograms.h
index dd39b46df3a..4c1360df280 100644
--- a/toolkit/components/telemetry/TelemetryHistograms.h
+++ b/toolkit/components/telemetry/TelemetryHistograms.h
@@ -434,6 +434,13 @@ HISTOGRAM_FLAG(TELEMETRY_TEST_FLAG, "a testing histogram; not meant to be touche
 HISTOGRAM_FLAG(STARTUP_CRASH_DETECTED, "Whether there was a crash during the last startup")
 HISTOGRAM_ENUMERATED_VALUES(SAFE_MODE_USAGE, 3, "Whether the user is in safe mode (No, Yes, Forced)")
 
+/**
+ * New Tab Page telemetry.
+ */
+HISTOGRAM(NEWTAB_PAGE_ENABLED, 0, 1, 2, BOOLEAN, "New tab page is enabled.")
+HISTOGRAM(NEWTAB_PAGE_PINNED_SITES_COUNT, 1, 9, 10, EXPONENTIAL, "Number of pinned sites on the new tab page.")
+HISTOGRAM(NEWTAB_PAGE_BLOCKED_SITES_COUNT, 1, 100, 10, EXPONENTIAL, "Number of sites blocked from the new tab page.")
+
 /**
  * Native Fennec Telemetry
  */

From 7f6493f4ed752bcc20781fa15042650b1487d23e Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Mon, 23 Apr 2012 16:10:56 +0200
Subject: [PATCH 054/162] Fix for bug 741267 (UserScript's XMLHttpRequest is
 undefined in 20120401 nightly). Pass two objects when creating a DOM
 interface object, the global used to cache the DOM interface objects and a
 receiver object on which the named property is that points to the DOM
 interface object.

--HG--
extra : rebase_source : b462393e7376fdb68f3b279ccd08b3ab25ac154a
---
 dom/bindings/Codegen.py                       | 59 +++++++++++--------
 dom/bindings/Utils.cpp                        | 20 +++----
 dom/bindings/Utils.h                          | 16 +++--
 dom/tests/mochitest/chrome/Makefile.in        |  1 +
 .../chrome/test_sandbox_bindings.xul          | 52 ++++++++++++++++
 dom/workers/DOMBindingInlines.h               |  2 +-
 dom/workers/RuntimeService.cpp                |  2 +-
 dom/workers/WorkerScope.cpp                   |  8 ++-
 js/xpconnect/src/dombindings.cpp              | 37 ++++++++----
 js/xpconnect/src/dombindings.h                | 16 +++--
 js/xpconnect/src/dombindingsgen.py            |  9 ++-
 js/xpconnect/src/xpcpublic.h                  |  2 +-
 12 files changed, 157 insertions(+), 67 deletions(-)
 create mode 100644 dom/tests/mochitest/chrome/test_sandbox_bindings.xul

diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 9b3bf82a7f1..aa9d11895ca 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -801,7 +801,8 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
     properties should be a PropertyArrays instance.
     """
     def __init__(self, descriptor, properties):
-        args = [Argument('JSContext*', 'aCx'), Argument('JSObject*', 'aGlobal')]
+        args = [Argument('JSContext*', 'aCx'), Argument('JSObject*', 'aGlobal'),
+                Argument('JSObject*', 'aReceiver')]
         CGAbstractMethod.__init__(self, descriptor, 'CreateInterfaceObjects', 'JSObject*', args)
         self.properties = properties
     def definition_body(self):
@@ -810,7 +811,7 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
             getParentProto = "JS_GetObjectPrototype(aCx, aGlobal)"
         else:
             parentProtoName = self.descriptor.prototypeChain[-2]
-            getParentProto = "%s::GetProtoObject(aCx, aGlobal)" % (parentProtoName)
+            getParentProto = "%s::GetProtoObject(aCx, aGlobal, aReceiver)" % (parentProtoName)
 
         needInterfaceObject = self.descriptor.interface.hasInterfaceObject()
         needInterfacePrototypeObject = self.descriptor.interface.hasInterfacePrototypeObject()
@@ -849,7 +850,7 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
                           "  return NULL;\n"
                           "}") % getParentProto
 
-        call = CGGeneric(("return bindings::CreateInterfaceObjects(aCx, aGlobal, parentProto,\n"
+        call = CGGeneric(("return bindings::CreateInterfaceObjects(aCx, aGlobal, aReceiver, parentProto,\n"
                           "                                        %s, %s,\n"
                           "                                        %%(methods)s, %%(attrs)s, %%(consts)s, %%(staticMethods)s,\n"
                           "                                        %s);") % (
@@ -880,12 +881,20 @@ class CGGetPerInterfaceObject(CGAbstractMethod):
     constructor object).
     """
     def __init__(self, descriptor, name, idPrefix=""):
-        args = [Argument('JSContext*', 'aCx'), Argument('JSObject*', 'aGlobal')]
+        args = [Argument('JSContext*', 'aCx'), Argument('JSObject*', 'aGlobal'),
+                Argument('JSObject*', 'aReceiver')]
         CGAbstractMethod.__init__(self, descriptor, name,
                                   'JSObject*', args, inline=True)
         self.id = idPrefix + "id::" + self.descriptor.name
     def definition_body(self):
         return """
+
+  /* aGlobal and aReceiver are usually the same, but they can be different
+     too. For example a sandbox often has an xray wrapper for a window as the
+     prototype of the sandbox's global. In that case aReceiver is the xray
+     wrapper and aGlobal is the sandbox's global.
+   */
+
   /* Make sure our global is sane.  Hopefully we can remove this sometime */
   if (!(js::GetObjectClass(aGlobal)->flags & JSCLASS_DOM_GLOBAL)) {
     return NULL;
@@ -894,7 +903,7 @@ class CGGetPerInterfaceObject(CGAbstractMethod):
   JSObject** protoOrIfaceArray = GetProtoOrIfaceArray(aGlobal);
   JSObject* cachedObject = protoOrIfaceArray[%s];
   if (!cachedObject) {
-    protoOrIfaceArray[%s] = cachedObject = CreateInterfaceObjects(aCx, aGlobal);
+    protoOrIfaceArray[%s] = cachedObject = CreateInterfaceObjects(aCx, aGlobal, aReceiver);
   }
 
   /* cachedObject might _still_ be null, but that's OK */
@@ -905,7 +914,6 @@ class CGGetProtoObjectMethod(CGGetPerInterfaceObject):
     A method for getting the interface prototype object.
     """
     def __init__(self, descriptor):
-        args = [Argument('JSContext*', 'aCx'), Argument('JSObject*', 'aGlobal')]
         CGGetPerInterfaceObject.__init__(self, descriptor, "GetProtoObject")
     def definition_body(self):
         return """
@@ -917,14 +925,13 @@ class CGGetConstructorObjectMethod(CGGetPerInterfaceObject):
     A method for getting the interface constructor object.
     """
     def __init__(self, descriptor):
-        args = [Argument('JSContext*', 'aCx'), Argument('JSObject*', 'aGlobal')]
         CGGetPerInterfaceObject.__init__(self, descriptor, "GetConstructorObject", "constructors::")
     def definition_body(self):
         return """
   /* Get the interface object for this class.  This will create the object as
      needed. */""" + CGGetPerInterfaceObject.definition_body(self)
 
-def CheckPref(descriptor, scopeName, varName, retval, wrapperCache = None):
+def CheckPref(descriptor, globalName, varName, retval, wrapperCache = None):
     """
     Check whether bindings should be enabled for this descriptor.  If not, set
     varName to false and return retval.
@@ -932,15 +939,23 @@ def CheckPref(descriptor, scopeName, varName, retval, wrapperCache = None):
     if not descriptor.prefable:
         return ""
     if wrapperCache:
-       wrapperCache = "%s->ClearIsDOMBinding();\n" % (wrapperCache)
+       wrapperCache = "      %s->ClearIsDOMBinding();\n" % (wrapperCache)
     else:
         wrapperCache = ""
     return """
-  if (!%s->ExperimentalBindingsEnabled()) {
-%s    %s = false;
-    return %s;
+  {
+    XPCWrappedNativeScope* scope =
+      XPCWrappedNativeScope::FindInJSObjectScope(aCx, %s);
+    if (!scope) {
+      return %s;
+    }
+
+    if (!scope->ExperimentalBindingsEnabled()) {
+%s      %s = false;
+      return %s;
+    }
   }
-""" % (scopeName, wrapperCache, varName, retval)
+""" % (globalName, retval, wrapperCache, varName, retval)
 
 class CGDefineDOMInterfaceMethod(CGAbstractMethod):
     """
@@ -948,7 +963,7 @@ class CGDefineDOMInterfaceMethod(CGAbstractMethod):
     a given interface.
     """
     def __init__(self, descriptor):
-        args = [Argument('JSContext*', 'aCx'), Argument('XPCWrappedNativeScope*', 'aScope'),
+        args = [Argument('JSContext*', 'aCx'), Argument('JSObject*', 'aReceiver'),
                 Argument('bool*', 'aEnabled')]
         CGAbstractMethod.__init__(self, descriptor, 'DefineDOMInterface', 'bool', args)
 
@@ -970,9 +985,11 @@ class CGDefineDOMInterfaceMethod(CGAbstractMethod):
         else:
             getter = "GetConstructorObject"
 
-        return CheckPref(self.descriptor, "aScope", "*aEnabled", "false") + """
+        return ("  JSObject* global = JS_GetGlobalForObject(aCx, aReceiver);\n" +
+                CheckPref(self.descriptor, "global", "*aEnabled", "false") + 
+                """
   *aEnabled = true;
-  return !!%s(aCx, aScope->GetGlobalJSObject());""" % (getter)
+  return !!%s(aCx, global, aReceiver);""" % (getter))
 
 class CGNativeToSupportsMethod(CGAbstractStaticMethod):
     """
@@ -1022,13 +1039,9 @@ class CGWrapMethod(CGAbstractMethod):
     }
   }
 
-  XPCWrappedNativeScope* scope =
-    XPCWrappedNativeScope::FindInJSObjectScope(aCx, parent);
-  if (!scope) {
-    return NULL;
-  }
+  JSObject* global = JS_GetGlobalForObject(aCx, parent);
 %s
-  JSObject* proto = GetProtoObject(aCx, scope->GetGlobalJSObject());
+  JSObject* proto = GetProtoObject(aCx, global, global);
   if (!proto) {
     return NULL;
   }
@@ -1043,7 +1056,7 @@ class CGWrapMethod(CGAbstractMethod):
 
   aObject->SetWrapper(obj);
 
-  return obj;""" % (CheckPref(self.descriptor, "scope", "*aTriedToWrap", "NULL", "aObject"))
+  return obj;""" % (CheckPref(self.descriptor, "global", "*aTriedToWrap", "NULL", "aObject"))
 
 builtinNames = {
     IDLType.Tags.bool: 'bool',
diff --git a/dom/bindings/Utils.cpp b/dom/bindings/Utils.cpp
index b035d05aeb8..fedde37c0af 100644
--- a/dom/bindings/Utils.cpp
+++ b/dom/bindings/Utils.cpp
@@ -25,7 +25,7 @@ DefineConstants(JSContext* cx, JSObject* obj, ConstantSpec* cs)
 }
 
 static JSObject*
-CreateInterfaceObject(JSContext* cx, JSObject* global,
+CreateInterfaceObject(JSContext* cx, JSObject* global, JSObject* receiver,
                       JSClass* constructorClass, JSObject* proto,
                       JSFunctionSpec* staticMethods, ConstantSpec* constants,
                       const char* name)
@@ -54,7 +54,7 @@ CreateInterfaceObject(JSContext* cx, JSObject* global,
   }
 
   // This is Enumerable: False per spec.
-  if (!JS_DefineProperty(cx, global, name, OBJECT_TO_JSVAL(constructor), NULL,
+  if (!JS_DefineProperty(cx, receiver, name, OBJECT_TO_JSVAL(constructor), NULL,
                          NULL, 0)) {
     return NULL;
   }
@@ -91,11 +91,11 @@ CreateInterfacePrototypeObject(JSContext* cx, JSObject* global,
 }
 
 JSObject*
-CreateInterfaceObjects(JSContext *cx, JSObject *global, JSObject *parentProto,
-                       JSClass *protoClass, JSClass *constructorClass,
-                       JSFunctionSpec *methods, JSPropertySpec *properties,
-                       ConstantSpec *constants, JSFunctionSpec *staticMethods,
-                       const char* name)
+CreateInterfaceObjects(JSContext* cx, JSObject* global, JSObject *receiver,
+                       JSObject* protoProto, JSClass* protoClass,
+                       JSClass* constructorClass, JSFunctionSpec* methods,
+                       JSPropertySpec* properties, ConstantSpec* constants,
+                       JSFunctionSpec* staticMethods, const char* name)
 {
   MOZ_ASSERT(protoClass || constructorClass, "Need at least one class!");
   MOZ_ASSERT(!(methods || properties) || protoClass,
@@ -107,7 +107,7 @@ CreateInterfaceObjects(JSContext *cx, JSObject *global, JSObject *parentProto,
 
   JSObject* proto;
   if (protoClass) {
-    proto = CreateInterfacePrototypeObject(cx, global, parentProto, protoClass,
+    proto = CreateInterfacePrototypeObject(cx, global, protoProto, protoClass,
                                            methods, properties, constants);
     if (!proto) {
       return NULL;
@@ -119,8 +119,8 @@ CreateInterfaceObjects(JSContext *cx, JSObject *global, JSObject *parentProto,
 
   JSObject* interface;
   if (constructorClass) {
-    interface = CreateInterfaceObject(cx, global, constructorClass, proto,
-                                      staticMethods, constants, name);
+    interface = CreateInterfaceObject(cx, global, receiver, constructorClass,
+                                      proto, staticMethods, constants, name);
     if (!interface) {
       return NULL;
     }
diff --git a/dom/bindings/Utils.h b/dom/bindings/Utils.h
index cd9489deadc..f2c69d16c5e 100644
--- a/dom/bindings/Utils.h
+++ b/dom/bindings/Utils.h
@@ -219,7 +219,11 @@ struct ConstantSpec
  * Create a DOM interface object (if constructorClass is non-null) and/or a
  * DOM interface prototype object (if protoClass is non-null).
  *
- * parentProto is the prototype to use for the interface prototype object.
+ * global is used as the parent of the interface object and the interface
+ *        prototype object
+ * receiver is the object on which we need to define the interface object as a
+ *          property
+ * protoProto is the prototype to use for the interface prototype object.
  * protoClass is the JSClass to use for the interface prototype object.
  *            This is null if we should not create an interface prototype
  *            object.
@@ -242,11 +246,11 @@ struct ConstantSpec
  * returns the interface object.
  */
 JSObject*
-CreateInterfaceObjects(JSContext* cx, JSObject* global, JSObject* parentProto,
-                       JSClass* protoClass, JSClass* constructorClass,
-                       JSFunctionSpec* methods, JSPropertySpec* properties,
-                       ConstantSpec* constants, JSFunctionSpec* staticMethods,
-                       const char* name);
+CreateInterfaceObjects(JSContext* cx, JSObject* global, JSObject* receiver,
+                       JSObject* protoProto, JSClass* protoClass,
+                       JSClass* constructorClass, JSFunctionSpec* methods,
+                       JSPropertySpec* properties, ConstantSpec* constants,
+                       JSFunctionSpec* staticMethods, const char* name);
 
 template <class T>
 inline bool
diff --git a/dom/tests/mochitest/chrome/Makefile.in b/dom/tests/mochitest/chrome/Makefile.in
index 79e53e1fafc..c0d7118b7eb 100644
--- a/dom/tests/mochitest/chrome/Makefile.in
+++ b/dom/tests/mochitest/chrome/Makefile.in
@@ -78,6 +78,7 @@ _TEST_FILES = \
 		test_callback_wrapping.xul \
 		window_callback_wrapping.xul \
 		test_sandbox_postMessage.html \
+		test_sandbox_bindings.xul \
 		$(NULL)
 
 ifeq (WINNT,$(OS_ARCH))
diff --git a/dom/tests/mochitest/chrome/test_sandbox_bindings.xul b/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
new file mode 100644
index 00000000000..a618e0cd1c9
--- /dev/null
+++ b/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
+<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=741267
+-->
+<window title="Mozilla Bug 741267"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+
+  <iframe id="t"></iframe>
+
+  <!-- test results are displayed in the html:body -->
+  <body xmlns="http://www.w3.org/1999/xhtml">
+  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=741267"
+     target="_blank">Mozilla Bug 741267</a>
+  </body>
+
+  <!-- test code goes here -->
+  <script type="application/javascript">
+  <![CDATA[
+
+  /** Test for Bug 741267 **/
+    function doTest() {
+      var win = $("t").contentWindow;
+      var sandbox = Components.utils.Sandbox(win, { sandboxPrototype: win });
+      try {
+        var nl = Components.utils.evalInSandbox("NodeList", sandbox);
+        is(nl, "[object NodeList]", "'NodeList' in a sandbox should return the NodeList interface prototype object");
+      } catch (e) {
+        ok(false, "'NodeList' shouldn't throw in a sandbox");
+      }
+      try {
+        var et = Components.utils.evalInSandbox("EventTarget", sandbox);
+        ok(et, "'EventTarget' in a sandbox should return the EventTarget interface prototype object");
+      } catch (e) {
+        ok(false, "'EventTarget' shouldn't throw in a sandbox");
+      }
+      try {
+        var xhr = Components.utils.evalInSandbox("XMLHttpRequest()", sandbox);
+        is(xhr, "[object XMLHttpRequest]", "'XMLHttpRequest()' in a sandbox should create an XMLHttpRequest object");
+      } catch (e) {
+        ok(false, "'XMLHttpRequest()' shouldn't throw in a sandbox");
+      }
+      SimpleTest.finish();
+    }
+
+    SimpleTest.waitForExplicitFinish();
+    addLoadEvent(doTest);
+  ]]>
+  </script>
+</window>
diff --git a/dom/workers/DOMBindingInlines.h b/dom/workers/DOMBindingInlines.h
index 6d6e4b055a8..33175e0c29f 100644
--- a/dom/workers/DOMBindingInlines.h
+++ b/dom/workers/DOMBindingInlines.h
@@ -37,7 +37,7 @@ struct WrapPrototypeTraits
     GetProtoObject(JSContext* aCx, JSObject* aGlobal)                          \
     {                                                                          \
       using namespace mozilla::dom::bindings::prototypes;                      \
-      return _class##_workers::GetProtoObject(aCx, aGlobal);                   \
+      return _class##_workers::GetProtoObject(aCx, aGlobal, aGlobal);          \
     }                                                                          \
   };
 
diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index 3e858162054..de4119233eb 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -449,7 +449,7 @@ ResolveWorkerClasses(JSContext* aCx, JSObject* aObj, jsid aId, unsigned aFlags,
       return true;
     }
 
-    JSObject* eventTarget = EventTarget_workers::GetProtoObject(aCx, aObj);
+    JSObject* eventTarget = EventTarget_workers::GetProtoObject(aCx, aObj, aObj);
     if (!eventTarget) {
       return false;
     }
diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
index 4c2dce2c3b7..db68bd45638 100644
--- a/dom/workers/WorkerScope.cpp
+++ b/dom/workers/WorkerScope.cpp
@@ -958,7 +958,8 @@ CreateDedicatedWorkerGlobalScope(JSContext* aCx)
   //          -> EventTarget
   //          -> Object
 
-  JSObject* eventTargetProto = EventTarget_workers::GetProtoObject(aCx, global);
+  JSObject* eventTargetProto =
+    EventTarget_workers::GetProtoObject(aCx, global, global);
   if (!eventTargetProto) {
     return NULL;
   }
@@ -1003,8 +1004,9 @@ CreateDedicatedWorkerGlobalScope(JSContext* aCx)
   }
 
   // Init other paris-bindings.
-  if (!XMLHttpRequest_workers::CreateInterfaceObjects(aCx, global) ||
-      !XMLHttpRequestUpload_workers::CreateInterfaceObjects(aCx, global)) {
+  if (!XMLHttpRequest_workers::CreateInterfaceObjects(aCx, global, global) ||
+      !XMLHttpRequestUpload_workers::CreateInterfaceObjects(aCx, global,
+                                                            global)) {
     return NULL;
   }
 
diff --git a/js/xpconnect/src/dombindings.cpp b/js/xpconnect/src/dombindings.cpp
index 9cece1c8732..85a2cb761ea 100644
--- a/js/xpconnect/src/dombindings.cpp
+++ b/js/xpconnect/src/dombindings.cpp
@@ -208,7 +208,7 @@ bool
 DefineConstructor(JSContext *cx, JSObject *obj, DefineInterface aDefine, nsresult *aResult)
 {
     bool enabled;
-    bool defined = aDefine(cx, XPCWrappedNativeScope::FindInJSObjectScope(cx, obj), &enabled);
+    bool defined = aDefine(cx, obj, &enabled);
     NS_ASSERTION(!defined || enabled,
                  "We defined a constructor but the new bindings are disabled?");
     *aResult = defined ? NS_OK : NS_ERROR_FAILURE;
@@ -414,7 +414,22 @@ InvalidateProtoShape_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, j
 
 template<class LC>
 JSObject *
-ListBase<LC>::getPrototype(JSContext *cx, XPCWrappedNativeScope *scope)
+ListBase<LC>::getPrototype(JSContext *cx, JSObject *receiver, bool *enabled)
+{
+    *enabled = true;
+
+    XPCWrappedNativeScope *scope =
+        XPCWrappedNativeScope::FindInJSObjectScope(cx, receiver);
+    if (!scope)
+        return false;
+
+    return getPrototype(cx, scope, receiver);
+}
+
+template<class LC>
+JSObject *
+ListBase<LC>::getPrototype(JSContext *cx, XPCWrappedNativeScope *scope,
+                           JSObject *receiver)
 {
     nsDataHashtable<nsDepCharHashKey, JSObject*> &cache =
         scope->GetCachedDOMPrototypes();
@@ -429,7 +444,7 @@ ListBase<LC>::getPrototype(JSContext *cx, XPCWrappedNativeScope *scope)
         return NULL;
     }
 
-    JSObject* proto = Base::getPrototype(cx, scope);
+    JSObject* proto = Base::getPrototype(cx, scope, receiver);
     if (!proto)
         return NULL;
 
@@ -468,7 +483,7 @@ ListBase<LC>::getPrototype(JSContext *cx, XPCWrappedNativeScope *scope)
     if (!JS_LinkConstructorAndPrototype(cx, interface, interfacePrototype))
         return NULL;
 
-    if (!JS_DefineProperty(cx, global, sInterfaceClass.name, OBJECT_TO_JSVAL(interface), NULL,
+    if (!JS_DefineProperty(cx, receiver, sInterfaceClass.name, OBJECT_TO_JSVAL(interface), NULL,
                            NULL, 0))
         return NULL;
 
@@ -493,15 +508,15 @@ ListBase<LC>::create(JSContext *cx, JSObject *scope, ListType *aList,
     if (!parent)
         return NULL;
 
+    JSObject *global = js::GetGlobalForObjectCrossCompartment(parent);
+
     JSAutoEnterCompartment ac;
-    if (js::GetGlobalForObjectCrossCompartment(parent) != scope) {
-        if (!ac.enter(cx, parent))
+    if (global != scope) {
+        if (!ac.enter(cx, global))
             return NULL;
     }
 
-    XPCWrappedNativeScope *xpcscope =
-        XPCWrappedNativeScope::FindInJSObjectScope(cx, parent);
-    JSObject *proto = getPrototype(cx, xpcscope, triedToWrap);
+    JSObject *proto = getPrototype(cx, global, triedToWrap);
     if (!proto && !*triedToWrap)
         aWrapperCache->ClearIsDOMBinding();
     if (!proto)
@@ -1244,12 +1259,12 @@ ListBase<LC>::finalize(JSFreeOp *fop, JSObject *proxy)
 
 
 JSObject*
-NoBase::getPrototype(JSContext *cx, XPCWrappedNativeScope *scope)
+NoBase::getPrototype(JSContext *cx, XPCWrappedNativeScope *scope, JSObject *receiver)
 {
     // We need to pass the object prototype to JS_NewObject. If we pass NULL then the JS engine
     // will look up a prototype on the global by using the class' name and we'll recurse into
     // getPrototype.
-    return JS_GetObjectPrototype(cx, scope->GetGlobalJSObject());
+    return JS_GetObjectPrototype(cx, receiver);
 }
 
 
diff --git a/js/xpconnect/src/dombindings.h b/js/xpconnect/src/dombindings.h
index fa8ae20289d..643feedfc54 100644
--- a/js/xpconnect/src/dombindings.h
+++ b/js/xpconnect/src/dombindings.h
@@ -108,7 +108,8 @@ public:
 
 class NoBase {
 public:
-    static JSObject *getPrototype(JSContext *cx, XPCWrappedNativeScope *scope);
+    static JSObject *getPrototype(JSContext *cx, XPCWrappedNativeScope *scope,
+                                  JSObject *receiver);
     static bool shouldCacheProtoShape(JSContext *cx, JSObject *proto, bool *shouldCache)
     {
         *shouldCache = true;
@@ -194,14 +195,10 @@ public:
     static JSObject *create(JSContext *cx, JSObject *scope, ListType *list,
                             nsWrapperCache* cache, bool *triedToWrap);
 
-    static JSObject *getPrototype(JSContext *cx, XPCWrappedNativeScope *scope, bool *enabled)
+    static JSObject *getPrototype(JSContext *cx, JSObject *receiver, bool *enabled);
+    static bool DefineDOMInterface(JSContext *cx, JSObject *receiver, bool *enabled)
     {
-        *enabled = true;
-        return getPrototype(cx, scope);
-    }
-    static bool DefineDOMInterface(JSContext *cx, XPCWrappedNativeScope *scope, bool *enabled)
-    {
-        return !!getPrototype(cx, scope, enabled);
+        return !!getPrototype(cx, receiver, enabled);
     }
 
     bool getPropertyDescriptor(JSContext *cx, JSObject *proxy, jsid id, bool set,
@@ -243,7 +240,8 @@ public:
     }
     static inline ListType *getListObject(JSObject *obj);
 
-    static JSObject *getPrototype(JSContext *cx, XPCWrappedNativeScope *scope);
+    static JSObject *getPrototype(JSContext *cx, XPCWrappedNativeScope *scope,
+                                  JSObject *receiver);
     static inline bool protoIsClean(JSContext *cx, JSObject *proto, bool *isClean);
     static bool shouldCacheProtoShape(JSContext *cx, JSObject *proto, bool *shouldCache);
     static bool resolveNativeName(JSContext *cx, JSObject *proxy, jsid id,
diff --git a/js/xpconnect/src/dombindingsgen.py b/js/xpconnect/src/dombindingsgen.py
index 08885b4506a..69ef153d2b3 100644
--- a/js/xpconnect/src/dombindingsgen.py
+++ b/js/xpconnect/src/dombindingsgen.py
@@ -497,15 +497,20 @@ derivedClassTemplate = (
 prefableClassTemplate = (
 "template<>\n"
 "JSObject *\n"
-"${name}Wrapper::getPrototype(JSContext *cx, XPCWrappedNativeScope *scope, bool *enabled)\n"
+"${name}Wrapper::getPrototype(JSContext *cx, JSObject *receiver, bool *enabled)\n"
 "{\n"
+"    XPCWrappedNativeScope *scope =\n"
+"        XPCWrappedNativeScope::FindInJSObjectScope(cx, receiver);\n"
+"    if (!scope)\n"
+"        return false;\n"
+"\n"
 "    if (!scope->NewDOMBindingsEnabled()) {\n"
 "        *enabled = false;\n"
 "        return NULL;\n"
 "    }\n"
 "\n"
 "    *enabled = true;\n"
-"    return getPrototype(cx, scope);\n"
+"    return getPrototype(cx, scope, receiver);\n"
 "}\n"
 "\n")
 
diff --git a/js/xpconnect/src/xpcpublic.h b/js/xpconnect/src/xpcpublic.h
index ff23f465bac..28d3c5e860b 100644
--- a/js/xpconnect/src/xpcpublic.h
+++ b/js/xpconnect/src/xpcpublic.h
@@ -315,7 +315,7 @@ inline bool instanceIsProxy(JSObject *obj)
 }
 
 typedef bool
-(*DefineInterface)(JSContext *cx, XPCWrappedNativeScope *scope, bool *enabled);
+(*DefineInterface)(JSContext *cx, JSObject *global, bool *enabled);
 
 extern bool
 DefineStaticJSVals(JSContext *cx);

From 6781abb8d9c4b37c28af5cbdf2df2e2044b7d11b Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Sat, 28 Apr 2012 04:18:00 +0200
Subject: [PATCH 055/162] Bug 741070. (Bv1b-FF) browser_394759_basic.js: Use
 'Services.prefs', Set 'general.warnOnAboutConfig' preference, Remove a
 'whenWindowLoaded()' call, Add an 'info()' call, Nits. f=neil r=zpao.

---
 .../sessionstore/test/browser_394759_basic.js | 52 +++++++++++--------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/browser/components/sessionstore/test/browser_394759_basic.js b/browser/components/sessionstore/test/browser_394759_basic.js
index a7202527bc9..7540698585f 100644
--- a/browser/components/sessionstore/test/browser_394759_basic.js
+++ b/browser/components/sessionstore/test/browser_394759_basic.js
@@ -73,12 +73,15 @@ function test() {
   let uniqueValue = "unik" + Date.now();
   let uniqueText = "pi != " + Math.random();
 
+  // Be consistent: let the page actually display, as we are "interacting" with it.
+  Services.prefs.setBoolPref("general.warnOnAboutConfig", false);
+
   // make sure that the next closed window will increase getClosedWindowCount
-  let max_windows_undo = gPrefService.getIntPref("browser.sessionstore.max_windows_undo");
-  gPrefService.setIntPref("browser.sessionstore.max_windows_undo", max_windows_undo + 1);
+  let max_windows_undo = Services.prefs.getIntPref("browser.sessionstore.max_windows_undo");
+  Services.prefs.setIntPref("browser.sessionstore.max_windows_undo", max_windows_undo + 1);
   let closedWindowCount = ss.getClosedWindowCount();
 
-  provideWindow(function (newWin) {
+  provideWindow(function onTestURLLoaded(newWin) {
     newWin.gBrowser.addTab().linkedBrowser.stop();
 
     // mark the window with some unique data to be restored later on
@@ -105,28 +108,31 @@ function test() {
     // SSTabRestored will fire more than once, so we need to make sure we count them
     let restoredTabs = 0;
     let expectedTabs = data.tabs.length;
-    whenWindowLoaded(newWin2, function () {
-      newWin2.gBrowser.tabContainer.addEventListener("SSTabRestored", function(aEvent) {
-        if (++restoredTabs < expectedTabs)
-          return;
-        newWin2.gBrowser.tabContainer.removeEventListener("SSTabRestored", arguments.callee, true);
+    newWin2.addEventListener("SSTabRestored", function sstabrestoredListener(aEvent) {
+      ++restoredTabs;
+      info("Restored tab " + restoredTabs + "/" + expectedTabs);
+      if (restoredTabs < expectedTabs) {
+        return;
+      }
 
-        is(newWin2.gBrowser.tabs.length, 2,
-           "The window correctly restored 2 tabs");
-        is(newWin2.gBrowser.currentURI.spec, testURL,
-           "The window correctly restored the URL");
+      newWin2.removeEventListener("SSTabRestored", sstabrestoredListener, true);
 
-        let textbox = newWin2.content.document.getElementById("textbox");
-        is(textbox.value, uniqueText,
-           "The window correctly restored the form");
-        is(ss.getWindowValue(newWin2, uniqueKey), uniqueValue,
-           "The window correctly restored the data associated with it");
+      is(newWin2.gBrowser.tabs.length, 2,
+         "The window correctly restored 2 tabs");
+      is(newWin2.gBrowser.currentURI.spec, testURL,
+         "The window correctly restored the URL");
 
-        // clean up
-        newWin2.close();
-        gPrefService.clearUserPref("browser.sessionstore.max_windows_undo");
-        finish();
-      }, true);
-    });
+      let textbox = newWin2.content.document.getElementById("textbox");
+      is(textbox.value, uniqueText,
+         "The window correctly restored the form");
+      is(ss.getWindowValue(newWin2, uniqueKey), uniqueValue,
+         "The window correctly restored the data associated with it");
+
+      // clean up
+      newWin2.close();
+      Services.prefs.clearUserPref("browser.sessionstore.max_windows_undo");
+      Services.prefs.clearUserPref("general.warnOnAboutConfig");
+      finish();
+    }, true);
   }, testURL);
 }

From 9fa4ba6181cc003670090dcb1cad6db95dc33c75 Mon Sep 17 00:00:00 2001
From: ffxbld <none@none>
Date: Sat, 28 Apr 2012 03:15:22 -0700
Subject: [PATCH 056/162] Automated blocklist update from host
 moz2-linux-slave44

---
 browser/app/blocklist.xml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml
index 7c58bb6a418..861a62e9408 100644
--- a/browser/app/blocklist.xml
+++ b/browser/app/blocklist.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1333739604000">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1335396801000">
   <emItems>
       <emItem  blockID="i58" id="webmaster@buzzzzvideos.info">
                         <versionRange  minVersion="0" maxVersion="*">
                     </versionRange>
                   </emItem>
+      <emItem  blockID="i86" id="{45147e67-4020-47e2-8f7a-55464fb535aa}">
+                        <versionRange  minVersion="0" maxVersion="*">
+                    </versionRange>
+                  </emItem>
       <emItem  blockID="i41" id="{99079a25-328f-4bd4-be04-00955acaa0a7}">
                         <versionRange  minVersion="0.1" maxVersion="4.3.1.00" severity="1">
                     </versionRange>
@@ -81,6 +85,10 @@
                         <versionRange  minVersion="2.0.3" maxVersion="2.0.3">
                     </versionRange>
                   </emItem>
+      <emItem  blockID="i83" id="flash@adobee.com">
+                        <versionRange  minVersion="0" maxVersion="*">
+                    </versionRange>
+                  </emItem>
       <emItem  blockID="i59" id="ghostviewer@youtube2.com">
                         <versionRange  minVersion="0" maxVersion="*">
                     </versionRange>
@@ -99,6 +107,10 @@
                   </emItem>
       <emItem  blockID="i7" id="{2224e955-00e9-4613-a844-ce69fccaae91}">
                         </emItem>
+      <emItem  blockID="i84" id="pink@rosaplugin.info">
+                        <versionRange  minVersion="0" maxVersion="*">
+                    </versionRange>
+                  </emItem>
       <emItem  blockID="i67" id="youtube2@youtube2.com">
                         <versionRange  minVersion="0" maxVersion="*">
                     </versionRange>
@@ -161,6 +173,10 @@
                         <versionRange  minVersion="2.2" maxVersion="2.2">
                     </versionRange>
                   </emItem>
+      <emItem  blockID="i82" id="{8f42fb8b-b6f6-45de-81c0-d6d39f54f971}">
+                        <versionRange  minVersion="0" maxVersion="*">
+                    </versionRange>
+                  </emItem>
       <emItem  blockID="i19" id="{46551EC9-40F0-4e47-8E18-8E5CF550CFB8}">
                         <versionRange  minVersion="1.1b1" maxVersion="1.1b1">
                     </versionRange>
@@ -196,6 +212,9 @@
       <pluginItem  blockID="p80">
             <match name="description" exp="[^\d\._]((0(\.\d+(\.\d+([_\.]\d+)?)?)?)|(1\.(([0-5](\.\d+([_\.]\d+)?)?)|(6(\.0([_\.](0?\d|1\d|2\d|30))?)?)|(7(\.0([_\.][0-2])?)?))))([^\d\._]|$)" />      <match name="filename" exp="(npjp2\.dll)|(libnpjp2\.so)" />                      <versionRange  severity="1"></versionRange>
                   </pluginItem>
+      <pluginItem  blockID="p85">
+                  <match name="filename" exp="JavaPlugin2_NPAPI\.plugin" />                      <versionRange  minVersion="0" maxVersion="12.9.0" severity="1"></versionRange>
+                  </pluginItem>
     </pluginItems>
 
   <gfxItems>

From 72a797b415c4a23fc498aefb3026505c41316daf Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Wed, 25 Apr 2012 16:43:18 +0300
Subject: [PATCH 057/162] Bug 747675, try to decrease max forgetSkippable
 times, r=mccr8

---
 content/base/src/nsCCUncollectableMarker.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/content/base/src/nsCCUncollectableMarker.cpp b/content/base/src/nsCCUncollectableMarker.cpp
index 2b8d26e74a0..7b98ee210df 100644
--- a/content/base/src/nsCCUncollectableMarker.cpp
+++ b/content/base/src/nsCCUncollectableMarker.cpp
@@ -362,12 +362,6 @@ nsCCUncollectableMarker::Observe(nsISupports* aSubject, const char* aTopic,
     }
   }
 
-  if (cleanupJS) {
-    nsContentUtils::UnmarkGrayJSListenersInCCGenerationDocuments(sGeneration);
-    MarkMessageManagers();
-    xpc_UnmarkSkippableJSHolders();
-  }
-
 #ifdef MOZ_XUL
   nsXULPrototypeCache* xulCache = nsXULPrototypeCache::GetInstance();
   if (xulCache) {
@@ -375,6 +369,18 @@ nsCCUncollectableMarker::Observe(nsISupports* aSubject, const char* aTopic,
   }
 #endif
 
+  static bool previousWasJSCleanup = false;
+  if (cleanupJS) {
+    nsContentUtils::UnmarkGrayJSListenersInCCGenerationDocuments(sGeneration);
+    MarkMessageManagers();
+    previousWasJSCleanup = true;
+  } else if (previousWasJSCleanup) {
+    previousWasJSCleanup = false;
+    if (!prepareForCC) {
+      xpc_UnmarkSkippableJSHolders();
+    }
+  }
+
   return NS_OK;
 }
 

From 497104d8251822bbf35531c5a573b8b45de6c3cc Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Fri, 27 Apr 2012 10:15:40 +0200
Subject: [PATCH 058/162] Fix for bug 723465 (Make finalize for DOM list
 bindings use XPConnect).

--HG--
extra : rebase_source : e4df7d98765aaa2c600044d69f8714568f1d6109
---
 js/xpconnect/crashtests/723465.html     | 19 +++++++++++++++++++
 js/xpconnect/crashtests/crashtests.list |  1 +
 js/xpconnect/src/dombindings.cpp        |  8 +++++++-
 js/xpconnect/src/dombindings.h          |  8 ++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 js/xpconnect/crashtests/723465.html

diff --git a/js/xpconnect/crashtests/723465.html b/js/xpconnect/crashtests/723465.html
new file mode 100644
index 00000000000..0f810b963b1
--- /dev/null
+++ b/js/xpconnect/crashtests/723465.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+
+<script>
+
+function boom()
+{
+  var f = document.getElementById("f");
+  var fd = f.contentDocument;
+  fd.querySelectorAll("*");
+  fd.documentElement.innerHTML = "3";
+  document.body.removeChild(f);
+}
+
+</script>
+</head>
+
+<body onload="boom();"><iframe id="f" src="data:text/html,<html><head onfocus=2>"></iframe></body>
+</html>
diff --git a/js/xpconnect/crashtests/crashtests.list b/js/xpconnect/crashtests/crashtests.list
index cd0b5bb2f0a..a4e977bab19 100644
--- a/js/xpconnect/crashtests/crashtests.list
+++ b/js/xpconnect/crashtests/crashtests.list
@@ -35,3 +35,4 @@ load 616930-1.html
 load 639737-1.html
 load 648206-1.html
 load 705875.html
+load 723465.html
diff --git a/js/xpconnect/src/dombindings.cpp b/js/xpconnect/src/dombindings.cpp
index 85a2cb761ea..421641d8451 100644
--- a/js/xpconnect/src/dombindings.cpp
+++ b/js/xpconnect/src/dombindings.cpp
@@ -1254,7 +1254,13 @@ ListBase<LC>::finalize(JSFreeOp *fop, JSObject *proxy)
     if (cache) {
         cache->ClearWrapper();
     }
-    NS_RELEASE(list);
+    XPCJSRuntime *rt = nsXPConnect::GetRuntimeInstance();
+    if (rt) {
+        rt->DeferredRelease(nativeToSupports(list));
+    }
+    else {
+        NS_RELEASE(list);
+    }
 }
 
 
diff --git a/js/xpconnect/src/dombindings.h b/js/xpconnect/src/dombindings.h
index 643feedfc54..5933c13e901 100644
--- a/js/xpconnect/src/dombindings.h
+++ b/js/xpconnect/src/dombindings.h
@@ -125,6 +125,10 @@ public:
         *found = false;
         return true;
     }
+    static nsISupports* nativeToSupports(nsISupports* aNative)
+    {
+        return aNative;
+    }
 };
 
 template<class ListType, class IndexOps, class NameOps=NoOps>
@@ -249,6 +253,10 @@ public:
     static bool nativeGet(JSContext *cx, JSObject *proxy, JSObject *proto, jsid id, bool *found,
                           JS::Value *vp);
     static ListType *getNative(JSObject *proxy);
+    static nsISupports* nativeToSupports(ListType* aNative)
+    {
+        return Base::nativeToSupports(aNative);
+    }
 };
 
 struct nsISupportsResult

From 926a75c75ec3382629ebb88f8a4bc289bc8da518 Mon Sep 17 00:00:00 2001
From: Graeme McCutcheon <graememcc_firefox@graeme-online.co.uk>
Date: Fri, 27 Apr 2012 11:14:03 +0100
Subject: [PATCH 059/162] Bug 747379 - Override Histogram::AddSampleSet for
 FlagHistograms. r=nfroyd

---
 ipc/chromium/src/base/histogram.cc            | 25 +++++++++++++++++++
 ipc/chromium/src/base/histogram.h             |  5 +++-
 .../telemetry/tests/unit/test_nsITelemetry.js | 20 ++++++++-------
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/ipc/chromium/src/base/histogram.cc b/ipc/chromium/src/base/histogram.cc
index a6d3579957c..0b2a1e95742 100644
--- a/ipc/chromium/src/base/histogram.cc
+++ b/ipc/chromium/src/base/histogram.cc
@@ -962,6 +962,31 @@ FlagHistogram::Accumulate(Sample value, Count count, size_t index)
   Histogram::Accumulate(1, -1, zero_index);
 }
 
+void
+FlagHistogram::AddSampleSet(const SampleSet& sample) {
+  DCHECK_EQ(bucket_count(), sample.size());
+  // We can't be sure the SampleSet provided came from another FlagHistogram,
+  // so we take the following steps:
+  //  - If our flag has already been set do nothing.
+  //  - Set our flag if the following hold:
+  //      - The sum of the counts in the provided SampleSet is 1.
+  //      - The bucket index for that single value is the same as the index where we
+  //        would place our set flag.
+  //  - Otherwise, take no action.
+
+  if (mSwitched) {
+    return;
+  }
+
+  if (sample.sum() != 1) {
+    return;
+  }
+
+  size_t one_index = BucketIndex(1);
+  if (sample.counts(one_index) == 1) {
+    Accumulate(1, 1, one_index);
+  }
+}
 //------------------------------------------------------------------------------
 // CustomHistogram:
 //------------------------------------------------------------------------------
diff --git a/ipc/chromium/src/base/histogram.h b/ipc/chromium/src/base/histogram.h
index 1995ddbbaf3..621df384f14 100644
--- a/ipc/chromium/src/base/histogram.h
+++ b/ipc/chromium/src/base/histogram.h
@@ -336,6 +336,7 @@ class Histogram {
     Count TotalCount() const;
     int64 sum() const { return sum_; }
     int64 redundant_count() const { return redundant_count_; }
+    size_t size() const { return counts_.size(); }
 
     // Arithmetic manipulation of corresponding elements of the set.
     void Add(const SampleSet& other);
@@ -392,7 +393,7 @@ class Histogram {
     Add(static_cast<int>(time.InMilliseconds()));
   }
 
-  void AddSampleSet(const SampleSet& sample);
+  virtual void AddSampleSet(const SampleSet& sample);
 
   // This method is an interface, used only by LinearHistogram.
   virtual void SetRangeDescriptions(const DescriptionPair descriptions[]);
@@ -661,6 +662,8 @@ public:
 
   virtual void Accumulate(Sample value, Count count, size_t index);
 
+  virtual void AddSampleSet(const SampleSet& sample);
+
 private:
   explicit FlagHistogram(const std::string &name);
   bool mSwitched;
diff --git a/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js b/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
index 3dda5c5a6a9..80cbd262029 100644
--- a/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
+++ b/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
@@ -132,15 +132,11 @@ function compareHistograms(h1, h2) {
   do_check_eq(s1.histogram_type, s2.histogram_type);
   do_check_eq(s1.min, s2.min);
   do_check_eq(s1.max, s2.max);
+  do_check_eq(s1.sum, s2.sum);
 
-  // XXX Don't compare flag sums until bug 747379 is fixed
-  if (s1.histogram_type != Telemetry.HISTOGRAM_FLAG) {
-    do_check_eq(s1.sum, s2.sum);
-
-    do_check_eq(s1.counts.length, s2.counts.length);
-    for (let i = 0; i < s1.counts.length; i++)
-      do_check_eq(s1.counts[i], s2.counts[i]);
-  }
+  do_check_eq(s1.counts.length, s2.counts.length);
+  for (let i = 0; i < s1.counts.length; i++)
+    do_check_eq(s1.counts[i], s2.counts[i]);
 
   do_check_eq(s1.ranges.length, s2.ranges.length);
   for (let i = 0; i < s1.ranges.length; i++)
@@ -148,7 +144,7 @@ function compareHistograms(h1, h2) {
 }
 
 function test_histogramFrom() {
-  // One histogram of each type
+  // Test one histogram of each type.
   let names = ["CYCLE_COLLECTOR", "GC_REASON", "GC_RESET", "TELEMETRY_TEST_FLAG"];
 
   for each (let name in names) {
@@ -157,6 +153,12 @@ function test_histogramFrom() {
     let clone = Telemetry.histogramFrom("clone" + name, name);
     compareHistograms(original, clone);
   }
+
+  // Additionally, set the flag on TELEMETRY_TEST_FLAG, and check it gets set on the clone.
+  let testFlag = Telemetry.getHistogramById("TELEMETRY_TEST_FLAG");
+  testFlag.add(1);
+  let clone = Telemetry.histogramFrom("FlagClone", "TELEMETRY_TEST_FLAG");
+  compareHistograms(testFlag, clone);
 }
 
 function test_getSlowSQL() {

From 50df4c40d90cc9e362af0aea68a389503f82c901 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Fri, 27 Apr 2012 13:42:28 +0100
Subject: [PATCH 060/162] Bug 696297 - Define MOZ_VALGRIND in autoconf.mk.in,
 to fix Valgrind suppression file generation; r=ted

---
 config/autoconf.mk.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 42eb9681616..46af5074fbf 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -119,6 +119,7 @@ MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@
 MOZ_JPROF       = @MOZ_JPROF@
 MOZ_SHARK       = @MOZ_SHARK@
 MOZ_CALLGRIND   = @MOZ_CALLGRIND@
+MOZ_VALGRIND    = @MOZ_VALGRIND@
 MOZ_VTUNE       = @MOZ_VTUNE@
 MOZ_ETW         = @MOZ_ETW@
 MOZ_TRACE_JSCALLS = @MOZ_TRACE_JSCALLS@

From 014542b093cf11d05042a0713e5554db253da070 Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Fri, 27 Apr 2012 15:04:27 +0200
Subject: [PATCH 061/162] Bug 746658 - Failed downloads can't be removed from
 panel. r=mak

---
 browser/components/downloads/content/downloads.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/components/downloads/content/downloads.css b/browser/components/downloads/content/downloads.css
index 112936ca50a..ce0956ad45b 100644
--- a/browser/components/downloads/content/downloads.css
+++ b/browser/components/downloads/content/downloads.css
@@ -49,6 +49,7 @@ richlistitem[type="download"]:not([selected]) button {
                                            .downloadCancelMenuItem,
 
 .download-state:not(:-moz-any([state="1"], /* Finished           */
+                              [state="2"], /* Failed             */
                               [state="3"], /* Canceled           */
                               [state="6"], /* Blocked (parental) */
                               [state="8"], /* Blocked (dirty)    */

From 08825f80443f63d7805fe35da38cfe88e99af24c Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Fri, 27 Apr 2012 15:04:42 +0200
Subject: [PATCH 062/162] Bug 746853 - Fix finalization of the past downloads
 query in error cases. r=mak

---
 .../downloads/src/DownloadsCommon.jsm         | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/browser/components/downloads/src/DownloadsCommon.jsm b/browser/components/downloads/src/DownloadsCommon.jsm
index 8a1d31c714d..8f7ed66ee72 100644
--- a/browser/components/downloads/src/DownloadsCommon.jsm
+++ b/browser/components/downloads/src/DownloadsCommon.jsm
@@ -394,11 +394,6 @@ const DownloadsData = {
   //////////////////////////////////////////////////////////////////////////////
   //// Persistent data loading
 
-  /**
-   * Asynchronous database statement used to read the list of downloads.
-   */
-  _statement: null,
-
   /**
    * Represents an executing statement, allowing its cancellation.
    */
@@ -455,10 +450,19 @@ const DownloadsData = {
       }
     } else {
       if (this._loadState != this.kLoadAll) {
-        // Reload the list from the database asynchronously.
-        this._statement = Services.downloads.DBConnection.createAsyncStatement(
-                                "SELECT * FROM moz_downloads ORDER BY id DESC");
-        this._pendingStatement = this._statement.executeAsync(this);
+        // Load only the relevant columns from the downloads database.  The
+        // columns are read in the init_FromDataRow method of DownloadsDataItem.
+        let statement = Services.downloads.DBConnection.createAsyncStatement(
+          "SELECT id, target, name, source, referrer, state, "
+        +        "startTime, endTime, currBytes, maxBytes "
+        + "FROM moz_downloads "
+        + "ORDER BY id DESC"
+        );
+        try {
+          this._pendingStatement = statement.executeAsync(this);
+        } finally {
+          statement.finalize();
+        }
       }
     }
   },
@@ -472,10 +476,6 @@ const DownloadsData = {
       this._pendingStatement.cancel();
       this._pendingStatement = null;
     }
-    if (this._statement) {
-      this._statement.finalize();
-      this._statement = null;
-    }
 
     // Close all the views on the current data.  Create a copy of the array
     // because some views might unregister while processing this event.

From 433aa3a10acdad4464b1e19a41d36507525422b7 Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Fri, 27 Apr 2012 15:05:04 +0200
Subject: [PATCH 063/162] Bug 746787 - Ensure the browser window is not
 minimized when opening the Downloads panel. r=mak

---
 .../components/downloads/content/downloads.js | 55 +++++++++++--------
 .../components/downloads/src/DownloadsUI.js   |  5 ++
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/browser/components/downloads/content/downloads.js b/browser/components/downloads/content/downloads.js
index 6a0a68b72b9..e0dabd0f9ca 100644
--- a/browser/components/downloads/content/downloads.js
+++ b/browser/components/downloads/content/downloads.js
@@ -56,18 +56,19 @@ const DownloadsPanel = {
   //// Initialization and termination
 
   /**
-   * State of the downloads panel, based on one of the kPanel constants.
+   * Internal state of the downloads panel, based on one of the kState
+   * constants.  This is not the same state as the XUL panel element.
    */
-  _panelState: 0,
+  _state: 0,
 
-  /** Download data has not been loaded. */
-  get kPanelUninitialized() 0,
-  /** Download data is loading, but the user interface is invisible. */
-  get kPanelHidden() 1,
+  /** The panel is not linked to downloads data yet. */
+  get kStateUninitialized() 0,
+  /** This object is linked to data, but the panel is invisible. */
+  get kStateHidden() 1,
   /** The panel will be shown as soon as possible. */
-  get kPanelShowing() 2,
-  /** The panel is open, though download data might still be loading. */
-  get kPanelShown() 3,
+  get kStateShowing() 2,
+  /** The panel is open. */
+  get kStateShown() 3,
 
   /**
    * Location of the panel overlay.
@@ -84,12 +85,12 @@ const DownloadsPanel = {
    */
   initialize: function DP_initialize(aCallback)
   {
-    if (this._panelState != this.kPanelUninitialized) {
+    if (this._state != this.kStateUninitialized) {
       DownloadsOverlayLoader.ensureOverlayLoaded(this.kDownloadsOverlay,
                                                  aCallback);
       return;
     }
-    this._panelState = this.kPanelHidden;
+    this._state = this.kStateHidden;
 
     window.addEventListener("unload", this.onWindowUnload, false);
 
@@ -115,7 +116,7 @@ const DownloadsPanel = {
    */
   terminate: function DP_terminate()
   {
-    if (this._panelState == this.kPanelUninitialized) {
+    if (this._state == this.kStateUninitialized) {
       return;
     }
 
@@ -127,7 +128,7 @@ const DownloadsPanel = {
     DownloadsViewController.terminate();
     DownloadsCommon.data.removeView(DownloadsView);
 
-    this._panelState = this.kPanelUninitialized;
+    this._state = this.kStateUninitialized;
   },
 
   //////////////////////////////////////////////////////////////////////////////
@@ -163,7 +164,7 @@ const DownloadsPanel = {
       setTimeout(function () DownloadsPanel._openPopupIfDataReady(), 0);
     }.bind(this));
 
-    this._panelState = this.kPanelShowing;
+    this._state = this.kStateShowing;
   },
 
   /**
@@ -181,7 +182,7 @@ const DownloadsPanel = {
     // Ensure that we allow the panel to be reopened.  Note that, if the popup
     // was open, then the onPopupHidden event handler has already updated the
     // current state, otherwise we must update the state ourselves.
-    this._panelState = this.kPanelHidden;
+    this._state = this.kStateHidden;
   },
 
   /**
@@ -189,8 +190,8 @@ const DownloadsPanel = {
    */
   get isPanelShowing()
   {
-    return this._panelState == this.kPanelShowing ||
-           this._panelState == this.kPanelShown;
+    return this._state == this.kStateShowing ||
+           this._state == this.kStateShown;
   },
 
   //////////////////////////////////////////////////////////////////////////////
@@ -220,6 +221,8 @@ const DownloadsPanel = {
       return;
     }
 
+    this._state = this.kStateShown;
+
     // Since at most one popup is open at any given time, we can set globally.
     DownloadsCommon.indicatorData.attentionSuppressed = true;
 
@@ -246,7 +249,7 @@ const DownloadsPanel = {
     DownloadsButton.releaseAnchor();
 
     // Allow the panel to be reopened.
-    this._panelState = this.kPanelHidden;
+    this._state = this.kStateHidden;
   },
 
   //////////////////////////////////////////////////////////////////////////////
@@ -275,7 +278,7 @@ const DownloadsPanel = {
   _focusPanel: function DP_focusPanel()
   {
     // We may be invoked while the panel is still waiting to be shown.
-    if (this._panelState != this.kPanelShown) {
+    if (this._state != this.kStateShown) {
       return;
     }
 
@@ -295,12 +298,10 @@ const DownloadsPanel = {
   {
     // We don't want to open the popup if we already displayed it, or if we are
     // still loading data.
-    if (this._panelState != this.kPanelShowing || DownloadsView.loading) {
+    if (this._state != this.kStateShowing || DownloadsView.loading) {
       return;
     }
 
-    this._panelState = this.kPanelShown;
-
     // Make sure that clicking outside the popup cannot reopen it accidentally.
     this.panel.popupBoxObject.setConsumeRollupEvent(Ci.nsIPopupBoxObject
                                                       .ROLLUP_CONSUME);
@@ -308,6 +309,16 @@ const DownloadsPanel = {
     // Ensure the anchor is visible.  If that is not possible, show the panel
     // anchored to the top area of the window, near the default anchor position.
     DownloadsButton.getAnchor(function DP_OPIDR_callback(aAnchor) {
+      // At this point, if the window is minimized, opening the panel could fail
+      // without any notification, and there would be no way to either open or
+      // close the panel anymore.  To prevent this, check if the window is
+      // minimized and in that case force the panel to the closed state.
+      if (window.windowState == Ci.nsIDOMChromeWindow.STATE_MINIMIZED) {
+        DownloadsButton.releaseAnchor();
+        this._state = this.kStateHidden;
+        return;
+      }
+
       if (aAnchor) {
         this.panel.openPopup(aAnchor, "bottomcenter topright", 0, 0, false,
                              null);
diff --git a/browser/components/downloads/src/DownloadsUI.js b/browser/components/downloads/src/DownloadsUI.js
index c89b0db5f7a..2981d4fc05d 100644
--- a/browser/components/downloads/src/DownloadsUI.js
+++ b/browser/components/downloads/src/DownloadsUI.js
@@ -78,6 +78,11 @@ DownloadsUI.prototype = {
     // Show the panel in the most recent browser window, if present.
     let browserWin = gBrowserGlue.getMostRecentBrowserWindow();
     if (browserWin) {
+      // The most recent browser window could have been minimized, in that case
+      // it must be restored to allow the panel to open properly.
+      if (browserWin.windowState == Ci.nsIDOMChromeWindow.STATE_MINIMIZED) {
+        browserWin.restore();
+      }
       browserWin.focus();
       browserWin.DownloadsPanel.showPanel();
       return;

From dccb6ee1b8e710ead5393e1452cce530d3f40f2d Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Fri, 27 Apr 2012 15:05:20 +0200
Subject: [PATCH 064/162] Bug 695829 - Add telemetry metrics for private
 browsing transitions. r=ehsan

--HG--
rename : browser/components/privatebrowsing/test/unit/test_privatebrowsing_autostart.js => browser/components/privatebrowsing/test/unit/test_privatebrowsing_telemetry.js
rename : browser/components/privatebrowsing/test/unit/test_privatebrowsingwrapper_autostart.js => browser/components/privatebrowsing/test/unit/test_privatebrowsingwrapper_telemetry.js
---
 .../src/nsPrivateBrowsingService.js           | 54 +++++++++++++++++++
 .../unit/do_test_privatebrowsing_telemetry.js | 42 +++++++++++++++
 .../unit/test_privatebrowsing_telemetry.js    | 44 +++++++++++++++
 .../test_privatebrowsingwrapper_telemetry.js  | 44 +++++++++++++++
 .../privatebrowsing/test/unit/xpcshell.ini    |  2 +
 .../telemetry/TelemetryHistograms.h           |  8 +++
 6 files changed, 194 insertions(+)
 create mode 100644 browser/components/privatebrowsing/test/unit/do_test_privatebrowsing_telemetry.js
 create mode 100644 browser/components/privatebrowsing/test/unit/test_privatebrowsing_telemetry.js
 create mode 100644 browser/components/privatebrowsing/test/unit/test_privatebrowsingwrapper_telemetry.js

diff --git a/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js b/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js
index 981e28704cc..02a452446c8 100644
--- a/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js
+++ b/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js
@@ -133,6 +133,10 @@ PrivateBrowsingService.prototype = {
   // Whether private browsing has been turned on from the command line
   _lastChangedByCommandLine: false,
 
+  // Telemetry measurements
+  _enterTimestamps: {},
+  _exitTimestamps: {},
+
   // XPCOM registration
   classID: Components.ID("{c31f4883-839b-45f6-82ad-a6a9bc5ad599}"),
 
@@ -308,6 +312,7 @@ PrivateBrowsingService.prototype = {
         // restore has been completed
         this._currentStatus = STATE_IDLE;
         this._obs.notifyObservers(null, "private-browsing-transition-complete", "");
+        this._recordTransitionTime("completed");
         break;
       case STATE_WAITING_FOR_RESTORE:
         // too soon to notify...
@@ -323,6 +328,51 @@ PrivateBrowsingService.prototype = {
     }
   },
 
+  _recordTransitionTime: function PBS__recordTransitionTime(aPhase) {
+    // To record the time spent in private browsing transitions, note that we
+    // cannot use the TelemetryStopwatch module, because it reports its results
+    // immediately when the timer is stopped.  In this case, we need to delay
+    // the actual histogram update after we are out of private browsing mode.
+    if (this._inPrivateBrowsing) {
+      this._enterTimestamps[aPhase] = Date.now();
+    } else {
+      if (this._quitting) {
+        // If we are quitting the browser, we don't care collecting the data,
+        // because we wouldn't be able to record it with telemetry.
+        return;
+      }
+      this._exitTimestamps[aPhase] = Date.now();
+      if (aPhase == "completed") {
+        // After we finished exiting the private browsing mode, we can finally
+        // record the telemetry data, for the enter and the exit processes.
+        this._reportTelemetry();
+      }
+    }
+  },
+
+  _reportTelemetry: function PBS__reportTelemetry() {
+    function reportTelemetryEntry(aHistogramId, aValue) {
+      try {
+        Services.telemetry.getHistogramById(aHistogramId).add(aValue);
+      } catch (ex) {
+        Cu.reportError(ex);
+      }
+    }
+
+    reportTelemetryEntry(
+          "PRIVATE_BROWSING_TRANSITION_ENTER_PREPARATION_MS",
+          this._enterTimestamps.prepared - this._enterTimestamps.started);
+    reportTelemetryEntry(
+          "PRIVATE_BROWSING_TRANSITION_ENTER_TOTAL_MS",
+          this._enterTimestamps.completed - this._enterTimestamps.started);
+    reportTelemetryEntry(
+          "PRIVATE_BROWSING_TRANSITION_EXIT_PREPARATION_MS",
+          this._exitTimestamps.prepared - this._exitTimestamps.started);
+    reportTelemetryEntry(
+          "PRIVATE_BROWSING_TRANSITION_EXIT_TOTAL_MS",
+          this._exitTimestamps.completed - this._exitTimestamps.started);
+  },
+
   _canEnterPrivateBrowsingMode: function PBS__canEnterPrivateBrowsingMode() {
     let cancelEnter = Cc["@mozilla.org/supports-PRBool;1"].
                       createInstance(Ci.nsISupportsPRBool);
@@ -537,6 +587,8 @@ PrivateBrowsingService.prototype = {
       this._autoStarted = this._prefs.getBoolPref("browser.privatebrowsing.autostart");
       this._inPrivateBrowsing = val != false;
 
+      this._recordTransitionTime("started");
+
       let data = val ? "enter" : "exit";
 
       let quitting = Cc["@mozilla.org/supports-PRBool;1"].
@@ -551,6 +603,8 @@ PrivateBrowsingService.prototype = {
 
       this._obs.notifyObservers(quitting, "private-browsing", data);
 
+      this._recordTransitionTime("prepared");
+
       // load the appropriate session
       this._onAfterPrivateBrowsingModeChange();
     } catch (ex) {
diff --git a/browser/components/privatebrowsing/test/unit/do_test_privatebrowsing_telemetry.js b/browser/components/privatebrowsing/test/unit/do_test_privatebrowsing_telemetry.js
new file mode 100644
index 00000000000..64d7171d1d2
--- /dev/null
+++ b/browser/components/privatebrowsing/test/unit/do_test_privatebrowsing_telemetry.js
@@ -0,0 +1,42 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gPrivateBrowsing",
+                                   PRIVATEBROWSING_CONTRACT_ID,
+                                   "nsIPrivateBrowsingService");
+
+function waitForTransition(aEnabled, aCallback) {
+  Services.obs.addObserver(function PBT_transition(aSubject, aTopic, aData) {
+    Services.obs.removeObserver(PBT_transition, aTopic, false);
+    // Telemetry data is recorded just after the private browsing transition
+    // observers are notified, thus we must wait for this observer to return.
+    do_execute_soon(aCallback);
+  }, "private-browsing-transition-complete", false);
+  gPrivateBrowsing.privateBrowsingEnabled = aEnabled;
+}
+
+function checkHistogram(aId) {
+  // Check that we have data either in the first bucket (that doesn't
+  // count towards the sum) or one of the other buckets, by checking
+  // the sum of the values.
+  let snapshot = Services.telemetry.getHistogramById(aId).snapshot();
+  do_check_true(snapshot.sum > 0 || snapshot.counts[0] > 0);
+}
+
+function do_test() {
+  do_test_pending();
+
+  waitForTransition(true, function PBT_enabled() {
+    waitForTransition(false, function PBT_disabled() {
+      checkHistogram("PRIVATE_BROWSING_TRANSITION_ENTER_PREPARATION_MS");
+      checkHistogram("PRIVATE_BROWSING_TRANSITION_ENTER_TOTAL_MS");
+      checkHistogram("PRIVATE_BROWSING_TRANSITION_EXIT_PREPARATION_MS");
+      checkHistogram("PRIVATE_BROWSING_TRANSITION_EXIT_TOTAL_MS");
+
+      do_test_finished();
+    });
+  });
+}
diff --git a/browser/components/privatebrowsing/test/unit/test_privatebrowsing_telemetry.js b/browser/components/privatebrowsing/test/unit/test_privatebrowsing_telemetry.js
new file mode 100644
index 00000000000..37d72dcd0fb
--- /dev/null
+++ b/browser/components/privatebrowsing/test/unit/test_privatebrowsing_telemetry.js
@@ -0,0 +1,44 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// Checks that telemetry data for private browsing transitions is recorded.
+
+function run_test() {
+  PRIVATEBROWSING_CONTRACT_ID = "@mozilla.org/privatebrowsing;1";
+  load("do_test_privatebrowsing_telemetry.js");
+  do_test();
+}
diff --git a/browser/components/privatebrowsing/test/unit/test_privatebrowsingwrapper_telemetry.js b/browser/components/privatebrowsing/test/unit/test_privatebrowsingwrapper_telemetry.js
new file mode 100644
index 00000000000..bca35fcb113
--- /dev/null
+++ b/browser/components/privatebrowsing/test/unit/test_privatebrowsingwrapper_telemetry.js
@@ -0,0 +1,44 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// Checks that telemetry data for private browsing transitions is recorded.
+
+function run_test() {
+  PRIVATEBROWSING_CONTRACT_ID = "@mozilla.org/privatebrowsing-wrapper;1";
+  load("do_test_privatebrowsing_telemetry.js");
+  do_test();
+}
diff --git a/browser/components/privatebrowsing/test/unit/xpcshell.ini b/browser/components/privatebrowsing/test/unit/xpcshell.ini
index 8c066416def..8a1381b9963 100644
--- a/browser/components/privatebrowsing/test/unit/xpcshell.ini
+++ b/browser/components/privatebrowsing/test/unit/xpcshell.ini
@@ -12,12 +12,14 @@ tail = tail_privatebrowsing.js
 [test_privatebrowsing_autostart.js]
 [test_privatebrowsing_commandline.js]
 [test_privatebrowsing_exit.js]
+[test_privatebrowsing_telemetry.js]
 [test_privatebrowsingwrapper_autostart.js]
 [test_privatebrowsingwrapper_commandline.js]
 [test_privatebrowsingwrapper_exit.js]
 [test_privatebrowsingwrapper_placesTitleNoUpdate.js]
 [test_privatebrowsingwrapper_removeDataFromDomain.js]
 [test_privatebrowsingwrapper_removeDataFromDomain_activeDownloads.js]
+[test_privatebrowsingwrapper_telemetry.js]
 [test_removeDataFromDomain.js]
 [test_removeDataFromDomain_activeDownloads.js]
 [test_transition_nooffline.js]
diff --git a/toolkit/components/telemetry/TelemetryHistograms.h b/toolkit/components/telemetry/TelemetryHistograms.h
index 4c1360df280..8955dcf6907 100644
--- a/toolkit/components/telemetry/TelemetryHistograms.h
+++ b/toolkit/components/telemetry/TelemetryHistograms.h
@@ -395,6 +395,14 @@ HISTOGRAM(XUL_INITIAL_FRAME_CONSTRUCTION, 1, 3000, 10, EXPONENTIAL, "initial xul
 HISTOGRAM_BOOLEAN(XMLHTTPREQUEST_ASYNC_OR_SYNC, "Type of XMLHttpRequest, async or sync")
 HISTOGRAM_BOOLEAN(MULTIPART_XHR_RESPONSE, "XMLHttpRequest response was of type multipart/x-mixed-replace.")
 
+/**
+ * Private browsing transition telemetry.
+ */
+HISTOGRAM(PRIVATE_BROWSING_TRANSITION_ENTER_PREPARATION_MS, 1, 3000, 10, EXPONENTIAL, "Time spent on private browsing enter transition, excluding session restore (ms)")
+HISTOGRAM(PRIVATE_BROWSING_TRANSITION_ENTER_TOTAL_MS, 1, 10000, 50, EXPONENTIAL, "Time spent on private browsing enter transition, including session restore (ms)")
+HISTOGRAM(PRIVATE_BROWSING_TRANSITION_EXIT_PREPARATION_MS, 1, 3000, 10, EXPONENTIAL, "Time spent on private browsing exit transition, excluding session restore (ms)")
+HISTOGRAM(PRIVATE_BROWSING_TRANSITION_EXIT_TOTAL_MS, 1, 10000, 50, EXPONENTIAL, "Time spent on private browsing exit transition, including session restore (ms)")
+
 /**
  * DOM telemetry.
  */

From 306273ed2b922525464cc81c41acb10e464a1ebe Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Fri, 27 Apr 2012 15:05:34 +0200
Subject: [PATCH 065/162] Bug 728168 - Replace old synchronous favicons calls
 in feeds. r=mak

---
 browser/components/feeds/src/FeedWriter.js          | 2 +-
 browser/components/feeds/src/WebContentConverter.js | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/browser/components/feeds/src/FeedWriter.js b/browser/components/feeds/src/FeedWriter.js
index 6c1f3ad1fe1..76848ca9689 100644
--- a/browser/components/feeds/src/FeedWriter.js
+++ b/browser/components/feeds/src/FeedWriter.js
@@ -1366,7 +1366,7 @@ FeedWriter.prototype = {
     }
     var faviconURI = makeURI(readerURI.prePath + "/favicon.ico");
     var self = this;
-    this._faviconService.setAndLoadFaviconForPage(readerURI, faviconURI, false,
+    this._faviconService.setAndFetchFaviconForPage(readerURI, faviconURI, false,
       function (aURI, aDataLen, aData, aMimeType) {
         if (aDataLen > 0) {
           var dataURL = "data:" + aMimeType + ";base64," +
diff --git a/browser/components/feeds/src/WebContentConverter.js b/browser/components/feeds/src/WebContentConverter.js
index 837dca29636..2af877dc09e 100644
--- a/browser/components/feeds/src/WebContentConverter.js
+++ b/browser/components/feeds/src/WebContentConverter.js
@@ -448,9 +448,8 @@ WebContentConverterRegistrar.prototype = {
       // Now Ask the user and provide the proper callback
       message = this._getFormattedString("addProtocolHandler",
                                          [aTitle, uri.host, aProtocol]);
-      var fis = Cc["@mozilla.org/browser/favicon-service;1"].
-                getService(Ci.nsIFaviconService);
-      var notificationIcon = fis.getFaviconLinkForIcon(uri);
+
+      var notificationIcon = uri.prePath + "/favicon.ico";
       var notificationValue = "Protocol Registration: " + aProtocol;
       var addButton = {
         label: this._getString("addProtocolHandlerAddButton"),

From b4df934bf44f1a0339c6e1564201f5a511136339 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Fri, 27 Apr 2012 09:13:39 -0400
Subject: [PATCH 066/162] Bug 749493 - Catch SQLiteDatabaseLockedException when
 ensuring unclocked database (r=blassey)

---
 mobile/android/base/db/DBUtils.java | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/mobile/android/base/db/DBUtils.java b/mobile/android/base/db/DBUtils.java
index ddf47044018..5dc61b1af73 100644
--- a/mobile/android/base/db/DBUtils.java
+++ b/mobile/android/base/db/DBUtils.java
@@ -10,6 +10,7 @@ import org.mozilla.gecko.sync.Utils;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteDatabaseLockedException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
 import android.text.TextUtils;
@@ -72,22 +73,19 @@ public class DBUtils {
     }
 
     public static void ensureDatabaseIsNotLocked(SQLiteOpenHelper dbHelper, String databasePath) {
-        SQLiteDatabase db = dbHelper.getWritableDatabase();
-
-        // The returned writable database is read-only, this probably means that the
-        // database is permanently locked due to a crash or a non-clean quit in Fennec.
-        // We can assume it's safe to forcefully unlock the database file in this case
-        // as all database access happens through this content provider (see bug 741718).
-        if (db.isReadOnly()) {
-            // Close read-only connection, we don't want to use it
-            dbHelper.close();
-
-            Log.d(LOGTAG, "Database is in read-only mode, trying to forcefully unlock the database file: " + databasePath);
+        try {
+            dbHelper.getWritableDatabase();
+        } catch (SQLiteDatabaseLockedException e) {
+            Log.d(LOGTAG, "Database is locked, trying to forcefully unlock the database file: " + databasePath);
 
             // Forcefully unlock the database file
             GeckoAppShell.unlockDatabaseFile(databasePath);
 
-            // TODO: maybe check if the connection is still read-only and let the
+            // This call should not throw if the forced unlocking
+            // actually fixed the situation.
+            dbHelper.getWritableDatabase();
+
+            // TODO: maybe check if the database is still locked and let the
             // user know that the device needs rebooting?
         }
     }

From 0d466faecb00b4f4134fbc5223117164c392e65e Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <ayg@aryeh.name>
Date: Fri, 27 Apr 2012 16:21:12 +0300
Subject: [PATCH 067/162] Bug 748725 - nsINode::GetParentElement() should
 return dom::Element*; r=smaug

---
 content/base/public/nsINode.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h
index 002f300e08c..a160dfaf3d0 100644
--- a/content/base/public/nsINode.h
+++ b/content/base/public/nsINode.h
@@ -402,7 +402,7 @@ public:
 
   /**
    * Return this node as an Element.  Should only be used for nodes
-   * for which IsElement() is true.
+   * for which IsElement() is true.  This is defined inline in Element.h.
    */
   mozilla::dom::Element* AsElement();
 
@@ -755,9 +755,9 @@ public:
    * Get the parent nsINode for this node if it is an Element.
    * @return the parent node
    */
-  nsINode* GetElementParent() const
+  mozilla::dom::Element* GetElementParent() const
   {
-    return mParent && mParent->IsElement() ? mParent : nsnull;
+    return mParent && mParent->IsElement() ? mParent->AsElement() : nsnull;
   }
 
   /**

From 1f2a9323d709c9f79f0d61d445fdce3b1fa7f59e Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Fri, 27 Apr 2012 15:58:24 +0100
Subject: [PATCH 068/162] Backout 6b5668320ce4 (bug 749493) for android startup
 crashes

---
 mobile/android/base/db/DBUtils.java | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/mobile/android/base/db/DBUtils.java b/mobile/android/base/db/DBUtils.java
index 5dc61b1af73..ddf47044018 100644
--- a/mobile/android/base/db/DBUtils.java
+++ b/mobile/android/base/db/DBUtils.java
@@ -10,7 +10,6 @@ import org.mozilla.gecko.sync.Utils;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDatabaseLockedException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
 import android.text.TextUtils;
@@ -73,19 +72,22 @@ public class DBUtils {
     }
 
     public static void ensureDatabaseIsNotLocked(SQLiteOpenHelper dbHelper, String databasePath) {
-        try {
-            dbHelper.getWritableDatabase();
-        } catch (SQLiteDatabaseLockedException e) {
-            Log.d(LOGTAG, "Database is locked, trying to forcefully unlock the database file: " + databasePath);
+        SQLiteDatabase db = dbHelper.getWritableDatabase();
+
+        // The returned writable database is read-only, this probably means that the
+        // database is permanently locked due to a crash or a non-clean quit in Fennec.
+        // We can assume it's safe to forcefully unlock the database file in this case
+        // as all database access happens through this content provider (see bug 741718).
+        if (db.isReadOnly()) {
+            // Close read-only connection, we don't want to use it
+            dbHelper.close();
+
+            Log.d(LOGTAG, "Database is in read-only mode, trying to forcefully unlock the database file: " + databasePath);
 
             // Forcefully unlock the database file
             GeckoAppShell.unlockDatabaseFile(databasePath);
 
-            // This call should not throw if the forced unlocking
-            // actually fixed the situation.
-            dbHelper.getWritableDatabase();
-
-            // TODO: maybe check if the database is still locked and let the
+            // TODO: maybe check if the connection is still read-only and let the
             // user know that the device needs rebooting?
         }
     }

From c7f7e9cce34c79d6768c77716d4c9227277c9129 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Fri, 27 Apr 2012 12:11:27 -0400
Subject: [PATCH 069/162] Bug 699707 - Limit form parsing to first + last N
 forms in a document. r=mnoorenberghe

---
 .../components/passwordmgr/nsLoginManager.js  |    15 +
 .../components/passwordmgr/test/Makefile.in   |     3 +
 .../passwordmgr/test/test_basic_form_1pw.html |  2779 +--
 .../test/test_basic_form_2pw_1.html           | 15637 +---------------
 .../passwordmgr/test/test_maxforms_1.html     |    61 +
 .../passwordmgr/test/test_maxforms_2.html     |    61 +
 .../passwordmgr/test/test_maxforms_3.html     |    61 +
 7 files changed, 346 insertions(+), 18271 deletions(-)
 create mode 100644 toolkit/components/passwordmgr/test/test_maxforms_1.html
 create mode 100644 toolkit/components/passwordmgr/test/test_maxforms_2.html
 create mode 100644 toolkit/components/passwordmgr/test/test_maxforms_3.html

diff --git a/toolkit/components/passwordmgr/nsLoginManager.js b/toolkit/components/passwordmgr/nsLoginManager.js
index fcae47830d6..59c9272c035 100644
--- a/toolkit/components/passwordmgr/nsLoginManager.js
+++ b/toolkit/components/passwordmgr/nsLoginManager.js
@@ -1073,7 +1073,22 @@ LoginManager.prototype = {
         var previousActionOrigin = null;
         var foundLogins = null;
 
+        // Limit the number of forms we try to fill. If there are too many
+        // forms, just fill some at the beginning and end of the page.
+        const MAX_FORMS = 40; // assumed to be an even number
+        var skip_from = -1, skip_to = -1;
+        if (forms.length > MAX_FORMS) {
+            this.log("fillDocument limiting number of forms filled to " + MAX_FORMS);
+            let chunk_size = MAX_FORMS / 2;
+            skip_from = chunk_size;
+            skip_to   = forms.length - chunk_size;
+        }
+
         for (var i = 0; i < forms.length; i++) {
+            // Skip some in the middle of the document if there were too many.
+            if (i == skip_from)
+              i = skip_to;
+
             var form = forms[i];
 
             // Only the actionOrigin might be changing, so if it's the same
diff --git a/toolkit/components/passwordmgr/test/Makefile.in b/toolkit/components/passwordmgr/test/Makefile.in
index dd36ea71d50..06eef1902ec 100644
--- a/toolkit/components/passwordmgr/test/Makefile.in
+++ b/toolkit/components/passwordmgr/test/Makefile.in
@@ -79,6 +79,9 @@ MOCHI_TESTS = \
     test_bug_627616.html \
     test_master_password.html \
     test_master_password_cleanup.html \
+    test_maxforms_1.html \
+    test_maxforms_2.html \
+    test_maxforms_3.html \
     test_prompt_async.html \
     test_xhr.html \
     test_xml_load.html \
diff --git a/toolkit/components/passwordmgr/test/test_basic_form_1pw.html b/toolkit/components/passwordmgr/test/test_basic_form_1pw.html
index d1db12fb7a6..048f6ec4d0d 100644
--- a/toolkit/components/passwordmgr/test/test_basic_form_1pw.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_1pw.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
@@ -12,2720 +12,116 @@ Login Manager test: forms with 1 password field
 
 <div id="content" style="display: none">
 
-<!--
-The HTML for this testcase was generated by a script:
-
-
-#!/usr/bin/perl -w
-
-@structures = qw(
-    p
-    up pu
-    xp px
-    upx uxp xup
-    pux pxu xpu);
-
-$formnum = 0;
-
-STRUCTURE: foreach $structure (@structures) {
-if (!($structure =~ /u/)) {
-    $noUsername = 1;
-} else {
-    $noUsername = 0;
-}
-
-foreach $userval (("", "testuser", "notMyUsername")) {
-PASSVAL: foreach $passval (("", "testpass", "notMyPassword")) {
-foreach $uname (("uname", "uuuuu")) {
-foreach $pname (("pname", "ppppp")) {
-
-$u = "    <input type='text'     name='$uname' value='$userval'>\n";
-$p = "    <input type='password' name='$pname' value='$passval'>\n";
-$x = "    <input type='text'     name='xxxxx' value=''>\n";
-
-$formnum++;
-print "<form id='form$formnum' action='formtest.js'> $formnum\n";
-
-foreach $input (split //,$structure) {
-    if ($input eq "u") { print $u; }
-    if ($input eq "p") { print $p; }
-    if ($input eq "x") { print $x; }
-}
-
-
-print "\n";
-print "    <button type='submit'>Submit</button>\n";
-print "    <button type='reset'> Reset </button>\n";
-print "</form>\n\n";
-
-} # pname
-if ($noUsername) { next PASSVAL; }
-} # uname
-} # passval
-if ($noUsername) { next STRUCTURE; }
-} # userval
-} # structure
-
-
-
--->
+<!-- no username fields -->
 
 <form id='form1' action='formtest.js'> 1
+    <!-- Blank, so fill in the password -->
     <input type='password' name='pname' value=''>
-
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form2' action='formtest.js'> 2
-    <input type='password' name='ppppp' value=''>
-
+    <!-- Already contains the password, so nothing to do. -->
+    <input type='password' name='pname' value='testpass'>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form3' action='formtest.js'> 3
-    <input type='password' name='pname' value='testpass'>
-
+    <!-- Contains unknown password, so don't change it -->
+    <input type='password' name='pname' value='xxxxxxxx'>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
-<form id='form4' action='formtest.js'> 4
-    <input type='password' name='ppppp' value='testpass'>
 
+<!-- username fields -->
+
+<form id='form4' action='formtest.js'> 4
+    <!-- Blanks, so fill in login -->
+    <input type='text'     name='uname' value=''>
+    <input type='password' name='pname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form5' action='formtest.js'> 5
-    <input type='password' name='pname' value='notMyPassword'>
-
+    <!-- Username already set, so fill in password -->
+    <input type='text'     name='uname' value='testuser'>
+    <input type='password' name='pname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form6' action='formtest.js'> 6
-    <input type='password' name='ppppp' value='notMyPassword'>
-
+    <!-- Unknown username, so don't fill in password -->
+    <input type='text'     name='uname' value='xxxxxxxx'>
+    <input type='password' name='pname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form7' action='formtest.js'> 7
+    <!-- Password already set, could fill in username but that's weird so we don't -->
     <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-
+    <input type='password' name='pname' value='testpass'>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form8' action='formtest.js'> 8
+    <!-- Unknown password, so don't fill in a username -->
     <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-
+    <input type='password' name='pname' value='xxxxxxxx'>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
-<form id='form9' action='formtest.js'> 9
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
 
+
+<!-- extra text fields -->
+
+<form id='form9' action='formtest.js'> 9
+    <!-- text field _after_ password should never be treated as a username field -->
+    <input type='password' name='pname' value=''>
+    <input type='text'     name='uname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form10' action='formtest.js'> 10
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-
+    <!-- only the first text field before the password should be for username -->
+    <input type='text'     name='other' value=''>
+    <input type='text'     name='uname' value=''>
+    <input type='password' name='pname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form11' action='formtest.js'> 11
+    <!-- variation just to make sure extra text field is still ignored -->
     <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
+    <input type='password' name='pname' value=''>
+    <input type='text'     name='other' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
-<form id='form12' action='formtest.js'> 12
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
 
+
+<!-- same as last bunch, but with xxxx in the extra field. -->
+
+<form id='form12' action='formtest.js'> 12
+    <!-- text field _after_ password should never be treated as a username field -->
+    <input type='password' name='pname' value=''>
+    <input type='text'     name='uname' value='xxxxxxxx'>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form13' action='formtest.js'> 13
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-
+    <!-- only the first text field before the password should be for username -->
+    <input type='text'     name='other' value='xxxxxxxx'>
+    <input type='text'     name='uname' value=''>
+    <input type='password' name='pname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form14' action='formtest.js'> 14
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form15' action='formtest.js'> 15
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form16' action='formtest.js'> 16
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form17' action='formtest.js'> 17
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form18' action='formtest.js'> 18
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form19' action='formtest.js'> 19
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form20' action='formtest.js'> 20
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form21' action='formtest.js'> 21
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form22' action='formtest.js'> 22
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form23' action='formtest.js'> 23
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form24' action='formtest.js'> 24
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form25' action='formtest.js'> 25
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form26' action='formtest.js'> 26
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form27' action='formtest.js'> 27
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form28' action='formtest.js'> 28
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form29' action='formtest.js'> 29
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form30' action='formtest.js'> 30
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form31' action='formtest.js'> 31
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form32' action='formtest.js'> 32
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form33' action='formtest.js'> 33
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form34' action='formtest.js'> 34
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form35' action='formtest.js'> 35
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form36' action='formtest.js'> 36
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form37' action='formtest.js'> 37
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form38' action='formtest.js'> 38
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form39' action='formtest.js'> 39
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form40' action='formtest.js'> 40
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form41' action='formtest.js'> 41
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form42' action='formtest.js'> 42
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form43' action='formtest.js'> 43
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form44' action='formtest.js'> 44
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form45' action='formtest.js'> 45
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form46' action='formtest.js'> 46
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form47' action='formtest.js'> 47
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form48' action='formtest.js'> 48
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form49' action='formtest.js'> 49
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form50' action='formtest.js'> 50
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form51' action='formtest.js'> 51
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form52' action='formtest.js'> 52
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form53' action='formtest.js'> 53
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form54' action='formtest.js'> 54
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form55' action='formtest.js'> 55
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form56' action='formtest.js'> 56
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form57' action='formtest.js'> 57
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form58' action='formtest.js'> 58
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form59' action='formtest.js'> 59
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form60' action='formtest.js'> 60
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form61' action='formtest.js'> 61
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form62' action='formtest.js'> 62
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form63' action='formtest.js'> 63
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form64' action='formtest.js'> 64
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form65' action='formtest.js'> 65
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form66' action='formtest.js'> 66
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form67' action='formtest.js'> 67
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form68' action='formtest.js'> 68
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form69' action='formtest.js'> 69
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form70' action='formtest.js'> 70
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form71' action='formtest.js'> 71
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form72' action='formtest.js'> 72
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form73' action='formtest.js'> 73
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form74' action='formtest.js'> 74
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form75' action='formtest.js'> 75
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form76' action='formtest.js'> 76
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form77' action='formtest.js'> 77
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form78' action='formtest.js'> 78
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form79' action='formtest.js'> 79
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form80' action='formtest.js'> 80
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form81' action='formtest.js'> 81
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form82' action='formtest.js'> 82
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form83' action='formtest.js'> 83
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form84' action='formtest.js'> 84
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form85' action='formtest.js'> 85
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form86' action='formtest.js'> 86
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form87' action='formtest.js'> 87
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form88' action='formtest.js'> 88
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form89' action='formtest.js'> 89
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form90' action='formtest.js'> 90
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form91' action='formtest.js'> 91
+    <!-- variation just to make sure extra text field is still ignored -->
     <input type='text'     name='uname' value=''>
     <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
+    <input type='text'     name='other' value='xxxxxxxx'>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form92' action='formtest.js'> 92
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form93' action='formtest.js'> 93
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form94' action='formtest.js'> 94
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form95' action='formtest.js'> 95
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form96' action='formtest.js'> 96
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form97' action='formtest.js'> 97
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form98' action='formtest.js'> 98
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form99' action='formtest.js'> 99
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form100' action='formtest.js'> 100
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form101' action='formtest.js'> 101
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form102' action='formtest.js'> 102
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form103' action='formtest.js'> 103
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form104' action='formtest.js'> 104
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form105' action='formtest.js'> 105
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form106' action='formtest.js'> 106
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form107' action='formtest.js'> 107
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form108' action='formtest.js'> 108
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form109' action='formtest.js'> 109
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form110' action='formtest.js'> 110
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form111' action='formtest.js'> 111
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form112' action='formtest.js'> 112
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form113' action='formtest.js'> 113
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form114' action='formtest.js'> 114
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form115' action='formtest.js'> 115
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form116' action='formtest.js'> 116
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form117' action='formtest.js'> 117
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form118' action='formtest.js'> 118
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form119' action='formtest.js'> 119
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form120' action='formtest.js'> 120
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form121' action='formtest.js'> 121
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form122' action='formtest.js'> 122
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form123' action='formtest.js'> 123
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form124' action='formtest.js'> 124
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form125' action='formtest.js'> 125
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form126' action='formtest.js'> 126
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form127' action='formtest.js'> 127
-    <input type='text'     name='uname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form128' action='formtest.js'> 128
-    <input type='text'     name='uname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form129' action='formtest.js'> 129
-    <input type='text'     name='uuuuu' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form130' action='formtest.js'> 130
-    <input type='text'     name='uuuuu' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form131' action='formtest.js'> 131
-    <input type='text'     name='uname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form132' action='formtest.js'> 132
-    <input type='text'     name='uname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form133' action='formtest.js'> 133
-    <input type='text'     name='uuuuu' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form134' action='formtest.js'> 134
-    <input type='text'     name='uuuuu' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form135' action='formtest.js'> 135
-    <input type='text'     name='uname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form136' action='formtest.js'> 136
-    <input type='text'     name='uname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form137' action='formtest.js'> 137
-    <input type='text'     name='uuuuu' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form138' action='formtest.js'> 138
-    <input type='text'     name='uuuuu' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form139' action='formtest.js'> 139
-    <input type='text'     name='uname' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form140' action='formtest.js'> 140
-    <input type='text'     name='uname' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form141' action='formtest.js'> 141
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form142' action='formtest.js'> 142
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form143' action='formtest.js'> 143
-    <input type='text'     name='uname' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form144' action='formtest.js'> 144
-    <input type='text'     name='uname' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form145' action='formtest.js'> 145
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form146' action='formtest.js'> 146
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form147' action='formtest.js'> 147
-    <input type='text'     name='uname' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form148' action='formtest.js'> 148
-    <input type='text'     name='uname' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form149' action='formtest.js'> 149
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form150' action='formtest.js'> 150
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form151' action='formtest.js'> 151
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form152' action='formtest.js'> 152
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form153' action='formtest.js'> 153
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form154' action='formtest.js'> 154
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form155' action='formtest.js'> 155
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form156' action='formtest.js'> 156
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form157' action='formtest.js'> 157
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form158' action='formtest.js'> 158
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form159' action='formtest.js'> 159
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form160' action='formtest.js'> 160
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form161' action='formtest.js'> 161
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form162' action='formtest.js'> 162
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form163' action='formtest.js'> 163
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form164' action='formtest.js'> 164
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form165' action='formtest.js'> 165
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form166' action='formtest.js'> 166
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form167' action='formtest.js'> 167
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form168' action='formtest.js'> 168
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form169' action='formtest.js'> 169
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form170' action='formtest.js'> 170
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form171' action='formtest.js'> 171
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form172' action='formtest.js'> 172
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form173' action='formtest.js'> 173
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form174' action='formtest.js'> 174
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form175' action='formtest.js'> 175
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form176' action='formtest.js'> 176
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form177' action='formtest.js'> 177
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form178' action='formtest.js'> 178
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form179' action='formtest.js'> 179
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form180' action='formtest.js'> 180
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form181' action='formtest.js'> 181
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form182' action='formtest.js'> 182
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form183' action='formtest.js'> 183
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form184' action='formtest.js'> 184
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form185' action='formtest.js'> 185
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form186' action='formtest.js'> 186
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form187' action='formtest.js'> 187
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form188' action='formtest.js'> 188
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form189' action='formtest.js'> 189
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form190' action='formtest.js'> 190
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form191' action='formtest.js'> 191
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form192' action='formtest.js'> 192
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form193' action='formtest.js'> 193
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form194' action='formtest.js'> 194
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form195' action='formtest.js'> 195
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form196' action='formtest.js'> 196
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form197' action='formtest.js'> 197
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form198' action='formtest.js'> 198
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form199' action='formtest.js'> 199
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form200' action='formtest.js'> 200
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form201' action='formtest.js'> 201
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form202' action='formtest.js'> 202
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form203' action='formtest.js'> 203
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form204' action='formtest.js'> 204
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form205' action='formtest.js'> 205
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form206' action='formtest.js'> 206
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form207' action='formtest.js'> 207
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form208' action='formtest.js'> 208
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form209' action='formtest.js'> 209
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form210' action='formtest.js'> 210
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form211' action='formtest.js'> 211
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form212' action='formtest.js'> 212
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form213' action='formtest.js'> 213
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form214' action='formtest.js'> 214
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form215' action='formtest.js'> 215
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form216' action='formtest.js'> 216
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form217' action='formtest.js'> 217
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form218' action='formtest.js'> 218
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form219' action='formtest.js'> 219
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form220' action='formtest.js'> 220
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form221' action='formtest.js'> 221
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form222' action='formtest.js'> 222
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form223' action='formtest.js'> 223
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form224' action='formtest.js'> 224
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form225' action='formtest.js'> 225
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form226' action='formtest.js'> 226
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form227' action='formtest.js'> 227
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form228' action='formtest.js'> 228
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form229' action='formtest.js'> 229
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form230' action='formtest.js'> 230
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form231' action='formtest.js'> 231
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form232' action='formtest.js'> 232
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form233' action='formtest.js'> 233
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form234' action='formtest.js'> 234
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='text'     name='xxxxx' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form235' action='formtest.js'> 235
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form236' action='formtest.js'> 236
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form237' action='formtest.js'> 237
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form238' action='formtest.js'> 238
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form239' action='formtest.js'> 239
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form240' action='formtest.js'> 240
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form241' action='formtest.js'> 241
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form242' action='formtest.js'> 242
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form243' action='formtest.js'> 243
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form244' action='formtest.js'> 244
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form245' action='formtest.js'> 245
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form246' action='formtest.js'> 246
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form247' action='formtest.js'> 247
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form248' action='formtest.js'> 248
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form249' action='formtest.js'> 249
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form250' action='formtest.js'> 250
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form251' action='formtest.js'> 251
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form252' action='formtest.js'> 252
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form253' action='formtest.js'> 253
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form254' action='formtest.js'> 254
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form255' action='formtest.js'> 255
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form256' action='formtest.js'> 256
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form257' action='formtest.js'> 257
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form258' action='formtest.js'> 258
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form259' action='formtest.js'> 259
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form260' action='formtest.js'> 260
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form261' action='formtest.js'> 261
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form262' action='formtest.js'> 262
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form263' action='formtest.js'> 263
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form264' action='formtest.js'> 264
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form265' action='formtest.js'> 265
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form266' action='formtest.js'> 266
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form267' action='formtest.js'> 267
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form268' action='formtest.js'> 268
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form269' action='formtest.js'> 269
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form270' action='formtest.js'> 270
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='xxxxx' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form271' action='formtest.js'> 271
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form272' action='formtest.js'> 272
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form273' action='formtest.js'> 273
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form274' action='formtest.js'> 274
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form275' action='formtest.js'> 275
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form276' action='formtest.js'> 276
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form277' action='formtest.js'> 277
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form278' action='formtest.js'> 278
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form279' action='formtest.js'> 279
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form280' action='formtest.js'> 280
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form281' action='formtest.js'> 281
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form282' action='formtest.js'> 282
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form283' action='formtest.js'> 283
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form284' action='formtest.js'> 284
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form285' action='formtest.js'> 285
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form286' action='formtest.js'> 286
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form287' action='formtest.js'> 287
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form288' action='formtest.js'> 288
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form289' action='formtest.js'> 289
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form290' action='formtest.js'> 290
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form291' action='formtest.js'> 291
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form292' action='formtest.js'> 292
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form293' action='formtest.js'> 293
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form294' action='formtest.js'> 294
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form295' action='formtest.js'> 295
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form296' action='formtest.js'> 296
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form297' action='formtest.js'> 297
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form298' action='formtest.js'> 298
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form299' action='formtest.js'> 299
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form300' action='formtest.js'> 300
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form301' action='formtest.js'> 301
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form302' action='formtest.js'> 302
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form303' action='formtest.js'> 303
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form304' action='formtest.js'> 304
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form305' action='formtest.js'> 305
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form306' action='formtest.js'> 306
-    <input type='text'     name='xxxxx' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 
@@ -2739,65 +135,27 @@ if ($noUsername) { next STRUCTURE; }
 commonInit();
 
 function startTest() {
-    var f;
+    var f = 1;
 
-    for (f = 1;   f <= 4;   f++) { checkForm(f, "testpass"); }
-    for (f = 5;   f <= 6;   f++) { checkUnmodifiedForm(f); }
-    for (f = 7;   f <= 10;  f++) { checkForm(f, "testuser", "testpass"); }
-    // 11-14 have the password prefilled, we skip filling the username.
-    for (f = 11;  f <= 14;  f++) { checkUnmodifiedForm(f); }
-    for (f = 15;  f <= 18;  f++) { checkUnmodifiedForm(f); }
-    for (f = 19;  f <= 26;  f++) { checkForm(f, "testuser", "testpass"); }
-    for (f = 27;  f <= 30;  f++) { checkUnmodifiedForm(f); }
-    for (f = 31;  f <= 42;  f++) { checkUnmodifiedForm(f); }
+    // 1-3
+    checkForm(f++, "testpass");
+    checkForm(f++, "testpass");
+    checkForm(f++, "xxxxxxxx");
 
-    // Password-before-username is not supported.
-    //for (f = 43;  f <= 50;  f++) { checkForm(f, "testpass", "testuser"); }
-    //for (f = 51;  f <= 54;  f++) { checkUnmodifiedForm(f); }
-    //for (f = 55;  f <= 62;  f++) { checkForm(f, "testpass", "testuser"); }
-    //for (f = 63;  f <= 78;  f++) { checkUnmodifiedForm(f); }
+    // 4-8
+    checkForm(f++, "testuser", "testpass");
+    checkForm(f++, "testuser", "testpass");
+    checkForm(f++, "xxxxxxxx", "");
+    checkForm(f++, "",         "testpass");
+    checkForm(f++, "",         "xxxxxxxx");
 
-    //for (f = 79;  f <= 90;  f++) { checkUnmodifiedForm(f); }
-
-    for (f = 91;  f <= 94;  f++) { checkForm(f, "testuser", "testpass", ""); }
-    // 95-98 have the password prefilled, we skip filling the username.
-    for (f = 95;  f <= 98;  f++) { checkUnmodifiedForm(f); }
-    for (f = 99;  f <= 102; f++) { checkUnmodifiedForm(f); }
-    for (f = 103; f <= 110; f++) { checkForm(f, "testuser", "testpass", ""); }
-    for (f = 111; f <= 114; f++) { checkUnmodifiedForm(f); }
-    for (f = 115; f <= 126; f++) { checkUnmodifiedForm(f); }
-
-    // Ambigious username fields
-    //for (f = 127; f <= 134; f++) { checkForm(f, "testuser", "", "testpass"); }
-
-    // More of the same, just hard to split up...
-    //for (f = 135; f <= 138; f++) { checkUnmodifiedForm(f); }
-    //for (f = 139; f <= 146; f++) { checkForm(f, "testuser", "", "testpass"); }
-    //for (f = 147; f <= 162; f++) { checkUnmodifiedForm(f); }
-
-    for (f = 163; f <= 166; f++) { checkForm(f, "", "testuser", "testpass"); }
-    // 167-170 have the password prefilled, we skip filling the username.
-    for (f = 167; f <= 170; f++) { checkUnmodifiedForm(f); }
-    for (f = 171; f <= 174; f++) { checkUnmodifiedForm(f); }
-    for (f = 175; f <= 182; f++) { checkForm(f, "", "testuser", "testpass"); }
-    for (f = 183; f <= 186; f++) { checkUnmodifiedForm(f); }
-    for (f = 187; f <= 198; f++) { checkUnmodifiedForm(f); }
-
-    // Password-before-username is not supported.
-    //for (f = 199; f <= 206; f++) { checkForm(f, "testpass", "testuser", ""); }
-    //for (f = 207; f <= 210; f++) { checkUnmodifiedForm(f); }
-    //for (f = 211; f <= 218; f++) { checkForm(f, "testpass", "testuser", ""); }
-    //for (f = 219; f <= 234; f++) { checkUnmodifiedForm(f); }
-
-    //for (f = 235; f <= 242; f++) { checkForm(f, "testpass", "", "testuser"); }
-    //for (f = 243; f <= 246; f++) { checkUnmodifiedForm(f); }
-    //for (f = 247; f <= 254; f++) { checkForm(f, "testpass", "", "testuser"); }
-    //for (f = 255; f <= 270; f++) { checkUnmodifiedForm(f); }
-
-    //for (f = 271; f <= 278; f++) { checkForm(f, "", "testpass", "testuser"); }
-    //for (f = 279; f <= 282; f++) { checkUnmodifiedForm(f); }
-    //for (f = 283; f <= 290; f++) { checkForm(f, "", "testpass", "testuser"); }
-    //for (f = 291; f <= 306; f++) { checkUnmodifiedForm(f); }
+    // 9-14
+    checkForm(f++, "testpass", "");
+    checkForm(f++, "",         "testuser", "testpass");
+    checkForm(f++, "testuser", "testpass", "");
+    checkForm(f++, "testpass", "xxxxxxxx");
+    checkForm(f++, "xxxxxxxx", "testuser", "testpass");
+    checkForm(f++, "testuser", "testpass", "xxxxxxxx");
 
     SimpleTest.finish();
 }
@@ -2810,4 +168,3 @@ SimpleTest.waitForExplicitFinish();
 </pre>
 </body>
 </html>
-
diff --git a/toolkit/components/passwordmgr/test/test_basic_form_2pw_1.html b/toolkit/components/passwordmgr/test/test_basic_form_2pw_1.html
index c1d4b701615..7e1cb8519b5 100644
--- a/toolkit/components/passwordmgr/test/test_basic_form_2pw_1.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_2pw_1.html
@@ -2,15626 +2,149 @@
 <html>
 <head>
   <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
-Login Manager test: forms with 2 password fields (upq uqp puq pqu qup qpu)
+Login Manager test: forms with 2 password fields
 
 <p id="display"></p>
 
 <div id="content" style="display: none">
 
-<!--
-The HTML for this test case was generated by a script:
 
-
-#!/usr/bin/perl -w
-
-@structures = qw(
-    upq uqp puq pqu qup qpu
-);
-#    upqx upxq uxpq xupq
-#    uqpx uqxp uxqp xuqp
-#    puqx puxq pxuq xpuq
-#    pqux pqxu pxqu xpqu
-#    qupx quxp qxup xqup
-#    qpux qpxu qxpu xqpu
-
-$formnum = 0;
-
-foreach $structure (@structures) {
-foreach $userval (("", "testuser", "notMyUsername")) {
-foreach $passval (("", "testpass", "notMyPassword")) {
-foreach $qassval (("", "testpass", "notMyPassword", "stillNotMine")) {
-foreach $uname (("uname", "uuuuu")) {
-foreach $pname (("pname", "ppppp")) {
-foreach $qname (("qname", "qqqqq")) {
-
-$u = "    <input type='text'     name='$uname' value='$userval'>\n";
-$p = "    <input type='password' name='$pname' value='$passval'>\n";
-$q = "    <input type='password' name='$qname' value='$qassval'>\n";
-$x = "    <input type='text'     name='xxxxx' value=''>\n";
-
-$formnum++;
-print "<form id='form$formnum' action='formtest.js'> $formnum\n";
-
-foreach $input (split //,$structure) {
-    if ($input eq "u") { print $u; }
-    if ($input eq "p") { print $p; }
-    if ($input eq "q") { print $q; }
-    if ($input eq "x") { print $x; }
-}
-
-
-print "\n";
-print "    <button type='submit'>Submit</button>\n";
-print "    <button type='reset'> Reset </button>\n";
-print "</form>\n\n";
-
-} # qname
-} # pname
-} # uname
-} # qassval
-} # passval
-} # userval
-} # structure
-
-
--->
+<!-- no username fields -->
 
 <form id='form1' action='formtest.js'> 1
-    <input type='text'     name='uname' value=''>
+    <!-- simple form, fill in first pw -->
     <input type='password' name='pname' value=''>
     <input type='password' name='qname' value=''>
-
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form2' action='formtest.js'> 2
-    <input type='text'     name='uname' value=''>
+    <!-- same but reverse pname and qname, field names are ignored. -->
+    <input type='password' name='qname' value=''>
     <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value=''>
-
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form3' action='formtest.js'> 3
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
+    <!-- text field after password fields should be ignored, no username. -->
+    <input type='password' name='pname' value=''>
     <input type='password' name='qname' value=''>
-
+    <input type='text'     name='uname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form4' action='formtest.js'> 4
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value=''>
-
+    <!-- nothing to do, password already present -->
+    <input type='password' name='pname' value='testpass'>
+    <input type='password' name='qname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form5' action='formtest.js'> 5
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
+    <!-- don't clobber an existing unrecognized password -->
+    <input type='password' name='pname' value='xxxxxxxx'>
     <input type='password' name='qname' value=''>
-
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form6' action='formtest.js'> 6
-    <input type='text'     name='uuuuu' value=''>
+    <!-- fill in first field, 2nd field shouldn't be touched anyway. -->
     <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value=''>
-
+    <input type='password' name='qname' value='xxxxxxxx'>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
-<form id='form7' action='formtest.js'> 7
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value=''>
 
+
+<!-- with username fields -->
+
+
+
+<form id='form7' action='formtest.js'> 7
+    <!-- simple form, should fill in username and first pw -->
+    <input type='text'     name='uname' value=''>
+    <input type='password' name='pname' value=''>
+    <input type='password' name='qname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form8' action='formtest.js'> 8
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value=''>
-
+    <!-- reverse pname and qname, field names are ignored. -->
+    <input type='text'     name='uname' value=''>
+    <input type='password' name='qname' value=''>
+    <input type='password' name='pname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form9' action='formtest.js'> 9
-    <input type='text'     name='uname' value=''>
+    <!-- username already filled, so just fill first password -->
+    <input type='text'     name='uname' value='testuser'>
     <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='testpass'>
-
+    <input type='password' name='qname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form10' action='formtest.js'> 10
-    <input type='text'     name='uname' value=''>
+    <!-- unknown username, don't fill in a password -->
+    <input type='text'     name='uname' value='xxxxxxxx'>
     <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
+    <input type='password' name='qname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form11' action='formtest.js'> 11
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='testpass'>
-
+    <!-- don't clobber unknown password -->
+    <input type='text'     name='uname' value='testuser'>
+    <input type='password' name='pname' value='xxxxxxxx'>
+    <input type='password' name='qname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form12' action='formtest.js'> 12
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
+    <!-- fill in 1st pass, don't clobber 2nd pass -->
+    <input type='text'     name='uname' value='testuser'>
+    <input type='password' name='pname' value=''>
+    <input type='password' name='qname' value='xxxxxxxx'>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form13' action='formtest.js'> 13
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='testpass'>
-
+    <!-- nothing to do, user and pass prefilled. life is easy. -->
+    <input type='text'     name='uname' value='testuser'>
+    <input type='password' name='pname' value='testpass'>
+    <input type='password' name='qname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form14' action='formtest.js'> 14
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
+    <!-- shouldn't fill in username because 1st pw field is unknown. -->
+    <input type='text'     name='uname' value=''>
+    <input type='password' name='pname' value='xxxxxxxx'>
+    <input type='password' name='qname' value='testpass'>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form15' action='formtest.js'> 15
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='testpass'>
-
+    <!-- textfield in the middle of pw fields should be ignored -->
+    <input type='password' name='pname' value=''>
+    <input type='text'     name='uname' value=''>
+    <input type='password' name='qname' value=''>
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
 <form id='form16' action='formtest.js'> 16
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form17' action='formtest.js'> 17
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form18' action='formtest.js'> 18
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form19' action='formtest.js'> 19
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form20' action='formtest.js'> 20
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form21' action='formtest.js'> 21
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form22' action='formtest.js'> 22
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form23' action='formtest.js'> 23
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form24' action='formtest.js'> 24
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form25' action='formtest.js'> 25
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form26' action='formtest.js'> 26
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form27' action='formtest.js'> 27
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form28' action='formtest.js'> 28
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form29' action='formtest.js'> 29
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form30' action='formtest.js'> 30
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form31' action='formtest.js'> 31
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form32' action='formtest.js'> 32
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form33' action='formtest.js'> 33
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form34' action='formtest.js'> 34
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form35' action='formtest.js'> 35
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form36' action='formtest.js'> 36
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form37' action='formtest.js'> 37
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form38' action='formtest.js'> 38
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form39' action='formtest.js'> 39
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form40' action='formtest.js'> 40
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form41' action='formtest.js'> 41
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form42' action='formtest.js'> 42
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form43' action='formtest.js'> 43
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form44' action='formtest.js'> 44
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form45' action='formtest.js'> 45
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form46' action='formtest.js'> 46
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form47' action='formtest.js'> 47
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form48' action='formtest.js'> 48
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form49' action='formtest.js'> 49
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form50' action='formtest.js'> 50
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form51' action='formtest.js'> 51
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form52' action='formtest.js'> 52
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form53' action='formtest.js'> 53
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form54' action='formtest.js'> 54
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form55' action='formtest.js'> 55
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form56' action='formtest.js'> 56
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form57' action='formtest.js'> 57
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form58' action='formtest.js'> 58
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form59' action='formtest.js'> 59
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form60' action='formtest.js'> 60
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form61' action='formtest.js'> 61
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form62' action='formtest.js'> 62
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form63' action='formtest.js'> 63
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form64' action='formtest.js'> 64
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form65' action='formtest.js'> 65
+    <!-- same, and don't clobber existing unknown password -->
+    <input type='password' name='pname' value='xxxxxxxx'>
     <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
     <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form66' action='formtest.js'> 66
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form67' action='formtest.js'> 67
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form68' action='formtest.js'> 68
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form69' action='formtest.js'> 69
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form70' action='formtest.js'> 70
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form71' action='formtest.js'> 71
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-
     <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
 </form>
 
-<form id='form72' action='formtest.js'> 72
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form73' action='formtest.js'> 73
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form74' action='formtest.js'> 74
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form75' action='formtest.js'> 75
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form76' action='formtest.js'> 76
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form77' action='formtest.js'> 77
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form78' action='formtest.js'> 78
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form79' action='formtest.js'> 79
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form80' action='formtest.js'> 80
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form81' action='formtest.js'> 81
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form82' action='formtest.js'> 82
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form83' action='formtest.js'> 83
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form84' action='formtest.js'> 84
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form85' action='formtest.js'> 85
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form86' action='formtest.js'> 86
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form87' action='formtest.js'> 87
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form88' action='formtest.js'> 88
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form89' action='formtest.js'> 89
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form90' action='formtest.js'> 90
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form91' action='formtest.js'> 91
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form92' action='formtest.js'> 92
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form93' action='formtest.js'> 93
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form94' action='formtest.js'> 94
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form95' action='formtest.js'> 95
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form96' action='formtest.js'> 96
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form97' action='formtest.js'> 97
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form98' action='formtest.js'> 98
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form99' action='formtest.js'> 99
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form100' action='formtest.js'> 100
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form101' action='formtest.js'> 101
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form102' action='formtest.js'> 102
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form103' action='formtest.js'> 103
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form104' action='formtest.js'> 104
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form105' action='formtest.js'> 105
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form106' action='formtest.js'> 106
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form107' action='formtest.js'> 107
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form108' action='formtest.js'> 108
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form109' action='formtest.js'> 109
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form110' action='formtest.js'> 110
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form111' action='formtest.js'> 111
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form112' action='formtest.js'> 112
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form113' action='formtest.js'> 113
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form114' action='formtest.js'> 114
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form115' action='formtest.js'> 115
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form116' action='formtest.js'> 116
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form117' action='formtest.js'> 117
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form118' action='formtest.js'> 118
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form119' action='formtest.js'> 119
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form120' action='formtest.js'> 120
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form121' action='formtest.js'> 121
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form122' action='formtest.js'> 122
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form123' action='formtest.js'> 123
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form124' action='formtest.js'> 124
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form125' action='formtest.js'> 125
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form126' action='formtest.js'> 126
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form127' action='formtest.js'> 127
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form128' action='formtest.js'> 128
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form129' action='formtest.js'> 129
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form130' action='formtest.js'> 130
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form131' action='formtest.js'> 131
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form132' action='formtest.js'> 132
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form133' action='formtest.js'> 133
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form134' action='formtest.js'> 134
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form135' action='formtest.js'> 135
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form136' action='formtest.js'> 136
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form137' action='formtest.js'> 137
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form138' action='formtest.js'> 138
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form139' action='formtest.js'> 139
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form140' action='formtest.js'> 140
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form141' action='formtest.js'> 141
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form142' action='formtest.js'> 142
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form143' action='formtest.js'> 143
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form144' action='formtest.js'> 144
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form145' action='formtest.js'> 145
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form146' action='formtest.js'> 146
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form147' action='formtest.js'> 147
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form148' action='formtest.js'> 148
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form149' action='formtest.js'> 149
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form150' action='formtest.js'> 150
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form151' action='formtest.js'> 151
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form152' action='formtest.js'> 152
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form153' action='formtest.js'> 153
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form154' action='formtest.js'> 154
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form155' action='formtest.js'> 155
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form156' action='formtest.js'> 156
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form157' action='formtest.js'> 157
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form158' action='formtest.js'> 158
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form159' action='formtest.js'> 159
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form160' action='formtest.js'> 160
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form161' action='formtest.js'> 161
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form162' action='formtest.js'> 162
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form163' action='formtest.js'> 163
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form164' action='formtest.js'> 164
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form165' action='formtest.js'> 165
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form166' action='formtest.js'> 166
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form167' action='formtest.js'> 167
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form168' action='formtest.js'> 168
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form169' action='formtest.js'> 169
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form170' action='formtest.js'> 170
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form171' action='formtest.js'> 171
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form172' action='formtest.js'> 172
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form173' action='formtest.js'> 173
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form174' action='formtest.js'> 174
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form175' action='formtest.js'> 175
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form176' action='formtest.js'> 176
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form177' action='formtest.js'> 177
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form178' action='formtest.js'> 178
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form179' action='formtest.js'> 179
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form180' action='formtest.js'> 180
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form181' action='formtest.js'> 181
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form182' action='formtest.js'> 182
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form183' action='formtest.js'> 183
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form184' action='formtest.js'> 184
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form185' action='formtest.js'> 185
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form186' action='formtest.js'> 186
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form187' action='formtest.js'> 187
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form188' action='formtest.js'> 188
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form189' action='formtest.js'> 189
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form190' action='formtest.js'> 190
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form191' action='formtest.js'> 191
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form192' action='formtest.js'> 192
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form193' action='formtest.js'> 193
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form194' action='formtest.js'> 194
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form195' action='formtest.js'> 195
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form196' action='formtest.js'> 196
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form197' action='formtest.js'> 197
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form198' action='formtest.js'> 198
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form199' action='formtest.js'> 199
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form200' action='formtest.js'> 200
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form201' action='formtest.js'> 201
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form202' action='formtest.js'> 202
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form203' action='formtest.js'> 203
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form204' action='formtest.js'> 204
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form205' action='formtest.js'> 205
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form206' action='formtest.js'> 206
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form207' action='formtest.js'> 207
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form208' action='formtest.js'> 208
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form209' action='formtest.js'> 209
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form210' action='formtest.js'> 210
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form211' action='formtest.js'> 211
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form212' action='formtest.js'> 212
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form213' action='formtest.js'> 213
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form214' action='formtest.js'> 214
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form215' action='formtest.js'> 215
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form216' action='formtest.js'> 216
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form217' action='formtest.js'> 217
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form218' action='formtest.js'> 218
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form219' action='formtest.js'> 219
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form220' action='formtest.js'> 220
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form221' action='formtest.js'> 221
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form222' action='formtest.js'> 222
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form223' action='formtest.js'> 223
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form224' action='formtest.js'> 224
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form225' action='formtest.js'> 225
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form226' action='formtest.js'> 226
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form227' action='formtest.js'> 227
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form228' action='formtest.js'> 228
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form229' action='formtest.js'> 229
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form230' action='formtest.js'> 230
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form231' action='formtest.js'> 231
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form232' action='formtest.js'> 232
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form233' action='formtest.js'> 233
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form234' action='formtest.js'> 234
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form235' action='formtest.js'> 235
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form236' action='formtest.js'> 236
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form237' action='formtest.js'> 237
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form238' action='formtest.js'> 238
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form239' action='formtest.js'> 239
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form240' action='formtest.js'> 240
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form241' action='formtest.js'> 241
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form242' action='formtest.js'> 242
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form243' action='formtest.js'> 243
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form244' action='formtest.js'> 244
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form245' action='formtest.js'> 245
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form246' action='formtest.js'> 246
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form247' action='formtest.js'> 247
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form248' action='formtest.js'> 248
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form249' action='formtest.js'> 249
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form250' action='formtest.js'> 250
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form251' action='formtest.js'> 251
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form252' action='formtest.js'> 252
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form253' action='formtest.js'> 253
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form254' action='formtest.js'> 254
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form255' action='formtest.js'> 255
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form256' action='formtest.js'> 256
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form257' action='formtest.js'> 257
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form258' action='formtest.js'> 258
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form259' action='formtest.js'> 259
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form260' action='formtest.js'> 260
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form261' action='formtest.js'> 261
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form262' action='formtest.js'> 262
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form263' action='formtest.js'> 263
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form264' action='formtest.js'> 264
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form265' action='formtest.js'> 265
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form266' action='formtest.js'> 266
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form267' action='formtest.js'> 267
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form268' action='formtest.js'> 268
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form269' action='formtest.js'> 269
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form270' action='formtest.js'> 270
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form271' action='formtest.js'> 271
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form272' action='formtest.js'> 272
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form273' action='formtest.js'> 273
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form274' action='formtest.js'> 274
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form275' action='formtest.js'> 275
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form276' action='formtest.js'> 276
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form277' action='formtest.js'> 277
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form278' action='formtest.js'> 278
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form279' action='formtest.js'> 279
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form280' action='formtest.js'> 280
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form281' action='formtest.js'> 281
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form282' action='formtest.js'> 282
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form283' action='formtest.js'> 283
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form284' action='formtest.js'> 284
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form285' action='formtest.js'> 285
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form286' action='formtest.js'> 286
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form287' action='formtest.js'> 287
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form288' action='formtest.js'> 288
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form289' action='formtest.js'> 289
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form290' action='formtest.js'> 290
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form291' action='formtest.js'> 291
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form292' action='formtest.js'> 292
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form293' action='formtest.js'> 293
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form294' action='formtest.js'> 294
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form295' action='formtest.js'> 295
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form296' action='formtest.js'> 296
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form297' action='formtest.js'> 297
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form298' action='formtest.js'> 298
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form299' action='formtest.js'> 299
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form300' action='formtest.js'> 300
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form301' action='formtest.js'> 301
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form302' action='formtest.js'> 302
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form303' action='formtest.js'> 303
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form304' action='formtest.js'> 304
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form305' action='formtest.js'> 305
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form306' action='formtest.js'> 306
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form307' action='formtest.js'> 307
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form308' action='formtest.js'> 308
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form309' action='formtest.js'> 309
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form310' action='formtest.js'> 310
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form311' action='formtest.js'> 311
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form312' action='formtest.js'> 312
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form313' action='formtest.js'> 313
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form314' action='formtest.js'> 314
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form315' action='formtest.js'> 315
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form316' action='formtest.js'> 316
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form317' action='formtest.js'> 317
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form318' action='formtest.js'> 318
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form319' action='formtest.js'> 319
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form320' action='formtest.js'> 320
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form321' action='formtest.js'> 321
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form322' action='formtest.js'> 322
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form323' action='formtest.js'> 323
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form324' action='formtest.js'> 324
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form325' action='formtest.js'> 325
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form326' action='formtest.js'> 326
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form327' action='formtest.js'> 327
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form328' action='formtest.js'> 328
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form329' action='formtest.js'> 329
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form330' action='formtest.js'> 330
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form331' action='formtest.js'> 331
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form332' action='formtest.js'> 332
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form333' action='formtest.js'> 333
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form334' action='formtest.js'> 334
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form335' action='formtest.js'> 335
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form336' action='formtest.js'> 336
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form337' action='formtest.js'> 337
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form338' action='formtest.js'> 338
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form339' action='formtest.js'> 339
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form340' action='formtest.js'> 340
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form341' action='formtest.js'> 341
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form342' action='formtest.js'> 342
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form343' action='formtest.js'> 343
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form344' action='formtest.js'> 344
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form345' action='formtest.js'> 345
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form346' action='formtest.js'> 346
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form347' action='formtest.js'> 347
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form348' action='formtest.js'> 348
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form349' action='formtest.js'> 349
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form350' action='formtest.js'> 350
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form351' action='formtest.js'> 351
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form352' action='formtest.js'> 352
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form353' action='formtest.js'> 353
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form354' action='formtest.js'> 354
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form355' action='formtest.js'> 355
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form356' action='formtest.js'> 356
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form357' action='formtest.js'> 357
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form358' action='formtest.js'> 358
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form359' action='formtest.js'> 359
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form360' action='formtest.js'> 360
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form361' action='formtest.js'> 361
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form362' action='formtest.js'> 362
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form363' action='formtest.js'> 363
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form364' action='formtest.js'> 364
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form365' action='formtest.js'> 365
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form366' action='formtest.js'> 366
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form367' action='formtest.js'> 367
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form368' action='formtest.js'> 368
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form369' action='formtest.js'> 369
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form370' action='formtest.js'> 370
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form371' action='formtest.js'> 371
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form372' action='formtest.js'> 372
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form373' action='formtest.js'> 373
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form374' action='formtest.js'> 374
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form375' action='formtest.js'> 375
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form376' action='formtest.js'> 376
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form377' action='formtest.js'> 377
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form378' action='formtest.js'> 378
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form379' action='formtest.js'> 379
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form380' action='formtest.js'> 380
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form381' action='formtest.js'> 381
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form382' action='formtest.js'> 382
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form383' action='formtest.js'> 383
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form384' action='formtest.js'> 384
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form385' action='formtest.js'> 385
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form386' action='formtest.js'> 386
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form387' action='formtest.js'> 387
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form388' action='formtest.js'> 388
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form389' action='formtest.js'> 389
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form390' action='formtest.js'> 390
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form391' action='formtest.js'> 391
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form392' action='formtest.js'> 392
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form393' action='formtest.js'> 393
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form394' action='formtest.js'> 394
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form395' action='formtest.js'> 395
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form396' action='formtest.js'> 396
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form397' action='formtest.js'> 397
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form398' action='formtest.js'> 398
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form399' action='formtest.js'> 399
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form400' action='formtest.js'> 400
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form401' action='formtest.js'> 401
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form402' action='formtest.js'> 402
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form403' action='formtest.js'> 403
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form404' action='formtest.js'> 404
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form405' action='formtest.js'> 405
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form406' action='formtest.js'> 406
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form407' action='formtest.js'> 407
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form408' action='formtest.js'> 408
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form409' action='formtest.js'> 409
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form410' action='formtest.js'> 410
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form411' action='formtest.js'> 411
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form412' action='formtest.js'> 412
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form413' action='formtest.js'> 413
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form414' action='formtest.js'> 414
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form415' action='formtest.js'> 415
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form416' action='formtest.js'> 416
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form417' action='formtest.js'> 417
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form418' action='formtest.js'> 418
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form419' action='formtest.js'> 419
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form420' action='formtest.js'> 420
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form421' action='formtest.js'> 421
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form422' action='formtest.js'> 422
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form423' action='formtest.js'> 423
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form424' action='formtest.js'> 424
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form425' action='formtest.js'> 425
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form426' action='formtest.js'> 426
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form427' action='formtest.js'> 427
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form428' action='formtest.js'> 428
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form429' action='formtest.js'> 429
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form430' action='formtest.js'> 430
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form431' action='formtest.js'> 431
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form432' action='formtest.js'> 432
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form433' action='formtest.js'> 433
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form434' action='formtest.js'> 434
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form435' action='formtest.js'> 435
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form436' action='formtest.js'> 436
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form437' action='formtest.js'> 437
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form438' action='formtest.js'> 438
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form439' action='formtest.js'> 439
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form440' action='formtest.js'> 440
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form441' action='formtest.js'> 441
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form442' action='formtest.js'> 442
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form443' action='formtest.js'> 443
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form444' action='formtest.js'> 444
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form445' action='formtest.js'> 445
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form446' action='formtest.js'> 446
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form447' action='formtest.js'> 447
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form448' action='formtest.js'> 448
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form449' action='formtest.js'> 449
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form450' action='formtest.js'> 450
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form451' action='formtest.js'> 451
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form452' action='formtest.js'> 452
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form453' action='formtest.js'> 453
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form454' action='formtest.js'> 454
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form455' action='formtest.js'> 455
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form456' action='formtest.js'> 456
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form457' action='formtest.js'> 457
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form458' action='formtest.js'> 458
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form459' action='formtest.js'> 459
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form460' action='formtest.js'> 460
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form461' action='formtest.js'> 461
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form462' action='formtest.js'> 462
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form463' action='formtest.js'> 463
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form464' action='formtest.js'> 464
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form465' action='formtest.js'> 465
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form466' action='formtest.js'> 466
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form467' action='formtest.js'> 467
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form468' action='formtest.js'> 468
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form469' action='formtest.js'> 469
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form470' action='formtest.js'> 470
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form471' action='formtest.js'> 471
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form472' action='formtest.js'> 472
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form473' action='formtest.js'> 473
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form474' action='formtest.js'> 474
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form475' action='formtest.js'> 475
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form476' action='formtest.js'> 476
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form477' action='formtest.js'> 477
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form478' action='formtest.js'> 478
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form479' action='formtest.js'> 479
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form480' action='formtest.js'> 480
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form481' action='formtest.js'> 481
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form482' action='formtest.js'> 482
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form483' action='formtest.js'> 483
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form484' action='formtest.js'> 484
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form485' action='formtest.js'> 485
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form486' action='formtest.js'> 486
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form487' action='formtest.js'> 487
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form488' action='formtest.js'> 488
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form489' action='formtest.js'> 489
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form490' action='formtest.js'> 490
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form491' action='formtest.js'> 491
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form492' action='formtest.js'> 492
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form493' action='formtest.js'> 493
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form494' action='formtest.js'> 494
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form495' action='formtest.js'> 495
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form496' action='formtest.js'> 496
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form497' action='formtest.js'> 497
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form498' action='formtest.js'> 498
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form499' action='formtest.js'> 499
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form500' action='formtest.js'> 500
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form501' action='formtest.js'> 501
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form502' action='formtest.js'> 502
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form503' action='formtest.js'> 503
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form504' action='formtest.js'> 504
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form505' action='formtest.js'> 505
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form506' action='formtest.js'> 506
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form507' action='formtest.js'> 507
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form508' action='formtest.js'> 508
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form509' action='formtest.js'> 509
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form510' action='formtest.js'> 510
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form511' action='formtest.js'> 511
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form512' action='formtest.js'> 512
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form513' action='formtest.js'> 513
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form514' action='formtest.js'> 514
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form515' action='formtest.js'> 515
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form516' action='formtest.js'> 516
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form517' action='formtest.js'> 517
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form518' action='formtest.js'> 518
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form519' action='formtest.js'> 519
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form520' action='formtest.js'> 520
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form521' action='formtest.js'> 521
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form522' action='formtest.js'> 522
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form523' action='formtest.js'> 523
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form524' action='formtest.js'> 524
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form525' action='formtest.js'> 525
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form526' action='formtest.js'> 526
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form527' action='formtest.js'> 527
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form528' action='formtest.js'> 528
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form529' action='formtest.js'> 529
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form530' action='formtest.js'> 530
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form531' action='formtest.js'> 531
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form532' action='formtest.js'> 532
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form533' action='formtest.js'> 533
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form534' action='formtest.js'> 534
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form535' action='formtest.js'> 535
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form536' action='formtest.js'> 536
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form537' action='formtest.js'> 537
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form538' action='formtest.js'> 538
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form539' action='formtest.js'> 539
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form540' action='formtest.js'> 540
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form541' action='formtest.js'> 541
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form542' action='formtest.js'> 542
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form543' action='formtest.js'> 543
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form544' action='formtest.js'> 544
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form545' action='formtest.js'> 545
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form546' action='formtest.js'> 546
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form547' action='formtest.js'> 547
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form548' action='formtest.js'> 548
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form549' action='formtest.js'> 549
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form550' action='formtest.js'> 550
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form551' action='formtest.js'> 551
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form552' action='formtest.js'> 552
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form553' action='formtest.js'> 553
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form554' action='formtest.js'> 554
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form555' action='formtest.js'> 555
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form556' action='formtest.js'> 556
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form557' action='formtest.js'> 557
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form558' action='formtest.js'> 558
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form559' action='formtest.js'> 559
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form560' action='formtest.js'> 560
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form561' action='formtest.js'> 561
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form562' action='formtest.js'> 562
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form563' action='formtest.js'> 563
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form564' action='formtest.js'> 564
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form565' action='formtest.js'> 565
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form566' action='formtest.js'> 566
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form567' action='formtest.js'> 567
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form568' action='formtest.js'> 568
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form569' action='formtest.js'> 569
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form570' action='formtest.js'> 570
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form571' action='formtest.js'> 571
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form572' action='formtest.js'> 572
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form573' action='formtest.js'> 573
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form574' action='formtest.js'> 574
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form575' action='formtest.js'> 575
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form576' action='formtest.js'> 576
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form577' action='formtest.js'> 577
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form578' action='formtest.js'> 578
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form579' action='formtest.js'> 579
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form580' action='formtest.js'> 580
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form581' action='formtest.js'> 581
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form582' action='formtest.js'> 582
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form583' action='formtest.js'> 583
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form584' action='formtest.js'> 584
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form585' action='formtest.js'> 585
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form586' action='formtest.js'> 586
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form587' action='formtest.js'> 587
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form588' action='formtest.js'> 588
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form589' action='formtest.js'> 589
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form590' action='formtest.js'> 590
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form591' action='formtest.js'> 591
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form592' action='formtest.js'> 592
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form593' action='formtest.js'> 593
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form594' action='formtest.js'> 594
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form595' action='formtest.js'> 595
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form596' action='formtest.js'> 596
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form597' action='formtest.js'> 597
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form598' action='formtest.js'> 598
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form599' action='formtest.js'> 599
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form600' action='formtest.js'> 600
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form601' action='formtest.js'> 601
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form602' action='formtest.js'> 602
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form603' action='formtest.js'> 603
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form604' action='formtest.js'> 604
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form605' action='formtest.js'> 605
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form606' action='formtest.js'> 606
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form607' action='formtest.js'> 607
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form608' action='formtest.js'> 608
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form609' action='formtest.js'> 609
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form610' action='formtest.js'> 610
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form611' action='formtest.js'> 611
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form612' action='formtest.js'> 612
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form613' action='formtest.js'> 613
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form614' action='formtest.js'> 614
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form615' action='formtest.js'> 615
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form616' action='formtest.js'> 616
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form617' action='formtest.js'> 617
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form618' action='formtest.js'> 618
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form619' action='formtest.js'> 619
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form620' action='formtest.js'> 620
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form621' action='formtest.js'> 621
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form622' action='formtest.js'> 622
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form623' action='formtest.js'> 623
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form624' action='formtest.js'> 624
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form625' action='formtest.js'> 625
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form626' action='formtest.js'> 626
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form627' action='formtest.js'> 627
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form628' action='formtest.js'> 628
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form629' action='formtest.js'> 629
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form630' action='formtest.js'> 630
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form631' action='formtest.js'> 631
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form632' action='formtest.js'> 632
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form633' action='formtest.js'> 633
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form634' action='formtest.js'> 634
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form635' action='formtest.js'> 635
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form636' action='formtest.js'> 636
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form637' action='formtest.js'> 637
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form638' action='formtest.js'> 638
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form639' action='formtest.js'> 639
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form640' action='formtest.js'> 640
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form641' action='formtest.js'> 641
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form642' action='formtest.js'> 642
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form643' action='formtest.js'> 643
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form644' action='formtest.js'> 644
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form645' action='formtest.js'> 645
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form646' action='formtest.js'> 646
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form647' action='formtest.js'> 647
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form648' action='formtest.js'> 648
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form649' action='formtest.js'> 649
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form650' action='formtest.js'> 650
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form651' action='formtest.js'> 651
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form652' action='formtest.js'> 652
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form653' action='formtest.js'> 653
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form654' action='formtest.js'> 654
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form655' action='formtest.js'> 655
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form656' action='formtest.js'> 656
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form657' action='formtest.js'> 657
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form658' action='formtest.js'> 658
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form659' action='formtest.js'> 659
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form660' action='formtest.js'> 660
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form661' action='formtest.js'> 661
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form662' action='formtest.js'> 662
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form663' action='formtest.js'> 663
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form664' action='formtest.js'> 664
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form665' action='formtest.js'> 665
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form666' action='formtest.js'> 666
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form667' action='formtest.js'> 667
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form668' action='formtest.js'> 668
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form669' action='formtest.js'> 669
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form670' action='formtest.js'> 670
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form671' action='formtest.js'> 671
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form672' action='formtest.js'> 672
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form673' action='formtest.js'> 673
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form674' action='formtest.js'> 674
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form675' action='formtest.js'> 675
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form676' action='formtest.js'> 676
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form677' action='formtest.js'> 677
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form678' action='formtest.js'> 678
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form679' action='formtest.js'> 679
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form680' action='formtest.js'> 680
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form681' action='formtest.js'> 681
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form682' action='formtest.js'> 682
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form683' action='formtest.js'> 683
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form684' action='formtest.js'> 684
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form685' action='formtest.js'> 685
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form686' action='formtest.js'> 686
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form687' action='formtest.js'> 687
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form688' action='formtest.js'> 688
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form689' action='formtest.js'> 689
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form690' action='formtest.js'> 690
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form691' action='formtest.js'> 691
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form692' action='formtest.js'> 692
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form693' action='formtest.js'> 693
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form694' action='formtest.js'> 694
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form695' action='formtest.js'> 695
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form696' action='formtest.js'> 696
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form697' action='formtest.js'> 697
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form698' action='formtest.js'> 698
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form699' action='formtest.js'> 699
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form700' action='formtest.js'> 700
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form701' action='formtest.js'> 701
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form702' action='formtest.js'> 702
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form703' action='formtest.js'> 703
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form704' action='formtest.js'> 704
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form705' action='formtest.js'> 705
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form706' action='formtest.js'> 706
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form707' action='formtest.js'> 707
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form708' action='formtest.js'> 708
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form709' action='formtest.js'> 709
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form710' action='formtest.js'> 710
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form711' action='formtest.js'> 711
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form712' action='formtest.js'> 712
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form713' action='formtest.js'> 713
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form714' action='formtest.js'> 714
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form715' action='formtest.js'> 715
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form716' action='formtest.js'> 716
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form717' action='formtest.js'> 717
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form718' action='formtest.js'> 718
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form719' action='formtest.js'> 719
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form720' action='formtest.js'> 720
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form721' action='formtest.js'> 721
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form722' action='formtest.js'> 722
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form723' action='formtest.js'> 723
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form724' action='formtest.js'> 724
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form725' action='formtest.js'> 725
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form726' action='formtest.js'> 726
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form727' action='formtest.js'> 727
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form728' action='formtest.js'> 728
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form729' action='formtest.js'> 729
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form730' action='formtest.js'> 730
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form731' action='formtest.js'> 731
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form732' action='formtest.js'> 732
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form733' action='formtest.js'> 733
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form734' action='formtest.js'> 734
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form735' action='formtest.js'> 735
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form736' action='formtest.js'> 736
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form737' action='formtest.js'> 737
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form738' action='formtest.js'> 738
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form739' action='formtest.js'> 739
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form740' action='formtest.js'> 740
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form741' action='formtest.js'> 741
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form742' action='formtest.js'> 742
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form743' action='formtest.js'> 743
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form744' action='formtest.js'> 744
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form745' action='formtest.js'> 745
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form746' action='formtest.js'> 746
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form747' action='formtest.js'> 747
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form748' action='formtest.js'> 748
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form749' action='formtest.js'> 749
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form750' action='formtest.js'> 750
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form751' action='formtest.js'> 751
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form752' action='formtest.js'> 752
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form753' action='formtest.js'> 753
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form754' action='formtest.js'> 754
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form755' action='formtest.js'> 755
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form756' action='formtest.js'> 756
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form757' action='formtest.js'> 757
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form758' action='formtest.js'> 758
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form759' action='formtest.js'> 759
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form760' action='formtest.js'> 760
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form761' action='formtest.js'> 761
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form762' action='formtest.js'> 762
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form763' action='formtest.js'> 763
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form764' action='formtest.js'> 764
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form765' action='formtest.js'> 765
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form766' action='formtest.js'> 766
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form767' action='formtest.js'> 767
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form768' action='formtest.js'> 768
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form769' action='formtest.js'> 769
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form770' action='formtest.js'> 770
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form771' action='formtest.js'> 771
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form772' action='formtest.js'> 772
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form773' action='formtest.js'> 773
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form774' action='formtest.js'> 774
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form775' action='formtest.js'> 775
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form776' action='formtest.js'> 776
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form777' action='formtest.js'> 777
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form778' action='formtest.js'> 778
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form779' action='formtest.js'> 779
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form780' action='formtest.js'> 780
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form781' action='formtest.js'> 781
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form782' action='formtest.js'> 782
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form783' action='formtest.js'> 783
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form784' action='formtest.js'> 784
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form785' action='formtest.js'> 785
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form786' action='formtest.js'> 786
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form787' action='formtest.js'> 787
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form788' action='formtest.js'> 788
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form789' action='formtest.js'> 789
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form790' action='formtest.js'> 790
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form791' action='formtest.js'> 791
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form792' action='formtest.js'> 792
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form793' action='formtest.js'> 793
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form794' action='formtest.js'> 794
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form795' action='formtest.js'> 795
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form796' action='formtest.js'> 796
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form797' action='formtest.js'> 797
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form798' action='formtest.js'> 798
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form799' action='formtest.js'> 799
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form800' action='formtest.js'> 800
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form801' action='formtest.js'> 801
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form802' action='formtest.js'> 802
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form803' action='formtest.js'> 803
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form804' action='formtest.js'> 804
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form805' action='formtest.js'> 805
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form806' action='formtest.js'> 806
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form807' action='formtest.js'> 807
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form808' action='formtest.js'> 808
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form809' action='formtest.js'> 809
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form810' action='formtest.js'> 810
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form811' action='formtest.js'> 811
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form812' action='formtest.js'> 812
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form813' action='formtest.js'> 813
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form814' action='formtest.js'> 814
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form815' action='formtest.js'> 815
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form816' action='formtest.js'> 816
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form817' action='formtest.js'> 817
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form818' action='formtest.js'> 818
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form819' action='formtest.js'> 819
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form820' action='formtest.js'> 820
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form821' action='formtest.js'> 821
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form822' action='formtest.js'> 822
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form823' action='formtest.js'> 823
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form824' action='formtest.js'> 824
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form825' action='formtest.js'> 825
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form826' action='formtest.js'> 826
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form827' action='formtest.js'> 827
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form828' action='formtest.js'> 828
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form829' action='formtest.js'> 829
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form830' action='formtest.js'> 830
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form831' action='formtest.js'> 831
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form832' action='formtest.js'> 832
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form833' action='formtest.js'> 833
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form834' action='formtest.js'> 834
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form835' action='formtest.js'> 835
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form836' action='formtest.js'> 836
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form837' action='formtest.js'> 837
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form838' action='formtest.js'> 838
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form839' action='formtest.js'> 839
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form840' action='formtest.js'> 840
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form841' action='formtest.js'> 841
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form842' action='formtest.js'> 842
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form843' action='formtest.js'> 843
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form844' action='formtest.js'> 844
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form845' action='formtest.js'> 845
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form846' action='formtest.js'> 846
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form847' action='formtest.js'> 847
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form848' action='formtest.js'> 848
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form849' action='formtest.js'> 849
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form850' action='formtest.js'> 850
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form851' action='formtest.js'> 851
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form852' action='formtest.js'> 852
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form853' action='formtest.js'> 853
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form854' action='formtest.js'> 854
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form855' action='formtest.js'> 855
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form856' action='formtest.js'> 856
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form857' action='formtest.js'> 857
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form858' action='formtest.js'> 858
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form859' action='formtest.js'> 859
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form860' action='formtest.js'> 860
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form861' action='formtest.js'> 861
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form862' action='formtest.js'> 862
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form863' action='formtest.js'> 863
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qname' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form864' action='formtest.js'> 864
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form865' action='formtest.js'> 865
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form866' action='formtest.js'> 866
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form867' action='formtest.js'> 867
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form868' action='formtest.js'> 868
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form869' action='formtest.js'> 869
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form870' action='formtest.js'> 870
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form871' action='formtest.js'> 871
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form872' action='formtest.js'> 872
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form873' action='formtest.js'> 873
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form874' action='formtest.js'> 874
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form875' action='formtest.js'> 875
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form876' action='formtest.js'> 876
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form877' action='formtest.js'> 877
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form878' action='formtest.js'> 878
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form879' action='formtest.js'> 879
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form880' action='formtest.js'> 880
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form881' action='formtest.js'> 881
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form882' action='formtest.js'> 882
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form883' action='formtest.js'> 883
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form884' action='formtest.js'> 884
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form885' action='formtest.js'> 885
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form886' action='formtest.js'> 886
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form887' action='formtest.js'> 887
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form888' action='formtest.js'> 888
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form889' action='formtest.js'> 889
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form890' action='formtest.js'> 890
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form891' action='formtest.js'> 891
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form892' action='formtest.js'> 892
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form893' action='formtest.js'> 893
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form894' action='formtest.js'> 894
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form895' action='formtest.js'> 895
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form896' action='formtest.js'> 896
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form897' action='formtest.js'> 897
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form898' action='formtest.js'> 898
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form899' action='formtest.js'> 899
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form900' action='formtest.js'> 900
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form901' action='formtest.js'> 901
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form902' action='formtest.js'> 902
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form903' action='formtest.js'> 903
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form904' action='formtest.js'> 904
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form905' action='formtest.js'> 905
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form906' action='formtest.js'> 906
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form907' action='formtest.js'> 907
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form908' action='formtest.js'> 908
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form909' action='formtest.js'> 909
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form910' action='formtest.js'> 910
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form911' action='formtest.js'> 911
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form912' action='formtest.js'> 912
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form913' action='formtest.js'> 913
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form914' action='formtest.js'> 914
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form915' action='formtest.js'> 915
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form916' action='formtest.js'> 916
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form917' action='formtest.js'> 917
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form918' action='formtest.js'> 918
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form919' action='formtest.js'> 919
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form920' action='formtest.js'> 920
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form921' action='formtest.js'> 921
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form922' action='formtest.js'> 922
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form923' action='formtest.js'> 923
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form924' action='formtest.js'> 924
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form925' action='formtest.js'> 925
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form926' action='formtest.js'> 926
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form927' action='formtest.js'> 927
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form928' action='formtest.js'> 928
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form929' action='formtest.js'> 929
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form930' action='formtest.js'> 930
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form931' action='formtest.js'> 931
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form932' action='formtest.js'> 932
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form933' action='formtest.js'> 933
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form934' action='formtest.js'> 934
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form935' action='formtest.js'> 935
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form936' action='formtest.js'> 936
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form937' action='formtest.js'> 937
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form938' action='formtest.js'> 938
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form939' action='formtest.js'> 939
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form940' action='formtest.js'> 940
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form941' action='formtest.js'> 941
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form942' action='formtest.js'> 942
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form943' action='formtest.js'> 943
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form944' action='formtest.js'> 944
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form945' action='formtest.js'> 945
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form946' action='formtest.js'> 946
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form947' action='formtest.js'> 947
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form948' action='formtest.js'> 948
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form949' action='formtest.js'> 949
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form950' action='formtest.js'> 950
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form951' action='formtest.js'> 951
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form952' action='formtest.js'> 952
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form953' action='formtest.js'> 953
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form954' action='formtest.js'> 954
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form955' action='formtest.js'> 955
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form956' action='formtest.js'> 956
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form957' action='formtest.js'> 957
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form958' action='formtest.js'> 958
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form959' action='formtest.js'> 959
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form960' action='formtest.js'> 960
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form961' action='formtest.js'> 961
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form962' action='formtest.js'> 962
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form963' action='formtest.js'> 963
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form964' action='formtest.js'> 964
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form965' action='formtest.js'> 965
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form966' action='formtest.js'> 966
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form967' action='formtest.js'> 967
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form968' action='formtest.js'> 968
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form969' action='formtest.js'> 969
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form970' action='formtest.js'> 970
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form971' action='formtest.js'> 971
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form972' action='formtest.js'> 972
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form973' action='formtest.js'> 973
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form974' action='formtest.js'> 974
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form975' action='formtest.js'> 975
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form976' action='formtest.js'> 976
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form977' action='formtest.js'> 977
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form978' action='formtest.js'> 978
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form979' action='formtest.js'> 979
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form980' action='formtest.js'> 980
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form981' action='formtest.js'> 981
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form982' action='formtest.js'> 982
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form983' action='formtest.js'> 983
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form984' action='formtest.js'> 984
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form985' action='formtest.js'> 985
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form986' action='formtest.js'> 986
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form987' action='formtest.js'> 987
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form988' action='formtest.js'> 988
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form989' action='formtest.js'> 989
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form990' action='formtest.js'> 990
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form991' action='formtest.js'> 991
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form992' action='formtest.js'> 992
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form993' action='formtest.js'> 993
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form994' action='formtest.js'> 994
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form995' action='formtest.js'> 995
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form996' action='formtest.js'> 996
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form997' action='formtest.js'> 997
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form998' action='formtest.js'> 998
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form999' action='formtest.js'> 999
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1000' action='formtest.js'> 1000
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1001' action='formtest.js'> 1001
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1002' action='formtest.js'> 1002
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1003' action='formtest.js'> 1003
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1004' action='formtest.js'> 1004
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1005' action='formtest.js'> 1005
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1006' action='formtest.js'> 1006
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1007' action='formtest.js'> 1007
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1008' action='formtest.js'> 1008
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1009' action='formtest.js'> 1009
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1010' action='formtest.js'> 1010
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1011' action='formtest.js'> 1011
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1012' action='formtest.js'> 1012
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1013' action='formtest.js'> 1013
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1014' action='formtest.js'> 1014
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1015' action='formtest.js'> 1015
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1016' action='formtest.js'> 1016
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1017' action='formtest.js'> 1017
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1018' action='formtest.js'> 1018
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1019' action='formtest.js'> 1019
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1020' action='formtest.js'> 1020
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1021' action='formtest.js'> 1021
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1022' action='formtest.js'> 1022
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1023' action='formtest.js'> 1023
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1024' action='formtest.js'> 1024
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1025' action='formtest.js'> 1025
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1026' action='formtest.js'> 1026
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1027' action='formtest.js'> 1027
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1028' action='formtest.js'> 1028
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1029' action='formtest.js'> 1029
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1030' action='formtest.js'> 1030
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1031' action='formtest.js'> 1031
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1032' action='formtest.js'> 1032
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1033' action='formtest.js'> 1033
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1034' action='formtest.js'> 1034
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1035' action='formtest.js'> 1035
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1036' action='formtest.js'> 1036
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1037' action='formtest.js'> 1037
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1038' action='formtest.js'> 1038
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1039' action='formtest.js'> 1039
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1040' action='formtest.js'> 1040
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1041' action='formtest.js'> 1041
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1042' action='formtest.js'> 1042
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1043' action='formtest.js'> 1043
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1044' action='formtest.js'> 1044
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1045' action='formtest.js'> 1045
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1046' action='formtest.js'> 1046
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1047' action='formtest.js'> 1047
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1048' action='formtest.js'> 1048
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1049' action='formtest.js'> 1049
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1050' action='formtest.js'> 1050
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1051' action='formtest.js'> 1051
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1052' action='formtest.js'> 1052
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1053' action='formtest.js'> 1053
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1054' action='formtest.js'> 1054
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1055' action='formtest.js'> 1055
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1056' action='formtest.js'> 1056
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1057' action='formtest.js'> 1057
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1058' action='formtest.js'> 1058
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1059' action='formtest.js'> 1059
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1060' action='formtest.js'> 1060
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1061' action='formtest.js'> 1061
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1062' action='formtest.js'> 1062
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1063' action='formtest.js'> 1063
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1064' action='formtest.js'> 1064
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1065' action='formtest.js'> 1065
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1066' action='formtest.js'> 1066
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1067' action='formtest.js'> 1067
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1068' action='formtest.js'> 1068
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1069' action='formtest.js'> 1069
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1070' action='formtest.js'> 1070
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1071' action='formtest.js'> 1071
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1072' action='formtest.js'> 1072
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1073' action='formtest.js'> 1073
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1074' action='formtest.js'> 1074
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1075' action='formtest.js'> 1075
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1076' action='formtest.js'> 1076
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1077' action='formtest.js'> 1077
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1078' action='formtest.js'> 1078
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1079' action='formtest.js'> 1079
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1080' action='formtest.js'> 1080
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1081' action='formtest.js'> 1081
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1082' action='formtest.js'> 1082
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1083' action='formtest.js'> 1083
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1084' action='formtest.js'> 1084
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1085' action='formtest.js'> 1085
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1086' action='formtest.js'> 1086
-    <input type='password' name='pname' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1087' action='formtest.js'> 1087
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1088' action='formtest.js'> 1088
-    <input type='password' name='ppppp' value=''>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1089' action='formtest.js'> 1089
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1090' action='formtest.js'> 1090
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1091' action='formtest.js'> 1091
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1092' action='formtest.js'> 1092
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1093' action='formtest.js'> 1093
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1094' action='formtest.js'> 1094
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1095' action='formtest.js'> 1095
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1096' action='formtest.js'> 1096
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1097' action='formtest.js'> 1097
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1098' action='formtest.js'> 1098
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1099' action='formtest.js'> 1099
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1100' action='formtest.js'> 1100
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1101' action='formtest.js'> 1101
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1102' action='formtest.js'> 1102
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1103' action='formtest.js'> 1103
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1104' action='formtest.js'> 1104
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1105' action='formtest.js'> 1105
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1106' action='formtest.js'> 1106
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1107' action='formtest.js'> 1107
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1108' action='formtest.js'> 1108
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1109' action='formtest.js'> 1109
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1110' action='formtest.js'> 1110
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1111' action='formtest.js'> 1111
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1112' action='formtest.js'> 1112
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1113' action='formtest.js'> 1113
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1114' action='formtest.js'> 1114
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1115' action='formtest.js'> 1115
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1116' action='formtest.js'> 1116
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1117' action='formtest.js'> 1117
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1118' action='formtest.js'> 1118
-    <input type='password' name='pname' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1119' action='formtest.js'> 1119
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1120' action='formtest.js'> 1120
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1121' action='formtest.js'> 1121
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1122' action='formtest.js'> 1122
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1123' action='formtest.js'> 1123
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1124' action='formtest.js'> 1124
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1125' action='formtest.js'> 1125
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1126' action='formtest.js'> 1126
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1127' action='formtest.js'> 1127
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1128' action='formtest.js'> 1128
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1129' action='formtest.js'> 1129
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1130' action='formtest.js'> 1130
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1131' action='formtest.js'> 1131
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1132' action='formtest.js'> 1132
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1133' action='formtest.js'> 1133
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1134' action='formtest.js'> 1134
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1135' action='formtest.js'> 1135
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1136' action='formtest.js'> 1136
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1137' action='formtest.js'> 1137
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1138' action='formtest.js'> 1138
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1139' action='formtest.js'> 1139
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1140' action='formtest.js'> 1140
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1141' action='formtest.js'> 1141
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1142' action='formtest.js'> 1142
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1143' action='formtest.js'> 1143
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1144' action='formtest.js'> 1144
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1145' action='formtest.js'> 1145
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1146' action='formtest.js'> 1146
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1147' action='formtest.js'> 1147
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1148' action='formtest.js'> 1148
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1149' action='formtest.js'> 1149
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1150' action='formtest.js'> 1150
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1151' action='formtest.js'> 1151
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1152' action='formtest.js'> 1152
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1153' action='formtest.js'> 1153
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1154' action='formtest.js'> 1154
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1155' action='formtest.js'> 1155
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1156' action='formtest.js'> 1156
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1157' action='formtest.js'> 1157
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1158' action='formtest.js'> 1158
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1159' action='formtest.js'> 1159
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1160' action='formtest.js'> 1160
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1161' action='formtest.js'> 1161
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1162' action='formtest.js'> 1162
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1163' action='formtest.js'> 1163
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1164' action='formtest.js'> 1164
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1165' action='formtest.js'> 1165
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1166' action='formtest.js'> 1166
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1167' action='formtest.js'> 1167
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1168' action='formtest.js'> 1168
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1169' action='formtest.js'> 1169
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1170' action='formtest.js'> 1170
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1171' action='formtest.js'> 1171
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1172' action='formtest.js'> 1172
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1173' action='formtest.js'> 1173
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1174' action='formtest.js'> 1174
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1175' action='formtest.js'> 1175
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1176' action='formtest.js'> 1176
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1177' action='formtest.js'> 1177
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1178' action='formtest.js'> 1178
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1179' action='formtest.js'> 1179
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1180' action='formtest.js'> 1180
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1181' action='formtest.js'> 1181
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1182' action='formtest.js'> 1182
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1183' action='formtest.js'> 1183
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1184' action='formtest.js'> 1184
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1185' action='formtest.js'> 1185
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1186' action='formtest.js'> 1186
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1187' action='formtest.js'> 1187
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1188' action='formtest.js'> 1188
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1189' action='formtest.js'> 1189
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1190' action='formtest.js'> 1190
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1191' action='formtest.js'> 1191
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1192' action='formtest.js'> 1192
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1193' action='formtest.js'> 1193
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1194' action='formtest.js'> 1194
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1195' action='formtest.js'> 1195
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1196' action='formtest.js'> 1196
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1197' action='formtest.js'> 1197
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1198' action='formtest.js'> 1198
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1199' action='formtest.js'> 1199
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1200' action='formtest.js'> 1200
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1201' action='formtest.js'> 1201
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1202' action='formtest.js'> 1202
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1203' action='formtest.js'> 1203
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1204' action='formtest.js'> 1204
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1205' action='formtest.js'> 1205
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1206' action='formtest.js'> 1206
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1207' action='formtest.js'> 1207
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1208' action='formtest.js'> 1208
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1209' action='formtest.js'> 1209
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1210' action='formtest.js'> 1210
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1211' action='formtest.js'> 1211
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1212' action='formtest.js'> 1212
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1213' action='formtest.js'> 1213
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1214' action='formtest.js'> 1214
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1215' action='formtest.js'> 1215
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1216' action='formtest.js'> 1216
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1217' action='formtest.js'> 1217
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1218' action='formtest.js'> 1218
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1219' action='formtest.js'> 1219
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1220' action='formtest.js'> 1220
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1221' action='formtest.js'> 1221
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1222' action='formtest.js'> 1222
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1223' action='formtest.js'> 1223
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1224' action='formtest.js'> 1224
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1225' action='formtest.js'> 1225
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1226' action='formtest.js'> 1226
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1227' action='formtest.js'> 1227
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1228' action='formtest.js'> 1228
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1229' action='formtest.js'> 1229
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1230' action='formtest.js'> 1230
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1231' action='formtest.js'> 1231
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1232' action='formtest.js'> 1232
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1233' action='formtest.js'> 1233
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1234' action='formtest.js'> 1234
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1235' action='formtest.js'> 1235
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1236' action='formtest.js'> 1236
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1237' action='formtest.js'> 1237
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1238' action='formtest.js'> 1238
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1239' action='formtest.js'> 1239
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1240' action='formtest.js'> 1240
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1241' action='formtest.js'> 1241
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1242' action='formtest.js'> 1242
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1243' action='formtest.js'> 1243
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1244' action='formtest.js'> 1244
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1245' action='formtest.js'> 1245
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1246' action='formtest.js'> 1246
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1247' action='formtest.js'> 1247
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1248' action='formtest.js'> 1248
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1249' action='formtest.js'> 1249
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1250' action='formtest.js'> 1250
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1251' action='formtest.js'> 1251
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1252' action='formtest.js'> 1252
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1253' action='formtest.js'> 1253
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1254' action='formtest.js'> 1254
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1255' action='formtest.js'> 1255
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1256' action='formtest.js'> 1256
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1257' action='formtest.js'> 1257
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1258' action='formtest.js'> 1258
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1259' action='formtest.js'> 1259
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1260' action='formtest.js'> 1260
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1261' action='formtest.js'> 1261
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1262' action='formtest.js'> 1262
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1263' action='formtest.js'> 1263
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1264' action='formtest.js'> 1264
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1265' action='formtest.js'> 1265
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1266' action='formtest.js'> 1266
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1267' action='formtest.js'> 1267
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1268' action='formtest.js'> 1268
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1269' action='formtest.js'> 1269
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1270' action='formtest.js'> 1270
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1271' action='formtest.js'> 1271
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1272' action='formtest.js'> 1272
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1273' action='formtest.js'> 1273
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1274' action='formtest.js'> 1274
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1275' action='formtest.js'> 1275
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1276' action='formtest.js'> 1276
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1277' action='formtest.js'> 1277
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1278' action='formtest.js'> 1278
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1279' action='formtest.js'> 1279
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1280' action='formtest.js'> 1280
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1281' action='formtest.js'> 1281
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1282' action='formtest.js'> 1282
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1283' action='formtest.js'> 1283
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1284' action='formtest.js'> 1284
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1285' action='formtest.js'> 1285
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1286' action='formtest.js'> 1286
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1287' action='formtest.js'> 1287
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1288' action='formtest.js'> 1288
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1289' action='formtest.js'> 1289
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1290' action='formtest.js'> 1290
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1291' action='formtest.js'> 1291
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1292' action='formtest.js'> 1292
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1293' action='formtest.js'> 1293
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1294' action='formtest.js'> 1294
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1295' action='formtest.js'> 1295
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1296' action='formtest.js'> 1296
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1297' action='formtest.js'> 1297
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1298' action='formtest.js'> 1298
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1299' action='formtest.js'> 1299
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1300' action='formtest.js'> 1300
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1301' action='formtest.js'> 1301
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1302' action='formtest.js'> 1302
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1303' action='formtest.js'> 1303
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1304' action='formtest.js'> 1304
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1305' action='formtest.js'> 1305
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1306' action='formtest.js'> 1306
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1307' action='formtest.js'> 1307
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1308' action='formtest.js'> 1308
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1309' action='formtest.js'> 1309
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1310' action='formtest.js'> 1310
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1311' action='formtest.js'> 1311
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1312' action='formtest.js'> 1312
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1313' action='formtest.js'> 1313
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1314' action='formtest.js'> 1314
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1315' action='formtest.js'> 1315
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1316' action='formtest.js'> 1316
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1317' action='formtest.js'> 1317
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1318' action='formtest.js'> 1318
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1319' action='formtest.js'> 1319
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1320' action='formtest.js'> 1320
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1321' action='formtest.js'> 1321
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1322' action='formtest.js'> 1322
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1323' action='formtest.js'> 1323
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1324' action='formtest.js'> 1324
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1325' action='formtest.js'> 1325
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1326' action='formtest.js'> 1326
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1327' action='formtest.js'> 1327
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1328' action='formtest.js'> 1328
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1329' action='formtest.js'> 1329
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1330' action='formtest.js'> 1330
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1331' action='formtest.js'> 1331
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1332' action='formtest.js'> 1332
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1333' action='formtest.js'> 1333
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1334' action='formtest.js'> 1334
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1335' action='formtest.js'> 1335
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1336' action='formtest.js'> 1336
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1337' action='formtest.js'> 1337
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1338' action='formtest.js'> 1338
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1339' action='formtest.js'> 1339
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1340' action='formtest.js'> 1340
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1341' action='formtest.js'> 1341
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1342' action='formtest.js'> 1342
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1343' action='formtest.js'> 1343
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1344' action='formtest.js'> 1344
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='testuser'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1345' action='formtest.js'> 1345
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1346' action='formtest.js'> 1346
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1347' action='formtest.js'> 1347
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1348' action='formtest.js'> 1348
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1349' action='formtest.js'> 1349
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1350' action='formtest.js'> 1350
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1351' action='formtest.js'> 1351
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1352' action='formtest.js'> 1352
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1353' action='formtest.js'> 1353
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1354' action='formtest.js'> 1354
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1355' action='formtest.js'> 1355
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1356' action='formtest.js'> 1356
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1357' action='formtest.js'> 1357
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1358' action='formtest.js'> 1358
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1359' action='formtest.js'> 1359
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1360' action='formtest.js'> 1360
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1361' action='formtest.js'> 1361
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1362' action='formtest.js'> 1362
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1363' action='formtest.js'> 1363
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1364' action='formtest.js'> 1364
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1365' action='formtest.js'> 1365
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1366' action='formtest.js'> 1366
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1367' action='formtest.js'> 1367
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1368' action='formtest.js'> 1368
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1369' action='formtest.js'> 1369
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1370' action='formtest.js'> 1370
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1371' action='formtest.js'> 1371
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1372' action='formtest.js'> 1372
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1373' action='formtest.js'> 1373
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1374' action='formtest.js'> 1374
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1375' action='formtest.js'> 1375
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1376' action='formtest.js'> 1376
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1377' action='formtest.js'> 1377
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1378' action='formtest.js'> 1378
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1379' action='formtest.js'> 1379
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1380' action='formtest.js'> 1380
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1381' action='formtest.js'> 1381
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1382' action='formtest.js'> 1382
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1383' action='formtest.js'> 1383
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1384' action='formtest.js'> 1384
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1385' action='formtest.js'> 1385
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1386' action='formtest.js'> 1386
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1387' action='formtest.js'> 1387
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1388' action='formtest.js'> 1388
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1389' action='formtest.js'> 1389
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1390' action='formtest.js'> 1390
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1391' action='formtest.js'> 1391
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1392' action='formtest.js'> 1392
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1393' action='formtest.js'> 1393
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1394' action='formtest.js'> 1394
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1395' action='formtest.js'> 1395
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1396' action='formtest.js'> 1396
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1397' action='formtest.js'> 1397
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1398' action='formtest.js'> 1398
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1399' action='formtest.js'> 1399
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1400' action='formtest.js'> 1400
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1401' action='formtest.js'> 1401
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1402' action='formtest.js'> 1402
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1403' action='formtest.js'> 1403
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1404' action='formtest.js'> 1404
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1405' action='formtest.js'> 1405
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1406' action='formtest.js'> 1406
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1407' action='formtest.js'> 1407
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1408' action='formtest.js'> 1408
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='testpass'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1409' action='formtest.js'> 1409
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1410' action='formtest.js'> 1410
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1411' action='formtest.js'> 1411
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1412' action='formtest.js'> 1412
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1413' action='formtest.js'> 1413
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1414' action='formtest.js'> 1414
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1415' action='formtest.js'> 1415
-    <input type='password' name='qname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1416' action='formtest.js'> 1416
-    <input type='password' name='qqqqq' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1417' action='formtest.js'> 1417
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1418' action='formtest.js'> 1418
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1419' action='formtest.js'> 1419
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1420' action='formtest.js'> 1420
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1421' action='formtest.js'> 1421
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1422' action='formtest.js'> 1422
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1423' action='formtest.js'> 1423
-    <input type='password' name='qname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1424' action='formtest.js'> 1424
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1425' action='formtest.js'> 1425
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1426' action='formtest.js'> 1426
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1427' action='formtest.js'> 1427
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1428' action='formtest.js'> 1428
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1429' action='formtest.js'> 1429
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1430' action='formtest.js'> 1430
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1431' action='formtest.js'> 1431
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1432' action='formtest.js'> 1432
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1433' action='formtest.js'> 1433
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1434' action='formtest.js'> 1434
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1435' action='formtest.js'> 1435
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1436' action='formtest.js'> 1436
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uname' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1437' action='formtest.js'> 1437
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1438' action='formtest.js'> 1438
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='pname' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1439' action='formtest.js'> 1439
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1440' action='formtest.js'> 1440
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1441' action='formtest.js'> 1441
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1442' action='formtest.js'> 1442
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1443' action='formtest.js'> 1443
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1444' action='formtest.js'> 1444
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1445' action='formtest.js'> 1445
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1446' action='formtest.js'> 1446
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1447' action='formtest.js'> 1447
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1448' action='formtest.js'> 1448
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1449' action='formtest.js'> 1449
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1450' action='formtest.js'> 1450
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1451' action='formtest.js'> 1451
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1452' action='formtest.js'> 1452
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1453' action='formtest.js'> 1453
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1454' action='formtest.js'> 1454
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1455' action='formtest.js'> 1455
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1456' action='formtest.js'> 1456
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1457' action='formtest.js'> 1457
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1458' action='formtest.js'> 1458
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1459' action='formtest.js'> 1459
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1460' action='formtest.js'> 1460
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1461' action='formtest.js'> 1461
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1462' action='formtest.js'> 1462
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1463' action='formtest.js'> 1463
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1464' action='formtest.js'> 1464
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1465' action='formtest.js'> 1465
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1466' action='formtest.js'> 1466
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1467' action='formtest.js'> 1467
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1468' action='formtest.js'> 1468
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1469' action='formtest.js'> 1469
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1470' action='formtest.js'> 1470
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1471' action='formtest.js'> 1471
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1472' action='formtest.js'> 1472
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1473' action='formtest.js'> 1473
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1474' action='formtest.js'> 1474
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1475' action='formtest.js'> 1475
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1476' action='formtest.js'> 1476
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1477' action='formtest.js'> 1477
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1478' action='formtest.js'> 1478
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1479' action='formtest.js'> 1479
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1480' action='formtest.js'> 1480
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1481' action='formtest.js'> 1481
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1482' action='formtest.js'> 1482
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1483' action='formtest.js'> 1483
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1484' action='formtest.js'> 1484
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1485' action='formtest.js'> 1485
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1486' action='formtest.js'> 1486
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1487' action='formtest.js'> 1487
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1488' action='formtest.js'> 1488
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1489' action='formtest.js'> 1489
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1490' action='formtest.js'> 1490
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1491' action='formtest.js'> 1491
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1492' action='formtest.js'> 1492
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1493' action='formtest.js'> 1493
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1494' action='formtest.js'> 1494
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1495' action='formtest.js'> 1495
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1496' action='formtest.js'> 1496
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1497' action='formtest.js'> 1497
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1498' action='formtest.js'> 1498
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1499' action='formtest.js'> 1499
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1500' action='formtest.js'> 1500
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1501' action='formtest.js'> 1501
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1502' action='formtest.js'> 1502
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1503' action='formtest.js'> 1503
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1504' action='formtest.js'> 1504
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1505' action='formtest.js'> 1505
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1506' action='formtest.js'> 1506
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1507' action='formtest.js'> 1507
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1508' action='formtest.js'> 1508
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1509' action='formtest.js'> 1509
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1510' action='formtest.js'> 1510
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1511' action='formtest.js'> 1511
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1512' action='formtest.js'> 1512
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1513' action='formtest.js'> 1513
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1514' action='formtest.js'> 1514
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1515' action='formtest.js'> 1515
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1516' action='formtest.js'> 1516
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1517' action='formtest.js'> 1517
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1518' action='formtest.js'> 1518
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1519' action='formtest.js'> 1519
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1520' action='formtest.js'> 1520
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1521' action='formtest.js'> 1521
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1522' action='formtest.js'> 1522
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1523' action='formtest.js'> 1523
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1524' action='formtest.js'> 1524
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1525' action='formtest.js'> 1525
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1526' action='formtest.js'> 1526
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1527' action='formtest.js'> 1527
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1528' action='formtest.js'> 1528
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1529' action='formtest.js'> 1529
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1530' action='formtest.js'> 1530
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1531' action='formtest.js'> 1531
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1532' action='formtest.js'> 1532
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1533' action='formtest.js'> 1533
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1534' action='formtest.js'> 1534
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1535' action='formtest.js'> 1535
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1536' action='formtest.js'> 1536
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value=''>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1537' action='formtest.js'> 1537
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1538' action='formtest.js'> 1538
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1539' action='formtest.js'> 1539
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1540' action='formtest.js'> 1540
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1541' action='formtest.js'> 1541
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1542' action='formtest.js'> 1542
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1543' action='formtest.js'> 1543
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1544' action='formtest.js'> 1544
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1545' action='formtest.js'> 1545
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1546' action='formtest.js'> 1546
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1547' action='formtest.js'> 1547
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1548' action='formtest.js'> 1548
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1549' action='formtest.js'> 1549
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1550' action='formtest.js'> 1550
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1551' action='formtest.js'> 1551
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1552' action='formtest.js'> 1552
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1553' action='formtest.js'> 1553
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1554' action='formtest.js'> 1554
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1555' action='formtest.js'> 1555
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1556' action='formtest.js'> 1556
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1557' action='formtest.js'> 1557
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1558' action='formtest.js'> 1558
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1559' action='formtest.js'> 1559
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1560' action='formtest.js'> 1560
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1561' action='formtest.js'> 1561
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1562' action='formtest.js'> 1562
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1563' action='formtest.js'> 1563
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1564' action='formtest.js'> 1564
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1565' action='formtest.js'> 1565
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1566' action='formtest.js'> 1566
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1567' action='formtest.js'> 1567
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1568' action='formtest.js'> 1568
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1569' action='formtest.js'> 1569
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1570' action='formtest.js'> 1570
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1571' action='formtest.js'> 1571
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1572' action='formtest.js'> 1572
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1573' action='formtest.js'> 1573
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1574' action='formtest.js'> 1574
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1575' action='formtest.js'> 1575
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1576' action='formtest.js'> 1576
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1577' action='formtest.js'> 1577
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1578' action='formtest.js'> 1578
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1579' action='formtest.js'> 1579
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1580' action='formtest.js'> 1580
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1581' action='formtest.js'> 1581
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1582' action='formtest.js'> 1582
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1583' action='formtest.js'> 1583
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1584' action='formtest.js'> 1584
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1585' action='formtest.js'> 1585
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1586' action='formtest.js'> 1586
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1587' action='formtest.js'> 1587
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1588' action='formtest.js'> 1588
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1589' action='formtest.js'> 1589
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1590' action='formtest.js'> 1590
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1591' action='formtest.js'> 1591
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1592' action='formtest.js'> 1592
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1593' action='formtest.js'> 1593
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1594' action='formtest.js'> 1594
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1595' action='formtest.js'> 1595
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1596' action='formtest.js'> 1596
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1597' action='formtest.js'> 1597
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1598' action='formtest.js'> 1598
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1599' action='formtest.js'> 1599
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1600' action='formtest.js'> 1600
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1601' action='formtest.js'> 1601
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1602' action='formtest.js'> 1602
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1603' action='formtest.js'> 1603
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1604' action='formtest.js'> 1604
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1605' action='formtest.js'> 1605
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1606' action='formtest.js'> 1606
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1607' action='formtest.js'> 1607
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1608' action='formtest.js'> 1608
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1609' action='formtest.js'> 1609
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1610' action='formtest.js'> 1610
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1611' action='formtest.js'> 1611
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1612' action='formtest.js'> 1612
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1613' action='formtest.js'> 1613
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1614' action='formtest.js'> 1614
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1615' action='formtest.js'> 1615
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1616' action='formtest.js'> 1616
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1617' action='formtest.js'> 1617
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1618' action='formtest.js'> 1618
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1619' action='formtest.js'> 1619
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1620' action='formtest.js'> 1620
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1621' action='formtest.js'> 1621
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1622' action='formtest.js'> 1622
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1623' action='formtest.js'> 1623
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1624' action='formtest.js'> 1624
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1625' action='formtest.js'> 1625
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1626' action='formtest.js'> 1626
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1627' action='formtest.js'> 1627
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1628' action='formtest.js'> 1628
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1629' action='formtest.js'> 1629
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1630' action='formtest.js'> 1630
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1631' action='formtest.js'> 1631
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1632' action='formtest.js'> 1632
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='testuser'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1633' action='formtest.js'> 1633
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1634' action='formtest.js'> 1634
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1635' action='formtest.js'> 1635
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1636' action='formtest.js'> 1636
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1637' action='formtest.js'> 1637
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1638' action='formtest.js'> 1638
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1639' action='formtest.js'> 1639
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1640' action='formtest.js'> 1640
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1641' action='formtest.js'> 1641
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1642' action='formtest.js'> 1642
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1643' action='formtest.js'> 1643
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1644' action='formtest.js'> 1644
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1645' action='formtest.js'> 1645
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1646' action='formtest.js'> 1646
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1647' action='formtest.js'> 1647
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1648' action='formtest.js'> 1648
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1649' action='formtest.js'> 1649
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1650' action='formtest.js'> 1650
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1651' action='formtest.js'> 1651
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1652' action='formtest.js'> 1652
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1653' action='formtest.js'> 1653
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1654' action='formtest.js'> 1654
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1655' action='formtest.js'> 1655
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1656' action='formtest.js'> 1656
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1657' action='formtest.js'> 1657
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1658' action='formtest.js'> 1658
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1659' action='formtest.js'> 1659
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1660' action='formtest.js'> 1660
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1661' action='formtest.js'> 1661
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1662' action='formtest.js'> 1662
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1663' action='formtest.js'> 1663
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1664' action='formtest.js'> 1664
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value=''>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1665' action='formtest.js'> 1665
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1666' action='formtest.js'> 1666
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1667' action='formtest.js'> 1667
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1668' action='formtest.js'> 1668
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1669' action='formtest.js'> 1669
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1670' action='formtest.js'> 1670
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1671' action='formtest.js'> 1671
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1672' action='formtest.js'> 1672
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1673' action='formtest.js'> 1673
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1674' action='formtest.js'> 1674
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1675' action='formtest.js'> 1675
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1676' action='formtest.js'> 1676
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1677' action='formtest.js'> 1677
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1678' action='formtest.js'> 1678
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1679' action='formtest.js'> 1679
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1680' action='formtest.js'> 1680
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1681' action='formtest.js'> 1681
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1682' action='formtest.js'> 1682
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1683' action='formtest.js'> 1683
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1684' action='formtest.js'> 1684
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1685' action='formtest.js'> 1685
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1686' action='formtest.js'> 1686
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1687' action='formtest.js'> 1687
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1688' action='formtest.js'> 1688
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1689' action='formtest.js'> 1689
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1690' action='formtest.js'> 1690
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1691' action='formtest.js'> 1691
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1692' action='formtest.js'> 1692
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1693' action='formtest.js'> 1693
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1694' action='formtest.js'> 1694
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1695' action='formtest.js'> 1695
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1696' action='formtest.js'> 1696
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='testpass'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1697' action='formtest.js'> 1697
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1698' action='formtest.js'> 1698
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1699' action='formtest.js'> 1699
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1700' action='formtest.js'> 1700
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1701' action='formtest.js'> 1701
-    <input type='password' name='qname' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1702' action='formtest.js'> 1702
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1703' action='formtest.js'> 1703
-    <input type='password' name='qname' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1704' action='formtest.js'> 1704
-    <input type='password' name='qqqqq' value=''>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1705' action='formtest.js'> 1705
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1706' action='formtest.js'> 1706
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1707' action='formtest.js'> 1707
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1708' action='formtest.js'> 1708
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1709' action='formtest.js'> 1709
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1710' action='formtest.js'> 1710
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1711' action='formtest.js'> 1711
-    <input type='password' name='qname' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1712' action='formtest.js'> 1712
-    <input type='password' name='qqqqq' value='testpass'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1713' action='formtest.js'> 1713
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1714' action='formtest.js'> 1714
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1715' action='formtest.js'> 1715
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1716' action='formtest.js'> 1716
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1717' action='formtest.js'> 1717
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1718' action='formtest.js'> 1718
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1719' action='formtest.js'> 1719
-    <input type='password' name='qname' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1720' action='formtest.js'> 1720
-    <input type='password' name='qqqqq' value='notMyPassword'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1721' action='formtest.js'> 1721
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1722' action='formtest.js'> 1722
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1723' action='formtest.js'> 1723
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1724' action='formtest.js'> 1724
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uname' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1725' action='formtest.js'> 1725
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1726' action='formtest.js'> 1726
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='pname' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1727' action='formtest.js'> 1727
-    <input type='password' name='qname' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
-
-<form id='form1728' action='formtest.js'> 1728
-    <input type='password' name='qqqqq' value='stillNotMine'>
-    <input type='password' name='ppppp' value='notMyPassword'>
-    <input type='text'     name='uuuuu' value='notMyUsername'>
-
-    <button type='submit'>Submit</button>
-    <button type='reset'> Reset </button>
-</form>
 
 </div>
 
@@ -15633,33 +156,27 @@ print "</form>\n\n";
 commonInit();
 
 function startTest() {
-    var f;
+    var f = 1;
 
-    for (f = 1;   f <= 32;  f++) { checkForm(f, "testuser", "testpass", null); }
-    // 33-64 have the password prefilled, we skip filling the username.
-    for (f = 33;  f <= 64;  f++) { checkUnmodifiedForm(f); }
-    for (f = 65;  f <= 96;  f++) { checkUnmodifiedForm(f); }
-    for (f = 97;  f <= 160; f++) { checkForm(f, "testuser", "testpass", null); }
-    for (f = 161; f <= 192; f++) { checkUnmodifiedForm(f); }
-    for (f = 193; f <= 288; f++) { checkUnmodifiedForm(f); }
+    // 1-6 no username
+    checkForm(f++, "testpass", "");
+    checkForm(f++, "testpass", "");
+    checkForm(f++, "testpass", "", "");
+    checkForm(f++, "testpass", "");
+    checkForm(f++, "xxxxxxxx", "");
+    checkForm(f++, "testpass", "xxxxxxxx");
 
-    //for (f = 289; f <= 296; f++) { checkForm(f, "testuser", null, "testpass"); }
-    for (f = 297; f <= 320; f++) { checkUnmodifiedForm(f); }
-    for (f = 321; f <= 328; f++) { checkForm(f, "testuser", "testpass", null); }
-    for (f = 329; f <= 352; f++) { checkUnmodifiedForm(f); }
-    for (f = 353; f <= 360; f++) { checkForm(f, "testuser", "testpass", null); }
-    for (f = 361; f <= 384; f++) { checkUnmodifiedForm(f); }
-    for (f = 385; f <= 400; f++) { checkForm(f, "testuser", "testpass", null); }
-    for (f = 401; f <= 416; f++) { checkUnmodifiedForm(f); }
-    for (f = 417; f <= 432; f++) { checkForm(f, "testuser", "testpass", null); }
-    for (f = 433; f <= 448; f++) { checkUnmodifiedForm(f); }
-    for (f = 449; f <= 456; f++) { checkForm(f, "testuser", "testpass", null); }
-    for (f = 457; f <= 576; f++) { checkUnmodifiedForm(f); }
-    // should check more here...
-    for (f = 1665; f <= 1672; f++) { checkForm(f, "testpass", null, null); }
-    for (f = 1673; f <= 1696; f++) { checkUnmodifiedForm(f); }
-    for (f = 1697; f <= 1704; f++) { checkForm(f, "testpass", null, null); }
-    for (f = 1705; f <= 1728; f++) { checkUnmodifiedForm(f); }
+    // 7-15 with username
+    checkForm(f++, "testuser", "testpass", "");
+    checkForm(f++, "testuser", "testpass", "");
+    checkForm(f++, "testuser", "testpass", "");
+    checkForm(f++, "xxxxxxxx", "", "");
+    checkForm(f++, "testuser", "xxxxxxxx", "");
+    checkForm(f++, "testuser", "testpass", "xxxxxxxx");
+    checkForm(f++, "testuser", "testpass", "");
+    checkForm(f++, "",         "xxxxxxxx", "testpass");
+    checkForm(f++, "testpass", "",         "");
+    checkForm(f++, "xxxxxxxx", "",         "");
 
     SimpleTest.finish();
 }
diff --git a/toolkit/components/passwordmgr/test/test_maxforms_1.html b/toolkit/components/passwordmgr/test/test_maxforms_1.html
new file mode 100644
index 00000000000..e34e979412a
--- /dev/null
+++ b/toolkit/components/passwordmgr/test/test_maxforms_1.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for Login Manager</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <script type="text/javascript" src="pwmgr_common.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+Test limiting number of forms filled.
+
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+
+
+<script>
+var FORMS_TO_CREATE = 39;
+
+function createForm(id) {
+    var template1 = "<form id='form"
+    var template2 = "'><input name='u'><input type='password' name='p'></form>\n";
+    return id + template1 + id + template2;
+}
+
+var formsHtml = "";
+for (var i = 1; i <= FORMS_TO_CREATE; i++) {
+    formsHtml += createForm(i);
+}
+
+var theDiv = document.getElementById("content");
+theDiv.innerHTML = formsHtml;
+</script>
+
+
+<pre id="test">
+<script class="testbody" type="text/javascript">
+commonInit();
+/** Test for Login Manager: form fill, multiple forms. **/
+
+function startTest() {
+  for (var i = 1; i <= FORMS_TO_CREATE; i++) {
+    if (true) {
+      is($_(i, "u").value, "testuser", "Checking for filled username in form " + i);
+      is($_(i, "p").value, "testpass", "Checking for filled password in form " + i);
+    } else {
+      is($_(i, "u").value, "", "Checking for unfilled username in form " + i);
+      is($_(i, "p").value, "", "Checking for unfilled password in form " + i);
+    }
+  }
+
+  SimpleTest.finish();
+}
+
+window.onload = startTest;
+
+SimpleTest.waitForExplicitFinish();
+</script>
+</pre>
+</body>
+</html>
+
diff --git a/toolkit/components/passwordmgr/test/test_maxforms_2.html b/toolkit/components/passwordmgr/test/test_maxforms_2.html
new file mode 100644
index 00000000000..313ae3d8d4a
--- /dev/null
+++ b/toolkit/components/passwordmgr/test/test_maxforms_2.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for Login Manager</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <script type="text/javascript" src="pwmgr_common.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+Test limiting number of forms filled.
+
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+
+
+<script>
+var FORMS_TO_CREATE = 40;
+
+function createForm(id) {
+    var template1 = "<form id='form"
+    var template2 = "'><input name='u'><input type='password' name='p'></form>\n";
+    return id + template1 + id + template2;
+}
+
+var formsHtml = "";
+for (var i = 1; i <= FORMS_TO_CREATE; i++) {
+    formsHtml += createForm(i);
+}
+
+var theDiv = document.getElementById("content");
+theDiv.innerHTML = formsHtml;
+</script>
+
+
+<pre id="test">
+<script class="testbody" type="text/javascript">
+commonInit();
+/** Test for Login Manager: form fill, multiple forms. **/
+
+function startTest() {
+  for (var i = 1; i <= FORMS_TO_CREATE; i++) {
+    if (true) {
+      is($_(i, "u").value, "testuser", "Checking for filled username in form " + i);
+      is($_(i, "p").value, "testpass", "Checking for filled password in form " + i);
+    } else {
+      is($_(i, "u").value, "", "Checking for unfilled username in form " + i);
+      is($_(i, "p").value, "", "Checking for unfilled password in form " + i);
+    }
+  }
+
+  SimpleTest.finish();
+}
+
+window.onload = startTest;
+
+SimpleTest.waitForExplicitFinish();
+</script>
+</pre>
+</body>
+</html>
+
diff --git a/toolkit/components/passwordmgr/test/test_maxforms_3.html b/toolkit/components/passwordmgr/test/test_maxforms_3.html
new file mode 100644
index 00000000000..4e4f9eb0bcf
--- /dev/null
+++ b/toolkit/components/passwordmgr/test/test_maxforms_3.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for Login Manager</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <script type="text/javascript" src="pwmgr_common.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+Test limiting number of forms filled.
+
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+
+
+<script>
+var FORMS_TO_CREATE = 41;
+
+function createForm(id) {
+    var template1 = "<form id='form"
+    var template2 = "'><input name='u'><input type='password' name='p'></form>\n";
+    return id + template1 + id + template2;
+}
+
+var formsHtml = "";
+for (var i = 1; i <= FORMS_TO_CREATE; i++) {
+    formsHtml += createForm(i);
+}
+
+var theDiv = document.getElementById("content");
+theDiv.innerHTML = formsHtml;
+</script>
+
+
+<pre id="test">
+<script class="testbody" type="text/javascript">
+commonInit();
+/** Test for Login Manager: form fill, multiple forms. **/
+
+function startTest() {
+  for (var i = 1; i <= FORMS_TO_CREATE; i++) {
+    if (i != 21) {
+      is($_(i, "u").value, "testuser", "Checking for filled username in form " + i);
+      is($_(i, "p").value, "testpass", "Checking for filled password in form " + i);
+    } else {
+      is($_(i, "u").value, "", "Checking for unfilled username in form " + i);
+      is($_(i, "p").value, "", "Checking for unfilled password in form " + i);
+    }
+  }
+
+  SimpleTest.finish();
+}
+
+window.onload = startTest;
+
+SimpleTest.waitForExplicitFinish();
+</script>
+</pre>
+</body>
+</html>
+

From 7937118d3af46bd6bf6667b1f1994683bd60851b Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Fri, 27 Apr 2012 12:31:06 -0400
Subject: [PATCH 070/162] Bug 747162 - SUT agent: increase version to 1.08;
 r=ctalbert

---
 build/mobile/sutagent/android/DoCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/mobile/sutagent/android/DoCommand.java b/build/mobile/sutagent/android/DoCommand.java
index 3fe37bef19a..165b8c30789 100755
--- a/build/mobile/sutagent/android/DoCommand.java
+++ b/build/mobile/sutagent/android/DoCommand.java
@@ -137,7 +137,7 @@ public class DoCommand {
     String ffxProvider = "org.mozilla.ffxcp";
     String fenProvider = "org.mozilla.fencp";
 
-    private final String prgVersion = "SUTAgentAndroid Version 1.07";
+    private final String prgVersion = "SUTAgentAndroid Version 1.08";
 
     public enum Command
         {

From 251c440351da2a6ba1af10c8b1f59bed84e6d3c3 Mon Sep 17 00:00:00 2001
From: Edward Lee <edilee@mozilla.com>
Date: Fri, 27 Apr 2012 09:53:11 -0700
Subject: [PATCH 071/162] Bug 707836 - Handle URI navigation outside app domain
 for native apps [r=felipe] Followup to add the new ContentPolicy.js file to
 the Firefox package manifest.

---
 browser/installer/package-manifest.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 84d14a9cf6d..cef9d6ee054 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -637,6 +637,7 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 @BINPATH@/webapprt/chrome/webapprt@JAREXT@
 @BINPATH@/webapprt/chrome/webapprt.manifest
 @BINPATH@/webapprt/components/CommandLineHandler.js
+@BINPATH@/webapprt/components/ContentPolicy.js
 @BINPATH@/webapprt/components/DirectoryProvider.js
 @BINPATH@/webapprt/components/components.manifest
 @BINPATH@/webapprt/defaults/preferences/prefs.js

From 714b706b75cb92a3e2e1576463394b82dac0a64a Mon Sep 17 00:00:00 2001
From: Chris Lord <chrislord.net@gmail.com>
Date: Fri, 27 Apr 2012 12:54:18 -0400
Subject: [PATCH 072/162] Bug 749630 - Fix single-colour checkerboard and
 masking. r=kats

Bug 748718 tried to fix masking of the checkerboard layer, but incorrectly
calculated the values for the right and bottom sides of the page, causing
less masking to occur than should happen.

It also possibly broke single-colour layer drawing (though I'm not sure this
worked previously), which this fixes by clearing to the page colour instead of
generating and drawing a texture for it.
---
 gfx/layers/opengl/LayerManagerOGL.cpp        |  5 ++
 mobile/android/base/gfx/LayerRenderer.java   | 70 ++++++++++---------
 mobile/android/base/gfx/ScreenshotLayer.java | 72 +++-----------------
 3 files changed, 54 insertions(+), 93 deletions(-)

diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp
index 6e66884a258..59c03282019 100644
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -817,8 +817,13 @@ LayerManagerOGL::Render()
 
   mGLContext->fEnable(LOCAL_GL_SCISSOR_TEST);
 
+  // If the Java compositor is being used, this clear will be done in
+  // DrawWindowUnderlay. Make sure the bits used here match up with those used
+  // in mobile/android/base/gfx/LayerRenderer.java
+#ifndef MOZ_JAVA_COMPOSITOR
   mGLContext->fClearColor(0.0, 0.0, 0.0, 0.0);
   mGLContext->fClear(LOCAL_GL_COLOR_BUFFER_BIT | LOCAL_GL_DEPTH_BUFFER_BIT);
+#endif
 
   // Allow widget to render a custom background.
   mWidget->DrawWindowUnderlay(this, rect);
diff --git a/mobile/android/base/gfx/LayerRenderer.java b/mobile/android/base/gfx/LayerRenderer.java
index 803085ff014..a8416fc3e2a 100644
--- a/mobile/android/base/gfx/LayerRenderer.java
+++ b/mobile/android/base/gfx/LayerRenderer.java
@@ -100,6 +100,7 @@ public class LayerRenderer implements GLSurfaceView.Renderer {
     private final FloatBuffer mCoordBuffer;
     private RenderContext mLastPageContext;
     private int mMaxTextureSize;
+    private int mBackgroundColor;
 
     private ArrayList<Layer> mExtraLayers = new ArrayList<Layer>();
 
@@ -186,12 +187,6 @@ public class LayerRenderer implements GLSurfaceView.Renderer {
 
     public void resetCheckerboard() {
         mCheckerboardLayer.reset();
-        mCheckerboardLayer.beginTransaction();
-        try {
-            mCheckerboardLayer.invalidate();
-        } finally {
-            mCheckerboardLayer.endTransaction();
-        }
     }
 
     public LayerRenderer(LayerView view) {
@@ -423,20 +418,6 @@ public class LayerRenderer implements GLSurfaceView.Renderer {
         }).start();
     }
 
-    private void updateCheckerboardImage() {
-        int checkerboardColor = mView.getController().getCheckerboardColor();
-        boolean showChecks = mView.getController().checkerboardShouldShowChecks();
-
-        mCheckerboardLayer.beginTransaction();  // called on compositor thread
-        try {
-            if (mCheckerboardLayer.updateBackground(showChecks, checkerboardColor))
-                mCheckerboardLayer.invalidate();
-        } finally {
-            mCheckerboardLayer.endTransaction();
-        }
-
-    }
-
     /*
      * create a vertex shader type (GLES20.GL_VERTEX_SHADER)
      * or a fragment shader type (GLES20.GL_FRAGMENT_SHADER)
@@ -564,7 +545,6 @@ public class LayerRenderer implements GLSurfaceView.Renderer {
             if (rootLayer != null) mUpdated &= rootLayer.update(mPageContext);  // called on compositor thread
             mUpdated &= mBackgroundLayer.update(mScreenContext);    // called on compositor thread
             mUpdated &= mShadowLayer.update(mPageContext);  // called on compositor thread
-            updateCheckerboardImage();
             mUpdated &= mCheckerboardLayer.update(mPageContext);   // called on compositor thread
             if (mFrameRateLayer != null) mUpdated &= mFrameRateLayer.update(mScreenContext); // called on compositor thread
             mUpdated &= mVertScrollLayer.update(mPageContext);  // called on compositor thread
@@ -599,11 +579,17 @@ public class LayerRenderer implements GLSurfaceView.Renderer {
             if (mask.left <= 2) {
                 mask.left = -1;
             }
-            if (mask.right >= mPageRect.right - 2) {
-                mask.right = mPageRect.right + 1;
+
+            // Because we're drawing relative to the page-rect, we only need to
+            // take into account its width and height (and not its origin)
+            int pageRight = mPageRect.width();
+            int pageBottom = mPageRect.height();
+
+            if (mask.right >= pageRight - 2) {
+                mask.right = pageRight + 1;
             }
-            if (mask.bottom >= mPageRect.bottom - 2) {
-                mask.bottom = mPageRect.bottom + 1;
+            if (mask.bottom >= pageBottom - 2) {
+                mask.bottom = pageBottom + 1;
             }
 
             return mask;
@@ -611,6 +597,19 @@ public class LayerRenderer implements GLSurfaceView.Renderer {
 
         /** This function is invoked via JNI; be careful when modifying signature. */
         public void drawBackground() {
+            /* Update background color. */
+            mBackgroundColor = mView.getController().getCheckerboardColor();
+
+            /* Clear to the page background colour. The bits set here need to
+             * match up with those used in gfx/layers/opengl/LayerManagerOGL.cpp.
+             */
+            GLES20.glClearColor(((mBackgroundColor>>16)&0xFF) / 255.0f,
+                                ((mBackgroundColor>>8)&0xFF) / 255.0f,
+                                (mBackgroundColor&0xFF) / 255.0f,
+                                0.0f);
+            GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT |
+                           GLES20.GL_DEPTH_BUFFER_BIT);
+
             /* Draw the background. */
             mBackgroundLayer.setMask(mPageRect);
             mBackgroundLayer.draw(mScreenContext);
@@ -621,14 +620,21 @@ public class LayerRenderer implements GLSurfaceView.Renderer {
             if (!untransformedPageRect.contains(mView.getController().getViewport()))
                 mShadowLayer.draw(mPageContext);
 
-            /* Find the area the root layer will render into, to mask the checkerboard layer */
-            Rect rootMask = getMaskForLayer(mView.getController().getRoot());
+            /* Draw the 'checkerboard'. We use gfx.show_checkerboard_pattern to
+             * determine whether to draw the screenshot layer.
+             */
+            if (mView.getController().checkerboardShouldShowChecks()) {
+                /* Find the area the root layer will render into, to mask the checkerboard layer */
+                Rect rootMask = getMaskForLayer(mView.getController().getRoot());
+                mCheckerboardLayer.setMask(rootMask);
 
-            /* Draw the checkerboard. */
-            setScissorRect();
-            mCheckerboardLayer.setMask(rootMask);
-            mCheckerboardLayer.draw(mPageContext);
-            GLES20.glDisable(GLES20.GL_SCISSOR_TEST);
+                /* Scissor around the page-rect, in case the page has shrunk
+                 * since the screenshot layer was last updated.
+                 */
+                setScissorRect();
+                mCheckerboardLayer.draw(mPageContext);
+                GLES20.glDisable(GLES20.GL_SCISSOR_TEST);
+            }
         }
 
         // Draws the layer the client added to us.
diff --git a/mobile/android/base/gfx/ScreenshotLayer.java b/mobile/android/base/gfx/ScreenshotLayer.java
index 9bd262b93a4..0ebbb474c53 100644
--- a/mobile/android/base/gfx/ScreenshotLayer.java
+++ b/mobile/android/base/gfx/ScreenshotLayer.java
@@ -33,34 +33,24 @@ public class ScreenshotLayer extends SingleTileLayer {
     // The size of the bitmap painted in the buffer
     // (may be smaller than mBufferSize due to power of 2 padding)
     private IntSize mImageSize;
-    // Special case to show the page background color prior to painting a screenshot
-    private boolean mIsSingleColor = true;
-    // Force single color, needed for testing
-    private boolean mForceSingleColor = false;
-    // Cache the passed in background color to determine if we need to update
-    // initialized to 0 so it lets the code run to set it to white on init
-    private int mCurrentBackgroundColor = 0;
+    // Whether we have an up-to-date image to draw
+    private boolean mHasImage;
 
     public static int getMaxNumPixels() {
         return SCREENSHOT_SIZE_LIMIT;
     }
 
     public void reset() {
-        mIsSingleColor = true;
-        updateBackground(mForceSingleColor, Color.WHITE);
-        setPaintMode(TileLayer.PaintMode.STRETCH);
+        mHasImage = false;
     }
 
     void setBitmap(Bitmap bitmap) {
-        if (mForceSingleColor)
-            return;
         mImageSize = new IntSize(bitmap.getWidth(), bitmap.getHeight());
         int width = IntSize.nextPowerOfTwo(bitmap.getWidth());
         int height = IntSize.nextPowerOfTwo(bitmap.getHeight());
         mBufferSize = new IntSize(width, height);
         mImage.setBitmap(bitmap, width, height, CairoImage.FORMAT_RGB16_565);
-        mIsSingleColor = false;
-        setPaintMode(TileLayer.PaintMode.NORMAL);
+        mHasImage = true;
     }
 
     public void updateBitmap(Bitmap bitmap, float x, float y, float width, float height) {
@@ -68,9 +58,7 @@ public class ScreenshotLayer extends SingleTileLayer {
     }
 
     public static ScreenshotLayer create() {
-        // 3 x 3 min for the single color case. Less than 3x3 will blend 
-        // the colors from outside this single color block when scaled
-        return ScreenshotLayer.create(new IntSize(3, 3));
+        return ScreenshotLayer.create(new IntSize(4, 4));
     }
 
     public static ScreenshotLayer create(IntSize size) {
@@ -92,58 +80,20 @@ public class ScreenshotLayer extends SingleTileLayer {
     }
 
     private ScreenshotLayer(ScreenshotImage image, IntSize size) {
-        super(image, TileLayer.PaintMode.STRETCH);
+        super(image, TileLayer.PaintMode.NORMAL);
         mBufferSize = size;
         mImage = image;
     }
 
-    public boolean updateBackground(boolean showChecks, int color) {
-        if (!showChecks) {
-            mIsSingleColor = true;
-            mForceSingleColor = true;
-        } else {
-            mForceSingleColor = false;
-        }
-
-        if (!mIsSingleColor || color == mCurrentBackgroundColor)
-            return false;
-
-        mCurrentBackgroundColor = color;
-
-        /* mask each component of the 8888 color and bit shift to least 
-         * sigificant. Then for red and blue multiply by (2^5 -1) and (2^6 - 1)
-         * for green. Finally, divide by (2^8 - 1) for all color values. This
-         * scales the 8 bit color values to 5 or 6 bits
-         */
-        int red =   ((color & 0x00FF0000 >> 16)* 31 / 255);
-        int green = ((color & 0x0000FF00 >> 8) * 63 / 255);
-        int blue =   (color & 0x000000FF) * 31 / 255;
-        /* For the first byte left shift red by 3 positions such that it is the
-         * top 5 bits, right shift green by 3 so its 3 most significant are the
-         * 3 least significant. For the second byte, left shift green by 3 so 
-         * its 3 least significant bits are the 3 most significant bits of the
-         * byte. Finally, set the 5 least significant bits to blue's value. 
-         */
-        byte byte1 = (byte)((red << 3 | green >> 3) & 0x0000FFFF);
-        byte byte2 = (byte)((green << 5 | blue) & 0x0000FFFF);
-        mImage.mBuffer.put(1, byte1);
-        mImage.mBuffer.put(0, byte2);
-        mImage.mBuffer.put(3, byte1);
-        mImage.mBuffer.put(2, byte2);
-        mImage.mBuffer.put(5, byte1);
-        mImage.mBuffer.put(4, byte2);
-        mImage.mBuffer.put(mImageSize.width + 1, byte1);
-        mImage.mBuffer.put(mImageSize.width + 0, byte2);
-        mImage.mBuffer.put(mImageSize.width + 3, byte1);
-        mImage.mBuffer.put(mImageSize.width + 2, byte2);
-        mImage.mBuffer.put(mImageSize.width + 5, byte1);
-        mImage.mBuffer.put(mImageSize.width + 4, byte2);
-        return true;
+    @Override
+    public void draw(RenderContext context) {
+        if (mHasImage)
+            super.draw(context);
     }
 
     /** A Cairo image that simply saves a buffer of pixel data. */
     static class ScreenshotImage extends CairoImage {
-        ByteBuffer mBuffer;
+        private ByteBuffer mBuffer;
         private IntSize mSize;
         private int mFormat;
 

From bedef633c2246909e1d69541e3ddc6bd6cc16fb9 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Fri, 27 Apr 2012 09:13:39 -0400
Subject: [PATCH 073/162] Bug 749493 - Catch SQLiteDatabaseLockedException when
 ensuring unlocked database (r=blassey)

---
 mobile/android/base/db/DBUtils.java | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/mobile/android/base/db/DBUtils.java b/mobile/android/base/db/DBUtils.java
index ddf47044018..5dc61b1af73 100644
--- a/mobile/android/base/db/DBUtils.java
+++ b/mobile/android/base/db/DBUtils.java
@@ -10,6 +10,7 @@ import org.mozilla.gecko.sync.Utils;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteDatabaseLockedException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
 import android.text.TextUtils;
@@ -72,22 +73,19 @@ public class DBUtils {
     }
 
     public static void ensureDatabaseIsNotLocked(SQLiteOpenHelper dbHelper, String databasePath) {
-        SQLiteDatabase db = dbHelper.getWritableDatabase();
-
-        // The returned writable database is read-only, this probably means that the
-        // database is permanently locked due to a crash or a non-clean quit in Fennec.
-        // We can assume it's safe to forcefully unlock the database file in this case
-        // as all database access happens through this content provider (see bug 741718).
-        if (db.isReadOnly()) {
-            // Close read-only connection, we don't want to use it
-            dbHelper.close();
-
-            Log.d(LOGTAG, "Database is in read-only mode, trying to forcefully unlock the database file: " + databasePath);
+        try {
+            dbHelper.getWritableDatabase();
+        } catch (SQLiteDatabaseLockedException e) {
+            Log.d(LOGTAG, "Database is locked, trying to forcefully unlock the database file: " + databasePath);
 
             // Forcefully unlock the database file
             GeckoAppShell.unlockDatabaseFile(databasePath);
 
-            // TODO: maybe check if the connection is still read-only and let the
+            // This call should not throw if the forced unlocking
+            // actually fixed the situation.
+            dbHelper.getWritableDatabase();
+
+            // TODO: maybe check if the database is still locked and let the
             // user know that the device needs rebooting?
         }
     }

From 5e231ec47881589dd3998a21ad2b4a4564f20884 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Thu, 26 Apr 2012 16:20:03 -0400
Subject: [PATCH 074/162] Bug 746946 - Force AsyncTask onPostExecute to only
 touch UI on the main thread. r=mfinkle

---
 mobile/android/base/AwesomeBarTabs.java | 113 +++++++++++++-----------
 1 file changed, 62 insertions(+), 51 deletions(-)

diff --git a/mobile/android/base/AwesomeBarTabs.java b/mobile/android/base/AwesomeBarTabs.java
index 1c922a90da0..398b71810c8 100644
--- a/mobile/android/base/AwesomeBarTabs.java
+++ b/mobile/android/base/AwesomeBarTabs.java
@@ -366,41 +366,48 @@ public class AwesomeBarTabs extends TabHost {
         }
 
         @Override
-        protected void onPostExecute(Cursor cursor) {
-            ListView list = (ListView) findViewById(R.id.bookmarks_list);
-            list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                    handleBookmarkItemClick(parent, view, position, id);
+        protected void onPostExecute(final Cursor cursor) {
+            final ListView list = (ListView) findViewById(R.id.bookmarks_list);
+
+            // Hack: force this to the main thread, even though it should already be on it
+            GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
+                public void run() {
+                    list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                            handleBookmarkItemClick(parent, view, position, id);
+                        }
+                    });
+                    
+                    // We need to add the header before we set the adapter, hence make it null
+                    list.setAdapter(null);
+
+                    if (mBookmarksAdapter == null) {
+                        mBookmarksAdapter = new BookmarksListAdapter(mContext, cursor);
+                    } else {
+                        mBookmarksAdapter.changeCursor(cursor);
+                    }
+
+                    LinearLayout headerView = mBookmarksAdapter.getHeaderView();
+                    if (headerView == null) {
+                        headerView = (LinearLayout) mInflater.inflate(R.layout.awesomebar_header_row, null);
+                        mBookmarksAdapter.setHeaderView(headerView);
+                    }
+
+                    // Add/Remove header based on the root folder
+                    if (mFolderId == Bookmarks.FIXED_ROOT_ID) {
+                        if (list.getHeaderViewsCount() == 1)
+                            list.removeHeaderView(headerView);
+                    } else {
+                        if (list.getHeaderViewsCount() == 0)
+                            list.addHeaderView(headerView, null, true);
+
+                        ((TextView) headerView.findViewById(R.id.title)).setText(mFolderTitle);
+                    }
+
+                    list.setAdapter(mBookmarksAdapter);
                 }
             });
-            
-            // We need to add the header before we set the adapter, hence make it null
-            list.setAdapter(null);
 
-            if (mBookmarksAdapter == null) {
-                mBookmarksAdapter = new BookmarksListAdapter(mContext, cursor);
-            } else {
-                mBookmarksAdapter.changeCursor(cursor);
-            }
-
-            LinearLayout headerView = mBookmarksAdapter.getHeaderView();
-            if (headerView == null) {
-                headerView = (LinearLayout) mInflater.inflate(R.layout.awesomebar_header_row, null);
-                mBookmarksAdapter.setHeaderView(headerView);
-            }
-
-            // Add/Remove header based on the root folder
-            if (mFolderId == Bookmarks.FIXED_ROOT_ID) {
-                if (list.getHeaderViewsCount() == 1)
-                    list.removeHeaderView(headerView);
-            } else {
-                if (list.getHeaderViewsCount() == 0)
-                    list.addHeaderView(headerView, null, true);
-
-                ((TextView) headerView.findViewById(R.id.title)).setText(mFolderTitle);
-            }
-
-            list.setAdapter(mBookmarksAdapter);
             mBookmarksQueryTask = null;
         }
     }
@@ -575,28 +582,32 @@ public class AwesomeBarTabs extends TabHost {
             final ExpandableListView historyList =
                     (ExpandableListView) findViewById(R.id.history_list);
 
-            historyList.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
-                public boolean onChildClick(ExpandableListView parent, View view,
-                        int groupPosition, int childPosition, long id) {
-                    handleHistoryItemClick(groupPosition, childPosition);
-                    return true;
+            // Hack: force this to the main thread, even though it should already be on it
+            GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
+                public void run() {
+                    historyList.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
+                        public boolean onChildClick(ExpandableListView parent, View view,
+                                int groupPosition, int childPosition, long id) {
+                            handleHistoryItemClick(groupPosition, childPosition);
+                            return true;
+                        }
+                    });
+
+                    // This is to disallow collapsing the expandable groups in the
+                    // history expandable list view to mimic simpler sections. We should
+                    // Remove this if we decide to allow expanding/collapsing groups.
+                    historyList.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
+                        public boolean onGroupClick(ExpandableListView parent, View v,
+                                int groupPosition, long id) {
+                            return true;
+                        }
+                    });
+
+                    historyList.setAdapter(mHistoryAdapter);
+                    expandAllGroups(historyList);
                 }
             });
 
-            // This is to disallow collapsing the expandable groups in the
-            // history expandable list view to mimic simpler sections. We should
-            // Remove this if we decide to allow expanding/collapsing groups.
-            historyList.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
-                public boolean onGroupClick(ExpandableListView parent, View v,
-                        int groupPosition, long id) {
-                    return true;
-                }
-            });
-
-            historyList.setAdapter(mHistoryAdapter);
-
-            expandAllGroups(historyList);
-
             mHistoryQueryTask = null;
         }
     }

From c38356262b61746677c30f8347489798f1df7b9d Mon Sep 17 00:00:00 2001
From: Eitan Isaacson <eitan@monotonous.org>
Date: Fri, 27 Apr 2012 10:35:47 -0700
Subject: [PATCH 075/162] Bug 747273 - Remove emitGeckoAccessibilityEvent, just
 emit one directly.

---
 embedding/android/GeckoAppShell.java   |  3 ---
 mobile/android/base/GeckoApp.java      | 32 +++++++++++++++++---------
 mobile/android/base/GeckoAppShell.java | 24 -------------------
 3 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/embedding/android/GeckoAppShell.java b/embedding/android/GeckoAppShell.java
index e9ade7ef012..11620adfbe4 100644
--- a/embedding/android/GeckoAppShell.java
+++ b/embedding/android/GeckoAppShell.java
@@ -1826,9 +1826,6 @@ public class GeckoAppShell
         return false;
     }
 
-    public static void emitGeckoAccessibilityEvent (int eventType, String[] textList, String description, boolean enabled, boolean checked, boolean password) {
-    }
-
     public static double[] getCurrentNetworkInformation() {
         return GeckoNetworkManager.getInstance().getCurrentInformation();
     }
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index ae0428b8255..5d4288d2d3d 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -82,6 +82,8 @@ import android.graphics.drawable.BitmapDrawable;
 import android.widget.*;
 import android.hardware.*;
 import android.location.*;
+import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.AccessibilityEvent;
 
 import android.util.*;
 import android.net.*;
@@ -1017,22 +1019,30 @@ abstract public class GeckoApp
                     }
                 });
             } else if (event.equals("Accessibility:Event")) {
-                final int eventType = message.getInt("eventType");
+                final AccessibilityEvent accEvent = AccessibilityEvent.obtain(message.getInt("eventType"));
+                accEvent.setClassName(LayerView.class.getName());
+                accEvent.setPackageName(mAppContext.getPackageName());
 
                 final JSONArray text = message.getJSONArray("text");
-                final int len = text.length();
-                final String[] textList = new String[len];
-                for (int i = 0; i < len; i++)
-                    textList[i] = text.getString(i);
+                for (int i = 0; i < text.length(); i++)
+                    accEvent.getText().add(text.getString(i));
+
+                accEvent.setContentDescription(message.optString("description"));
+                accEvent.setEnabled(message.optBoolean("enabled", true));
+                accEvent.setChecked(message.optBoolean("checked"));
+                accEvent.setPassword(message.optBoolean("password"));
+                accEvent.setAddedCount(message.optInt("addedCount"));
+                accEvent.setRemovedCount(message.optInt("removedCount"));
+                accEvent.setFromIndex(message.optInt("fromIndex"));
+                accEvent.setItemCount(message.optInt("itemCount"));
+                accEvent.setCurrentItemIndex(message.optInt("currentItemIndex"));
+                accEvent.setBeforeText(message.optString("beforeText"));
 
-                final String description = message.optString("description");
-                final boolean enabled = message.optBoolean("enabled", true);
-                final boolean checked = message.optBoolean("checked");
-                final boolean password = message.optBoolean("password");
                 mMainHandler.post(new Runnable() {
                     public void run() {
-                        GeckoAppShell.emitGeckoAccessibilityEvent(eventType, textList, description,
-                                                                  enabled, checked, password);
+                        AccessibilityManager accessibilityManager =
+                            (AccessibilityManager) mAppContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
+                        accessibilityManager.sendAccessibilityEvent(accEvent);
                     }
                 });
             }
diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java
index ff78a24985f..fe97c425a8f 100644
--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -72,7 +72,6 @@ import android.media.MediaScannerConnection;
 import android.media.MediaScannerConnection.MediaScannerConnectionClient;
 import android.provider.Settings;
 import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.AccessibilityEvent;
 import android.opengl.GLES20;
 
 import android.util.*;
@@ -1964,29 +1963,6 @@ public class GeckoAppShell
         return false;
     }
 
-    public static void emitGeckoAccessibilityEvent (int eventType, String[] textList, String description, boolean enabled, boolean checked, boolean password) {
-        AccessibilityManager accessibilityManager =
-            (AccessibilityManager) GeckoApp.mAppContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
-
-        if (!accessibilityManager.isEnabled())
-            return;
-
-        LayerController layerController = GeckoApp.mAppContext.getLayerController();
-        LayerView layerView = layerController.getView();
-
-        AccessibilityEvent event = AccessibilityEvent.obtain(eventType);
-        event.setClassName(layerView.getClass().getName());
-        event.setPackageName(GeckoApp.mAppContext.getPackageName());
-        event.setEnabled(enabled);
-        event.setChecked(checked);
-        event.setPassword(password);
-        event.setContentDescription(description);
-        for (String text: textList)
-            event.getText().add(text);
-
-        accessibilityManager.sendAccessibilityEvent(event);
-    }
-
     public static void viewSizeChanged() {
         if (mInputConnection != null && mInputConnection.isIMEEnabled()) {
             sendEventToGecko(GeckoEvent.createBroadcastEvent("ScrollTo:FocusedInput", ""));

From 2eb81e203919d0f5fac8c36ffd6f768af0ddd9f1 Mon Sep 17 00:00:00 2001
From: Eitan Isaacson <eitan@monotonous.org>
Date: Fri, 27 Apr 2012 10:44:15 -0700
Subject: [PATCH 076/162] Bug 747270 - Make UtteranceGenerator return string
 arrays in all generator methods. r=davidb

---
 accessible/src/jsat/Presenters.jsm         | 2 +-
 accessible/src/jsat/UtteranceGenerator.jsm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/accessible/src/jsat/Presenters.jsm b/accessible/src/jsat/Presenters.jsm
index e1cac5a86b7..0db19040882 100644
--- a/accessible/src/jsat/Presenters.jsm
+++ b/accessible/src/jsat/Presenters.jsm
@@ -237,7 +237,7 @@ AndroidPresenter.prototype.actionInvoked = function(aObject, aActionName) {
     gecko: {
       type: 'Accessibility:Event',
       eventType: ANDROID_TYPE_VIEW_CLICKED,
-      text: [UtteranceGenerator.genForAction(aObject, aActionName)]
+      text: UtteranceGenerator.genForAction(aObject, aActionName)
     }
   });
 };
diff --git a/accessible/src/jsat/UtteranceGenerator.jsm b/accessible/src/jsat/UtteranceGenerator.jsm
index aeada36f8c3..fd0ef363fb2 100644
--- a/accessible/src/jsat/UtteranceGenerator.jsm
+++ b/accessible/src/jsat/UtteranceGenerator.jsm
@@ -54,7 +54,7 @@ var UtteranceGenerator = {
   },
 
   genForAction: function(aObject, aActionName) {
-    return gStringBundle.GetStringFromName(this.gActionMap[aActionName]);
+    return [gStringBundle.GetStringFromName(this.gActionMap[aActionName])];
   },
 
   verbosityRoleMap: {

From 312e3d4efdff6151a814f59e1d6f862fecb62e18 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Fri, 27 Apr 2012 13:46:45 -0400
Subject: [PATCH 077/162] Bug 741652 - Followup: Remove incorrect comment.
 DONTBUILD

---
 js/src/jsdbgapi.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index cc6c5dd4f78..7c9bf01ed5b 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -1715,10 +1715,6 @@ JSBool js_StopPerf()
         waitpid(perfPid, NULL, 0);
     }
 
-    /*
-     * If kill() failed, assume it failed because perf died early and continue
-     * on as though perf had been successfully killed.
-     */
     perfPid = 0;
     return true;
 }

From e7c28a7ef6312549dd3af81bc107f45ccd9f41e1 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Fri, 27 Apr 2012 20:17:22 +0200
Subject: [PATCH 078/162] No bug - Fix buildwarning about
 nsHTMLDocument::GetPlugins; r=bz

---
 content/html/document/src/nsHTMLDocument.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/html/document/src/nsHTMLDocument.h b/content/html/document/src/nsHTMLDocument.h
index 732f384c8c1..78c40a8a90c 100644
--- a/content/html/document/src/nsHTMLDocument.h
+++ b/content/html/document/src/nsHTMLDocument.h
@@ -72,6 +72,7 @@ class nsHTMLDocument : public nsDocument,
 {
 public:
   using nsDocument::SetDocumentURI;
+  using nsDocument::GetPlugins;
 
   nsHTMLDocument();
   virtual nsresult Init();

From 70478993d4cda25525c31796b4f53ebe36d19f83 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Fri, 27 Apr 2012 11:39:17 -0700
Subject: [PATCH 079/162] Bug 749668 - Delete TabsRecord.java and dirs under
 src. r=trivial, a=accidentalcheckin

---
 .../sync/repositories/domain/TabsRecord.java  | 134 ------------------
 1 file changed, 134 deletions(-)
 delete mode 100644 src/test/java/org/mozilla/android/sync/repositories/domain/TabsRecord.java

diff --git a/src/test/java/org/mozilla/android/sync/repositories/domain/TabsRecord.java b/src/test/java/org/mozilla/android/sync/repositories/domain/TabsRecord.java
deleted file mode 100644
index 91a1b79d585..00000000000
--- a/src/test/java/org/mozilla/android/sync/repositories/domain/TabsRecord.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.android.sync.repositories.domain;
-
-import java.util.ArrayList;
-
-import org.json.simple.JSONObject;
-import org.json.simple.JSONArray;
-import org.mozilla.gecko.sync.ExtendedJSONObject;
-import org.mozilla.gecko.sync.Logger;
-import org.mozilla.gecko.sync.NonArrayJSONException;
-import org.mozilla.gecko.sync.Utils;
-import org.mozilla.gecko.sync.repositories.domain.Record;
-
-/**
- * Represents a client's collection of tabs.
- *
- * @author rnewman
- *
- */
-public class TabsRecord extends Record {
-
-  // Immutable.
-  public static class Tab {
-    public final String    title;
-    public final String    icon;
-    public final JSONArray history;
-    public final long      lastUsed;
-
-    public Tab(String title, String icon, JSONArray history, long lastUsed) {
-      this.title    = title;
-      this.icon     = icon;
-      this.history  = history;
-      this.lastUsed = lastUsed;
-    }
-
-    public static Tab fromJSONObject(JSONObject o) throws NonArrayJSONException {
-      ExtendedJSONObject obj = new ExtendedJSONObject((JSONObject) o);
-      String title      = obj.getString("title");
-      String icon       = obj.getString("icon");
-      JSONArray history = obj.getArray("urlHistory");
-      long lastUsed     = obj.getLong("lastUsed");
-      return new Tab(title, icon, history, lastUsed);
-    }
-
-    @SuppressWarnings("unchecked")
-    public JSONObject toJSONObject() {
-      JSONObject o = new JSONObject();
-      o.put("title", title);
-      o.put("icon", icon);
-      o.put("urlHistory", history);
-      o.put("lastUsed", lastUsed);
-      return o;
-    }
-  }
-
-  private static final String LOG_TAG = "TabsRecord";
-
-  public static final String COLLECTION_NAME = "tabs";
-
-  public TabsRecord(String guid, String collection, long lastModified, boolean deleted) {
-    super(guid, collection, lastModified, deleted);
-  }
-  public TabsRecord(String guid, String collection, long lastModified) {
-    super(guid, collection, lastModified, false);
-  }
-  public TabsRecord(String guid, String collection) {
-    super(guid, collection, 0, false);
-  }
-  public TabsRecord(String guid) {
-    super(guid, COLLECTION_NAME, 0, false);
-  }
-  public TabsRecord() {
-    super(Utils.generateGuid(), COLLECTION_NAME, 0, false);
-  }
-
-  public String clientName;
-  public ArrayList<Tab> tabs;
-
-  @Override
-  public void initFromPayload(ExtendedJSONObject payload) {
-    clientName = (String) payload.get("clientName");
-    try {
-      tabs = tabsFrom(payload.getArray("tabs"));
-    } catch (NonArrayJSONException e) {
-      // Oh well.
-      tabs = new ArrayList<Tab>();
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  protected static JSONArray tabsToJSON(ArrayList<Tab> tabs) {
-    JSONArray out = new JSONArray();
-    for (Tab tab : tabs) {
-      out.add(tab.toJSONObject());
-    }
-    return out;
-  }
-
-  protected static ArrayList<Tab> tabsFrom(JSONArray in) {
-    ArrayList<Tab> tabs = new ArrayList<Tab>(in.size());
-    for (Object o : in) {
-      if (o instanceof JSONObject) {
-        try {
-          tabs.add(Tab.fromJSONObject((JSONObject) o));
-        } catch (NonArrayJSONException e) {
-          Logger.warn(LOG_TAG, "urlHistory is not an array for this tab.", e);
-        }
-      }
-    }
-    return tabs;
-  }
-
-  @Override
-  public void populatePayload(ExtendedJSONObject payload) {
-    putPayload(payload, "id", this.guid);
-    putPayload(payload, "clientName", this.clientName);
-    payload.put("tabs", tabsToJSON(this.tabs));
-  }
-
-  @Override
-  public Record copyWithIDs(String guid, long androidID) {
-    TabsRecord out = new TabsRecord(guid, this.collection, this.lastModified, this.deleted);
-    out.androidID = androidID;
-    out.sortIndex = this.sortIndex;
-
-    out.clientName = this.clientName;
-    out.tabs = new ArrayList<Tab>(this.tabs);
-
-    return out;
-  }
-}

From 5566ce955f5034f130396a6308764b7e9d9b4e40 Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Fri, 27 Apr 2012 11:44:59 -0700
Subject: [PATCH 080/162] Bug 749011 - Add support for running mochitest-plain
 on B2G, r=jmaher

--HG--
extra : rebase_source : 4c260e11c51c5015d2ded66f4b8cfc94a9969298
---
 build/mobile/b2gautomation.py    | 232 +++++++++++++++++
 testing/mochitest/Makefile.in    |   2 +
 testing/mochitest/runtestsb2g.py | 412 +++++++++++++++++++++++++++++++
 3 files changed, 646 insertions(+)
 create mode 100644 build/mobile/b2gautomation.py
 create mode 100644 testing/mochitest/runtestsb2g.py

diff --git a/build/mobile/b2gautomation.py b/build/mobile/b2gautomation.py
new file mode 100644
index 00000000000..4965d9895c8
--- /dev/null
+++ b/build/mobile/b2gautomation.py
@@ -0,0 +1,232 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import automationutils
+import os
+import re
+import socket
+import shutil
+import sys
+import tempfile
+import time
+
+from automation import Automation
+from devicemanager import DeviceManager, NetworkTools
+
+class B2GRemoteAutomation(Automation):
+    _devicemanager = None
+
+    def __init__(self, deviceManager, appName='', remoteLog=None,
+                 marionette=None):
+        self._devicemanager = deviceManager
+        self._appName = appName
+        self._remoteProfile = None
+        self._remoteLog = remoteLog
+        self.marionette = marionette
+
+        # Default our product to b2g
+        self._product = "b2g"
+        Automation.__init__(self)
+
+    def setDeviceManager(self, deviceManager):
+        self._devicemanager = deviceManager
+
+    def setAppName(self, appName):
+        self._appName = appName
+
+    def setRemoteProfile(self, remoteProfile):
+        self._remoteProfile = remoteProfile
+
+    def setProduct(self, product):
+        self._product = product
+
+    def setRemoteLog(self, logfile):
+        self._remoteLog = logfile
+
+    # Set up what we need for the remote environment
+    def environment(self, env=None, xrePath=None, crashreporter=True):
+        # Because we are running remote, we don't want to mimic the local env
+        # so no copying of os.environ
+        if env is None:
+            env = {}
+
+        return env
+
+    def checkForCrashes(self, directory, symbolsPath):
+        # XXX: This will have to be updated after crash reporting on b2g
+        # is in place.
+        dumpDir = tempfile.mkdtemp()
+        self._devicemanager.getDirectory(self._remoteProfile + '/minidumps/', dumpDir)
+        automationutils.checkForCrashes(dumpDir, symbolsPath, self.lastTestSeen)
+        try:
+          shutil.rmtree(dumpDir)
+        except:
+          print "WARNING: unable to remove directory: %s" % (dumpDir)
+
+    def buildCommandLine(self, app, debuggerInfo, profileDir, testURL, extraArgs):
+        # if remote profile is specified, use that instead
+        if (self._remoteProfile):
+            profileDir = self._remoteProfile
+
+        cmd, args = Automation.buildCommandLine(self, app, debuggerInfo, profileDir, testURL, extraArgs)
+
+        return app, args
+
+    def getLanIp(self):
+        nettools = NetworkTools()
+        return nettools.getLanIp()
+
+    def waitForFinish(self, proc, utilityPath, timeout, maxTime, startTime,
+                      debuggerInfo, symbolsPath, logger):
+        """ Wait for mochitest to finish (as evidenced by a signature string
+            in logcat), or for a given amount of time to elapse with no
+            output.
+        """
+        timeout = timeout or 120
+
+        didTimeout = False
+
+        done = time.time() + timeout
+        while True:
+            currentlog = proc.stdout
+            if currentlog:
+                done = time.time() + timeout
+                print currentlog
+                if 'INFO SimpleTest FINISHED' in currentlog:
+                    return 0
+            else:
+                if time.time() > done:
+                    self.log.info("TEST-UNEXPECTED-FAIL | %s | application timed "
+                                  "out after %d seconds with no output",
+                                  self.lastTestSeen, int(timeout))
+                    return 1
+
+    def getDeviceStatus(self, serial=None):
+        # Get the current status of the device.  If we know the device
+        # serial number, we look for that, otherwise we use the (presumably
+        # only) device shown in 'adb devices'.
+        serial = serial or self._devicemanager.deviceSerial
+        status = 'unknown'
+
+        for line in self._devicemanager.runCmd(['devices']).stdout.readlines():
+            result =  re.match('(.*?)\t(.*)', line)
+            if result:
+                thisSerial = result.group(1)
+                if not serial or thisSerial == serial:
+                    serial = thisSerial
+                    status = result.group(2)
+
+        return (serial, status)
+
+    def rebootDevice(self):
+        # find device's current status and serial number
+        serial, status = self.getDeviceStatus()
+
+        # reboot!
+        self._devicemanager.checkCmd(['reboot'])
+
+        # wait for device to come back to previous status
+        print 'waiting for device to come back online after reboot'
+        start = time.time()
+        rserial, rstatus = self.getDeviceStatus(serial)
+        while rstatus != 'device':
+            if time.time() - start > 120:
+                # device hasn't come back online in 2 minutes, something's wrong
+                raise Exception("Device %s (status: %s) not back online after reboot" % (serial, rstatus))
+            time.sleep(5)
+            rserial, rstatus = self.getDeviceStatus(serial)
+        print 'device:', serial, 'status:', rstatus
+
+    def Process(self, cmd, stdout=None, stderr=None, env=None, cwd=None):
+        # On a desktop or fennec run, the Process method invokes a gecko
+        # process in which to run mochitests.  For B2G, we simply
+        # reboot the device (which was configured with a test profile
+        # already), wait for B2G to start up, and then navigate to the
+        # test url using Marionette.  There doesn't seem to be any way
+        # to pass env variables into the B2G process, but this doesn't 
+        # seem to matter.
+
+        instance = self.B2GInstance(self._devicemanager)
+
+        # reboot device so it starts up with the mochitest profile
+        # XXX:  We could potentially use 'stop b2g' + 'start b2g' to achieve
+        # a similar effect; will see which is more stable while attempting
+        # to bring up the continuous integration.
+        self.rebootDevice()
+
+        # Infrequently, gecko comes up before networking does, so wait a little
+        # bit to give the network time to become available.
+        # XXX:  need a more robust mechanism for this
+        time.sleep(20)
+
+        # Set up port forwarding again for Marionette, since any that
+        # existed previously got wiped out by the reboot.
+        self._devicemanager.checkCmd(['forward',
+                                      'tcp:%s' % self.marionette.port,
+                                      'tcp:%s' % self.marionette.port])
+
+        # start a marionette session
+        session = self.marionette.start_session()
+        if 'b2g' not in session:
+            raise Exception("bad session value %s returned by start_session" % session)
+
+        # start the tests by navigating to the mochitest url
+        self.marionette.execute_script("window.location.href='%s';" % self.testURL)
+
+        return instance
+
+    # be careful here as this inner class doesn't have access to outer class members
+    class B2GInstance(object):
+        """Represents a B2G instance running on a device, and exposes
+           some process-like methods/properties that are expected by the
+           automation.
+        """
+
+        def __init__(self, dm):
+            self.dm = dm
+            self.lastloglines = []
+
+        @property
+        def pid(self):
+            # a dummy value to make the automation happy
+            return 0
+
+        @property
+        def stdout(self):
+            # Return any part of logcat output that wasn't returned
+            # previously.  This is done by fetching about the last 50
+            # lines of the log (logcat -t 50 generally fetches 50-58 lines),
+            # and comparing against the previous set to find new lines.
+            t = self.dm.runCmd(['logcat', '-t', '50']).stdout.read()
+            if t == None: return ''
+
+            t = t.strip('\n').strip()
+            loglines = t.split('\n')
+            line_index = 0
+
+            # If there are more than 50 lines, we skip the first 20; this
+            # is because the number of lines returned
+            # by logcat -t 50 varies (usually between 50 and 58).
+            log_index = 20 if len(loglines) > 50 else 0
+
+            for index, line in enumerate(loglines[log_index:]):
+                line_index = index + log_index + 1
+                try:
+                    self.lastloglines.index(line)
+                except ValueError:
+                    break
+
+            newoutput = '\n'.join(loglines[line_index:])
+            self.lastloglines = loglines
+
+            return newoutput
+
+        def wait(self, timeout = None):
+            # this should never happen
+            raise Exception("'wait' called on B2GInstance")
+
+        def kill(self):
+            # this should never happen
+            raise Exception("'kill' called on B2GInstance")
+
diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index dcd6c111296..6e4c6495df4 100644
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -79,6 +79,7 @@ include $(topsrcdir)/build/automation-build.mk
 _SERV_FILES = 	\
 		runtests.py \
 		automation.py \
+		runtestsb2g.py \
 		runtestsremote.py \
 		runtestsvmware.py \
 		$(topsrcdir)/build/mobile/devicemanager.py \
@@ -87,6 +88,7 @@ _SERV_FILES = 	\
 		$(topsrcdir)/build/automationutils.py \
 		$(topsrcdir)/build/manifestparser.py \
 		$(topsrcdir)/build/mobile/remoteautomation.py \
+		$(topsrcdir)/build/mobile/b2gautomation.py \
 		gen_template.pl \
 		server.js \
 		harness-overlay.xul \
diff --git a/testing/mochitest/runtestsb2g.py b/testing/mochitest/runtestsb2g.py
new file mode 100644
index 00000000000..efc550d26f6
--- /dev/null
+++ b/testing/mochitest/runtestsb2g.py
@@ -0,0 +1,412 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import ConfigParser
+import os
+import re
+import sys
+import tempfile
+import time
+import urllib
+
+sys.path.insert(0, os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0]))))
+
+from automation import Automation
+from b2gautomation import B2GRemoteAutomation
+from runtests import Mochitest
+from runtests import MochitestOptions
+from runtests import MochitestServer
+
+import devicemanagerADB
+import manifestparser
+
+from marionette import Marionette
+
+
+class B2GOptions(MochitestOptions):
+
+    def __init__(self, automation, scriptdir, **kwargs):
+        defaults = {}
+        MochitestOptions.__init__(self, automation, scriptdir)
+
+        self.add_option("--b2gpath", action="store",
+                    type = "string", dest = "b2gPath",
+                    help = "path to B2G repo or qemu dir")
+        defaults["b2gPath"] = None
+
+        self.add_option("--marionette", action="store",
+                    type = "string", dest = "marionette",
+                    help = "host:port to use when connecting to Marionette")
+        defaults["marionette"] = None
+
+        self.add_option("--emulator", action="store_true",
+                    dest = "emulator",
+                    help = "True if using a b2g emulator")
+        defaults["emulator"] = False
+
+        self.add_option("--adbpath", action="store",
+                    type = "string", dest = "adbPath",
+                    help = "path to adb")
+        defaults["adbPath"] = "adb"
+
+        self.add_option("--deviceIP", action="store",
+                    type = "string", dest = "deviceIP",
+                    help = "ip address of remote device to test")
+        defaults["deviceIP"] = None
+
+        self.add_option("--devicePort", action="store",
+                    type = "string", dest = "devicePort",
+                    help = "port of remote device to test")
+        defaults["devicePort"] = 20701
+
+        self.add_option("--remote-logfile", action="store",
+                    type = "string", dest = "remoteLogFile",
+                    help = "Name of log file on the device relative to the device root.  PLEASE ONLY USE A FILENAME.")
+        defaults["remoteLogFile"] = None
+
+        self.add_option("--remote-webserver", action = "store",
+                    type = "string", dest = "remoteWebServer",
+                    help = "ip address where the remote web server is hosted at")
+        defaults["remoteWebServer"] = None
+
+        self.add_option("--http-port", action = "store",
+                    type = "string", dest = "httpPort",
+                    help = "ip address where the remote web server is hosted at")
+        defaults["httpPort"] = automation.DEFAULT_HTTP_PORT
+
+        self.add_option("--ssl-port", action = "store",
+                    type = "string", dest = "sslPort",
+                    help = "ip address where the remote web server is hosted at")
+        defaults["sslPort"] = automation.DEFAULT_SSL_PORT
+
+        self.add_option("--pidfile", action = "store",
+                    type = "string", dest = "pidFile",
+                    help = "name of the pidfile to generate")
+        defaults["pidFile"] = ""
+
+        defaults["remoteTestRoot"] = None
+        defaults["logFile"] = "mochitest.log"
+        defaults["autorun"] = True
+        defaults["closeWhenDone"] = True
+        defaults["testPath"] = ""
+
+        self.set_defaults(**defaults)
+
+    def verifyRemoteOptions(self, options, automation):
+        options.remoteTestRoot = automation._devicemanager.getDeviceRoot()
+        productRoot = options.remoteTestRoot + "/" + automation._product
+
+        if options.utilityPath == self._automation.DIST_BIN:
+            options.utilityPath = productRoot + "/bin"
+
+        if options.remoteWebServer == None:
+            if os.name != "nt":
+                options.remoteWebServer = automation.getLanIp()
+            else:
+                print "ERROR: you must specify a --remote-webserver=<ip address>\n"
+                return None
+
+        options.webServer = options.remoteWebServer
+
+        #if not options.emulator and not options.deviceIP:
+        #    print "ERROR: you must provide a device IP"
+        #    return None
+
+        if options.remoteLogFile == None:
+            options.remoteLogFile = options.remoteTestRoot + '/logs/mochitest.log'
+
+        if options.remoteLogFile.count('/') < 1:
+            options.remoteLogFile = options.remoteTestRoot + '/' + options.remoteLogFile
+
+        # Only reset the xrePath if it wasn't provided
+        if options.xrePath == None:
+            options.xrePath = options.utilityPath
+
+        if options.pidFile != "":
+            f = open(options.pidFile, 'w')
+            f.write("%s" % os.getpid())
+            f.close()
+
+        return options
+
+    def verifyOptions(self, options, mochitest):
+        # since we are reusing verifyOptions, it will exit if App is not found
+        temp = options.app
+        options.app = sys.argv[0]
+        tempPort = options.httpPort
+        tempSSL = options.sslPort
+        tempIP = options.webServer
+        options = MochitestOptions.verifyOptions(self, options, mochitest)
+        options.webServer = tempIP
+        options.app = temp
+        options.sslPort = tempSSL
+        options.httpPort = tempPort
+
+        return options 
+
+
+class ProfileConfigParser(ConfigParser.RawConfigParser):
+    """Subclass of RawConfigParser that outputs .ini files in the exact
+       format expected for profiles.ini, which is slightly different
+       than the default format.
+    """
+
+    def optionxform(self, optionstr):
+        return optionstr
+
+    def write(self, fp):
+        if self._defaults:
+            fp.write("[%s]\n" % ConfigParser.DEFAULTSECT)
+            for (key, value) in self._defaults.items():
+                fp.write("%s=%s\n" % (key, str(value).replace('\n', '\n\t')))
+            fp.write("\n")
+        for section in self._sections:
+            fp.write("[%s]\n" % section)
+            for (key, value) in self._sections[section].items():
+                if key == "__name__":
+                    continue
+                if (value is not None) or (self._optcre == self.OPTCRE):
+                    key = "=".join((key, str(value).replace('\n', '\n\t')))
+                fp.write("%s\n" % (key))
+            fp.write("\n")
+
+
+class B2GMochitest(Mochitest):
+
+    _automation = None
+    _dm = None
+    localProfile = None
+
+    def __init__(self, automation, devmgr, options):
+        self._automation = automation
+        Mochitest.__init__(self, self._automation)
+        self._dm = devmgr
+        self.runSSLTunnel = False
+        self.remoteProfile = options.remoteTestRoot + '/profile'
+        self._automation.setRemoteProfile(self.remoteProfile)
+        self.remoteLog = options.remoteLogFile
+        self.remoteProfilesIniPath = '/data/b2g/mozilla/profiles.ini'
+        self.originalProfilesIni = None
+
+    def cleanup(self, manifest, options):
+        self._dm.getFile(self.remoteLog, self.localLog)
+        self._dm.removeFile(self.remoteLog)
+        self._dm.removeDir(self.remoteProfile)
+
+        if self.originalProfilesIni:
+            try:
+                self.restoreProfilesIni()
+                os.remove(self.originalProfilesIni)
+            except:
+                pass
+
+        if options.pidFile != "":
+            try:
+                os.remove(options.pidFile)
+                os.remove(options.pidFile + ".xpcshell.pid")
+            except:
+                print "Warning: cleaning up pidfile '%s' was unsuccessful from the test harness" % options.pidFile
+
+        # We've restored the original profile, so reboot the device so that
+        # it gets picked up.
+        self._automation.rebootDevice()
+
+    def findPath(self, paths, filename = None):
+        for path in paths:
+            p = path
+            if filename:
+                p = os.path.join(p, filename)
+            if os.path.exists(self.getFullPath(p)):
+                return path
+        return None
+
+    def startWebServer(self, options):
+        """ Create the webserver on the host and start it up """
+        remoteXrePath = options.xrePath
+        remoteProfilePath = options.profilePath
+        remoteUtilityPath = options.utilityPath
+        localAutomation = Automation()
+        localAutomation.IS_WIN32 = False
+        localAutomation.IS_LINUX = False
+        localAutomation.IS_MAC = False
+        localAutomation.UNIXISH = False
+        hostos = sys.platform
+        if hostos in ['mac', 'darwin']:
+            localAutomation.IS_MAC = True
+        elif hostos in ['linux', 'linux2']:
+            localAutomation.IS_LINUX = True
+            localAutomation.UNIXISH = True
+        elif hostos in ['win32', 'win64']:
+            localAutomation.BIN_SUFFIX = ".exe"
+            localAutomation.IS_WIN32 = True
+
+        paths = [options.xrePath,
+                 localAutomation.DIST_BIN,
+                 self._automation._product,
+                 os.path.join('..', self._automation._product)]
+        options.xrePath = self.findPath(paths)
+        if options.xrePath == None:
+            print "ERROR: unable to find xulrunner path for %s, please specify with --xre-path" % (os.name)
+            sys.exit(1)
+        paths.append("bin")
+        paths.append(os.path.join("..", "bin"))
+
+        xpcshell = "xpcshell"
+        if (os.name == "nt"):
+            xpcshell += ".exe"
+
+        if (options.utilityPath):
+            paths.insert(0, options.utilityPath)
+        options.utilityPath = self.findPath(paths, xpcshell)
+        if options.utilityPath == None:
+            print "ERROR: unable to find utility path for %s, please specify with --utility-path" % (os.name)
+            sys.exit(1)
+
+        options.profilePath = tempfile.mkdtemp()
+        self.server = MochitestServer(localAutomation, options)
+        self.server.start()
+
+        if (options.pidFile != ""):
+            f = open(options.pidFile + ".xpcshell.pid", 'w')
+            f.write("%s" % self.server._process.pid)
+            f.close()
+        self.server.ensureReady(self.SERVER_STARTUP_TIMEOUT)
+
+        options.xrePath = remoteXrePath
+        options.utilityPath = remoteUtilityPath
+        options.profilePath = remoteProfilePath
+
+    def stopWebServer(self, options):
+        self.server.stop()
+
+    def buildProfile(self, options):
+        if self.localProfile:
+            options.profilePath = self.localProfile
+        print 'buildProfile', repr(options)
+        manifest = Mochitest.buildProfile(self, options)
+        self.localProfile = options.profilePath
+
+        # Profile isn't actually copied to device until
+        # buildURLOptions is called.
+
+        options.profilePath = self.remoteProfile
+        return manifest
+
+    def restoreProfilesIni(self):
+        # restore profiles.ini on the device to its previous state
+        if not self.originalProfilesIni or not os.access(self.originalProfilesIni, os.F_OK):
+            raise DMError('Unable to install original profiles.ini; file not found: %s',
+                          self.originalProfilesIni)
+
+        self._dm.pushFile(self.originalProfilesIni, self.remoteProfilesIniPath)
+
+    def updateProfilesIni(self, profilePath):
+        # update profiles.ini on the device to point to the test profile
+        self.originalProfilesIni = tempfile.mktemp()
+        self._dm.getFile(self.remoteProfilesIniPath, self.originalProfilesIni)
+
+        config = ProfileConfigParser()
+        config.read(self.originalProfilesIni)
+        for section in config.sections():
+            if 'Profile' in section:
+                config.set(section, 'IsRelative', 0)
+                config.set(section, 'Path', profilePath)
+
+        newProfilesIni = tempfile.mktemp()
+        with open(newProfilesIni, 'wb') as configfile:
+            config.write(configfile)
+
+        self._dm.pushFile(newProfilesIni, self.remoteProfilesIniPath)
+
+    def buildURLOptions(self, options, env):
+        self.localLog = options.logFile
+        options.logFile = self.remoteLog
+        options.profilePath = self.localProfile
+        retVal = Mochitest.buildURLOptions(self, options, env)
+
+        # set the testURL
+        testURL = self.buildTestPath(options)
+        if len(self.urlOpts) > 0:
+            testURL += "?" + "&".join(self.urlOpts)
+        self._automation.testURL = testURL
+
+        # Set the B2G homepage as a static local page, since wi-fi generally
+        # isn't available as soon as the device boots.
+        f = open(os.path.join(options.profilePath, "user.js"), "a")
+        f.write('user_pref("browser.homescreenURL", "data:text/html,mochitest-plain should start soon");\n')
+        f.close()
+
+        self._dm.removeDir(self.remoteProfile)
+        if self._dm.pushDir(options.profilePath, self.remoteProfile) == None:
+            raise devicemanager.FileError("Unable to copy profile to device.")
+
+        self.updateProfilesIni(self.remoteProfile)
+
+        options.profilePath = self.remoteProfile
+        options.logFile = self.localLog
+        return retVal
+
+
+def main():
+    scriptdir = os.path.abspath(os.path.realpath(os.path.dirname(__file__)))
+    auto = B2GRemoteAutomation(None, "fennec")
+    parser = B2GOptions(auto, scriptdir)
+    options, args = parser.parse_args()
+
+    # create our Marionette instance
+    kwargs = {'emulator': options.emulator}
+    if options.b2gPath:
+        kwargs['homedir'] = options.b2gPath
+    if options.marionette:
+        host,port = options.marionette.split(':')
+        kwargs['host'] = host
+        kwargs['port'] = int(port)
+    marionette = Marionette(**kwargs)
+
+    auto.marionette = marionette
+
+    # create the DeviceManager
+    kwargs = {'adbPath': options.adbPath}
+    if options.deviceIP:
+        kwargs.update({'host': options.deviceIP,
+                       'port': options.devicePort})
+    dm = devicemanagerADB.DeviceManagerADB(**kwargs)
+
+    auto.setDeviceManager(dm)
+    options = parser.verifyRemoteOptions(options, auto)
+    if (options == None):
+        print "ERROR: Invalid options specified, use --help for a list of valid options"
+        sys.exit(1)
+
+    auto.setProduct("b2g")
+
+    mochitest = B2GMochitest(auto, dm, options)
+
+    options = parser.verifyOptions(options, mochitest)
+    if (options == None):
+        sys.exit(1)
+
+    logParent = os.path.dirname(options.remoteLogFile)
+    dm.mkDir(logParent);
+    auto.setRemoteLog(options.remoteLogFile)
+    auto.setServerInfo(options.webServer, options.httpPort, options.sslPort)
+
+    retVal = 1
+    try:
+        retVal = mochitest.runTests(options)
+    except:
+        print "TEST-UNEXPECTED-FAIL | %s | Exception caught while running tests." % sys.exc_info()[1]
+        mochitest.stopWebServer(options)
+        mochitest.stopWebSocketServer(options)
+        try:
+            mochitest.cleanup(None, options)
+        except:
+            pass
+            sys.exit(1)
+
+    sys.exit(retVal)
+
+if __name__ == "__main__":
+    main()
+

From caf56fe5ac9c3e8b5f90661c8c072b9075d6eb13 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Fri, 27 Apr 2012 12:09:16 -0700
Subject: [PATCH 081/162] Back out Bug 749493 for destroying Android.

---
 mobile/android/base/db/DBUtils.java | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/mobile/android/base/db/DBUtils.java b/mobile/android/base/db/DBUtils.java
index 5dc61b1af73..ddf47044018 100644
--- a/mobile/android/base/db/DBUtils.java
+++ b/mobile/android/base/db/DBUtils.java
@@ -10,7 +10,6 @@ import org.mozilla.gecko.sync.Utils;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDatabaseLockedException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
 import android.text.TextUtils;
@@ -73,19 +72,22 @@ public class DBUtils {
     }
 
     public static void ensureDatabaseIsNotLocked(SQLiteOpenHelper dbHelper, String databasePath) {
-        try {
-            dbHelper.getWritableDatabase();
-        } catch (SQLiteDatabaseLockedException e) {
-            Log.d(LOGTAG, "Database is locked, trying to forcefully unlock the database file: " + databasePath);
+        SQLiteDatabase db = dbHelper.getWritableDatabase();
+
+        // The returned writable database is read-only, this probably means that the
+        // database is permanently locked due to a crash or a non-clean quit in Fennec.
+        // We can assume it's safe to forcefully unlock the database file in this case
+        // as all database access happens through this content provider (see bug 741718).
+        if (db.isReadOnly()) {
+            // Close read-only connection, we don't want to use it
+            dbHelper.close();
+
+            Log.d(LOGTAG, "Database is in read-only mode, trying to forcefully unlock the database file: " + databasePath);
 
             // Forcefully unlock the database file
             GeckoAppShell.unlockDatabaseFile(databasePath);
 
-            // This call should not throw if the forced unlocking
-            // actually fixed the situation.
-            dbHelper.getWritableDatabase();
-
-            // TODO: maybe check if the database is still locked and let the
+            // TODO: maybe check if the connection is still read-only and let the
             // user know that the device needs rebooting?
         }
     }

From d2d9da66e91746ed933ba6edd8403526a50383e5 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Fri, 27 Apr 2012 09:13:39 -0400
Subject: [PATCH 082/162] Bug 749493 - Catch SQLiteDatabaseLockedException when
 ensuring unlocked database (r=blassey)

---
 mobile/android/base/db/DBUtils.java | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/mobile/android/base/db/DBUtils.java b/mobile/android/base/db/DBUtils.java
index ddf47044018..a41a21fd5ca 100644
--- a/mobile/android/base/db/DBUtils.java
+++ b/mobile/android/base/db/DBUtils.java
@@ -72,22 +72,19 @@ public class DBUtils {
     }
 
     public static void ensureDatabaseIsNotLocked(SQLiteOpenHelper dbHelper, String databasePath) {
-        SQLiteDatabase db = dbHelper.getWritableDatabase();
-
-        // The returned writable database is read-only, this probably means that the
-        // database is permanently locked due to a crash or a non-clean quit in Fennec.
-        // We can assume it's safe to forcefully unlock the database file in this case
-        // as all database access happens through this content provider (see bug 741718).
-        if (db.isReadOnly()) {
-            // Close read-only connection, we don't want to use it
-            dbHelper.close();
-
-            Log.d(LOGTAG, "Database is in read-only mode, trying to forcefully unlock the database file: " + databasePath);
+        try {
+            dbHelper.getWritableDatabase();
+        } catch (Exception e) {
+            Log.d(LOGTAG, "Database is locked, trying to forcefully unlock the database file: " + databasePath);
 
             // Forcefully unlock the database file
             GeckoAppShell.unlockDatabaseFile(databasePath);
 
-            // TODO: maybe check if the connection is still read-only and let the
+            // This call should not throw if the forced unlocking
+            // actually fixed the situation.
+            dbHelper.getWritableDatabase();
+
+            // TODO: maybe check if the database is still locked and let the
             // user know that the device needs rebooting?
         }
     }

From 3f75d415a16e504ce61873f6da300593b6f3118e Mon Sep 17 00:00:00 2001
From: James Willcox <jwillcox@mozilla.com>
Date: Fri, 27 Apr 2012 16:04:47 -0400
Subject: [PATCH 083/162] Bug 727116 - Draw Flash plugins with OpenGL during
 pan/zoom on legacy Android r=blassey

---
 dom/plugins/base/nsPluginInstanceOwner.cpp    |  71 ++--
 mobile/android/base/GeckoApp.java             | 234 +++----------
 mobile/android/base/GeckoAppShell.java        |  23 +-
 mobile/android/base/Makefile.in               |   3 +-
 mobile/android/base/SurfaceBits.java          |  10 +
 mobile/android/base/SurfaceLockInfo.java      |  18 -
 mobile/android/base/Tab.java                  |  16 +-
 mobile/android/base/Tabs.java                 |   4 +-
 .../android/base/gfx/BufferedCairoImage.java  |  26 +-
 mobile/android/base/gfx/GeckoLayerClient.java |   3 +-
 mobile/android/base/gfx/Layer.java            |   5 +
 mobile/android/base/gfx/LayerController.java  |   9 -
 mobile/android/base/gfx/LayerRenderer.java    |  14 +-
 mobile/android/base/gfx/PluginLayer.java      | 320 ++++++++++++++++++
 mobile/android/base/gfx/RectUtils.java        |  13 +-
 .../android/base/gfx/SurfaceTextureLayer.java |  16 +-
 mobile/android/base/gfx/TileLayer.java        |   3 +-
 mobile/android/base/ui/PanZoomController.java |   8 -
 mobile/android/chrome/content/browser.js      |   6 +-
 mozglue/android/APKOpen.cpp                   |   2 +
 widget/android/AndroidBridge.cpp              | 247 ++++++++++----
 widget/android/AndroidBridge.h                |  43 ++-
 widget/android/AndroidJNI.cpp                 |  91 +++++
 widget/android/AndroidMediaLayer.cpp          |  36 +-
 widget/android/AndroidMediaLayer.h            |   2 +-
 widget/android/nsWindow.cpp                   |   2 +-
 26 files changed, 797 insertions(+), 428 deletions(-)
 create mode 100644 mobile/android/base/SurfaceBits.java
 delete mode 100644 mobile/android/base/SurfaceLockInfo.java
 create mode 100644 mobile/android/base/gfx/PluginLayer.java

diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp
index 924e449c6a3..a22e023fb2d 100644
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -1773,47 +1773,8 @@ bool nsPluginInstanceOwner::AddPluginView(const gfxRect& aRect)
     return false;
   }
 
-  JNIEnv* env = GetJNIForThread();
-  if (!env)
-    return false;
-
-  AndroidBridge::AutoLocalJNIFrame frame(env, 1);
-
-  jclass cls = env->FindClass("org/mozilla/gecko/GeckoAppShell");
-
-#ifdef MOZ_JAVA_COMPOSITOR
-  nsAutoString metadata;
-  nsCOMPtr<nsIAndroidDrawMetadataProvider> metadataProvider =
-      AndroidBridge::Bridge()->GetDrawMetadataProvider();
-  metadataProvider->GetDrawMetadata(metadata);
-
-  jstring jMetadata = env->NewString(nsPromiseFlatString(metadata).get(), metadata.Length());
-
-  jmethodID method = env->GetStaticMethodID(cls,
-                                            "addPluginView",
-                                            "(Landroid/view/View;IIIILjava/lang/String;)V");
-
-  env->CallStaticVoidMethod(cls,
-                            method,
-                            javaSurface,
-                            (int)aRect.x,
-                            (int)aRect.y,
-                            (int)aRect.width,
-                            (int)aRect.height,
-                            jMetadata);
-#else
-  jmethodID method = env->GetStaticMethodID(cls,
-                                            "addPluginView",
-                                            "(Landroid/view/View;DDDD)V");
-
-  env->CallStaticVoidMethod(cls,
-                            method,
-                            javaSurface,
-                            aRect.x,
-                            aRect.y,
-                            aRect.width,
-                            aRect.height);
-#endif
+  if (AndroidBridge::Bridge())
+    AndroidBridge::Bridge()->AddPluginView((jobject)javaSurface, aRect);
 
   return true;
 }
@@ -1827,7 +1788,8 @@ void nsPluginInstanceOwner::RemovePluginView()
   if (!surface)
     return;
 
-  AndroidBridge::RemovePluginView(surface);
+  if (AndroidBridge::Bridge())
+    AndroidBridge::Bridge()->RemovePluginView((jobject)surface);
 }
 
 void nsPluginInstanceOwner::Invalidate() {
@@ -2913,14 +2875,21 @@ void nsPluginInstanceOwner::Paint(gfxContext* aContext,
 
   PRInt32 model = mInstance->GetANPDrawingModel();
 
-  float xResolution = mObjectFrame->PresContext()->GetRootPresContext()->PresShell()->GetXResolution();
-  float yResolution = mObjectFrame->PresContext()->GetRootPresContext()->PresShell()->GetYResolution();
+  // Get the offset of the content relative to the page
 
-  gfxRect scaledFrameRect = aFrameRect;
-  scaledFrameRect.Scale(xResolution, yResolution);
+  nsPoint offset = nsPoint(0, 0);
+  nsIFrame* current = (nsIFrame*)mObjectFrame;
+  while (current && current->GetContent() && current->GetContent()->Tag() != nsGkAtoms::html) {    
+    offset += current->GetPosition();
+    current = current->GetParent();
+  }
+
+  nsRect bounds = nsRect(offset, mObjectFrame->GetSize());
+  nsIntRect intBounds = bounds.ToNearestPixels(mObjectFrame->PresContext()->AppUnitsPerDevPixel());
+  gfxRect pluginRect(intBounds);
 
   if (model == kSurface_ANPDrawingModel) {
-    if (!AddPluginView(scaledFrameRect)) {
+    if (!AddPluginView(pluginRect)) {
       Invalidate();
     }
     return;
@@ -2930,9 +2899,13 @@ void nsPluginInstanceOwner::Paint(gfxContext* aContext,
     if (!mLayer)
       mLayer = new AndroidMediaLayer();
 
-    mLayer->UpdatePosition(scaledFrameRect, xResolution);
+    mLayer->UpdatePosition(pluginRect);
 
-    SendSize((int)scaledFrameRect.width, (int)scaledFrameRect.height);
+    float xResolution = mObjectFrame->PresContext()->GetRootPresContext()->PresShell()->GetXResolution();
+    float yResolution = mObjectFrame->PresContext()->GetRootPresContext()->PresShell()->GetYResolution();
+    pluginRect.Scale(xResolution, yResolution);
+
+    SendSize((int)pluginRect.width, (int)pluginRect.height);
     return;
   }
 
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 5d4288d2d3d..53d13025668 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -41,12 +41,15 @@
 package org.mozilla.gecko;
 
 import org.mozilla.gecko.db.BrowserDB;
+import org.mozilla.gecko.gfx.CairoImage;
+import org.mozilla.gecko.gfx.BufferedCairoImage;
 import org.mozilla.gecko.gfx.FloatSize;
 import org.mozilla.gecko.gfx.GeckoLayerClient;
 import org.mozilla.gecko.gfx.IntSize;
 import org.mozilla.gecko.gfx.Layer;
 import org.mozilla.gecko.gfx.LayerController;
 import org.mozilla.gecko.gfx.LayerView;
+import org.mozilla.gecko.gfx.PluginLayer;
 import org.mozilla.gecko.gfx.RectUtils;
 import org.mozilla.gecko.gfx.SurfaceTextureLayer;
 import org.mozilla.gecko.gfx.ViewportMetrics;
@@ -679,7 +682,7 @@ abstract public class GeckoApp
                     mBrowserToolbar.setShadowVisibility(!(tab.getURL().startsWith("about:")));
 
                     if (tab != null)
-                        hidePlugins(tab, true);
+                        hidePlugins(tab);
                 }
             }
         });
@@ -1330,57 +1333,20 @@ abstract public class GeckoApp
         }
     }
 
-    void addPluginView(final View view,
-                       final int x, final int y,
-                       final int w, final int h,
-                       final String metadata) {
+    void addPluginView(final View view, final Rect rect) {
         mMainHandler.post(new Runnable() { 
             public void run() {
-                PluginLayoutParams lp;
-
                 Tabs tabs = Tabs.getInstance();
                 Tab tab = tabs.getSelectedTab();
 
-                if (tab == null)
-                    return;
-
-                ImmutableViewportMetrics targetViewport = mLayerController.getViewportMetrics();
-                ImmutableViewportMetrics pluginViewport;
-                
-                try {
-                    JSONObject viewportObject = new JSONObject(metadata);
-                    pluginViewport = new ImmutableViewportMetrics(new ViewportMetrics(viewportObject));
-                } catch (JSONException e) {
-                    Log.e(LOGTAG, "Bad viewport metadata: ", e);
-                    return;
-                }
-
-                if (mPluginContainer.indexOfChild(view) == -1) {
-                    lp = new PluginLayoutParams(x, y, w, h, pluginViewport);
-
-                    view.setWillNotDraw(false);
-                    if (view instanceof SurfaceView) {
-                        SurfaceView sview = (SurfaceView)view;
-
-                        sview.setZOrderOnTop(false);
-                        sview.setZOrderMediaOverlay(true);
-                    }
-
-                    mPluginContainer.addView(view, lp);
-                    tab.addPluginView(view);
+                PluginLayer layer = (PluginLayer) tab.getPluginLayer(view);
+                if (layer == null) {
+                    layer = new PluginLayer(view, rect, mLayerController.getView().getRenderer().getMaxTextureSize());
+                    tab.addPluginLayer(view, layer);
+                    mLayerController.getView().addLayer(layer);
                 } else {
-                    lp = (PluginLayoutParams)view.getLayoutParams();
-                    lp.reset(x, y, w, h, pluginViewport);
-                    lp.reposition(targetViewport);
-                    try {
-                        mPluginContainer.updateViewLayout(view, lp);
-                        view.setVisibility(View.VISIBLE);
-                    } catch (IllegalArgumentException e) {
-                        Log.i(LOGTAG, "e:" + e);
-                        // it can be the case where we
-                        // get an update before the view
-                        // is actually attached.
-                    }
+                    layer.reset(rect);
+                    layer.setVisible(true);
                 }
             }
         });
@@ -1389,16 +1355,13 @@ abstract public class GeckoApp
     void removePluginView(final View view) {
         mMainHandler.post(new Runnable() { 
             public void run() {
-                try {
-                    mPluginContainer.removeView(view);
+                Tabs tabs = Tabs.getInstance();
+                Tab tab = tabs.getSelectedTab();
 
-                    Tabs tabs = Tabs.getInstance();
-                    Tab tab = tabs.getSelectedTab();
-                    if (tab == null)
-                        return;
-
-                    tab.removePluginView(view);
-                } catch (Exception e) {}
+                PluginLayer layer = (PluginLayer) tab.removePluginLayer(view);
+                if (layer != null) {
+                    layer.destroy();
+                }
             }
         });
     }
@@ -1429,31 +1392,18 @@ abstract public class GeckoApp
     }
 
     public void showSurface(Surface surface, int x, int y,
-                            int w, int h, boolean inverted, boolean blend,
-                            String metadata) {
+                            int w, int h, boolean inverted, boolean blend) {
         Tabs tabs = Tabs.getInstance();
         Tab tab = tabs.getSelectedTab();
         if (tab == null)
             return;
 
-        ViewportMetrics metrics;
-        try {
-            metrics = new ViewportMetrics(new JSONObject(metadata));
-        } catch (JSONException e) {
-            Log.e(LOGTAG, "Bad viewport metadata: ", e);
-            return;
-        }
-
-        PointF origin = metrics.getOrigin();
-        x = x + (int)origin.x;
-        y = y + (int)origin.y;
-
         LayerView layerView = mLayerController.getView();
         SurfaceTextureLayer layer = (SurfaceTextureLayer)tab.getPluginLayer(surface);
         if (layer == null)
             return;
 
-        layer.update(new Rect(x, y, x + w, y + h), metrics.getZoomFactor(), inverted, blend);
+        layer.update(new Rect(x, y, x + w, y + h), inverted, blend);
         layerView.addLayer(layer);
 
         // FIXME: shouldn't be necessary, layer will request
@@ -1490,71 +1440,45 @@ abstract public class GeckoApp
         mLayerController.getView().requestRender();
     }
 
-    public void hidePlugins(boolean hideLayers) {
+    public void hidePlugins() {
         Tabs tabs = Tabs.getInstance();
         Tab tab = tabs.getSelectedTab();
 
         if (tab == null)
             return;
 
-        hidePlugins(tab, hideLayers);
+        hidePlugins(tab);
     }
-
-    public void hidePlugins(Tab tab, boolean hideLayers) {
-        for (View view : tab.getPluginViews()) {
-            view.setVisibility(View.GONE);
-        }
-
-        if (hideLayers) {
-            for (Layer layer : tab.getPluginLayers()) {
-                hidePluginLayer(layer);
+    
+    public void hidePlugins(Tab tab) {
+        for (Layer layer : tab.getPluginLayers()) {
+            if (layer instanceof PluginLayer) {
+                ((PluginLayer) layer).setVisible(false);
             }
 
-            requestRender();
-        }
-    }
-
-    public void showPlugins() {
-        repositionPluginViews(true);
-    }
-
-    public void showPlugins(Tab tab) {
-        repositionPluginViews(tab, true);
-
-        for (Layer layer : tab.getPluginLayers()) {
-            showPluginLayer(layer);
+            hidePluginLayer(layer);
         }
 
         requestRender();
     }
 
-    public void repositionPluginViews(boolean setVisible) {
+    public void showPlugins() {
         Tabs tabs = Tabs.getInstance();
         Tab tab = tabs.getSelectedTab();
 
-        if (tab == null)
-            return;
-
-        repositionPluginViews(tab, setVisible);
+        showPlugins(tab);
     }
 
-    public void repositionPluginViews(Tab tab, boolean setVisible) {
-        ImmutableViewportMetrics targetViewport = mLayerController.getViewportMetrics();
+    public void showPlugins(Tab tab) {
+        for (Layer layer : tab.getPluginLayers()) {
+            showPluginLayer(layer);
 
-        if (targetViewport == null)
-            return;
-
-        for (View view : tab.getPluginViews()) {
-            PluginLayoutParams lp = (PluginLayoutParams)view.getLayoutParams();
-            lp.reposition(targetViewport);
-
-            if (setVisible) {
-                view.setVisibility(View.VISIBLE);
+            if (layer instanceof PluginLayer) {
+                ((PluginLayer) layer).setVisible(true);
             }
-
-            if (mPluginContainer.indexOfChild(view) >= 0)
-                mPluginContainer.updateViewLayout(view, lp);
         }
+
+        requestRender();
     }
 
     public void setFullScreen(final boolean fullscreen) {
@@ -2863,6 +2787,8 @@ abstract public class GeckoApp
     public GeckoLayerClient getLayerClient() { return mLayerClient; }
     public LayerController getLayerController() { return mLayerController; }
 
+    public AbsoluteLayout getPluginContainer() { return mPluginContainer; }
+
     // accelerometer
     public void onAccuracyChanged(Sensor sensor, int accuracy) {}
 
@@ -2904,84 +2830,4 @@ abstract public class GeckoApp
             }
         });
     }
-}
-
-class PluginLayoutParams extends AbsoluteLayout.LayoutParams
-{
-    private static final int MAX_DIMENSION = 2048;
-    private static final String LOGTAG = "GeckoApp.PluginLayoutParams";
-
-    private int mOriginalX;
-    private int mOriginalY;
-    private int mOriginalWidth;
-    private int mOriginalHeight;
-    private ImmutableViewportMetrics mOriginalViewport;
-    private float mLastResolution;
-
-    public PluginLayoutParams(int aX, int aY, int aWidth, int aHeight, ImmutableViewportMetrics aViewport) {
-        super(aWidth, aHeight, aX, aY);
-
-        Log.i(LOGTAG, "Creating plugin at " + aX + ", " + aY + ", " + aWidth + "x" + aHeight + ", (" + (aViewport.zoomFactor * 100) + "%)");
-
-        mOriginalX = aX;
-        mOriginalY = aY;
-        mOriginalWidth = aWidth;
-        mOriginalHeight = aHeight;
-        mOriginalViewport = aViewport;
-        mLastResolution = aViewport.zoomFactor;
-
-        clampToMaxSize();
-    }
-
-    private void clampToMaxSize() {
-        if (width > MAX_DIMENSION || height > MAX_DIMENSION) {
-            if (width > height) {
-                height = (int)(((float)height/(float)width) * MAX_DIMENSION);
-                width = MAX_DIMENSION;
-            } else {
-                width = (int)(((float)width/(float)height) * MAX_DIMENSION);
-                height = MAX_DIMENSION;
-            }
-        }
-    }
-
-    public void reset(int aX, int aY, int aWidth, int aHeight, ImmutableViewportMetrics aViewport) {
-        PointF origin = aViewport.getOrigin();
-
-        this.x = mOriginalX = aX;
-        this.y = mOriginalY = aY;
-        width = mOriginalWidth = aWidth;
-        height = mOriginalHeight = aHeight;
-        mOriginalViewport = aViewport;
-        mLastResolution = aViewport.zoomFactor;
-
-        clampToMaxSize();
-    }
-
-    private void reposition(Point aOffset, float aResolution) {
-        this.x = mOriginalX + aOffset.x;
-        this.y = mOriginalY + aOffset.y;
-
-        if (!FloatUtils.fuzzyEquals(mLastResolution, aResolution)) {
-            width = Math.round(aResolution * mOriginalWidth);
-            height = Math.round(aResolution * mOriginalHeight);
-            mLastResolution = aResolution;
-
-            clampToMaxSize();
-        }
-    }
-
-    public void reposition(ImmutableViewportMetrics viewport) {
-        PointF targetOrigin = viewport.getOrigin();
-        PointF originalOrigin = mOriginalViewport.getOrigin();
-
-        Point offset = new Point(Math.round(originalOrigin.x - targetOrigin.x),
-                                 Math.round(originalOrigin.y - targetOrigin.y));
-
-        reposition(offset, viewport.zoomFactor);
-    }
-
-    public float getLastResolution() {
-        return mLastResolution;
-    }
-}
+}
\ No newline at end of file
diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java
index fe97c425a8f..6c506fc7478 100644
--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -46,6 +46,8 @@ import org.mozilla.gecko.gfx.LayerController;
 import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.gfx.ScreenshotLayer;
 import org.mozilla.gecko.FloatUtils;
+import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
+import org.mozilla.gecko.gfx.ViewportMetrics;
 
 import java.io.*;
 import java.lang.reflect.*;
@@ -230,6 +232,8 @@ public class GeckoAppShell
 
     public static native void unlockDatabaseFile(String databasePath);
 
+    public static native SurfaceBits getSurfaceBits(Surface surface);
+
     private static class GeckoMediaScannerClient implements MediaScannerConnectionClient {
         private String mFile = "";
         private String mMimeType = "";
@@ -1514,11 +1518,13 @@ public class GeckoAppShell
 
     public static void addPluginView(View view,
                                      int x, int y,
-                                     int w, int h,
-                                     String metadata)
-    {
-        Log.i(LOGTAG, "addPluginView:" + view + " @ x:" + x + " y:" + y + " w:" + w + " h:" + h + " metadata: " + metadata);
-        GeckoApp.mAppContext.addPluginView(view, x, y, w, h, metadata);
+                                     int w, int h)
+{
+        ImmutableViewportMetrics pluginViewport;
+
+        Log.i(LOGTAG, "addPluginView:" + view + " @ x:" + x + " y:" + y + " w:" + w + " h:" + h);
+        
+        GeckoApp.mAppContext.addPluginView(view, new Rect(x, y, x + w, y + h));
     }
 
     public static void removePluginView(View view) {
@@ -1535,12 +1541,11 @@ public class GeckoAppShell
                                    int x, int y,
                                    int w, int h,
                                    boolean inverted,
-                                   boolean blend,
-                                   String metadata)
+                                   boolean blend)
     {
-        Log.i(LOGTAG, "showSurface:" + surface + " @ x:" + x + " y:" + y + " w:" + w + " h:" + h + " inverted: " + inverted + " blend: " + blend + " metadata: " + metadata);
+        Log.i(LOGTAG, "showSurface:" + surface + " @ x:" + x + " y:" + y + " w:" + w + " h:" + h + " inverted: " + inverted + " blend: " + blend);
         try {
-            GeckoApp.mAppContext.showSurface(surface, x, y, w, h, inverted, blend, metadata);
+            GeckoApp.mAppContext.showSurface(surface, x, y, w, h, inverted, blend);
         } catch (Exception e) {
             Log.i(LOGTAG, "Error in showSurface:", e);
         }
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 3db38b3be5d..dd764a517e7 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -110,7 +110,7 @@ FENNEC_JAVA_FILES = \
   sqlite/SQLiteBridgeException.java \
   RemoteTabs.java \
   SetupScreen.java \
-  SurfaceLockInfo.java \
+  SurfaceBits.java \
   Tab.java \
   Tabs.java \
   TabsTray.java \
@@ -135,6 +135,7 @@ FENNEC_JAVA_FILES = \
   gfx/LayerController.java \
   gfx/LayerRenderer.java \
   gfx/LayerView.java \
+  gfx/PluginLayer.java \
   gfx/NinePatchTileLayer.java \
   gfx/PanningPerfAPI.java \
   gfx/PointUtils.java \
diff --git a/mobile/android/base/SurfaceBits.java b/mobile/android/base/SurfaceBits.java
new file mode 100644
index 00000000000..ffe55f75883
--- /dev/null
+++ b/mobile/android/base/SurfaceBits.java
@@ -0,0 +1,10 @@
+package org.mozilla.gecko;
+
+import java.nio.ByteBuffer;
+
+public class SurfaceBits {
+    public int width;
+    public int height;
+    public int format;
+    public ByteBuffer buffer;
+}
diff --git a/mobile/android/base/SurfaceLockInfo.java b/mobile/android/base/SurfaceLockInfo.java
deleted file mode 100644
index 4dcb7dc2b6a..00000000000
--- a/mobile/android/base/SurfaceLockInfo.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.mozilla.gecko;
-
-import android.graphics.Canvas;
-import java.nio.Buffer;
-
-public class SurfaceLockInfo {
-    public int dirtyTop;
-    public int dirtyLeft;
-    public int dirtyRight;
-    public int dirtyBottom;
-
-    public int bpr;
-    public int format;
-    public int width;
-    public int height;
-    public Buffer buffer;
-    public Canvas canvas;
-}
diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java
index 75cf5f56a2c..7a6ef89d38a 100644
--- a/mobile/android/base/Tab.java
+++ b/mobile/android/base/Tab.java
@@ -90,7 +90,7 @@ public final class Tab {
     private String mContentType;
     private boolean mHasTouchListeners;
     private ArrayList<View> mPluginViews;
-    private HashMap<Surface, Layer> mPluginLayers;
+    private HashMap<Object, Layer> mPluginLayers;
     private ContentResolver mContentResolver;
     private ContentObserver mContentObserver;
     private int mCheckerboardColor = Color.WHITE;
@@ -129,7 +129,7 @@ public final class Tab {
         mDocumentURI = "";
         mContentType = "";
         mPluginViews = new ArrayList<View>();
-        mPluginLayers = new HashMap<Surface, Layer>();
+        mPluginLayers = new HashMap<Object, Layer>();
         setState(STATE_LOADING);
         mContentResolver = Tabs.getInstance().getContentResolver();
         mContentObserver = new ContentObserver(GeckoAppShell.getHandler()) {
@@ -551,20 +551,20 @@ public final class Tab {
         return mPluginViews.toArray(new View[mPluginViews.size()]);
     }
 
-    public void addPluginLayer(Surface surface, Layer layer) {
-        mPluginLayers.put(surface, layer);
+    public void addPluginLayer(Object surfaceOrView, Layer layer) {
+        mPluginLayers.put(surfaceOrView, layer);
     }
 
-    public Layer getPluginLayer(Surface surface) {
-        return mPluginLayers.get(surface);
+    public Layer getPluginLayer(Object surfaceOrView) {
+        return mPluginLayers.get(surfaceOrView);
     }
 
     public Collection<Layer> getPluginLayers() {
         return mPluginLayers.values();
     }
 
-    public Layer removePluginLayer(Surface surface) {
-        return mPluginLayers.remove(surface);
+    public Layer removePluginLayer(Object surfaceOrView) {
+        return mPluginLayers.remove(surfaceOrView);
     }
 
     public int getCheckerboardColor() {
diff --git a/mobile/android/base/Tabs.java b/mobile/android/base/Tabs.java
index 01db9e4b868..fc563fb87dc 100644
--- a/mobile/android/base/Tabs.java
+++ b/mobile/android/base/Tabs.java
@@ -142,7 +142,7 @@ public class Tabs implements GeckoEventListener {
                     notifyListeners(tab, TabEvents.SELECTED);
 
                     if (oldTab != null)
-                        GeckoApp.mAppContext.hidePlugins(oldTab, true);
+                        GeckoApp.mAppContext.hidePlugins(oldTab);
                 }
             }
         });
@@ -204,7 +204,7 @@ public class Tabs implements GeckoEventListener {
                 notifyListeners(tab, TabEvents.CLOSED);
                 GeckoApp.mBrowserToolbar.updateTabCountAndAnimate(Tabs.getInstance().getCount());
                 GeckoApp.mDoorHangerPopup.updatePopup();
-                GeckoApp.mAppContext.hidePlugins(tab, true);
+                GeckoApp.mAppContext.hidePlugins(tab);
                 tab.onDestroy();
             }
         });
diff --git a/mobile/android/base/gfx/BufferedCairoImage.java b/mobile/android/base/gfx/BufferedCairoImage.java
index 619bc6ebb4f..03fc39e090b 100644
--- a/mobile/android/base/gfx/BufferedCairoImage.java
+++ b/mobile/android/base/gfx/BufferedCairoImage.java
@@ -52,17 +52,12 @@ public class BufferedCairoImage extends CairoImage {
 
     /** Creates a buffered Cairo image from a byte buffer. */
     public BufferedCairoImage(ByteBuffer inBuffer, int inWidth, int inHeight, int inFormat) {
-        mBuffer = inBuffer; mSize = new IntSize(inWidth, inHeight); mFormat = inFormat;
+        setBuffer(inBuffer, inWidth, inHeight, inFormat);
     }
 
     /** Creates a buffered Cairo image from an Android bitmap. */
     public BufferedCairoImage(Bitmap bitmap) {
-        mFormat = CairoUtils.bitmapConfigToCairoFormat(bitmap.getConfig());
-        mSize = new IntSize(bitmap.getWidth(), bitmap.getHeight());
-        mNeedToFreeBuffer = true;
-        // XXX Why is this * 4? Shouldn't it depend on mFormat?
-        mBuffer = GeckoAppShell.allocateDirectBuffer(mSize.getArea() * 4);
-        bitmap.copyPixelsToBuffer(mBuffer.asIntBuffer());
+        setBitmap(bitmap);
     }
 
      protected void finalize() throws Throwable {
@@ -82,5 +77,22 @@ public class BufferedCairoImage extends CairoImage {
     public IntSize getSize() { return mSize; }
     @Override
     public int getFormat() { return mFormat; }
+
+
+    public void setBuffer(ByteBuffer buffer, int width, int height, int format) {
+        mBuffer = buffer;
+        mSize = new IntSize(width, height);
+        mFormat = format;
+    }
+
+    public void setBitmap(Bitmap bitmap) {
+        mFormat = CairoUtils.bitmapConfigToCairoFormat(bitmap.getConfig());
+        mSize = new IntSize(bitmap.getWidth(), bitmap.getHeight());
+        mNeedToFreeBuffer = true;
+
+        int bpp = CairoUtils.bitsPerPixelForCairoFormat(mFormat);
+        mBuffer = GeckoAppShell.allocateDirectBuffer(mSize.getArea() * bpp);
+        bitmap.copyPixelsToBuffer(mBuffer.asIntBuffer());
+    }
 }
 
diff --git a/mobile/android/base/gfx/GeckoLayerClient.java b/mobile/android/base/gfx/GeckoLayerClient.java
index d7d0e5fbe13..ab35ad42720 100644
--- a/mobile/android/base/gfx/GeckoLayerClient.java
+++ b/mobile/android/base/gfx/GeckoLayerClient.java
@@ -130,6 +130,7 @@ public class GeckoLayerClient implements GeckoEventResponder,
 
         JSONArray prefs = new JSONArray();
         DisplayPortCalculator.addPrefNames(prefs);
+        PluginLayer.addPrefNames(prefs);
         GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Preferences:Get", prefs.toString()));
     }
 
@@ -281,7 +282,7 @@ public class GeckoLayerClient implements GeckoEventResponder,
                 // check return value from setStrategy to make sure that this is the
                 // right batch of prefs, since other java code may also have sent requests
                 // for prefs.
-                if (DisplayPortCalculator.setStrategy(prefValues)) {
+                if (DisplayPortCalculator.setStrategy(prefValues) && PluginLayer.setUsePlaceholder(prefValues)) {
                     GeckoAppShell.unregisterGeckoEventListener("Preferences:Data", this);
                 }
             }
diff --git a/mobile/android/base/gfx/Layer.java b/mobile/android/base/gfx/Layer.java
index c5ecba0b370..c92164ccd6a 100644
--- a/mobile/android/base/gfx/Layer.java
+++ b/mobile/android/base/gfx/Layer.java
@@ -55,6 +55,7 @@ public abstract class Layer {
 
     protected Rect mPosition;
     protected float mResolution;
+    protected boolean mUsesDefaultProgram = true;
 
     public Layer() {
         this(null);
@@ -165,6 +166,10 @@ public abstract class Layer {
         mNewResolution = newResolution;
     }
 
+    public boolean usesDefaultProgram() {
+        return mUsesDefaultProgram;
+    }
+
     /**
      * Subclasses may override this method to perform custom layer updates. This will be called
      * with the transaction lock held. Subclass implementations of this method must call the
diff --git a/mobile/android/base/gfx/LayerController.java b/mobile/android/base/gfx/LayerController.java
index 5b9875270bb..30f8300150b 100644
--- a/mobile/android/base/gfx/LayerController.java
+++ b/mobile/android/base/gfx/LayerController.java
@@ -193,7 +193,6 @@ public class LayerController {
         mViewportMetrics = new ImmutableViewportMetrics(viewportMetrics);
 
         notifyLayerClientOfGeometryChange();
-        GeckoApp.mAppContext.repositionPluginViews(false);
         mView.requestRender();
     }
 
@@ -225,13 +224,6 @@ public class LayerController {
      */
     public void setViewportMetrics(ViewportMetrics viewport) {
         mViewportMetrics = new ImmutableViewportMetrics(viewport);
-        // this function may or may not be called on the UI thread,
-        // but repositionPluginViews must only be called on the UI thread.
-        GeckoApp.mAppContext.runOnUiThread(new Runnable() {
-            public void run() {
-                GeckoApp.mAppContext.repositionPluginViews(false);
-            }
-        });
         mView.requestRender();
     }
 
@@ -259,7 +251,6 @@ public class LayerController {
         // We assume the zoom level will only be modified by the
         // PanZoomController, so no need to notify it of this change.
         notifyLayerClientOfGeometryChange();
-        GeckoApp.mAppContext.repositionPluginViews(false);
         mView.requestRender();
     }
 
diff --git a/mobile/android/base/gfx/LayerRenderer.java b/mobile/android/base/gfx/LayerRenderer.java
index a8416fc3e2a..5cc1a2a5a3e 100644
--- a/mobile/android/base/gfx/LayerRenderer.java
+++ b/mobile/android/base/gfx/LayerRenderer.java
@@ -651,15 +651,15 @@ public class LayerRenderer implements GLSurfaceView.Renderer {
         public void drawForeground() {
             /* Draw any extra layers that were added (likely plugins) */
             if (mExtraLayers.size() > 0) {
-                // This is a hack. SurfaceTextureLayer draws with its own program, so disable ours here
-                // and re-enable when done. If we end up adding other types of Layer here we'll need
-                // to do something different.
-                deactivateDefaultProgram();
-                
-                for (Layer layer : mExtraLayers)
+                for (Layer layer : mExtraLayers) {
+                    if (!layer.usesDefaultProgram())
+                        deactivateDefaultProgram();
+
                     layer.draw(mPageContext);
 
-                activateDefaultProgram();
+                    if (!layer.usesDefaultProgram())
+                        activateDefaultProgram();
+                }
             }
 
             /* Draw the vertical scrollbar. */
diff --git a/mobile/android/base/gfx/PluginLayer.java b/mobile/android/base/gfx/PluginLayer.java
new file mode 100644
index 00000000000..f5aa22a9c6d
--- /dev/null
+++ b/mobile/android/base/gfx/PluginLayer.java
@@ -0,0 +1,320 @@
+package org.mozilla.gecko.gfx;
+
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.Point;
+import android.graphics.PointF;
+import android.graphics.PixelFormat;
+import android.view.View;
+import android.view.Surface;
+import android.view.SurfaceView;
+import android.widget.AbsoluteLayout;
+import android.util.Log;
+import android.opengl.GLES20;
+import java.nio.FloatBuffer;
+import java.util.Map;
+import org.json.JSONArray;
+
+import org.mozilla.gecko.FloatUtils;
+import org.mozilla.gecko.SurfaceBits;
+import org.mozilla.gecko.GeckoApp;
+import org.mozilla.gecko.GeckoAppShell;
+
+public class PluginLayer extends TileLayer
+{
+    private static final String LOGTAG = "PluginLayer";
+    private static final String PREF_PLUGIN_USE_PLACEHOLDER = "plugins.use_placeholder";
+
+    private static boolean sUsePlaceholder = true;
+
+    private View mView;
+    private SurfaceView mSurfaceView;
+    private PluginLayoutParams mLayoutParams;
+    private AbsoluteLayout mContainer;
+
+    private boolean mViewVisible;
+    private boolean mShowPlaceholder;
+    private boolean mDestroyed;
+
+    private RectF mLastViewport;
+    private float mLastZoomFactor;
+
+    private ShowViewRunnable mShowViewRunnable;
+
+    private static final float TEXTURE_MAP[] = {
+                0.0f, 1.0f, // top left
+                0.0f, 0.0f, // bottom left
+                1.0f, 1.0f, // top right
+                1.0f, 0.0f, // bottom right
+    };
+
+    public PluginLayer(View view, Rect rect, int maxDimension) {
+        super(new BufferedCairoImage(null, 0, 0, 0), TileLayer.PaintMode.NORMAL);
+
+        mView = view;
+        mContainer = GeckoApp.mAppContext.getPluginContainer();
+        mShowViewRunnable = new ShowViewRunnable(this);
+
+        mView.setWillNotDraw(false);
+        if (mView instanceof SurfaceView) {
+            mSurfaceView = (SurfaceView)view;
+            mSurfaceView.setZOrderOnTop(false);
+            mSurfaceView.setZOrderMediaOverlay(true);
+        }
+
+        mLayoutParams = new PluginLayoutParams(rect, maxDimension);
+    }
+
+    static void addPrefNames(JSONArray prefs) {
+        prefs.put(PREF_PLUGIN_USE_PLACEHOLDER);
+    }
+
+    static boolean setUsePlaceholder(Map<String, Integer> prefs) {
+        Integer usePlaceholder = prefs.get(PREF_PLUGIN_USE_PLACEHOLDER);
+        if (usePlaceholder == null) {
+            return false;
+        }
+
+        sUsePlaceholder = (int)usePlaceholder == 1 ? true : false;
+        Log.i(LOGTAG, "Using plugin placeholder: " + sUsePlaceholder);
+        return true;
+    }
+
+    public void setVisible(boolean newVisible) {
+        if (newVisible && !mShowPlaceholder) {
+            showView();
+        } else {
+            hideView();
+        }
+    }
+
+    private void hideView() {
+        if (mViewVisible) {
+            GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
+                public void run() {
+                    mView.setVisibility(View.GONE);
+                }
+            });
+
+            mViewVisible = false;
+        }
+    }
+
+    private void suspendView() {
+        // Right now we can only show a placeholder ("suspend") a 
+        // SurfaceView plugin (Flash)
+        if (mSurfaceView != null) {
+            hideView();
+
+            GeckoApp.mAppContext.mMainHandler.removeCallbacks(mShowViewRunnable);
+            GeckoApp.mAppContext.mMainHandler.postDelayed(mShowViewRunnable, 250);
+        }
+    }
+
+    public void updateView() {
+        showView(true);
+    }
+
+    public void showView() {
+        showView(false);
+    }
+
+    public void showView(boolean forceUpdate) {
+        if (!mViewVisible || forceUpdate) {
+            GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
+                public void run() {
+                    if (mContainer.indexOfChild(mView) < 0) {
+                        mContainer.addView(mView, mLayoutParams);
+                    } else {
+                        mContainer.updateViewLayout(mView, mLayoutParams);
+                        mView.setVisibility(View.VISIBLE);
+                    }
+                }
+            });
+            mViewVisible = true;
+            mShowPlaceholder = false;
+        }
+    }
+
+    public void destroy() {
+        mDestroyed = true;
+
+        mContainer.removeView(mView);
+        GeckoApp.mAppContext.mMainHandler.removeCallbacks(mShowViewRunnable);
+    }
+
+    public void reset(Rect rect) {
+        mLayoutParams.reset(rect);
+    }
+
+    @Override
+    protected void performUpdates(RenderContext context) {
+        if (mDestroyed)
+            return;
+
+        if (!RectUtils.fuzzyEquals(context.viewport, mLastViewport) ||
+            !FloatUtils.fuzzyEquals(context.zoomFactor, mLastZoomFactor)) {
+
+            // Viewport has changed from the last update
+            
+            if (mLastViewport != null && mSurfaceView != null && !mShowPlaceholder && sUsePlaceholder) {
+                // We have a SurfaceView that we can snapshot for a placeholder, and we are
+                // not currently showing a placeholder.
+
+                Surface surface = mSurfaceView.getHolder().getSurface();
+                SurfaceBits bits = GeckoAppShell.getSurfaceBits(surface);
+                if (bits != null) {
+                    int cairoFormat = -1;
+                    switch (bits.format) {
+                    case PixelFormat.RGBA_8888:
+                        cairoFormat = CairoImage.FORMAT_ARGB32;
+                        break;
+                    case PixelFormat.RGB_565:
+                        cairoFormat = CairoImage.FORMAT_RGB16_565;
+                        break;
+                    default:
+                        Log.w(LOGTAG, "Unable to handle format " + bits.format);
+                        break;
+                    }
+
+                    if (cairoFormat >= 0) {
+                        BufferedCairoImage image = (BufferedCairoImage)mImage;
+                        image.setBuffer(bits.buffer, bits.width, bits.height, cairoFormat);
+
+                        mPosition = new Rect(mLayoutParams.x, mLayoutParams.y, mLayoutParams.x + bits.width, mLayoutParams.y + bits.height);
+                        mPosition.offset(Math.round(mLastViewport.left), Math.round(mLastViewport.top));
+
+                        mResolution = mLastZoomFactor;
+
+                        // We've uploaded the snapshot to the texture now (or will in super.performUpdates)
+                        // so we can draw the placeholder
+                        mShowPlaceholder = true;
+                        super.performUpdates(context);
+                    }
+                }
+            }
+
+            mLastZoomFactor = context.zoomFactor;
+            mLastViewport = context.viewport;
+            mLayoutParams.reposition(context.viewport, context.zoomFactor);
+
+            if (mShowPlaceholder) {
+                suspendView();
+            } else {
+                // We aren't showing the placeholder so we need to update the view position immediately
+                updateView();
+            }
+        }
+    }
+
+    @Override
+    public void draw(RenderContext context) {
+        if (!mShowPlaceholder || mDestroyed || !initialized())
+            return;
+
+        RectF bounds;
+        Rect position = getPosition();
+        RectF viewport = context.viewport;
+
+        bounds = getBounds(context);
+
+        float height = mLayoutParams.height;
+        float left = bounds.left - viewport.left;
+        float top = viewport.height() - (bounds.top + height - viewport.top);
+
+        float[] coords = {
+            //x, y, z, texture_x, texture_y
+            left/viewport.width(), top/viewport.height(), 0,
+            0.0f, mLayoutParams.height / bounds.height(),
+
+            left/viewport.width(), (top+height)/viewport.height(), 0,
+            0.0f, 0.0f,
+
+            (left+mLayoutParams.width)/viewport.width(), top/viewport.height(), 0,
+            mLayoutParams.width / bounds.width(), mLayoutParams.height / bounds.height(),
+
+            (left+mLayoutParams.width)/viewport.width(), (top+height)/viewport.height(), 0,
+            mLayoutParams.width / bounds.width(), 0.0f
+        };
+
+        FloatBuffer coordBuffer = context.coordBuffer;
+        int positionHandle = context.positionHandle;
+        int textureHandle = context.textureHandle;
+
+        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, getTextureID());
+
+        // Make sure we are at position zero in the buffer
+        coordBuffer.position(0);
+        coordBuffer.put(coords);
+
+        // Vertex coordinates are x,y,z starting at position 0 into the buffer.
+        coordBuffer.position(0);
+        GLES20.glVertexAttribPointer(positionHandle, 3, GLES20.GL_FLOAT, false, 20, coordBuffer);
+
+        // Texture coordinates are texture_x, texture_y starting at position 3 into the buffer.
+        coordBuffer.position(3);
+        GLES20.glVertexAttribPointer(textureHandle, 2, GLES20.GL_FLOAT, false, 20, coordBuffer);
+        GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
+    }
+
+    class PluginLayoutParams extends AbsoluteLayout.LayoutParams
+    {
+        private static final String LOGTAG = "GeckoApp.PluginLayoutParams";
+
+        private RectF mRect;
+        private int mMaxDimension;
+        private float mLastResolution;
+
+        public PluginLayoutParams(Rect rect, int maxDimension) {
+            super(0, 0, 0, 0);
+
+            mMaxDimension = maxDimension;
+            reset(rect);
+        }
+
+        private void clampToMaxSize() {
+            if (width > mMaxDimension || height > mMaxDimension) {
+                if (width > height) {
+                    height = Math.round(((float)height/(float)width) * mMaxDimension);
+                    width = mMaxDimension;
+                } else {
+                    width = Math.round(((float)width/(float)height) * mMaxDimension);
+                    height = mMaxDimension;
+                }
+            }
+        }
+
+        public void reset(Rect rect) {
+            mRect = new RectF(rect);
+        }
+
+        public void reposition(RectF viewport, float zoomFactor) {
+
+            RectF scaled = RectUtils.scale(mRect, zoomFactor);
+
+            this.x = Math.round(scaled.left - viewport.left);
+            this.y = Math.round(scaled.top - viewport.top);
+
+            if (!FloatUtils.fuzzyEquals(mLastResolution, zoomFactor)) {
+                width = Math.round(mRect.width() * zoomFactor);
+                height = Math.round(mRect.height() * zoomFactor);
+                mLastResolution = zoomFactor;
+
+                clampToMaxSize();
+            }
+        }
+    }
+
+    class ShowViewRunnable implements Runnable {
+
+        private PluginLayer mLayer;
+
+        public ShowViewRunnable(PluginLayer layer) {
+            mLayer = layer;
+        }
+
+        public void run() {
+            mLayer.showView();
+        }
+    }
+}
\ No newline at end of file
diff --git a/mobile/android/base/gfx/RectUtils.java b/mobile/android/base/gfx/RectUtils.java
index fe9c4ae753b..752ea6fd3f4 100644
--- a/mobile/android/base/gfx/RectUtils.java
+++ b/mobile/android/base/gfx/RectUtils.java
@@ -137,9 +137,14 @@ public final class RectUtils {
     }
 
     public static boolean fuzzyEquals(RectF a, RectF b) {
-        return FloatUtils.fuzzyEquals(a.top, b.top)
-            && FloatUtils.fuzzyEquals(a.left, b.left)
-            && FloatUtils.fuzzyEquals(a.right, b.right)
-            && FloatUtils.fuzzyEquals(a.bottom, b.bottom);
+        if (a == null && b == null)
+            return true;
+        else if ((a == null && b != null) || (a != null && b == null))
+            return false;
+        else
+            return FloatUtils.fuzzyEquals(a.top, b.top)
+                && FloatUtils.fuzzyEquals(a.left, b.left)
+                && FloatUtils.fuzzyEquals(a.right, b.right)
+                && FloatUtils.fuzzyEquals(a.bottom, b.bottom);
     }
 }
diff --git a/mobile/android/base/gfx/SurfaceTextureLayer.java b/mobile/android/base/gfx/SurfaceTextureLayer.java
index ddc69caa372..46d15de9cf1 100644
--- a/mobile/android/base/gfx/SurfaceTextureLayer.java
+++ b/mobile/android/base/gfx/SurfaceTextureLayer.java
@@ -61,6 +61,8 @@ public class SurfaceTextureLayer extends Layer implements SurfaceTexture.OnFrame
     private boolean mHaveFrame;
     private float[] mTextureTransform = new float[16];
 
+    private Rect mPageRect;
+
     private boolean mInverted;
     private boolean mNewInverted;
     private boolean mBlend;
@@ -120,6 +122,9 @@ public class SurfaceTextureLayer extends Layer implements SurfaceTexture.OnFrame
         mHaveFrame = true;
         mInverted = false;
 
+        // We have our own special shaders necessary for rendering the SurfaceTexture
+        this.mUsesDefaultProgram = false;
+
         mSurfaceTexture = new SurfaceTexture(mTextureId);
         mSurfaceTexture.setOnFrameAvailableListener(this);
 
@@ -147,11 +152,10 @@ public class SurfaceTextureLayer extends Layer implements SurfaceTexture.OnFrame
         GeckoApp.mAppContext.requestRender();
     }
 
-    public void update(Rect position, float resolution, boolean inverted, boolean blend) {
-        beginTransaction(); // this is called on the Gecko thread
+    public void update(Rect rect, boolean inverted, boolean blend) {
+        beginTransaction();
 
-        setPosition(position);
-        setResolution(resolution);
+        setPosition(rect);
 
         mNewInverted = inverted;
         mNewBlend = blend;
@@ -239,7 +243,6 @@ public class SurfaceTextureLayer extends Layer implements SurfaceTexture.OnFrame
 
         float[] textureCoords = mInverted ? TEXTURE_MAP_INVERTED : TEXTURE_MAP;
 
-        // Coordinates for the scrollbar's body combined with the texture coordinates
         float[] coords = {
             // x, y, z, texture_x, texture_y
             rect.left/viewWidth, bot/viewHeight, 0,
@@ -270,6 +273,7 @@ public class SurfaceTextureLayer extends Layer implements SurfaceTexture.OnFrame
 
         GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
         GLES20.glUniform1i(mSampleHandle, 0);
+        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, 0);
         GLES20.glBindTexture(LOCAL_GL_TEXTURE_EXTERNAL_OES, mTextureId);
       
         mSurfaceTexture.updateTexImage();
@@ -284,7 +288,7 @@ public class SurfaceTextureLayer extends Layer implements SurfaceTexture.OnFrame
 
         // Texture coordinates are texture_x, texture_y starting at position 3 into the buffer.
         coordBuffer.position(3);
-        GLES20.glVertexAttribPointer(mTextureHandle, 3, GLES20.GL_FLOAT, false, 20,
+        GLES20.glVertexAttribPointer(mTextureHandle, 2, GLES20.GL_FLOAT, false, 20,
                 coordBuffer);
 
         if (mBlend) {
diff --git a/mobile/android/base/gfx/TileLayer.java b/mobile/android/base/gfx/TileLayer.java
index e4bc24b2caf..c42baa5ae1a 100644
--- a/mobile/android/base/gfx/TileLayer.java
+++ b/mobile/android/base/gfx/TileLayer.java
@@ -57,10 +57,11 @@ public abstract class TileLayer extends Layer {
     private static final String LOGTAG = "GeckoTileLayer";
 
     private final Rect mDirtyRect;
-    private final CairoImage mImage;
     private IntSize mSize;
     private int[] mTextureIDs;
 
+    protected final CairoImage mImage;
+
     public enum PaintMode { NORMAL, REPEAT, STRETCH };
     private PaintMode mPaintMode;
 
diff --git a/mobile/android/base/ui/PanZoomController.java b/mobile/android/base/ui/PanZoomController.java
index 045243a206c..136eecee959 100644
--- a/mobile/android/base/ui/PanZoomController.java
+++ b/mobile/android/base/ui/PanZoomController.java
@@ -369,7 +369,6 @@ public class PanZoomController
             }
             cancelTouch();
             startPanning(event.getX(0), event.getY(0), event.getEventTime());
-            GeckoApp.mAppContext.hidePlugins(false /* don't hide layers */);
             GeckoApp.mFormAssistPopup.hide();
             track(event);
             return true;
@@ -564,8 +563,6 @@ public class PanZoomController
             stopAnimationTimer();
         }
 
-        GeckoApp.mAppContext.hidePlugins(false /* don't hide layers */);
-
         mAnimationTimer = new Timer("Animation Timer");
         mAnimationRunnable = runnable;
         mAnimationTimer.scheduleAtFixedRate(new TimerTask() {
@@ -584,8 +581,6 @@ public class PanZoomController
             mAnimationRunnable.terminate();
             mAnimationRunnable = null;
         }
-
-        GeckoApp.mAppContext.showPlugins();
     }
 
     private float getVelocity() {
@@ -761,7 +756,6 @@ public class PanZoomController
         stopAnimationTimer();
 
         // Force a viewport synchronisation
-        GeckoApp.mAppContext.showPlugins();
         mController.setForceRedraw();
         mController.notifyLayerClientOfGeometryChange();
     }
@@ -845,7 +839,6 @@ public class PanZoomController
 
         mState = PanZoomState.PINCHING;
         mLastZoomFocus = new PointF(detector.getFocusX(), detector.getFocusY());
-        GeckoApp.mAppContext.hidePlugins(false /* don't hide layers, only views */);
         GeckoApp.mFormAssistPopup.hide();
         cancelTouch();
 
@@ -913,7 +906,6 @@ public class PanZoomController
         startTouch(detector.getFocusX(), detector.getFocusY(), detector.getEventTime());
 
         // Force a viewport synchronisation
-        GeckoApp.mAppContext.showPlugins();
         mController.setForceRedraw();
         mController.notifyLayerClientOfGeometryChange();
     }
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index dfc763eb3c2..3e9d4e8092b 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -153,7 +153,9 @@ var Strings = {};
 
 var MetadataProvider = {
   getDrawMetadata: function getDrawMetadata() {
-    return JSON.stringify(BrowserApp.selectedTab.getViewport());
+    let viewport = BrowserApp.selectedTab.getViewport();
+    viewport.zoom = BrowserApp.selectedTab._drawZoom;
+    return JSON.stringify(viewport);
   },
 };
 
@@ -1896,7 +1898,7 @@ Tab.prototype = {
       // We make up matching css page dimensions
       cssPageWidth: gScreenWidth / this._zoom,
       cssPageHeight: gScreenHeight / this._zoom,
-      zoom: this._zoom
+      zoom: this._zoom,
     };
 
     // Set the viewport offset to current scroll offset
diff --git a/mozglue/android/APKOpen.cpp b/mozglue/android/APKOpen.cpp
index 819319612e7..843dd32bd65 100644
--- a/mozglue/android/APKOpen.cpp
+++ b/mozglue/android/APKOpen.cpp
@@ -350,6 +350,7 @@ SHELL_WRAPPER8(notifyListCreated, jint, jint, jstring, jstring, jstring, jlong,
 SHELL_WRAPPER7(notifyGotNextMessage, jint, jstring, jstring, jstring, jlong, jint, jlong)
 SHELL_WRAPPER3(notifyReadingMessageListFailed, jint, jint, jlong)
 SHELL_WRAPPER2(notifyFilePickerResult, jstring, jlong)
+SHELL_WRAPPER1_WITH_RETURN(getSurfaceBits, jobject, jobject)
 
 static void * xul_handle = NULL;
 static void * sqlite_handle = NULL;
@@ -766,6 +767,7 @@ loadGeckoLibs(const char *apkName)
   GETFUNC(notifyGotNextMessage);
   GETFUNC(notifyReadingMessageListFailed);
   GETFUNC(notifyFilePickerResult);
+  GETFUNC(getSurfaceBits);
 #undef GETFUNC
   sStartupTimeline = (uint64_t *)__wrap_dlsym(xul_handle, "_ZN7mozilla15StartupTimeline16sStartupTimelineE");
   gettimeofday(&t1, 0);
diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp
index f77d97e95f0..bbb363bb9e9 100644
--- a/widget/android/AndroidBridge.cpp
+++ b/widget/android/AndroidBridge.cpp
@@ -104,11 +104,14 @@ AndroidBridge::Init(JNIEnv *jEnv,
     ALOG_BRIDGE("AndroidBridge::Init");
     jEnv->GetJavaVM(&mJavaVM);
 
+    AutoLocalJNIFrame frame(jEnv);
+
     mJNIEnv = nsnull;
     mThread = nsnull;
     mOpenedGraphicsLibraries = false;
     mHasNativeBitmapAccess = false;
     mHasNativeWindowAccess = false;
+    mHasNativeWindowFallback = false;
 
     mGeckoAppShellClass = (jclass) jEnv->NewGlobalRef(jGeckoAppShellClass);
 
@@ -200,11 +203,30 @@ AndroidBridge::Init(JNIEnv *jEnv,
 
     jStringClass = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("java/lang/String"));
 
+    jSurfaceClass = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("android/view/Surface"));
+
+    PRInt32 apiVersion = 0;
+    if (!GetStaticIntField("android/os/Build$VERSION", "SDK_INT", &apiVersion, jEnv))
+        ALOG_BRIDGE("Failed to find API version");
+
+    if (apiVersion <= 8 /* Froyo */)
+        jSurfacePointerField = jEnv->GetFieldID(jSurfaceClass, "mSurface", "I");
+    else /* not Froyo */
+        jSurfacePointerField = jEnv->GetFieldID(jSurfaceClass, "mNativeSurface", "I");
+
 #ifdef MOZ_JAVA_COMPOSITOR
+    jAddPluginView = jEnv->GetStaticMethodID(jGeckoAppShellClass, "addPluginView", "(Landroid/view/View;IIII)V");
+    jCreateSurface = jEnv->GetStaticMethodID(jGeckoAppShellClass, "createSurface", "()Landroid/view/Surface;");
+    jShowSurface = jEnv->GetStaticMethodID(jGeckoAppShellClass, "showSurface", "(Landroid/view/Surface;IIIIZZ)V");
+    jHideSurface = jEnv->GetStaticMethodID(jGeckoAppShellClass, "hideSurface", "(Landroid/view/Surface;)V");
+    jDestroySurface = jEnv->GetStaticMethodID(jGeckoAppShellClass, "destroySurface", "(Landroid/view/Surface;)V");
+
     jLayerView = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("org/mozilla/gecko/gfx/LayerView"));
 
     AndroidGLController::Init(jEnv);
     AndroidEGLObject::Init(jEnv);
+#else
+    jAddPluginView = jEnv->GetStaticMethodID(jGeckoAppShellClass, "addPluginView", "(Landroid/view/View;DDDD)V"); 
 #endif
 
     InitAndroidJavaWrappers(jEnv);
@@ -1123,12 +1145,15 @@ AndroidBridge::ProvideEGLSurface()
 }
 
 bool
-AndroidBridge::GetStaticIntField(const char *className, const char *fieldName, PRInt32* aInt)
+AndroidBridge::GetStaticIntField(const char *className, const char *fieldName, PRInt32* aInt, JNIEnv* env /* = nsnull */)
 {
     ALOG_BRIDGE("AndroidBridge::GetStaticIntField %s", fieldName);
-    JNIEnv *env = GetJNIEnv();
-    if (!env)
-        return false;
+
+    if (!env) {
+        env = GetJNIEnv();
+        if (!env)
+            return false;
+    }
 
     AutoLocalJNIFrame jniFrame(env, 3);
     jclass cls = env->FindClass(className);
@@ -1145,13 +1170,15 @@ AndroidBridge::GetStaticIntField(const char *className, const char *fieldName, P
 }
 
 bool
-AndroidBridge::GetStaticStringField(const char *className, const char *fieldName, nsAString &result)
+AndroidBridge::GetStaticStringField(const char *className, const char *fieldName, nsAString &result, JNIEnv* env /* = nsnull */)
 {
     ALOG_BRIDGE("AndroidBridge::GetStaticIntField %s", fieldName);
 
-    JNIEnv *env = GetJNIEnv();
-    if (!env)
-        return false;
+    if (!env) {
+        env = GetJNIEnv();
+        if (!env)
+            return false;
+    }
 
     AutoLocalJNIFrame jniFrame(env, 3);
     jclass cls = env->FindClass(className);
@@ -1250,6 +1277,14 @@ AndroidBridge::ExecuteNextRunnable(JNIEnv *env)
     }
 }
 
+void*
+AndroidBridge::GetNativeSurface(JNIEnv* env, jobject surface) {
+    if (!env || !mHasNativeWindowFallback)
+        return nsnull;
+
+    return (void*)env->GetIntField(surface, jSurfacePointerField);
+}
+
 void
 AndroidBridge::OpenGraphicsLibraries()
 {
@@ -1258,6 +1293,7 @@ AndroidBridge::OpenGraphicsLibraries()
         // Android 2.2+ (API level 8)
         mOpenedGraphicsLibraries = true;
         mHasNativeWindowAccess = false;
+        mHasNativeWindowFallback = false;
         mHasNativeBitmapAccess = false;
 
         void *handle = dlopen("libjnigraphics.so", RTLD_LAZY | RTLD_LOCAL);
@@ -1285,6 +1321,24 @@ AndroidBridge::OpenGraphicsLibraries()
 
             ALOG_BRIDGE("Successfully opened libandroid.so, have native window access? %d", mHasNativeWindowAccess);
         }
+
+        if (mHasNativeWindowAccess)
+            return;
+
+        // Look up Surface functions, used for native window (surface) fallback
+        handle = dlopen("libsurfaceflinger_client.so", RTLD_LAZY);
+        if (handle) {
+            Surface_lock = (int (*)(void*, void*, void*, bool))dlsym(handle, "_ZN7android7Surface4lockEPNS0_11SurfaceInfoEPNS_6RegionEb");
+            Surface_unlockAndPost = (int (*)(void*))dlsym(handle, "_ZN7android7Surface13unlockAndPostEv");
+
+            handle = dlopen("libui.so", RTLD_LAZY);
+            if (handle) {
+                Region_constructor = (void (*)(void*))dlsym(handle, "_ZN7android6RegionC1Ev");
+                Region_set = (void (*)(void*, void*))dlsym(handle, "_ZN7android6Region3setERKNS_4RectE");
+
+                mHasNativeWindowFallback = Surface_lock && Surface_unlockAndPost && Region_constructor && Region_set;
+            }
+        }
     }
 }
 
@@ -1773,20 +1827,21 @@ AndroidBridge::HasNativeWindowAccess()
 {
     OpenGraphicsLibraries();
 
-    return mHasNativeWindowAccess;
+    // We have a fallback hack in place, so return true if that will work as well
+    return mHasNativeWindowAccess || mHasNativeWindowFallback;
 }
 
 void*
-AndroidBridge::AcquireNativeWindow(jobject surface)
+AndroidBridge::AcquireNativeWindow(JNIEnv* aEnv, jobject aSurface)
 {
-    if (!HasNativeWindowAccess())
-        return nsnull;
+    OpenGraphicsLibraries();
 
-    JNIEnv *env = GetJNIEnv();
-    if (!env)
+    if (mHasNativeWindowAccess)
+        return ANativeWindow_fromSurface(aEnv, aSurface);
+    else if (mHasNativeWindowFallback)
+        return GetNativeSurface(aEnv, aSurface);
+    else
         return nsnull;
-
-    return ANativeWindow_fromSurface(env, surface);
 }
 
 void
@@ -1795,13 +1850,20 @@ AndroidBridge::ReleaseNativeWindow(void *window)
     if (!window)
         return;
 
-    ANativeWindow_release(window);
+    if (mHasNativeWindowAccess)
+        ANativeWindow_release(window);
+
+    // XXX: we don't ref the pointer we get from the fallback (GetNativeSurface), so we
+    // have nothing to do here. We should probably ref it.
 }
 
 bool
 AndroidBridge::SetNativeWindowFormat(void *window, int width, int height, int format)
 {
-    return ANativeWindow_setBuffersGeometry(window, width, height, format) == 0;
+    if (mHasNativeWindowAccess)
+        return ANativeWindow_setBuffersGeometry(window, width, height, format) == 0;
+    else
+        return false; //unimplemented in fallback
 }
 
 bool
@@ -1829,21 +1891,49 @@ AndroidBridge::LockWindow(void *window, unsigned char **bits, int *width, int *h
         uint32_t reserved[6];
     } ANativeWindow_Buffer;
 
-    int err;
-    ANativeWindow_Buffer buffer;
+    // Very similar to the above, but the 'usage' field is included. We use this
+    // in the fallback case when NDK support is not available
+    typedef struct SurfaceInfo {
+        uint32_t    w;
+        uint32_t    h;
+        uint32_t    s;
+        uint32_t    usage;
+        uint32_t    format;
+        unsigned char* bits;
+        uint32_t    reserved[2];
+    };
 
+    int err;
     *bits = NULL;
     *width = *height = *format = 0;
-    if ((err = ANativeWindow_lock(window, (void*)&buffer, NULL)) != 0) {
-        ALOG_BRIDGE("ANativeWindow_lock failed! (error %d)", err);
-        return false;
-    }
+    
+    if (mHasNativeWindowAccess) {
+        ANativeWindow_Buffer buffer;
 
-    *bits = (unsigned char*)buffer.bits;
-    *width = buffer.width;
-    *height = buffer.height;
-    *format = buffer.format;
-    *stride = buffer.stride;
+        if ((err = ANativeWindow_lock(window, (void*)&buffer, NULL)) != 0) {
+            ALOG_BRIDGE("ANativeWindow_lock failed! (error %d)", err);
+            return false;
+        }
+
+        *bits = (unsigned char*)buffer.bits;
+        *width = buffer.width;
+        *height = buffer.height;
+        *format = buffer.format;
+        *stride = buffer.stride;
+    } else if (mHasNativeWindowFallback) {
+        SurfaceInfo info;
+
+        if ((err = Surface_lock(window, &info, NULL, true)) != 0) {
+            ALOG_BRIDGE("Surface_lock failed! (error %d)", err);
+            return false;
+        }
+
+        *bits = info.bits;
+        *width = info.w;
+        *height = info.h;
+        *format = info.format;
+        *stride = info.s;
+    } else return false;
 
     return true;
 }
@@ -1852,9 +1942,16 @@ bool
 AndroidBridge::UnlockWindow(void* window)
 {
     int err;
-    if ((err = ANativeWindow_unlockAndPost(window)) != 0) {
+
+    if (!HasNativeWindowAccess())
+        return false;
+
+    if (mHasNativeWindowAccess && (err = ANativeWindow_unlockAndPost(window)) != 0) {
         ALOG_BRIDGE("ANativeWindow_unlockAndPost failed! (error %d)", err);
         return false;
+    } else if (mHasNativeWindowFallback && (err = Surface_unlockAndPost(window)) != 0) {
+        ALOG_BRIDGE("Surface_unlockAndPost failed! (error %d)", err);
+        return false;
     }
 
     return true;
@@ -1994,16 +2091,13 @@ AndroidBridge::CreateSurface()
 #ifndef MOZ_JAVA_COMPOSITOR
   return NULL;
 #else
-  AutoLocalJNIFrame frame(1);
+  JNIEnv* env = GetJNIEnv();
+  if (!env)
+    return nsnull;
 
-  JNIEnv* env = GetJNIForThread();
-  jclass cls = env->FindClass("org/mozilla/gecko/GeckoAppShell");
+  AutoLocalJNIFrame frame(env);
 
-  jmethodID method = env->GetStaticMethodID(cls,
-                                            "createSurface",
-                                            "()Landroid/view/Surface;");
-
-  jobject surface = env->CallStaticObjectMethod(cls, method);
+  jobject surface = env->CallStaticObjectMethod(mGeckoAppShellClass, jCreateSurface);
   if (surface)
     env->NewGlobalRef(surface);
   
@@ -2015,15 +2109,13 @@ void
 AndroidBridge::DestroySurface(jobject surface)
 {
 #ifdef MOZ_JAVA_COMPOSITOR
-  AutoLocalJNIFrame frame(1);
+  JNIEnv* env = GetJNIEnv();
+  if (!env)
+    return;
 
-  JNIEnv* env = GetJNIForThread();
-  jclass cls = env->FindClass("org/mozilla/gecko/GeckoAppShell");
+  AutoLocalJNIFrame frame(env);
 
-  jmethodID method = env->GetStaticMethodID(cls,
-                                            "destroySurface",
-                                            "(Landroid/view/Surface;)V");
-  env->CallStaticVoidMethod(cls, method, surface);
+  env->CallStaticVoidMethod(mGeckoAppShellClass, jDestroySurface, surface);
   env->DeleteGlobalRef(surface);
 #endif
 }
@@ -2032,25 +2124,16 @@ void
 AndroidBridge::ShowSurface(jobject surface, const gfxRect& aRect, bool aInverted, bool aBlend)
 {
 #ifdef MOZ_JAVA_COMPOSITOR
-  AutoLocalJNIFrame frame;
+    JNIEnv* env = GetJNIEnv();
+    if (!env)
+        return;
 
-  JNIEnv* env = GetJNIForThread();
-  jclass cls = env->FindClass("org/mozilla/gecko/GeckoAppShell");
+    AutoLocalJNIFrame frame(env);
 
-  nsAutoString metadata;
-  nsCOMPtr<nsIAndroidDrawMetadataProvider> metadataProvider = GetDrawMetadataProvider();
-  metadataProvider->GetDrawMetadata(metadata);
-
-  jstring jMetadata = env->NewString(nsPromiseFlatString(metadata).get(), metadata.Length());
-
-  jmethodID method = env->GetStaticMethodID(cls,
-                                            "showSurface",
-                                            "(Landroid/view/Surface;IIIIZZLjava/lang/String;)V");
-
-  env->CallStaticVoidMethod(cls, method, surface,
-                            (int)aRect.x, (int)aRect.y,
-                            (int)aRect.width, (int)aRect.height,
-                            aInverted, aBlend, jMetadata);
+    env->CallStaticVoidMethod(mGeckoAppShellClass, jShowSurface, surface,
+                             (int)aRect.x, (int)aRect.y,
+                             (int)aRect.width, (int)aRect.height,
+                             aInverted, aBlend);
 #endif
 }
 
@@ -2058,15 +2141,13 @@ void
 AndroidBridge::HideSurface(jobject surface)
 {
 #ifdef MOZ_JAVA_COMPOSITOR
-  AutoLocalJNIFrame frame(1);
+    JNIEnv* env = GetJNIEnv();
+    if (!env)
+        return;
 
-  JNIEnv* env = GetJNIForThread();
-  jclass cls = env->FindClass("org/mozilla/gecko/GeckoAppShell");
+    AutoLocalJNIFrame frame(env);
 
-  jmethodID method = env->GetStaticMethodID(cls,
-                                            "hideSurface",
-                                            "(Landroid/view/Surface;)V");
-  env->CallStaticVoidMethod(cls, method, surface);
+    env->CallStaticVoidMethod(mGeckoAppShellClass, jHideSurface, surface);
 #endif
 }
 
@@ -2120,14 +2201,32 @@ NS_IMETHODIMP nsAndroidBridge::SetBrowserApp(nsIAndroidBrowserApp *aBrowserApp)
 }
 
 void
-AndroidBridge::RemovePluginView(void* surface) {
-  JNIEnv *env = AndroidBridge::GetJNIEnv();
+AndroidBridge::AddPluginView(jobject view, const gfxRect& rect) {
+    JNIEnv *env = AndroidBridge::GetJNIEnv();
+    if (!env)
+        return;
+
+    AndroidBridge::AutoLocalJNIFrame frame(env);
+
+#if MOZ_JAVA_COMPOSITOR
+    env->CallStaticVoidMethod(sBridge->mGeckoAppShellClass,
+                              sBridge->jAddPluginView, view,
+                              (int)rect.x, (int)rect.y, (int)rect.width, (int)rect.height);
+#else
+    env->CallStaticVoidMethod(sBridge->mGeckoAppShellClass,
+                              sBridge->jAddPluginView, view,
+                              rect.x, rect.y, rect.width, rect.height);
+#endif
+}
+
+void
+AndroidBridge::RemovePluginView(jobject view) {
+  JNIEnv *env = GetJNIEnv();
   if (!env)
     return;
 
-  AndroidBridge::AutoLocalJNIFrame frame(env, 1);
-  env->CallStaticVoidMethod(sBridge->mGeckoAppShellClass,
-                            sBridge->jRemovePluginView, surface);
+  AndroidBridge::AutoLocalJNIFrame frame(env);
+  env->CallStaticVoidMethod(mGeckoAppShellClass, jRemovePluginView, view);
 }
 
 extern "C"
diff --git a/widget/android/AndroidBridge.h b/widget/android/AndroidBridge.h
index 028212190fe..361ce05ca49 100644
--- a/widget/android/AndroidBridge.h
+++ b/widget/android/AndroidBridge.h
@@ -181,8 +181,6 @@ public:
 
     static void NotifyIMEChange(const PRUnichar *aText, PRUint32 aTextLen, int aStart, int aEnd, int aNewEnd);
 
-    static void RemovePluginView(void* surface);
-
     /* These are defined in mobile/android/base/GeckoAppShell.java */
     enum {
         SCREENSHOT_THUMBNAIL = 0,
@@ -318,16 +316,23 @@ public:
             }
         }
 
-        ~AutoLocalJNIFrame() {
-            if (!mJNIEnv)
-                return;
-
+        bool CheckForException() {
             jthrowable exception = mJNIEnv->ExceptionOccurred();
             if (exception) {
                 mJNIEnv->ExceptionDescribe();
                 mJNIEnv->ExceptionClear();
+                return true;
             }
 
+            return false;
+        }
+
+        ~AutoLocalJNIFrame() {
+            if (!mJNIEnv)
+                return;
+
+            CheckForException();
+
             mJNIEnv->PopLocalFrame(NULL);
         }
 
@@ -353,9 +358,9 @@ public:
     void RegisterCompositor();
     EGLSurface ProvideEGLSurface();
 
-    bool GetStaticStringField(const char *classID, const char *field, nsAString &result);
+    bool GetStaticStringField(const char *classID, const char *field, nsAString &result, JNIEnv* env = nsnull);
 
-    bool GetStaticIntField(const char *className, const char *fieldName, PRInt32* aInt);
+    bool GetStaticIntField(const char *className, const char *fieldName, PRInt32* aInt, JNIEnv* env = nsnull);
 
     void SetKeepScreenOn(bool on);
 
@@ -385,7 +390,7 @@ public:
 
     bool HasNativeWindowAccess();
 
-    void *AcquireNativeWindow(jobject surface);
+    void *AcquireNativeWindow(JNIEnv* aEnv, jobject aSurface);
     void ReleaseNativeWindow(void *window);
     bool SetNativeWindowFormat(void *window, int width, int height, int format);
 
@@ -433,6 +438,9 @@ public:
     void ShowSurface(jobject surface, const gfxRect& aRect, bool aInverted, bool aBlend);
     void HideSurface(jobject surface);
 
+    void AddPluginView(jobject view, const gfxRect& rect);
+    void RemovePluginView(jobject view);
+
     // This method doesn't take a ScreenOrientation because it's an enum and
     // that would require including the header which requires include IPC
     // headers which requires including basictypes.h which requires a lot of
@@ -468,9 +476,11 @@ protected:
 
     bool mOpenedGraphicsLibraries;
     void OpenGraphicsLibraries();
+    void* GetNativeSurface(JNIEnv* env, jobject surface);
 
     bool mHasNativeBitmapAccess;
     bool mHasNativeWindowAccess;
+    bool mHasNativeWindowFallback;
 
     nsCOMArray<nsIRunnable> mRunnableQueue;
 
@@ -532,7 +542,13 @@ protected:
     jmethodID jHandleGeckoMessage;
     jmethodID jCheckUriVisited;
     jmethodID jMarkUriVisited;
+    jmethodID jAddPluginView;
     jmethodID jRemovePluginView;
+    jmethodID jCreateSurface;
+    jmethodID jShowSurface;
+    jmethodID jHideSurface;
+    jmethodID jDestroySurface;
+
     jmethodID jNotifyPaintedRect;
 
     jmethodID jNumberOfMessages;
@@ -554,6 +570,10 @@ protected:
     jmethodID jLockScreenOrientation;
     jmethodID jUnlockScreenOrientation;
 
+    // For native surface stuff
+    jclass jSurfaceClass;
+    jfieldID jSurfacePointerField;
+
     // stuff we need for CallEglCreateWindowSurface
     jclass jEGLSurfaceImplClass;
     jclass jEGLContextImplClass;
@@ -579,6 +599,11 @@ protected:
 
     int (* ANativeWindow_lock)(void *window, void *outBuffer, void *inOutDirtyBounds);
     int (* ANativeWindow_unlockAndPost)(void *window);
+
+    int (* Surface_lock)(void* surface, void* surfaceInfo, void* region, bool block);
+    int (* Surface_unlockAndPost)(void* surface);
+    void (* Region_constructor)(void* region);
+    void (* Region_set)(void* region, void* rect);
 };
 
 }
diff --git a/widget/android/AndroidJNI.cpp b/widget/android/AndroidJNI.cpp
index 096b30a3059..46ba479bcf4 100644
--- a/widget/android/AndroidJNI.cpp
+++ b/widget/android/AndroidJNI.cpp
@@ -46,6 +46,7 @@
 #include <pthread.h>
 #include <dlfcn.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include "nsAppShell.h"
 #include "nsWindow.h"
@@ -897,5 +898,95 @@ Java_org_mozilla_gecko_GeckoAppShell_notifyFilePickerResult(JNIEnv* jenv, jclass
     NS_DispatchToMainThread(runnable);
 }
 
+static int
+NextPowerOfTwo(int value) {
+    // code taken from http://acius2.blogspot.com/2007/11/calculating-next-power-of-2.html
+    if (0 == value--) {
+        return 1;
+    }
+    value = (value >> 1) | value;
+    value = (value >> 2) | value;
+    value = (value >> 4) | value;
+    value = (value >> 8) | value;
+    value = (value >> 16) | value;
+    return value + 1;
+}
+
+NS_EXPORT jobject JNICALL
+Java_org_mozilla_gecko_GeckoAppShell_getSurfaceBits(JNIEnv* jenv, jclass, jobject surface)
+{
+    static jclass jSurfaceBitsClass = nsnull;
+    static jmethodID jSurfaceBitsCtor = 0;
+    static jfieldID jSurfaceBitsWidth, jSurfaceBitsHeight, jSurfaceBitsFormat, jSurfaceBitsBuffer;
+
+    jobject surfaceBits = nsnull;
+    unsigned char* bitsCopy = nsnull;
+    int dstWidth, dstHeight, dstSize;
+
+    void* window = AndroidBridge::Bridge()->AcquireNativeWindow(jenv, surface);
+    if (!window)
+        return nsnull;
+
+    unsigned char* bits;
+    int srcWidth, srcHeight, format, srcStride;
+
+    // So we lock/unlock once here in order to get whatever is currently the front buffer. It sucks.
+    while (!AndroidBridge::Bridge()->LockWindow(window, &bits, &srcWidth, &srcHeight, &format, &srcStride)) {
+        usleep(1000);
+    }
+    AndroidBridge::Bridge()->UnlockWindow(window);
+
+    // This is lock will result in the front buffer, since the last unlock rotated it to the back. Probably.
+    while (!AndroidBridge::Bridge()->LockWindow(window, &bits, &srcWidth, &srcHeight, &format, &srcStride)) {
+        usleep(1000);
+    }
+
+    // These are from android.graphics.PixelFormat
+    int bpp;
+    switch (format) {
+    case 1: // RGBA_8888
+        bpp = 4;
+        break;
+    case 4: // RGB_565
+        bpp = 2;
+        break;
+    default:
+        goto cleanup;
+    }
+
+    dstWidth = NextPowerOfTwo(srcWidth);
+    dstHeight = NextPowerOfTwo(srcHeight);
+    dstSize = dstWidth * dstHeight * bpp;
+
+    bitsCopy = (unsigned char*)malloc(dstSize);
+    bzero(bitsCopy, dstSize);
+    for (int i = 0; i < srcHeight; i++) {
+        memcpy(bitsCopy + ((dstHeight - i - 1) * dstWidth * bpp), bits + (i * srcStride * bpp), srcStride * bpp);
+    }
+    
+    if (!jSurfaceBitsClass) {
+        jSurfaceBitsClass = (jclass)jenv->NewGlobalRef(jenv->FindClass("org/mozilla/gecko/SurfaceBits"));
+        jSurfaceBitsCtor = jenv->GetMethodID(jSurfaceBitsClass, "<init>", "()V");
+
+        jSurfaceBitsWidth = jenv->GetFieldID(jSurfaceBitsClass, "width", "I");
+        jSurfaceBitsHeight = jenv->GetFieldID(jSurfaceBitsClass, "height", "I");
+        jSurfaceBitsFormat = jenv->GetFieldID(jSurfaceBitsClass, "format", "I");
+        jSurfaceBitsBuffer = jenv->GetFieldID(jSurfaceBitsClass, "buffer", "Ljava/nio/ByteBuffer;");
+    }
+
+    surfaceBits = jenv->NewObject(jSurfaceBitsClass, jSurfaceBitsCtor);
+    jenv->SetIntField(surfaceBits, jSurfaceBitsWidth, dstWidth);
+    jenv->SetIntField(surfaceBits, jSurfaceBitsHeight, dstHeight);
+    jenv->SetIntField(surfaceBits, jSurfaceBitsFormat, format);
+    jenv->SetObjectField(surfaceBits, jSurfaceBitsBuffer, jenv->NewDirectByteBuffer(bitsCopy, dstSize));
+
+cleanup:
+    AndroidBridge::Bridge()->UnlockWindow(window);
+    AndroidBridge::Bridge()->ReleaseNativeWindow(window);
+
+    return surfaceBits;
+}
+
+
 #endif
 }
diff --git a/widget/android/AndroidMediaLayer.cpp b/widget/android/AndroidMediaLayer.cpp
index 1771c2f56b1..ccd8600e55a 100644
--- a/widget/android/AndroidMediaLayer.cpp
+++ b/widget/android/AndroidMediaLayer.cpp
@@ -49,12 +49,12 @@ AndroidMediaLayer::AndroidMediaLayer()
 }
 
 AndroidMediaLayer::~AndroidMediaLayer() {
-  if (mContentData.window) {
+  if (mContentData.window && AndroidBridge::Bridge()) {
     AndroidBridge::Bridge()->ReleaseNativeWindow(mContentData.window);
     mContentData.window = NULL;
   }
 
-  if (mContentData.surface) {
+  if (mContentData.surface && AndroidBridge::Bridge()) {
     AndroidBridge::Bridge()->DestroySurface(mContentData.surface);
     mContentData.surface = NULL;
   }
@@ -64,8 +64,11 @@ AndroidMediaLayer::~AndroidMediaLayer() {
   for (it = mVideoSurfaces.begin(); it != mVideoSurfaces.end(); it++) {
     SurfaceData* data = it->second;
 
-    AndroidBridge::Bridge()->ReleaseNativeWindow(data->window);
-    AndroidBridge::Bridge()->DestroySurface(data->surface);
+    if (AndroidBridge::Bridge()) {
+      AndroidBridge::Bridge()->ReleaseNativeWindow(data->window);
+      AndroidBridge::Bridge()->DestroySurface(data->surface);
+    }
+
     delete data;
   }
 
@@ -73,10 +76,10 @@ AndroidMediaLayer::~AndroidMediaLayer() {
 }
 
 bool AndroidMediaLayer::EnsureContentSurface() {
-  if (!mContentData.surface) {
+  if (!mContentData.surface && AndroidBridge::Bridge()) {
     mContentData.surface = AndroidBridge::Bridge()->CreateSurface();
     if (mContentData.surface) {
-      mContentData.window = AndroidBridge::Bridge()->AcquireNativeWindow(mContentData.surface);
+      mContentData.window = AndroidBridge::Bridge()->AcquireNativeWindow(AndroidBridge::GetJNIEnv(), mContentData.surface);
       AndroidBridge::Bridge()->SetNativeWindowFormat(mContentData.window, 0, 0, AndroidBridge::WINDOW_FORMAT_RGBA_8888);
     }
   }
@@ -92,9 +95,12 @@ void* AndroidMediaLayer::GetNativeWindowForContent() {
 }
 
 void* AndroidMediaLayer::RequestNativeWindowForVideo() {
+  if (!AndroidBridge::Bridge())
+    return NULL;
+
   jobject surface = AndroidBridge::Bridge()->CreateSurface();
   if (surface) {
-    void* window = AndroidBridge::Bridge()->AcquireNativeWindow(surface);
+    void* window = AndroidBridge::Bridge()->AcquireNativeWindow(AndroidBridge::GetJNIEnv(), surface);
     if (window) {
       AndroidBridge::Bridge()->SetNativeWindowFormat(window, 0, 0, AndroidBridge::WINDOW_FORMAT_RGBA_8888);
       mVideoSurfaces[window] = new SurfaceData(surface, window);
@@ -111,7 +117,7 @@ void* AndroidMediaLayer::RequestNativeWindowForVideo() {
 }
 
 void AndroidMediaLayer::ReleaseNativeWindowForVideo(void* aWindow) {
-  if (mVideoSurfaces.find(aWindow) == mVideoSurfaces.end())
+  if (mVideoSurfaces.find(aWindow) == mVideoSurfaces.end() || !AndroidBridge::Bridge())
     return;
 
   SurfaceData* data = mVideoSurfaces[aWindow];
@@ -131,8 +137,8 @@ void AndroidMediaLayer::SetNativeWindowDimensions(void* aWindow, const gfxRect&
   data->dimensions = aDimensions;
 }
 
-void AndroidMediaLayer::UpdatePosition(const gfxRect& aRect, float aZoomLevel) {
-  if (!mVisible)
+void AndroidMediaLayer::UpdatePosition(const gfxRect& aRect) {
+  if (!mVisible || !AndroidBridge::Bridge())
     return;
 
   std::map<void*, SurfaceData*>::iterator it;
@@ -140,13 +146,9 @@ void AndroidMediaLayer::UpdatePosition(const gfxRect& aRect, float aZoomLevel) {
   for (it = mVideoSurfaces.begin(); it != mVideoSurfaces.end(); it++) {
     SurfaceData* data = it->second;
 
-    // The video window dimension we get is not adjusted by zoom factor (unlike the
-    // content window). Fix it up here.
-    gfxRect scaledDimensions = data->dimensions;
-    scaledDimensions.Scale(aZoomLevel);
+    gfxRect videoRect(aRect.x + data->dimensions.x, aRect.y + data->dimensions.y,
+                      data->dimensions.width, data->dimensions.height);
 
-    gfxRect videoRect(aRect.x + scaledDimensions.x, aRect.y + scaledDimensions.y,
-                      scaledDimensions.width, scaledDimensions.height);
     AndroidBridge::Bridge()->ShowSurface(data->surface, videoRect, mInverted, false);
   }
 
@@ -156,7 +158,7 @@ void AndroidMediaLayer::UpdatePosition(const gfxRect& aRect, float aZoomLevel) {
 }
 
 void AndroidMediaLayer::SetVisible(bool aVisible) {
-  if (aVisible == mVisible)
+  if (aVisible == mVisible || !AndroidBridge::Bridge())
     return;
 
   mVisible = aVisible;
diff --git a/widget/android/AndroidMediaLayer.h b/widget/android/AndroidMediaLayer.h
index a5b01e6e080..e957d9b7d8f 100644
--- a/widget/android/AndroidMediaLayer.h
+++ b/widget/android/AndroidMediaLayer.h
@@ -60,7 +60,7 @@ public:
 
   void SetNativeWindowDimensions(void* aWindow, const gfxRect& aDimensions);
 
-  void UpdatePosition(const gfxRect& aRect, float aZoomLevel);
+  void UpdatePosition(const gfxRect& aRect);
 
   bool Inverted() {
     return mInverted;
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index c538fc6a294..db7e8a3cdbe 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -916,7 +916,7 @@ nsWindow::OnGlobalAndroidEvent(AndroidGeckoEvent *ae)
                 AndroidGeckoSurfaceView& sview(AndroidBridge::Bridge()->SurfaceView());
                 jobject surface = sview.GetSurface();
                 if (surface) {
-                    sNativeWindow = AndroidBridge::Bridge()->AcquireNativeWindow(surface);
+                    sNativeWindow = AndroidBridge::Bridge()->AcquireNativeWindow(AndroidBridge::GetJNIEnv(), surface);
                     if (sNativeWindow) {
                         AndroidBridge::Bridge()->SetNativeWindowFormat(sNativeWindow, 0, 0, AndroidBridge::WINDOW_FORMAT_RGB_565);
                     }

From a3cf6c48976d73909901d1a0e43712931cdabd12 Mon Sep 17 00:00:00 2001
From: James Willcox <jwillcox@mozilla.com>
Date: Fri, 27 Apr 2012 16:10:03 -0400
Subject: [PATCH 084/162] Bug 749750 - Correctly ref created Surfaces on
 Android r=blassey

---
 widget/android/AndroidBridge.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp
index bbb363bb9e9..9227b772fe5 100644
--- a/widget/android/AndroidBridge.cpp
+++ b/widget/android/AndroidBridge.cpp
@@ -2099,7 +2099,7 @@ AndroidBridge::CreateSurface()
 
   jobject surface = env->CallStaticObjectMethod(mGeckoAppShellClass, jCreateSurface);
   if (surface)
-    env->NewGlobalRef(surface);
+    surface = env->NewGlobalRef(surface);
   
   return surface;
 #endif

From b49b358199be3681a81f009622a69ec5ee261be6 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Fri, 27 Apr 2012 16:18:21 -0400
Subject: [PATCH 085/162] bug 749649 checked wrong pointer in
 SpeculativeConnect r=honzab

---
 netwerk/base/src/nsIOService.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp
index 5197bf772e1..4e7557f526d 100644
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -640,9 +640,7 @@ nsIOService::LookupProxyInfo(nsIURI *aURI,
         if (NS_FAILED(rv))
             pi = nsnull;
     }
-    *outPI = pi;
-    if (pi)
-        pi.forget();
+    pi.forget(outPI);
 }
 
 
@@ -1281,7 +1279,7 @@ nsIOService::SpeculativeConnect(nsIURI *aURI,
 
     nsCOMPtr<nsISpeculativeConnect> speculativeHandler =
         do_QueryInterface(handler);
-    if (!handler)
+    if (!speculativeHandler)
         return NS_OK;
 
     return speculativeHandler->SpeculativeConnect(aURI,

From 956914dcf652ea11b018da1daae25d0418f6507d Mon Sep 17 00:00:00 2001
From: Eddy Bruel <ejpbruel@mozilla.com>
Date: Fri, 27 Apr 2012 17:09:32 -0400
Subject: [PATCH 086/162] Bug 703537: Removing the fix trap
 r=jorendorff@mozilla.com

---
 .../tests/basic/Proxy-function-freeze.js      | 115 ----------
 js/src/jit-test/tests/basic/bug684348.js      |   4 -
 js/src/jit-test/tests/for-of/proxy-4.js       |  10 -
 .../jit-test/tests/jaeger/globalOptimize-3.js |  18 --
 js/src/jsarray.cpp                            |  20 --
 js/src/jsclass.h                              |  13 +-
 js/src/jscntxtinlines.h                       |   1 -
 js/src/jsobj.cpp                              |  15 +-
 js/src/jsobj.h                                |   2 +-
 js/src/jsproxy.cpp                            | 200 +-----------------
 js/src/jsproxy.h                              |   2 -
 js/src/jsscope.cpp                            |  26 +--
 js/src/jswrapper.cpp                          |  15 --
 js/src/jswrapper.h                            |   1 -
 js/src/jsxml.cpp                              |   9 -
 js/src/tests/e4x/extensions/extensibility.js  |   6 +-
 js/src/vm/Debugger.cpp                        |   3 +-
 js/src/vm/GlobalObject.cpp                    |   3 +-
 js/src/vm/ScopeObject.cpp                     |   1 -
 js/xpconnect/src/XPCWrappedNativeJSOps.cpp    |   1 -
 js/xpconnect/src/dombindings.cpp              |   8 -
 js/xpconnect/src/dombindings.h                |   1 -
 js/xpconnect/src/xpcprivate.h                 |   2 -
 js/xpconnect/wrappers/XrayWrapper.cpp         |   8 -
 js/xpconnect/wrappers/XrayWrapper.h           |   1 -
 25 files changed, 26 insertions(+), 459 deletions(-)
 delete mode 100644 js/src/jit-test/tests/basic/Proxy-function-freeze.js
 delete mode 100644 js/src/jit-test/tests/basic/bug684348.js
 delete mode 100644 js/src/jit-test/tests/for-of/proxy-4.js
 delete mode 100644 js/src/jit-test/tests/jaeger/globalOptimize-3.js

diff --git a/js/src/jit-test/tests/basic/Proxy-function-freeze.js b/js/src/jit-test/tests/basic/Proxy-function-freeze.js
deleted file mode 100644
index 5387da2fd3f..00000000000
--- a/js/src/jit-test/tests/basic/Proxy-function-freeze.js
+++ /dev/null
@@ -1,115 +0,0 @@
-// Once a function proxy has been frozen, its handler's traps are no longer called,
-// but its call traps are.
-
-var callTrapCalls;
-function handleCall() {
-    print('call');
-    callTrapCalls++;
-    return 'favor';
-}
-function handleConstruct() {
-    print('construct');
-    callTrapCalls++;
-    return 'compliment';
-}
-
-var descriptorForX = { configurable: true, enumerable: true, writable: true, value: 42 };
-var trapCalls;
-var handler = {
-    getOwnPropertyNames: function () {
-        print('getOwnPropertyNames');
-        trapCalls++;
-        return ['x'];
-    },
-    getPropertyNames: function() {
-        print('getPropertyNames');
-        trapCalls++;
-        return ['x'];
-    },
-    getOwnPropertyDescriptor: function(name) {
-        print('getOwnPropertyDescriptor');
-        trapCalls++;
-        assertEq(name, 'x');
-        return descriptorForX;
-    },
-    getPropertyDescriptor: function(name) {
-        print('getPropertyDescriptor');
-        trapCalls++;
-        assertEq(name, 'x');
-        return descriptorForX;
-    },
-    defineProperty: function(name, propertyDescriptor) {
-        print('defineProperty');
-        trapCalls++;
-    },
-    delete: function(name) {
-        print('delete');
-        trapCalls++;
-        return false;
-    },
-    fix: function() {
-        print('fix');
-        trapCalls++;
-        return { x: descriptorForX };
-    }
-};
-
-var fp = Proxy.createFunction(handler, handleCall, handleConstruct);
-
-trapCalls = callTrapCalls = 0;
-assertEq(Object.getOwnPropertyNames(fp)[0], 'x');
-assertEq(trapCalls > 0, true);
-assertEq(callTrapCalls, 0);
-
-trapCalls = callTrapCalls = 0;
-assertEq(Object.getOwnPropertyDescriptor(fp, 'x').value, 42);
-assertEq(trapCalls > 0, true);
-assertEq(callTrapCalls, 0);
-
-trapCalls = callTrapCalls = 0;
-assertEq(delete fp.x, false);
-assertEq(trapCalls > 0, true);
-assertEq(callTrapCalls, 0);
-
-trapCalls = callTrapCalls = 0;
-assertEq(fp(), 'favor');
-assertEq(trapCalls, 0);
-assertEq(callTrapCalls, 1);
-
-trapCalls = callTrapCalls = 0;
-assertEq(new fp, 'compliment');
-assertEq(trapCalls, 0);
-assertEq(callTrapCalls, 1);
-
-trapCalls = callTrapCalls = 0;
-Object.freeze(fp);
-assertEq(trapCalls > 0, true);
-assertEq(callTrapCalls, 0);
-
-// Once the proxy has been frozen, its traps should never be invoked any
-// more.
-trapCalls = callTrapCalls = 0;
-assertEq(Object.getOwnPropertyNames(fp)[0], 'x');
-assertEq(trapCalls, 0);
-
-trapCalls = callTrapCalls = 0;
-assertEq(Object.getOwnPropertyDescriptor(fp, 'x').value, 42);
-assertEq(trapCalls, 0);
-
-trapCalls = callTrapCalls = 0;
-assertEq(delete fp.x, false);
-assertEq(trapCalls, 0);
-
-trapCalls = callTrapCalls = 0;
-assertEq(fp(), 'favor');
-assertEq(trapCalls, 0);
-assertEq(callTrapCalls, 1);
-
-trapCalls = callTrapCalls = 0;
-assertEq(new fp, 'compliment');
-assertEq(trapCalls, 0);
-assertEq(callTrapCalls, 1);
-
-trapCalls = callTrapCalls = 0;
-Object.freeze(fp);
-assertEq(trapCalls, 0);
diff --git a/js/src/jit-test/tests/basic/bug684348.js b/js/src/jit-test/tests/basic/bug684348.js
deleted file mode 100644
index 58c064fc4a4..00000000000
--- a/js/src/jit-test/tests/basic/bug684348.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var x = Proxy.create({ fix: function() { return []; } });
-Object.__proto__ = x;
-Object.freeze(x);
-quit();
diff --git a/js/src/jit-test/tests/for-of/proxy-4.js b/js/src/jit-test/tests/for-of/proxy-4.js
deleted file mode 100644
index 2a8cbeb330b..00000000000
--- a/js/src/jit-test/tests/for-of/proxy-4.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// for-of on a fixed (non-trapping) proxy does not call the iterate trap.
-
-load(libdir + "asserts.js");
-
-var p = Proxy.create({
-    iterate: function () { throw "FAIL"; },
-    fix: function () { return {}; }
-});
-Object.preventExtensions(p);
-assertThrowsInstanceOf(function () { for (var v of p) {} }, TypeError);
diff --git a/js/src/jit-test/tests/jaeger/globalOptimize-3.js b/js/src/jit-test/tests/jaeger/globalOptimize-3.js
deleted file mode 100644
index c3f15c19f07..00000000000
--- a/js/src/jit-test/tests/jaeger/globalOptimize-3.js
+++ /dev/null
@@ -1,18 +0,0 @@
-
-y = 30;
-function bar() {
-  assertEq(y, 30);
-  Object.defineProperty(this, 'y', {writable:false});
-  y = 10;
-  assertEq(y, 30);
-}
-bar();
-
-x = 30;
-function foo() {
-  assertEq(x, 30);
-  Object.freeze(this);
-  x = 10;
-  assertEq(x, 30);
-}
-foo();
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index 7b6c4d5a842..120671ee6dc 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -1239,25 +1239,6 @@ array_trace(JSTracer *trc, JSObject *obj)
     MarkArraySlots(trc, initLength, obj->getDenseArrayElements(), "element");
 }
 
-static JSBool
-array_fix(JSContext *cx, JSObject *obj_, bool *success, AutoIdVector *props)
-{
-    RootedVarObject obj(cx, obj_);
-
-    JS_ASSERT(obj->isDenseArray());
-
-    /*
-     * We must slowify dense arrays; otherwise, we'd need to detect assignments to holes,
-     * since that is effectively adding a new property to the array.
-     */
-    if (!JSObject::makeDenseArraySlow(cx, obj) ||
-        !GetPropertyNames(cx, obj, JSITER_HIDDEN | JSITER_OWNONLY, props))
-        return false;
-
-    *success = true;
-    return true;
-}
-
 Class js::ArrayClass = {
     "Array",
     Class::NON_NATIVE | JSCLASS_HAS_CACHED_PROTO(JSProto_Array) | JSCLASS_FOR_OF_ITERATION,
@@ -1314,7 +1295,6 @@ Class js::ArrayClass = {
         array_deleteSpecial,
         NULL,       /* enumerate      */
         array_typeOf,
-        array_fix,
         NULL,       /* thisObject     */
         NULL,       /* clear          */
     }
diff --git a/js/src/jsclass.h b/js/src/jsclass.h
index 1c98f44dd27..a9cf05da9b4 100644
--- a/js/src/jsclass.h
+++ b/js/src/jsclass.h
@@ -235,16 +235,6 @@ typedef JSBool
 typedef JSType
 (* TypeOfOp)(JSContext *cx, JSObject *obj);
 
-/*
- * Prepare to make |obj| non-extensible; in particular, fully resolve its properties.
- * On error, return false.
- * If |obj| is now ready to become non-extensible, set |*fixed| to true and return true.
- * If |obj| refuses to become non-extensible, set |*fixed| to false and return true; the
- * caller will throw an appropriate error.
- */
-typedef JSBool
-(* FixOp)(JSContext *cx, JSObject *obj, bool *fixed, AutoIdVector *props);
-
 typedef JSObject *
 (* ObjectOp)(JSContext *cx, JSObject *obj);
 typedef void
@@ -332,7 +322,6 @@ struct ObjectOps
 
     JSNewEnumerateOp    enumerate;
     TypeOfOp            typeOf;
-    FixOp               fix;
     ObjectOp            thisObject;
     ClearOp             clear;
 };
@@ -340,7 +329,7 @@ struct ObjectOps
 #define JS_NULL_OBJECT_OPS                                                    \
     {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,   \
      NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,        \
-     NULL,NULL,NULL,NULL,NULL,NULL}
+     NULL,NULL,NULL,NULL,NULL}
 
 struct Class
 {
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index 00c6eec5f7a..5584b9489eb 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -349,7 +349,6 @@ CallJSNativeConstructor(JSContext *cx, Native native, const CallArgs &args)
      * (new Object(Object)) returns the callee.
      */
     JS_ASSERT_IF(native != FunctionProxyClass.construct &&
-                 native != CallableObjectClass.construct &&
                  native != js::CallOrConstructBoundFunction &&
                  (!callee->isFunction() || callee->toFunction()->native() != js_Object),
                  !args.rval().isPrimitive() && callee != &args.rval().toObject());
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 53197137646..fa3894fb5a2 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -2468,8 +2468,7 @@ obj_preventExtensions(JSContext *cx, unsigned argc, Value *vp)
     if (!obj->isExtensible())
         return true;
 
-    AutoIdVector props(cx);
-    return obj->preventExtensions(cx, &props);
+    return obj->preventExtensions(cx);
 }
 
 /* static */ inline unsigned
@@ -2489,14 +2488,12 @@ JSObject::sealOrFreeze(JSContext *cx, ImmutabilityType it)
 
     RootedVarObject self(cx, this);
 
+    if (isExtensible() && !preventExtensions(cx))
+        return false;
+
     AutoIdVector props(cx);
-    if (isExtensible()) {
-        if (!preventExtensions(cx, &props))
-            return false;
-    } else {
-        if (!GetPropertyNames(cx, this, JSITER_HIDDEN | JSITER_OWNONLY, &props))
-            return false;
-    }
+    if (!GetPropertyNames(cx, this, JSITER_HIDDEN | JSITER_OWNONLY, &props))
+        return false;
 
     /* preventExtensions must slowify dense arrays, so we can assign to holes without checks. */
     JS_ASSERT(!self->isDenseArray());
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 65e85e0c64d..2d2fbb7fbbe 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -559,7 +559,7 @@ struct JSObject : public js::ObjectImpl
     static inline unsigned getSealedOrFrozenAttributes(unsigned attrs, ImmutabilityType it);
 
   public:
-    bool preventExtensions(JSContext *cx, js::AutoIdVector *props);
+    bool preventExtensions(JSContext *cx);
 
     /* ES5 15.2.3.8: non-extensible, all props non-configurable */
     inline bool seal(JSContext *cx) { return sealOrFreeze(cx, SEAL); }
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index 3299c709224..c749e84c691 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -94,9 +94,6 @@ OperationInProgress(JSContext *cx, JSObject *proxy)
     return false;
 }
 
-static bool
-FixProxy(JSContext *cx, JSObject *proxy, JSBool *bp);
-
 ProxyHandler::ProxyHandler(void *family) : mFamily(family)
 {
 }
@@ -534,7 +531,6 @@ class ScriptedProxyHandler : public ProxyHandler {
     virtual bool getOwnPropertyNames(JSContext *cx, JSObject *proxy, AutoIdVector &props);
     virtual bool delete_(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
     virtual bool enumerate(JSContext *cx, JSObject *proxy, AutoIdVector &props);
-    virtual bool fix(JSContext *cx, JSObject *proxy, Value *vp);
 
     /* ES5 Harmony derived proxy traps. */
     virtual bool has(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
@@ -647,14 +643,6 @@ ScriptedProxyHandler::enumerate(JSContext *cx, JSObject *proxy, AutoIdVector &pr
            ArrayToIdVector(cx, tvr.value(), props);
 }
 
-bool
-ScriptedProxyHandler::fix(JSContext *cx, JSObject *proxy, Value *vp)
-{
-    JSObject *handler = GetProxyHandlerObject(cx, proxy);
-    return GetFundamentalTrap(cx, handler, ATOM(fix), vp) &&
-           Trap(cx, handler, *vp, 0, NULL, vp);
-}
-
 bool
 ScriptedProxyHandler::has(JSContext *cx, JSObject *proxy, jsid id, bool *bp)
 {
@@ -840,14 +828,6 @@ Proxy::enumerate(JSContext *cx, JSObject *proxy, AutoIdVector &props)
     return GetProxyHandler(proxy)->enumerate(cx, proxy, props);
 }
 
-bool
-Proxy::fix(JSContext *cx, JSObject *proxy, Value *vp)
-{
-    JS_CHECK_RECURSION(cx, return false);
-    AutoPendingProxyOperation pending(cx, proxy);
-    return GetProxyHandler(proxy)->fix(cx, proxy, vp);
-}
-
 bool
 Proxy::has(JSContext *cx, JSObject *proxy, jsid id, bool *bp)
 {
@@ -1276,19 +1256,6 @@ proxy_Convert(JSContext *cx, JSObject *proxy, JSType hint, Value *vp)
     return Proxy::defaultValue(cx, proxy, hint, vp);
 }
 
-static JSBool
-proxy_Fix(JSContext *cx, JSObject *obj, bool *fixed, AutoIdVector *props)
-{
-    JS_ASSERT(obj->isProxy());
-    JSBool isFixed;
-    bool ok = FixProxy(cx, obj, &isFixed);
-    if (ok) {
-        *fixed = isFixed;
-        return GetPropertyNames(cx, obj, JSITER_OWNONLY | JSITER_HIDDEN, props);
-    }
-    return false;
-}
-
 static void
 proxy_Finalize(FreeOp *fop, JSObject *obj)
 {
@@ -1363,7 +1330,6 @@ JS_FRIEND_DATA(Class) js::ObjectProxyClass = {
         proxy_DeleteSpecial,
         NULL,                /* enumerate       */
         proxy_TypeOf,
-        proxy_Fix,           /* fix             */
         NULL,                /* thisObject      */
         NULL,                /* clear           */
     }
@@ -1422,7 +1388,6 @@ JS_FRIEND_DATA(Class) js::OuterWindowProxyClass = {
         proxy_DeleteSpecial,
         NULL,                /* enumerate       */
         NULL,                /* typeof          */
-        NULL,                /* fix             */
         NULL,                /* thisObject      */
         NULL,                /* clear           */
     }
@@ -1493,7 +1458,6 @@ JS_FRIEND_DATA(Class) js::FunctionProxyClass = {
         proxy_DeleteSpecial,
         NULL,                /* enumerate       */
         proxy_TypeOf,
-        proxy_Fix,           /* fix             */
         NULL,                /* thisObject      */
         NULL,                /* clear           */
     }
@@ -1606,117 +1570,12 @@ proxy_createFunction(JSContext *cx, unsigned argc, Value *vp)
     return true;
 }
 
-#ifdef DEBUG
-
-static JSBool
-proxy_isTrapping(JSContext *cx, unsigned argc, Value *vp)
-{
-    if (argc < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_MORE_ARGS_NEEDED,
-                             "isTrapping", "0", "s");
-        return false;
-    }
-    JSObject *obj = NonNullObject(cx, vp[2]);
-    if (!obj)
-        return false;
-    vp->setBoolean(obj->isProxy());
-    return true;
-}
-
-static JSBool
-proxy_fix(JSContext *cx, unsigned argc, Value *vp)
-{
-    if (argc < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_MORE_ARGS_NEEDED,
-                             "fix", "0", "s");
-        return false;
-    }
-    JSObject *obj = NonNullObject(cx, vp[2]);
-    if (!obj)
-        return false;
-    if (obj->isProxy()) {
-        JSBool flag;
-        if (!FixProxy(cx, obj, &flag))
-            return false;
-        vp->setBoolean(flag);
-    } else {
-        vp->setBoolean(true);
-    }
-    return true;
-}
-
-#endif
-
 static JSFunctionSpec static_methods[] = {
     JS_FN("create",         proxy_create,          2, 0),
     JS_FN("createFunction", proxy_createFunction,  3, 0),
-#ifdef DEBUG
-    JS_FN("isTrapping",     proxy_isTrapping,      1, 0),
-    JS_FN("fix",            proxy_fix,             1, 0),
-#endif
     JS_FS_END
 };
 
-static const uint32_t JSSLOT_CALLABLE_CALL = 0;
-static const uint32_t JSSLOT_CALLABLE_CONSTRUCT = 1;
-
-static JSBool
-callable_Call(JSContext *cx, unsigned argc, Value *vp)
-{
-    JSObject *callable = &JS_CALLEE(cx, vp).toObject();
-    JS_ASSERT(callable->getClass() == &CallableObjectClass);
-    const Value &fval = callable->getSlot(JSSLOT_CALLABLE_CALL);
-    const Value &thisval = vp[1];
-    bool ok = Invoke(cx, thisval, fval, argc, JS_ARGV(cx, vp), vp);
-    return ok;
-}
-
-JSBool
-callable_Construct(JSContext *cx, unsigned argc, Value *vp)
-{
-    JSObject *callable = &vp[0].toObject();
-    JS_ASSERT(callable->getClass() == &CallableObjectClass);
-    Value fval = callable->getSlot(JSSLOT_CALLABLE_CONSTRUCT);
-    if (fval.isUndefined()) {
-        /* We don't have an explicit constructor so allocate a new object and use the call. */
-        fval = callable->getSlot(JSSLOT_CALLABLE_CALL);
-        JS_ASSERT(fval.isObject());
-
-        /* callable is the constructor, so get callable.prototype is the proto of the new object. */
-        Value protov;
-        if (!callable->getProperty(cx, ATOM(classPrototype), &protov))
-            return false;
-
-        JSObject *proto;
-        if (protov.isObject()) {
-            proto = &protov.toObject();
-        } else {
-            proto = callable->global().getOrCreateObjectPrototype(cx);
-            if (!proto)
-                return false;
-        }
-
-        JSObject *newobj = NewObjectWithGivenProto(cx, &ObjectClass, proto, NULL);
-        if (!newobj)
-            return false;
-
-        /* If the call returns an object, return that, otherwise the original newobj. */
-        Value rval;
-        if (!Invoke(cx, ObjectValue(*newobj), callable->getSlot(JSSLOT_CALLABLE_CALL),
-                    argc, vp + 2, &rval)) {
-            return false;
-        }
-        if (rval.isPrimitive())
-            vp->setObject(*newobj);
-        else
-            *vp = rval;
-        return true;
-    }
-
-    bool ok = Invoke(cx, UndefinedValue(), fval, argc, vp + 2, vp);
-    return ok;
-}
-
 Class js::CallableObjectClass = {
     "Function",
     JSCLASS_HAS_RESERVED_SLOTS(2),
@@ -1729,65 +1588,10 @@ Class js::CallableObjectClass = {
     JS_ConvertStub,
     NULL,                    /* finalize    */
     NULL,                    /* checkAccess */
-    callable_Call,
-    callable_Construct,
+    NULL,                    /* call        */
+    NULL                     /* construct   */
 };
 
-static bool
-FixProxy(JSContext *cx, JSObject *proxy, JSBool *bp)
-{
-    if (OperationInProgress(cx, proxy)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BAD_PROXY_FIX);
-        return false;
-    }
-
-    AutoValueRooter tvr(cx);
-    if (!Proxy::fix(cx, proxy, tvr.addr()))
-        return false;
-    if (tvr.value().isUndefined()) {
-        *bp = false;
-        return true;
-    }
-
-    JSObject *props = NonNullObject(cx, tvr.value());
-    if (!props)
-        return false;
-
-    JSObject *proto = proxy->getProto();
-    JSObject *parent = proxy->getParent();
-    Class *clasp = IsFunctionProxy(proxy) ? &CallableObjectClass : &ObjectClass;
-
-    /*
-     * Make a blank object from the recipe fix provided to us.  This must have
-     * number of fixed slots as the proxy so that we can swap their contents.
-     */
-    gc::AllocKind kind = proxy->getAllocKind();
-    RootedVarObject newborn(cx);
-    newborn = NewObjectWithGivenProto(cx, clasp, proto, parent, kind);
-    if (!newborn)
-        return false;
-
-    if (clasp == &CallableObjectClass) {
-        newborn->setSlot(JSSLOT_CALLABLE_CALL, GetCall(proxy));
-        newborn->setSlot(JSSLOT_CALLABLE_CONSTRUCT, GetConstruct(proxy));
-    }
-
-    {
-        AutoPendingProxyOperation pending(cx, proxy);
-        if (!js_PopulateObject(cx, newborn, props))
-            return false;
-    }
-
-    /* Trade contents between the newborn object and the proxy. */
-    if (!proxy->swap(cx, newborn))
-        return false;
-
-    /* The GC will dispose of the proxy object. */
-
-    *bp = true;
-    return true;
-}
-
 Class js::ProxyClass = {
     "Proxy",
     JSCLASS_HAS_CACHED_PROTO(JSProto_Proxy),
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index 8aeea56ab4e..00771007e40 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -64,7 +64,6 @@ class JS_FRIEND_API(ProxyHandler) {
     virtual bool getOwnPropertyNames(JSContext *cx, JSObject *proxy, AutoIdVector &props) = 0;
     virtual bool delete_(JSContext *cx, JSObject *proxy, jsid id, bool *bp) = 0;
     virtual bool enumerate(JSContext *cx, JSObject *proxy, AutoIdVector &props) = 0;
-    virtual bool fix(JSContext *cx, JSObject *proxy, Value *vp) = 0;
 
     /* ES5 Harmony derived proxy traps. */
     virtual bool has(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
@@ -117,7 +116,6 @@ class Proxy {
     static bool getOwnPropertyNames(JSContext *cx, JSObject *proxy, AutoIdVector &props);
     static bool delete_(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
     static bool enumerate(JSContext *cx, JSObject *proxy, AutoIdVector &props);
-    static bool fix(JSContext *cx, JSObject *proxy, Value *vp);
 
     /* ES5 Harmony derived proxy traps. */
     static bool has(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 0763e00b8e3..d9ec9a49938 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -1082,26 +1082,22 @@ Shape::setObjectParent(JSContext *cx, JSObject *parent, JSObject *proto, Shape *
 }
 
 bool
-JSObject::preventExtensions(JSContext *cx, js::AutoIdVector *props)
+JSObject::preventExtensions(JSContext *cx)
 {
     JS_ASSERT(isExtensible());
 
     RootedVarObject self(cx, this);
 
-    if (props) {
-        if (js::FixOp fix = getOps()->fix) {
-            bool success;
-            if (!fix(cx, this, &success, props))
-                return false;
-            if (!success) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_CHANGE_EXTENSIBILITY);
-                return false;
-            }
-        } else {
-            if (!js::GetPropertyNames(cx, this, JSITER_HIDDEN | JSITER_OWNONLY, props))
-                return false;
-        }
-    }
+    /*
+     * Force lazy properties to be resolved by iterating over the objects' own
+     * properties.
+     */
+    AutoIdVector props(cx);
+    if (!js::GetPropertyNames(cx, this, JSITER_HIDDEN | JSITER_OWNONLY, &props))
+        return false;
+
+    if (this->isDenseArray())
+        this->makeDenseArraySlow(cx, RootedVarObject(cx, this));
 
     return self->setFlag(cx, BaseShape::NOT_EXTENSIBLE, GENERATE_SHAPE);
 }
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index dc18237985f..ea19ca8f687 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -211,13 +211,6 @@ AbstractWrapper::enumerate(JSContext *cx, JSObject *wrapper, AutoIdVector &props
     GET(GetPropertyNames(cx, wrappedObject(wrapper), 0, &props));
 }
 
-bool
-AbstractWrapper::fix(JSContext *cx, JSObject *wrapper, Value *vp)
-{
-    vp->setUndefined();
-    return true;
-}
-
 static bool
 Cond(JSBool b, bool *bp)
 {
@@ -961,7 +954,6 @@ class JS_FRIEND_API(DeadObjectProxy) : public ProxyHandler
     virtual bool getOwnPropertyNames(JSContext *cx, JSObject *wrapper, AutoIdVector &props) MOZ_OVERRIDE;
     virtual bool delete_(JSContext *cx, JSObject *wrapper, jsid id, bool *bp) MOZ_OVERRIDE;
     virtual bool enumerate(JSContext *cx, JSObject *wrapper, AutoIdVector &props) MOZ_OVERRIDE;
-    virtual bool fix(JSContext *cx, JSObject *wrapper, Value *vp) MOZ_OVERRIDE;
 
     /* Spidermonkey extensions. */
     virtual bool call(JSContext *cx, JSObject *proxy, unsigned argc, Value *vp);
@@ -1035,13 +1027,6 @@ DeadObjectProxy::enumerate(JSContext *cx, JSObject *wrapper,
     return false;
 }
 
-bool
-DeadObjectProxy::fix(JSContext *cx, JSObject *wrapper, Value *vp)
-{
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_DEAD_OBJECT);
-    return false;
-}
-
 bool
 DeadObjectProxy::call(JSContext *cx, JSObject *wrapper, unsigned argc, Value *vp)
 {
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index dc56416e9f3..29bf7a7ba3d 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -74,7 +74,6 @@ class JS_FRIEND_API(AbstractWrapper) : public ProxyHandler
     virtual bool getOwnPropertyNames(JSContext *cx, JSObject *wrapper, AutoIdVector &props) MOZ_OVERRIDE;
     virtual bool delete_(JSContext *cx, JSObject *wrapper, jsid id, bool *bp) MOZ_OVERRIDE;
     virtual bool enumerate(JSContext *cx, JSObject *wrapper, AutoIdVector &props) MOZ_OVERRIDE;
-    virtual bool fix(JSContext *cx, JSObject *wrapper, Value *vp) MOZ_OVERRIDE;
 
     /* Policy enforcement traps.
      *
diff --git a/js/src/jsxml.cpp b/js/src/jsxml.cpp
index b01532c45a7..278fb95410c 100644
--- a/js/src/jsxml.cpp
+++ b/js/src/jsxml.cpp
@@ -5164,14 +5164,6 @@ xml_trace(JSTracer *trc, JSObject *obj)
     }
 }
 
-static JSBool
-xml_fix(JSContext *cx, JSObject *obj, bool *success, AutoIdVector *props)
-{
-    JS_ASSERT(obj->isExtensible());
-    *success = false;
-    return true;
-}
-
 static void
 xml_clear(JSContext *cx, JSObject *obj)
 {
@@ -5412,7 +5404,6 @@ JS_FRIEND_DATA(Class) js::XMLClass = {
         xml_deleteSpecial,
         xml_enumerate,
         xml_typeOf,
-        xml_fix,
         NULL,       /* thisObject     */
         xml_clear
     }
diff --git a/js/src/tests/e4x/extensions/extensibility.js b/js/src/tests/e4x/extensions/extensibility.js
index 3ac33bebada..1dc45881751 100644
--- a/js/src/tests/e4x/extensions/extensibility.js
+++ b/js/src/tests/e4x/extensions/extensibility.js
@@ -27,11 +27,11 @@ try
 }
 catch (e)
 {
-  assertEq(e instanceof TypeError, true,
-           "xmlValue.[[Extensible]] cannot be changed");
+  // assertEq(e instanceof TypeError, true,
+  //          "xmlValue.[[Extensible]] cannot be changed");
 }
 
-assertEq(Object.isExtensible(x), true);
+// assertEq(Object.isExtensible(x), true);
 
 
 /******************************************************************************/
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index db5a3935082..5ea2236bbb6 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -3944,8 +3944,7 @@ DebuggerObject_sealHelper(JSContext *cx, unsigned argc, Value *vp, SealHelperOp
             args.rval().setUndefined();
             return true;
         }
-        AutoIdVector props(cx);
-        ok = obj->preventExtensions(cx, &props);
+        ok = obj->preventExtensions(cx);
     }
     if (!ok)
         return false;
diff --git a/js/src/vm/GlobalObject.cpp b/js/src/vm/GlobalObject.cpp
index 87fcea1c592..256e298e277 100644
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -240,8 +240,7 @@ GlobalObject::initFunctionAndObjectClasses(JSContext *cx)
     throwTypeError = js_NewFunction(cx, NULL, ThrowTypeError, 0, 0, self, NULL);
     if (!throwTypeError)
         return NULL;
-    AutoIdVector ids(cx);
-    if (!throwTypeError->preventExtensions(cx, &ids))
+    if (!throwTypeError->preventExtensions(cx))
         return NULL;
     self->setThrowTypeError(throwTypeError);
 
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index 926941fc431..88ba7643896 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -688,7 +688,6 @@ Class js::WithClass = {
         with_DeleteSpecial,
         with_Enumerate,
         with_TypeOf,
-        NULL,             /* fix   */
         with_ThisObject,
         NULL,             /* clear */
     }
diff --git a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
index d50e21c711b..8e6a327c314 100644
--- a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
@@ -885,7 +885,6 @@ XPCWrappedNativeJSClass XPC_WN_NoHelper_JSClass = {
         nsnull, // deleteSpecial
         XPC_WN_JSOp_Enumerate,
         XPC_WN_JSOp_TypeOf_Object,
-        nsnull, // fix
         XPC_WN_JSOp_ThisObject,
         XPC_WN_JSOp_Clear
     }
diff --git a/js/xpconnect/src/dombindings.cpp b/js/xpconnect/src/dombindings.cpp
index 421641d8451..55e9bd6e7f6 100644
--- a/js/xpconnect/src/dombindings.cpp
+++ b/js/xpconnect/src/dombindings.cpp
@@ -806,14 +806,6 @@ ListBase<LC>::enumerate(JSContext *cx, JSObject *proxy, AutoIdVector &props)
            (!proto || js::GetPropertyNames(cx, proto, 0, &props));
 }
 
-template<class LC>
-bool
-ListBase<LC>::fix(JSContext *cx, JSObject *proxy, Value *vp)
-{
-    vp->setUndefined();
-    return true;
-}
-
 template<class LC>
 bool
 ListBase<LC>::hasOwn(JSContext *cx, JSObject *proxy, jsid id, bool *bp)
diff --git a/js/xpconnect/src/dombindings.h b/js/xpconnect/src/dombindings.h
index 5933c13e901..0bb935d39f7 100644
--- a/js/xpconnect/src/dombindings.h
+++ b/js/xpconnect/src/dombindings.h
@@ -214,7 +214,6 @@ public:
     bool getOwnPropertyNames(JSContext *cx, JSObject *proxy, JS::AutoIdVector &props);
     bool delete_(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
     bool enumerate(JSContext *cx, JSObject *proxy, JS::AutoIdVector &props);
-    bool fix(JSContext *cx, JSObject *proxy, JS::Value *vp);
 
     bool has(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
     bool hasOwn(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 40135bfc490..10ee1125e64 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -1417,7 +1417,6 @@ XPC_WN_JSOp_ThisObject(JSContext *cx, JSObject *obj);
         nsnull, /* deleteSpecial */                                           \
         XPC_WN_JSOp_Enumerate,                                                \
         XPC_WN_JSOp_TypeOf_Function,                                          \
-        nsnull, /* fix            */                                          \
         XPC_WN_JSOp_ThisObject,                                               \
         XPC_WN_JSOp_Clear                                                     \
     }
@@ -1454,7 +1453,6 @@ XPC_WN_JSOp_ThisObject(JSContext *cx, JSObject *obj);
         nsnull, /* deleteSpecial */                                           \
         XPC_WN_JSOp_Enumerate,                                                \
         XPC_WN_JSOp_TypeOf_Object,                                            \
-        nsnull, /* fix            */                                          \
         XPC_WN_JSOp_ThisObject,                                               \
         XPC_WN_JSOp_Clear                                                     \
     }
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index 4a5dde0a9c1..69ed63f6b09 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -1326,14 +1326,6 @@ XrayWrapper<Base, Traits>::enumerate(JSContext *cx, JSObject *wrapper, JS::AutoI
     return enumerate(cx, wrapper, 0, props);
 }
 
-template <typename Base, typename Traits>
-bool
-XrayWrapper<Base, Traits>::fix(JSContext *cx, JSObject *proxy, js::Value *vp)
-{
-    vp->setUndefined();
-    return true;
-}
-
 template <typename Base, typename Traits>
 bool
 XrayWrapper<Base, Traits>::get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id,
diff --git a/js/xpconnect/wrappers/XrayWrapper.h b/js/xpconnect/wrappers/XrayWrapper.h
index c7d36fc4b2d..8f969939cf9 100644
--- a/js/xpconnect/wrappers/XrayWrapper.h
+++ b/js/xpconnect/wrappers/XrayWrapper.h
@@ -91,7 +91,6 @@ class XrayWrapper : public Base {
                                      js::AutoIdVector &props);
     virtual bool delete_(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);
     virtual bool enumerate(JSContext *cx, JSObject *wrapper, js::AutoIdVector &props);
-    virtual bool fix(JSContext *cx, JSObject *proxy, js::Value *vp);
 
     /* Derived proxy traps. */
     virtual bool get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id,

From f6ea75f51ccfd767e273218e699f674a7db4d29e Mon Sep 17 00:00:00 2001
From: Marty Rosenberg <mrosenberg@mozilla.com>
Date: Fri, 27 Apr 2012 14:58:03 -0700
Subject: [PATCH 087/162] Specify that the input to a gnu asm statemnt is also
 an output so gcc knows the value in the register gets clobbered (bug 749486,
 r=jbramley)

---
 js/src/vm/NumericConversions.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/vm/NumericConversions.h b/js/src/vm/NumericConversions.h
index dc201c26e8c..0939609570d 100644
--- a/js/src/vm/NumericConversions.h
+++ b/js/src/vm/NumericConversions.h
@@ -226,8 +226,8 @@ ToInt32(double d)
     // will result in a conversion of '0'.
 "   mov     %0, #0\n"
 "9:\n"
-    : "=r" (i), "=&r" (tmp0), "=&r" (tmp1), "=&r" (tmp2)
-    : "r" (d)
+    : "=r" (i), "=&r" (tmp0), "=&r" (tmp1), "=&r" (tmp2), "=&r" (d)
+    : "4" (d)
     : "cc"
         );
     return i;

From eb0bc244a1df1de184a7db8926303c85f068e082 Mon Sep 17 00:00:00 2001
From: David Mandelin <dmandelin@mozilla.com>
Date: Fri, 27 Apr 2012 15:10:54 -0700
Subject: [PATCH 088/162] No bug, add header comments to Memory.h, r=none

---
 js/src/gc/Memory.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/js/src/gc/Memory.h b/js/src/gc/Memory.h
index 30caeba4c70..3d24b2ac507 100644
--- a/js/src/gc/Memory.h
+++ b/js/src/gc/Memory.h
@@ -14,16 +14,21 @@
 namespace js {
 namespace gc {
 
-/*
- * Sanity check that our compiled configuration matches the currently running
- * instance and initialize any runtime data needed for allocation.
- */
+// Sanity check that our compiled configuration matches the currently running
+// instance and initialize any runtime data needed for allocation.
 void InitMemorySubsystem();
 
+// Allocate or deallocate pages from the system with the given alignment.
 void *MapAlignedPages(size_t size, size_t alignment);
 void UnmapPages(void *p, size_t size);
 
+// Tell the OS that the given pages are not in use, so they should not
+// be written to a paging file. This may be a no-op on some platforms.
 bool MarkPagesUnused(void *p, size_t size);
+
+// Undo |MarkPagesUnused|: tell the OS that the given pages are of interest
+// and should be paged in and out normally. This may be a no-op on some
+// platforms.
 bool MarkPagesInUse(void *p, size_t size);
 
 } /* namespace gc */

From 1745afcfa75f05da1f461892556cb028c0e82d5d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@mozilla.com>
Date: Fri, 27 Apr 2012 15:03:12 -0700
Subject: [PATCH 089/162] Bug 745057 part 1 - Abstract StackFrame in
 TypeObject::clearNewScript. r=luke

---
 js/src/jsfun.cpp    |  2 +-
 js/src/jsinfer.cpp  | 25 +++++++++++++------------
 js/src/shell/js.cpp |  2 +-
 js/src/vm/Stack.cpp | 37 +++++++++++++++++++++++++++++++++----
 js/src/vm/Stack.h   | 25 ++++++++-----------------
 5 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index e0952135078..3565fbfc5dd 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -126,7 +126,7 @@ fun_getProperty(JSContext *cx, JSObject *obj, jsid id, Value *vp)
     for (; !iter.done(); ++iter) {
         if (!iter.isFunctionFrame() || iter.isEvalFrame())
             continue;
-        if (iter.callee().toFunction() == fun)
+        if (iter.callee() == fun)
             break;
     }
     if (iter.done())
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index 54d3706a1a3..9a644dc619f 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -3045,14 +3045,16 @@ TypeObject::clearNewScript(JSContext *cx)
      * script keeps track of where each property is initialized so we can walk
      * the stack and fix up any such objects.
      */
+    Vector<uint32_t, 32> pcOffsets(cx);
     for (FrameRegsIter iter(cx); !iter.done(); ++iter) {
-        StackFrame *fp = iter.fp();
-        if (fp->isScriptFrame() && fp->isConstructing() &&
-            fp->fun() == newScript->fun && fp->thisValue().isObject() &&
-            !fp->thisValue().toObject().hasLazyType() &&
-            fp->thisValue().toObject().type() == this) {
-            JSObject *obj = &fp->thisValue().toObject();
-            jsbytecode *pc = iter.pc();
+        pcOffsets.append(uint32_t(iter.pc() - iter.script()->code));
+        if (iter.isConstructing() &&
+            iter.callee() == newScript->fun &&
+            iter.thisv().isObject() &&
+            !iter.thisv().toObject().hasLazyType() &&
+            iter.thisv().toObject().type() == this)
+        {
+            JSObject *obj = &iter.thisv().toObject();
 
             /* Whether all identified 'new' properties have been initialized. */
             bool finished = false;
@@ -3065,9 +3067,10 @@ TypeObject::clearNewScript(JSContext *cx)
              * already finished.
              */
             size_t depth = 0;
+            size_t callDepth = pcOffsets.length() - 1;
+            uint32_t offset = pcOffsets[callDepth];
 
             for (TypeNewScript::Initializer *init = newScript->initializerList;; init++) {
-                uint32_t offset = uint32_t(pc - fp->script()->code);
                 if (init->kind == TypeNewScript::Initializer::SETPROP) {
                     if (!depth && init->offset > offset) {
                         /* Advanced past all properties which have been initialized. */
@@ -3081,11 +3084,9 @@ TypeObject::clearNewScript(JSContext *cx)
                         /* Advanced past all properties which have been initialized. */
                         break;
                     } else if (init->offset == offset) {
-                        StackSegment &seg = cx->stack.space().containingSegment(fp);
-                        if (seg.maybefp() == fp)
+                        if (!callDepth)
                             break;
-                        fp = seg.computeNextFrame(fp);
-                        pc = fp->pcQuadratic(cx->stack);
+                        offset = pcOffsets[--callDepth];
                     } else {
                         /* This call has already finished. */
                         depth = 1;
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index f588bdcbd53..49bbf30b2ee 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -2139,7 +2139,7 @@ DumpStack(JSContext *cx, unsigned argc, Value *vp)
         return false;
 
     StackIter iter(cx);
-    JS_ASSERT(iter.isNativeCall() && iter.callee().toFunction()->native() == DumpStack);
+    JS_ASSERT(iter.isNativeCall() && iter.callee()->native() == DumpStack);
     ++iter;
 
     uint32_t index = 0;
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index d8f58524358..94faf03d338 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -1291,7 +1291,22 @@ StackIter::isNonEvalFunctionFrame() const
     return false;
 }
 
-JSObject &
+bool
+StackIter::isConstructing() const
+{
+    switch (state_) {
+      case DONE:
+        JS_NOT_REACHED("Unexpected state");
+        return false;
+      case SCRIPTED:
+      case NATIVE:
+      case IMPLICIT_NATIVE:
+        return fp()->isConstructing();
+    }
+    return false;
+}
+
+JSFunction *
 StackIter::callee() const
 {
     switch (state_) {
@@ -1299,13 +1314,13 @@ StackIter::callee() const
         break;
       case SCRIPTED:
         JS_ASSERT(isFunctionFrame());
-        return fp()->callee();
+        return fp()->callee().toFunction();
       case NATIVE:
       case IMPLICIT_NATIVE:
-        return nativeArgs().callee();
+        return nativeArgs().callee().toFunction();
     }
     JS_NOT_REACHED("Unexpected state");
-    return *(JSObject *) NULL;
+    return NULL;
 }
 
 Value
@@ -1325,6 +1340,20 @@ StackIter::calleev() const
     return Value();
 }
 
+Value
+StackIter::thisv() const
+{
+    switch (state_) {
+      case DONE:
+        JS_NOT_REACHED("Unexpected state");
+        return Value();
+      case SCRIPTED:
+      case NATIVE:
+      case IMPLICIT_NATIVE:
+        return fp()->thisValue();
+    }
+}
+
 /*****************************************************************************/
 
 AllFramesIter::AllFramesIter(StackSpace &space)
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index 47767bbf880..b34d9743d52 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -1851,41 +1851,32 @@ class StackIter
     bool isFunctionFrame() const;
     bool isEvalFrame() const;
     bool isNonEvalFunctionFrame() const;
+    bool isConstructing() const;
 
     StackFrame *fp() const { JS_ASSERT(isScript()); return fp_; }
     Value      *sp() const { JS_ASSERT(isScript()); return sp_; }
     jsbytecode *pc() const { JS_ASSERT(isScript()); return pc_; }
     JSScript   *script() const { JS_ASSERT(isScript()); return script_; }
-    JSObject   &callee() const;
+    JSFunction *callee() const;
     Value       calleev() const;
+    Value       thisv() const;
 
     CallArgs nativeArgs() const { JS_ASSERT(isNativeCall()); return args_; }
 };
 
 /* A filtering of the StackIter to only stop at scripts. */
-class FrameRegsIter
+class FrameRegsIter : public StackIter
 {
-    StackIter iter_;
-
     void settle() {
-        while (!iter_.done() && !iter_.isScript())
-            ++iter_;
+        while (!done() && !isScript())
+            StackIter::operator++();
     }
 
   public:
     FrameRegsIter(JSContext *cx, StackIter::SavedOption opt = StackIter::STOP_AT_SAVED)
-        : iter_(cx, opt) { settle(); }
+        : StackIter(cx, opt) { settle(); }
 
-    bool done() const { return iter_.done(); }
-    FrameRegsIter &operator++() { ++iter_; settle(); return *this; }
-
-    bool operator==(const FrameRegsIter &rhs) const { return iter_ == rhs.iter_; }
-    bool operator!=(const FrameRegsIter &rhs) const { return iter_ != rhs.iter_; }
-
-    StackFrame *fp() const { return iter_.fp(); }
-    Value      *sp() const { return iter_.sp(); }
-    jsbytecode *pc() const { return iter_.pc(); }
-    JSScript   *script() const { return iter_.script(); }
+    FrameRegsIter &operator++() { StackIter::operator++(); settle(); return *this; }
 };
 
 /*****************************************************************************/

From 27f27c52128f776bcdbdaa555af24f26fa55c768 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@mozilla.com>
Date: Fri, 27 Apr 2012 15:03:12 -0700
Subject: [PATCH 090/162] Bug 745057 part 2 - Rename FrameRegsIter to
 ScriptFrameIter. r=luke

---
 js/src/jsapi.cpp       |  4 ++--
 js/src/jscntxt.cpp     | 15 +++++++--------
 js/src/jsdbgapi.cpp    |  2 +-
 js/src/jsexn.cpp       | 29 +++++++++++------------------
 js/src/jsfun.cpp       |  4 ++--
 js/src/jsinfer.cpp     |  2 +-
 js/src/jsobj.cpp       |  2 +-
 js/src/jsopcode.cpp    |  2 +-
 js/src/jsprvtd.h       |  2 +-
 js/src/jsscript.cpp    |  8 +++-----
 js/src/jsxml.cpp       |  6 +++---
 js/src/shell/js.cpp    |  4 ++--
 js/src/vm/Debugger.cpp |  6 +++---
 js/src/vm/Stack.h      | 10 +++++-----
 14 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index e682b28edfd..5ca89117467 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -6619,7 +6619,7 @@ JS_DescribeScriptedCaller(JSContext *cx, JSScript **script, unsigned *lineno)
     if (lineno)
         *lineno = 0;
 
-    FrameRegsIter i(cx);
+    ScriptFrameIter i(cx);
     if (i.done())
         return JS_FALSE;
 
@@ -6724,7 +6724,7 @@ JS_DecodeInterpretedFunction(JSContext *cx, const void *data, uint32_t length,
 JS_PUBLIC_API(JSObject *)
 JS_GetScriptedGlobal(JSContext *cx)
 {
-    FrameRegsIter i(cx);
+    ScriptFrameIter i(cx);
     if (i.done())
         return JS_GetGlobalForScopeChain(cx);
 
diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 4c9208634ac..4e2719ec11d 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -339,14 +339,13 @@ PopulateReportBlame(JSContext *cx, JSErrorReport *report)
      * Walk stack until we find a frame that is associated with some script
      * rather than a native frame.
      */
-    for (FrameRegsIter iter(cx); !iter.done(); ++iter) {
-        if (iter.fp()->isScriptFrame()) {
-            report->filename = iter.fp()->script()->filename;
-            report->lineno = PCToLineNumber(iter.fp()->script(), iter.pc());
-            report->originPrincipals = iter.fp()->script()->originPrincipals;
-            break;
-        }
-    }
+    ScriptFrameIter iter(cx);
+    if (iter.done())
+        return;
+
+    report->filename = iter.script()->filename;
+    report->lineno = PCToLineNumber(iter.script(), iter.pc());
+    report->originPrincipals = iter.script()->originPrincipals;
 }
 
 /*
diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index 7c9bf01ed5b..c11e243c1e8 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -1797,7 +1797,7 @@ JS_UnwrapObject(JSObject *obj)
 JS_FRIEND_API(JSBool)
 js_CallContextDebugHandler(JSContext *cx)
 {
-    FrameRegsIter iter(cx);
+    ScriptFrameIter iter(cx);
     JS_ASSERT(!iter.done());
 
     jsval rval;
diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index 2ffb32f5457..6eb6314d159 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -292,36 +292,31 @@ InitExnPrivate(JSContext *cx, HandleObject exnObject, HandleString message,
     Vector<JSStackTraceStackElem> frames(cx);
     {
         SuppressErrorsGuard seg(cx);
-        for (FrameRegsIter i(cx); !i.done(); ++i) {
+        for (ScriptFrameIter i(cx); !i.done(); ++i) {
             StackFrame *fp = i.fp();
 
             /*
              * Ask the crystal CAPS ball whether we can see across compartments.
              * NB: this means 'fp' may point to cross-compartment frames.
              */
-            if (checkAccess && fp->isNonEvalFunctionFrame()) {
+            if (checkAccess && i.isNonEvalFunctionFrame()) {
                 Value v = NullValue();
                 jsid callerid = ATOM_TO_JSID(cx->runtime->atomState.callerAtom);
-                if (!checkAccess(cx, &fp->callee(), callerid, JSACC_READ, &v))
+                if (!checkAccess(cx, i.callee(), callerid, JSACC_READ, &v))
                     break;
             }
 
             if (!frames.growBy(1))
                 return false;
             JSStackTraceStackElem &frame = frames.back();
-            if (fp->isNonEvalFunctionFrame())
+            if (i.isNonEvalFunctionFrame())
                 frame.funName = fp->fun()->atom ? fp->fun()->atom : cx->runtime->emptyString;
             else
                 frame.funName = NULL;
-            if (fp->isScriptFrame()) {
-                frame.filename = SaveScriptFilename(cx, fp->script()->filename);
-                if (!frame.filename)
-                    return false;
-                frame.ulineno = PCToLineNumber(fp->script(), i.pc());
-            } else {
-                frame.ulineno = 0;
-                frame.filename = NULL;
-            }
+            frame.filename = SaveScriptFilename(cx, i.script()->filename);
+            if (!frame.filename)
+                return false;
+            frame.ulineno = PCToLineNumber(i.script(), i.pc());
         }
     }
 
@@ -660,9 +655,7 @@ Exception(JSContext *cx, unsigned argc, Value *vp)
     }
 
     /* Find the scripted caller. */
-    FrameRegsIter iter(cx);
-    while (!iter.done() && !iter.fp()->isScriptFrame())
-        ++iter;
+    ScriptFrameIter iter(cx);
 
     /* Set the 'fileName' property. */
     RootedVarString filename(cx);
@@ -673,7 +666,7 @@ Exception(JSContext *cx, unsigned argc, Value *vp)
         args[1].setString(filename);
     } else {
         if (!iter.done()) {
-            filename = FilenameToString(cx, iter.fp()->script()->filename);
+            filename = FilenameToString(cx, iter.script()->filename);
             if (!filename)
                 return false;
         } else {
@@ -687,7 +680,7 @@ Exception(JSContext *cx, unsigned argc, Value *vp)
         if (!ToUint32(cx, args[2], &lineno))
             return false;
     } else {
-        lineno = iter.done() ? 0 : PCToLineNumber(iter.fp()->script(), iter.pc());
+        lineno = iter.done() ? 0 : PCToLineNumber(iter.script(), iter.pc());
     }
 
     int exnType = args.callee().toFunction()->getExtendedSlot(0).toInt32();
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 3565fbfc5dd..fc9485d1789 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -1371,9 +1371,9 @@ js_ReportIsNotFunction(JSContext *cx, const Value *vp, unsigned flags)
      */
     ptrdiff_t spindex = 0;
 
-    FrameRegsIter i(cx);
+    ScriptFrameIter i(cx);
     if (!i.done()) {
-        unsigned depth = js_ReconstructStackDepth(cx, i.fp()->script(), i.pc());
+        unsigned depth = js_ReconstructStackDepth(cx, i.script(), i.pc());
         Value *simsp = i.fp()->base() + depth;
         if (i.fp()->base() <= vp && vp < Min(simsp, i.sp()))
             spindex = vp - simsp;
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index 9a644dc619f..ffc32e52a82 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -3046,7 +3046,7 @@ TypeObject::clearNewScript(JSContext *cx)
      * the stack and fix up any such objects.
      */
     Vector<uint32_t, 32> pcOffsets(cx);
-    for (FrameRegsIter iter(cx); !iter.done(); ++iter) {
+    for (ScriptFrameIter iter(cx); !iter.done(); ++iter) {
         pcOffsets.append(uint32_t(iter.pc() - iter.script()->code));
         if (iter.isConstructing() &&
             iter.callee() == newScript->fun &&
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index fa3894fb5a2..ec0ae6cf379 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -6203,7 +6203,7 @@ JS_FRIEND_API(void)
 js_DumpStackFrame(JSContext *cx, StackFrame *start)
 {
     /* This should only called during live debugging. */
-    FrameRegsIter i(cx, StackIter::GO_THROUGH_SAVED);
+    ScriptFrameIter i(cx, StackIter::GO_THROUGH_SAVED);
     if (!start) {
         if (i.done()) {
             fprintf(stderr, "no stack for cx = %p\n", (void*) cx);
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index b07dc46d8cc..7e6b1ff4e36 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -2720,7 +2720,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, int nb)
              */
             uint32_t format = cs->format;
             bool matchPC = false;
-            FrameRegsIter iter(cx);
+            ScriptFrameIter iter(cx);
             if (!iter.done()) {
                 jsbytecode *npc = iter.pc();
                 if (pc == npc) {
diff --git a/js/src/jsprvtd.h b/js/src/jsprvtd.h
index ff178e4bf55..634938923d2 100644
--- a/js/src/jsprvtd.h
+++ b/js/src/jsprvtd.h
@@ -160,7 +160,7 @@ class StackFrame;
 class StackSegment;
 class StackSpace;
 class ContextStack;
-class FrameRegsIter;
+class ScriptFrameIter;
 class CallReceiver;
 class CallArgs;
 
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index b1b0d8eebba..d3cd66df9c9 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -1719,9 +1719,7 @@ void
 CurrentScriptFileLineOriginSlow(JSContext *cx, const char **file, unsigned *linenop,
                                 JSPrincipals **origin)
 {
-    FrameRegsIter iter(cx);
-    while (!iter.done() && !iter.fp()->isScriptFrame())
-        ++iter;
+    ScriptFrameIter iter(cx);
 
     if (iter.done()) {
         *file = NULL;
@@ -1730,9 +1728,9 @@ CurrentScriptFileLineOriginSlow(JSContext *cx, const char **file, unsigned *line
         return;
     }
 
-    JSScript *script = iter.fp()->script();
+    JSScript *script = iter.script();
     *file = script->filename;
-    *linenop = PCToLineNumber(iter.fp()->script(), iter.pc());
+    *linenop = PCToLineNumber(iter.script(), iter.pc());
     *origin = script->originPrincipals;
 }
 
diff --git a/js/src/jsxml.cpp b/js/src/jsxml.cpp
index 278fb95410c..b3343fa1bf9 100644
--- a/js/src/jsxml.cpp
+++ b/js/src/jsxml.cpp
@@ -1783,12 +1783,12 @@ ParseXMLSource(JSContext *cx, JSString *src)
     xml = NULL;
     filename = NULL;
     lineno = 1;
-    FrameRegsIter i(cx);
+    ScriptFrameIter i(cx);
     if (!i.done()) {
         op = (JSOp) *i.pc();
         if (op == JSOP_TOXML || op == JSOP_TOXMLLIST) {
-            filename = i.fp()->script()->filename;
-            lineno = PCToLineNumber(i.fp()->script(), i.pc());
+            filename = i.script()->filename;
+            lineno = PCToLineNumber(i.script(), i.pc());
             for (endp = srcp + srclen; srcp < endp; srcp++) {
                 if (*srcp == '\n')
                     --lineno;
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 49bbf30b2ee..a1ca01fb311 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -1329,7 +1329,7 @@ TrapHandler(JSContext *cx, JSScript *, jsbytecode *pc, jsval *rval,
 {
     JSString *str = JSVAL_TO_STRING(closure);
 
-    FrameRegsIter iter(cx);
+    ScriptFrameIter iter(cx);
     JS_ASSERT(!iter.done());
 
     JSStackFrame *caller = Jsvalify(iter.fp());
@@ -2683,7 +2683,7 @@ EvalInFrame(JSContext *cx, unsigned argc, jsval *vp)
 
     JS_ASSERT(cx->hasfp());
 
-    FrameRegsIter fi(cx);
+    ScriptFrameIter fi(cx);
     for (uint32_t i = 0; i < upCount; ++i, ++fi) {
         if (!fi.fp()->prev())
             break;
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index 5ea2236bbb6..10a60e46ce9 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -2109,9 +2109,9 @@ class Debugger::ScriptQuery {
          * Since eval scripts have no global, we need to find them via the call
          * stack, where frame's scope tells us the global in use.
          */
-        for (FrameRegsIter fri(cx); !fri.done(); ++fri) {
-            if (fri.fp()->isEvalFrame()) {
-                JSScript *script = fri.fp()->script();
+        for (ScriptFrameIter fri(cx); !fri.done(); ++fri) {
+            if (fri.isEvalFrame()) {
+                JSScript *script = fri.script();
 
                 /*
                  * If eval scripts never have global objects set, then we don't need
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index b34d9743d52..7cc0db6d9c9 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -71,7 +71,7 @@ class DummyFrameGuard;
 class GeneratorFrameGuard;
 
 class CallIter;
-class FrameRegsIter;
+class ScriptFrameIter;
 class AllFramesIter;
 
 class ArgumentsObject;
@@ -582,7 +582,7 @@ class StackFrame
      *   for ( ...; fp; fp = fp->prev())
      *     ... fp->pcQuadratic(cx->stack);
      *
-     * Using next can avoid this, but in most cases prefer FrameRegsIter;
+     * Using next can avoid this, but in most cases prefer ScriptFrameIter;
      * it is amortized O(1).
      *
      *   When I get to the bottom I go back to the top of the stack
@@ -1865,7 +1865,7 @@ class StackIter
 };
 
 /* A filtering of the StackIter to only stop at scripts. */
-class FrameRegsIter : public StackIter
+class ScriptFrameIter : public StackIter
 {
     void settle() {
         while (!done() && !isScript())
@@ -1873,10 +1873,10 @@ class FrameRegsIter : public StackIter
     }
 
   public:
-    FrameRegsIter(JSContext *cx, StackIter::SavedOption opt = StackIter::STOP_AT_SAVED)
+    ScriptFrameIter(JSContext *cx, StackIter::SavedOption opt = StackIter::STOP_AT_SAVED)
         : StackIter(cx, opt) { settle(); }
 
-    FrameRegsIter &operator++() { StackIter::operator++(); settle(); return *this; }
+    ScriptFrameIter &operator++() { StackIter::operator++(); settle(); return *this; }
 };
 
 /*****************************************************************************/

From bf5704b4cf3b7e9188e8b40f0b1617c8e7fc8d8f Mon Sep 17 00:00:00 2001
From: Gregor Wagner <gwagner@mozilla.com>
Date: Fri, 27 Apr 2012 16:21:31 -0700
Subject: [PATCH 091/162] Bug 743336 - Settings API: Add service. r=fabrice

---
 b2g/installer/package-manifest.in             |   2 +
 dom/interfaces/settings/Makefile.in           |   1 +
 .../settings/nsISettingsService.idl           |  27 +++
 dom/settings/Makefile.in                      |   7 +
 dom/settings/SettingsDB.jsm                   |  36 ++++
 dom/settings/SettingsManager.js               |  53 +----
 dom/settings/SettingsQueue.jsm                |  30 +++
 dom/settings/SettingsService.js               | 183 ++++++++++++++++++
 dom/settings/SettingsService.manifest         |   5 +
 dom/settings/tests/Makefile.in                |   3 -
 10 files changed, 295 insertions(+), 52 deletions(-)
 create mode 100644 dom/interfaces/settings/nsISettingsService.idl
 create mode 100644 dom/settings/SettingsDB.jsm
 create mode 100644 dom/settings/SettingsQueue.jsm
 create mode 100644 dom/settings/SettingsService.js
 create mode 100644 dom/settings/SettingsService.manifest

diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index ddc4c0f2812..70befef465b 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -408,6 +408,8 @@
 @BINPATH@/components/messageWakeupService.manifest
 @BINPATH@/components/SettingsManager.js
 @BINPATH@/components/SettingsManager.manifest
+@BINPATH@/components/SettingsService.js
+@BINPATH@/components/SettingsService.manifest
 @BINPATH@/components/nsFilePicker.js
 @BINPATH@/components/nsFilePicker.manifest
 #ifdef MOZ_B2G_RIL
diff --git a/dom/interfaces/settings/Makefile.in b/dom/interfaces/settings/Makefile.in
index df585a98e7c..367a2308f0c 100644
--- a/dom/interfaces/settings/Makefile.in
+++ b/dom/interfaces/settings/Makefile.in
@@ -15,6 +15,7 @@ GRE_MODULE     = 1
 
 XPIDLSRCS =                           \
             nsIDOMSettingsManager.idl \
+            nsISettingsService.idl    \
             $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/interfaces/settings/nsISettingsService.idl b/dom/interfaces/settings/nsISettingsService.idl
new file mode 100644
index 00000000000..3945dd7d91b
--- /dev/null
+++ b/dom/interfaces/settings/nsISettingsService.idl
@@ -0,0 +1,27 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "domstubs.idl"
+
+[scriptable, uuid(83d67430-8516-11e1-b0c4-0800200c9a66)]
+interface nsISettingsServiceCallback : nsISupports
+{
+  [implicit_jscontext]
+  void handle(in DOMString aName, in jsval aResult);
+  [implicit_jscontext]
+  void handleError(in DOMString aErrorMessage);
+};
+
+[scriptable, uuid(3ab3cbc0-8513-11e1-b0c4-0800200c9a66)]
+interface nsISettingsServiceLock : nsISupports
+{
+  void set(in string aName, in jsval aValue, in nsISettingsServiceCallback aCallback);
+  void get(in string aName, in nsISettingsServiceCallback aCallback);
+};
+
+[scriptable, uuid(3458e760-8513-11e1-b0c4-0800200c9a66)]
+interface nsISettingsService : nsISupports
+{
+  nsISettingsServiceLock getLock();
+};
diff --git a/dom/settings/Makefile.in b/dom/settings/Makefile.in
index 65518d35ab6..b096c07fd38 100644
--- a/dom/settings/Makefile.in
+++ b/dom/settings/Makefile.in
@@ -18,6 +18,13 @@ LIBXUL_LIBRARY = 1
 EXTRA_COMPONENTS =         \
   SettingsManager.js       \
   SettingsManager.manifest \
+  SettingsService.js \
+  SettingsService.manifest \
+  $(NULL)
+
+EXTRA_JS_MODULES =   \
+  SettingsQueue.jsm  \
+  SettingsDB.jsm     \
   $(NULL)
 
 ifdef ENABLE_TESTS
diff --git a/dom/settings/SettingsDB.jsm b/dom/settings/SettingsDB.jsm
new file mode 100644
index 00000000000..ddc43c13c8a
--- /dev/null
+++ b/dom/settings/SettingsDB.jsm
@@ -0,0 +1,36 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let EXPORTED_SYMBOLS = ["SettingsDB", "SETTINGSDB_NAME", "SETTINGSSTORE_NAME"];
+
+/* static functions */
+let DEBUG = 0;
+if (DEBUG) {
+  debug = function (s) { dump("-*- SettingsDB: " + s + "\n"); }
+} else {
+  debug = function (s) {}
+}
+
+const SETTINGSDB_NAME = "settings";
+const SETTINGSDB_VERSION = 1;
+const SETTINGSSTORE_NAME = "settings";
+
+Components.utils.import("resource://gre/modules/IndexedDBHelper.jsm");
+
+function SettingsDB() {}
+
+SettingsDB.prototype = {
+
+  __proto__: IndexedDBHelper.prototype,
+
+  createSchema: function createSchema(aDb) {
+    let objectStore = aDb.createObjectStore(SETTINGSSTORE_NAME, { keyPath: "settingName" });
+    objectStore.createIndex("settingValue", "settingValue", { unique: false });
+    debug("Created object stores and indexes");
+  },
+
+  init: function init(aGlobal) {
+      this.initDBHelper(SETTINGSDB_NAME, SETTINGSDB_VERSION, SETTINGSSTORE_NAME, aGlobal);
+  }
+}
diff --git a/dom/settings/SettingsManager.js b/dom/settings/SettingsManager.js
index bc5fadb059c..8ebe66378db 100644
--- a/dom/settings/SettingsManager.js
+++ b/dom/settings/SettingsManager.js
@@ -11,57 +11,12 @@ if (DEBUG)
 else
   debug = function (s) {}
 
-function Queue() {
-  this._queue = [];
-  this._index = 0;
-}
-
-Queue.prototype = {
-  getLength: function() { return (this._queue.length - this._index); },
-
-  isEmpty: function() { return (this._queue.length == 0); },
-
-  enqueue: function(item) { this._queue.push(item); },
-
-  dequeue: function() {
-    if(this.isEmpty())
-      return undefined;
-
-    var item = this._queue[this._index];
-    if (++this._index * 2 >= this._queue.length){
-      this._queue  = this._queue.slice(this._index);
-      this._index = 0;
-    }
-    return item;
-  }
-}
-
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-Cu.import("resource://gre/modules/IndexedDBHelper.jsm");
-
-const DB_NAME = "settings";
-const DB_VERSION = 1;
-const STORE_NAME = "settings";
-
-function SettingsDB() {}
-
-SettingsDB.prototype = {
-  __proto__: IndexedDBHelper.prototype,
-
-  createSchema: function createSchema(aDb) {
-    let objectStore = aDb.createObjectStore(STORE_NAME, { keyPath: "settingName" });
-    objectStore.createIndex("settingValue", "settingValue", { unique: false });
-    debug("Created object stores and indexes");
-  },
-
-  init: function init(aGlobal) {
-      this.initDBHelper(DB_NAME, DB_VERSION, STORE_NAME, aGlobal);
-  }
-}
-
+Cu.import("resource://gre/modules/SettingsQueue.jsm");
+Cu.import("resource://gre/modules/SettingsDB.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
@@ -83,7 +38,7 @@ SettingsLock.prototype = {
   process: function process() {
     let lock = this;
     lock._open = false;
-    let store = lock._transaction.objectStore(STORE_NAME);
+    let store = lock._transaction.objectStore(SETTINGSSTORE_NAME);
 
     while (!lock._requests.isEmpty()) {
       let info = lock._requests.dequeue();
@@ -152,7 +107,7 @@ SettingsLock.prototype = {
       var lock;
       while (lock = this._settingsManager._locks.dequeue()) {
         if (!lock._transaction) {
-          lock._transaction = lock._settingsManager._settingsDB._db.transaction(STORE_NAME, "readwrite");
+          lock._transaction = lock._settingsManager._settingsDB._db.transaction(SETTINGSSTORE_NAME, "readwrite");
         }
         lock.process();
       }
diff --git a/dom/settings/SettingsQueue.jsm b/dom/settings/SettingsQueue.jsm
new file mode 100644
index 00000000000..6f8bb9c791a
--- /dev/null
+++ b/dom/settings/SettingsQueue.jsm
@@ -0,0 +1,30 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let EXPORTED_SYMBOLS = ["Queue"];
+
+function Queue() {
+  this._queue = [];
+  this._index = 0;
+}
+
+Queue.prototype = {
+  getLength: function() { return (this._queue.length - this._index); },
+
+  isEmpty: function() { return (this._queue.length == 0); },
+
+  enqueue: function(item) { this._queue.push(item); },
+
+  dequeue: function() {
+    if(this.isEmpty())
+      return undefined;
+
+    var item = this._queue[this._index];
+    if (++this._index * 2 >= this._queue.length){
+      this._queue  = this._queue.slice(this._index);
+      this._index = 0;
+    }
+    return item;
+  }
+}
diff --git a/dom/settings/SettingsService.js b/dom/settings/SettingsService.js
new file mode 100644
index 00000000000..b08e261ed25
--- /dev/null
+++ b/dom/settings/SettingsService.js
@@ -0,0 +1,183 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict"
+
+/* static functions */
+let DEBUG = 0;
+if (DEBUG)
+  debug = function (s) { dump("-*- SettingsService: " + s + "\n"); }
+else
+  debug = function (s) {}
+
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/SettingsQueue.jsm");
+Cu.import("resource://gre/modules/SettingsDB.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+const nsIClassInfo            = Ci.nsIClassInfo;
+
+const SETTINGSSERVICELOCK_CONTRACTID = "@mozilla.org/settingsServiceLock;1";
+const SETTINGSSERVICELOCK_CID        = Components.ID("{3ab3cbc0-8513-11e1-b0c4-0800200c9a66}");
+const nsISettingsServiceLock         = Ci.nsISettingsServiceLock;
+
+function SettingsServiceLock(aSettingsService)
+{
+  debug("settingsServiceLock constr!");
+  this._open = true;
+  this._requests = new Queue();
+  this._settingsService = aSettingsService;
+  this._transaction = null;
+}
+
+SettingsServiceLock.prototype = {
+
+  process: function process() {
+    debug("process!");
+    let lock = this;
+    lock._open = false;
+    let store = lock._transaction.objectStore(SETTINGSSTORE_NAME);
+
+    while (!lock._requests.isEmpty()) {
+      let info = lock._requests.dequeue();
+      debug("info:" + info.intent);
+      let callback = info.callback;
+      let req;
+      let name = info.name;
+      switch (info.intent) {
+        case "set":
+          let value = info.value;
+          if(typeof(value) == 'object')
+            debug("object name:" + name + ", val: " + JSON.stringify(value));
+          req = store.put({settingName: name, settingValue: value});
+
+          req.onsuccess = function() {
+            debug("set on success");
+            lock._open = true;
+            if (callback)
+              callback.handle(name, value);
+            Services.obs.notifyObservers(lock, "mozsettings-changed", JSON.stringify({
+              key: name,
+              value: value
+            }));
+            lock._open = false;
+          };
+
+          req.onerror = function(event) { callback ? callback.handleError(event.target.errorMessage) : null; };
+          break;
+        case "get":
+          req = store.getAll(name);
+          req.onsuccess = function(event) {
+            debug("Request successful. Record count:" + event.target.result.length);
+            debug("result: " + JSON.stringify(event.target.result));
+            this._open = true;
+            if (callback) {
+              if (event.target.result[0]) {
+                if (event.target.result.length > 1) {
+                  debug("Warning: overloaded setting:" + name);
+                }
+                callback.handle(name, event.target.result[0].settingValue);
+              } else
+                callback.handle(name, null);
+            } else {
+              debug("no callback defined!");
+            }
+            this._open = false;
+          }.bind(lock);
+          req.onerror = function error(event) { callback ? callback.handleError(event.target.errorMessage) : null; };
+          break;
+      }
+    }
+    if (!lock._requests.isEmpty())
+      throw Components.results.NS_ERROR_ABORT;
+    lock._open = true;
+  },
+
+  createTransactionAndProcess: function createTransactionAndProcess() {
+    if (this._settingsService._settingsDB._db) {
+      var lock;
+      while (lock = this._settingsService._locks.dequeue()) {
+        if (!lock._transaction) {
+          lock._transaction = lock._settingsService._settingsDB._db.transaction(SETTINGSSTORE_NAME, "readwrite");
+        }
+        lock.process();
+      }
+      if (!this._requests.isEmpty())
+        this.process();
+    }
+  },
+
+  get: function get(aName, aCallback) {
+    debug("get: " + aName + ", " + aCallback);
+    this._requests.enqueue({ callback: aCallback, intent:"get", name: aName });
+    this.createTransactionAndProcess();
+  },
+
+  set: function set(aName, aValue, aCallback) {
+    debug("set: " + aName + ": " + JSON.stringify(aValue));
+    this._requests.enqueue({ callback: aCallback, intent: "set", name: aName, value: aValue});
+    this.createTransactionAndProcess();
+  },
+
+  classID : SETTINGSSERVICELOCK_CID,
+  QueryInterface : XPCOMUtils.generateQI([nsISettingsServiceLock]),
+
+  classInfo : XPCOMUtils.generateCI({classID: SETTINGSSERVICELOCK_CID,
+                                     contractID: SETTINGSSERVICELOCK_CONTRACTID,
+                                     classDescription: "SettingsServiceLock",
+                                     interfaces: [nsISettingsServiceLock],
+                                     flags: nsIClassInfo.DOM_OBJECT})
+};
+
+const SETTINGSSERVICE_CONTRACTID = "@mozilla.org/settingsService;1";
+const SETTINGSSERVICE_CID        = Components.ID("{3458e760-8513-11e1-b0c4-0800200c9a66}");
+const nsISettingsService         = Ci.nsISettingsService;
+
+let myGlobal = this;
+
+function SettingsService()
+{
+  debug("settingsService Constructor");
+  this._locks = new Queue();
+  var idbManager = Components.classes["@mozilla.org/dom/indexeddb/manager;1"].getService(Ci.nsIIndexedDatabaseManager);
+  idbManager.initWindowless(myGlobal);
+  this._settingsDB = new SettingsDB();
+  this._settingsDB.init(myGlobal);
+}
+
+SettingsService.prototype = {
+
+  nextTick: function nextTick(aCallback, thisObj) {
+    if (thisObj)
+      aCallback = aCallback.bind(thisObj);
+
+    Services.tm.currentThread.dispatch(aCallback, Ci.nsIThread.DISPATCH_NORMAL);
+  },
+
+  getLock: function getLock() {
+    debug("get lock!");
+    var lock = new SettingsServiceLock(this);
+    this._locks.enqueue(lock);
+    this._settingsDB.ensureDB(
+      function() { lock.createTransactionAndProcess(); },
+      function() { dump("ensureDB error cb!\n"); },
+      myGlobal );
+    this.nextTick(function() { this._open = false; }, lock);
+    return lock;
+  },
+
+  classID : SETTINGSSERVICE_CID,
+  QueryInterface : XPCOMUtils.generateQI([nsISettingsService]),
+
+  classInfo : XPCOMUtils.generateCI({classID: SETTINGSSERVICE_CID,
+                                     contractID: SETTINGSSERVICE_CONTRACTID,
+                                     classDescription: "SettingsService",
+                                     interfaces: [nsISettingsService],
+                                     flags: nsIClassInfo.DOM_OBJECT})
+}
+
+const NSGetFactory = XPCOMUtils.generateNSGetFactory([SettingsService, SettingsServiceLock])
diff --git a/dom/settings/SettingsService.manifest b/dom/settings/SettingsService.manifest
new file mode 100644
index 00000000000..1ec54b2c8c3
--- /dev/null
+++ b/dom/settings/SettingsService.manifest
@@ -0,0 +1,5 @@
+component {3ab3cbc0-8513-11e1-b0c4-0800200c9a66} SettingsService.js
+contract @mozilla.org/settingsServiceLock;1 {3ab3cbc0-8513-11e1-b0c4-0800200c9a66}
+
+component {3458e760-8513-11e1-b0c4-0800200c9a66} SettingsService.js
+contract @mozilla.org/settingsService;1 {3458e760-8513-11e1-b0c4-0800200c9a66}
diff --git a/dom/settings/tests/Makefile.in b/dom/settings/tests/Makefile.in
index 777868497a4..fbdd6af547a 100644
--- a/dom/settings/tests/Makefile.in
+++ b/dom/settings/tests/Makefile.in
@@ -11,9 +11,6 @@ relativesrcdir   = dom/settings/tests
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = \

From 11fd487d834eaa18e6ba2b973f1a072a87c6c41a Mon Sep 17 00:00:00 2001
From: David Mandelin <dmandelin@mozilla.com>
Date: Fri, 27 Apr 2012 16:40:10 -0700
Subject: [PATCH 092/162] No bug, update Handle documentation, r=NPOTB

---
 js/src/gc/Root.h | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/js/src/gc/Root.h b/js/src/gc/Root.h
index 37e92e7dd94..4babe71a908 100644
--- a/js/src/gc/Root.h
+++ b/js/src/gc/Root.h
@@ -102,8 +102,9 @@ template <typename T>
 struct RootMethods { };
 
 /*
- * Reference to a stack location rooted for GC. See the "Moving GC Stack
- * Rooting" comment above.
+ * Reference to a T that has been rooted elsewhere. This is most useful
+ * as a parameter type, which guarantees that the T lvalue is properly
+ * rooted. See "Move GC Stack Rooting" above.
  */
 template <typename T>
 class Handle
@@ -116,8 +117,11 @@ class Handle
     }
 
     /*
-     * Get a handle to a location that may not be a Root or RootedVar, but is
-     * marked and updated by the GC.
+     * This may be called only if the location of the T is guaranteed
+     * to be marked (for some reason other than being a Root or RootedVar),
+     * e.g., if it is guaranteed to be reachable from an implicit root.
+     *
+     * Create a Handle from a raw location of a T.
      */
     static Handle fromMarkedLocation(const T *p) {
         Handle h;
@@ -125,7 +129,10 @@ class Handle
         return h;
     }
 
-    /* Get a handle from a rooted stack location, with implicit coercion. */
+    /*
+     * Construct a handle from an explicitly rooted location. This is the
+     * normal way to create a handle.
+     */
     template <typename S> inline Handle(const Root<S> &root);
     template <typename S> inline Handle(const RootedVar<S> &root);
 

From 05e4361cb4c8c79e970ce9e043d6653f24376b33 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Sat, 28 Apr 2012 00:04:47 -0400
Subject: [PATCH 093/162] Bug 727116 - Redirect SurfaceView rendering for Flash
 on Froyo/Gingerbread (add default pref) r=blassey

---
 mobile/android/app/mobile.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 0a917ddb62a..519226ed47d 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -479,6 +479,7 @@ pref("dom.ipc.plugins.enabled", true);
 #endif
 
 pref("plugins.click_to_play", true);
+pref("plugins.use_placeholder", 1);
 
 // process priority
 // higher values give content process less CPU time

From 24e2565bfa68e84c023a7c77211606990389a535 Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Fri, 27 Apr 2012 21:08:30 -0400
Subject: [PATCH 094/162] Bug 743247.  Ensure we don't have an array buffer
 bound when drawing. r=bas

Our C++ code was binding a buffer and leaving it bound. This
avoids that problem by making sure we unbind it before
calling VertexPointerAttrib.

--HG--
extra : rebase_source : ec39fcf4a6a74c2f96765752b0ffb6e38b44f5de
---
 mobile/android/base/gfx/NinePatchTileLayer.java  | 3 +++
 mobile/android/base/gfx/ScrollbarLayer.java      | 3 +++
 mobile/android/base/gfx/SingleTileLayer.java     | 3 +++
 mobile/android/base/gfx/SurfaceTextureLayer.java | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/mobile/android/base/gfx/NinePatchTileLayer.java b/mobile/android/base/gfx/NinePatchTileLayer.java
index f0bcdc50604..6bcbd288d6b 100644
--- a/mobile/android/base/gfx/NinePatchTileLayer.java
+++ b/mobile/android/base/gfx/NinePatchTileLayer.java
@@ -139,6 +139,9 @@ public class NinePatchTileLayer extends TileLayer {
         coordBuffer.position(0);
         coordBuffer.put(coords);
 
+        // Unbind any the current array buffer so we can use client side buffers
+        GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, 0);
+
         // Vertex coordinates are x,y,z starting at position 0 into the buffer.
         coordBuffer.position(0);
         GLES20.glVertexAttribPointer(positionHandle, 3, GLES20.GL_FLOAT, false, 20, coordBuffer);
diff --git a/mobile/android/base/gfx/ScrollbarLayer.java b/mobile/android/base/gfx/ScrollbarLayer.java
index c22878f39ae..2049c0ec80d 100644
--- a/mobile/android/base/gfx/ScrollbarLayer.java
+++ b/mobile/android/base/gfx/ScrollbarLayer.java
@@ -307,6 +307,9 @@ public class ScrollbarLayer extends TileLayer {
         coordBuffer.position(0);
         coordBuffer.put(bodyCoords);
 
+        // Unbind any the current array buffer so we can use client side buffers
+        GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, 0);
+
         // Vertex coordinates are x,y,z starting at position 0 into the buffer.
         coordBuffer.position(0);
         GLES20.glVertexAttribPointer(positionHandle, 3, GLES20.GL_FLOAT, false, 20,
diff --git a/mobile/android/base/gfx/SingleTileLayer.java b/mobile/android/base/gfx/SingleTileLayer.java
index 5c2766c055e..173bdda771a 100644
--- a/mobile/android/base/gfx/SingleTileLayer.java
+++ b/mobile/android/base/gfx/SingleTileLayer.java
@@ -164,6 +164,9 @@ public class SingleTileLayer extends TileLayer {
             coordBuffer.position(0);
             coordBuffer.put(coords);
 
+            // Unbind any the current array buffer so we can use client side buffers
+            GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, 0);
+
             // Vertex coordinates are x,y,z starting at position 0 into the buffer.
             coordBuffer.position(0);
             GLES20.glVertexAttribPointer(positionHandle, 3, GLES20.GL_FLOAT, false, 20, coordBuffer);
diff --git a/mobile/android/base/gfx/SurfaceTextureLayer.java b/mobile/android/base/gfx/SurfaceTextureLayer.java
index 46d15de9cf1..50011529e15 100644
--- a/mobile/android/base/gfx/SurfaceTextureLayer.java
+++ b/mobile/android/base/gfx/SurfaceTextureLayer.java
@@ -281,6 +281,9 @@ public class SurfaceTextureLayer extends Layer implements SurfaceTexture.OnFrame
 
         GLES20.glUniformMatrix4fv(mTextureMatrixHandle, 1, false, mTextureTransform, 0);
 
+        // Unbind any the current array buffer so we can use client side buffers
+        GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, 0);
+        
         // Vertex coordinates are x,y,z starting at position 0 into the buffer.
         coordBuffer.position(0);
         GLES20.glVertexAttribPointer(mPositionHandle, 3, GLES20.GL_FLOAT, false, 20,

From 1f3637c57f40e003fb5d83984de328b68be3245b Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Sat, 28 Apr 2012 00:55:16 -0400
Subject: [PATCH 095/162] Bug 743247. Ensure we don't have an array buffer
 bound when drawing PluginLayer. r=kats

This fixes the same problem in the newly added PluginLayer
---
 mobile/android/base/gfx/PluginLayer.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/gfx/PluginLayer.java b/mobile/android/base/gfx/PluginLayer.java
index f5aa22a9c6d..de9e57c0e8d 100644
--- a/mobile/android/base/gfx/PluginLayer.java
+++ b/mobile/android/base/gfx/PluginLayer.java
@@ -247,6 +247,9 @@ public class PluginLayer extends TileLayer
         coordBuffer.position(0);
         coordBuffer.put(coords);
 
+        // Unbind any the current array buffer so we can use client side buffers
+        GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, 0);
+
         // Vertex coordinates are x,y,z starting at position 0 into the buffer.
         coordBuffer.position(0);
         GLES20.glVertexAttribPointer(positionHandle, 3, GLES20.GL_FLOAT, false, 20, coordBuffer);
@@ -317,4 +320,4 @@ public class PluginLayer extends TileLayer
             mLayer.showView();
         }
     }
-}
\ No newline at end of file
+}

From 04187e5976fe3778ed608e2e515af107073fda2c Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 27 Apr 2012 21:56:31 -0700
Subject: [PATCH 096/162] Examine parentBorder only when parentContext is
 non-null.  (Bug 749860)  r=bzbarsky

---
 layout/style/nsRuleNode.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 344e2d6a7f3..26b9c9a935c 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -5644,14 +5644,14 @@ nsRuleNode::ComputeBorderData(void* aStartStruct,
 
     case eCSSUnit_Inherit: {
       canStoreInRuleTree = false;
-      nsBorderColors *parentColors;
-      parentBorder->GetCompositeColors(side, &parentColors);
-      if (parentColors) {
-        border->EnsureBorderColors();
-        border->ClearBorderColors(side);
-        border->mBorderColors[side] = parentColors->Clone();
-      } else {
-        border->ClearBorderColors(side);
+      border->ClearBorderColors(side);
+      if (parentContext) {
+        nsBorderColors *parentColors;
+        parentBorder->GetCompositeColors(side, &parentColors);
+        if (parentColors) {
+          border->EnsureBorderColors();
+          border->mBorderColors[side] = parentColors->Clone();
+        }
       }
       break;
     }

From 0ab3bf49079921895cd48250a967d3bab459fb34 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Sat, 28 Apr 2012 01:02:19 -0400
Subject: [PATCH 097/162] Bug 749429 - Increase displayport size multiplier
 default to 2000 for fixed-margin and velocity-bias. r=Cwiiis

---
 mobile/android/base/gfx/DisplayPortCalculator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/gfx/DisplayPortCalculator.java b/mobile/android/base/gfx/DisplayPortCalculator.java
index 11d9d336cbc..0f510aacc35 100644
--- a/mobile/android/base/gfx/DisplayPortCalculator.java
+++ b/mobile/android/base/gfx/DisplayPortCalculator.java
@@ -267,7 +267,7 @@ final class DisplayPortCalculator {
         private final float DANGER_ZONE_Y_MULTIPLIER;
 
         FixedMarginStrategy(Map<String, Integer> prefs) {
-            SIZE_MULTIPLIER = getFloatPref(prefs, PREF_DISPLAYPORT_FM_MULTIPLIER, 1500);
+            SIZE_MULTIPLIER = getFloatPref(prefs, PREF_DISPLAYPORT_FM_MULTIPLIER, 2000);
             DANGER_ZONE_X_MULTIPLIER = getFloatPref(prefs, PREF_DISPLAYPORT_FM_DANGER_X, 100);
             DANGER_ZONE_Y_MULTIPLIER = getFloatPref(prefs, PREF_DISPLAYPORT_FM_DANGER_Y, 200);
         }
@@ -340,7 +340,7 @@ final class DisplayPortCalculator {
         private final float DANGER_ZONE_INCR_Y_MULTIPLIER;
 
         VelocityBiasStrategy(Map<String, Integer> prefs) {
-            SIZE_MULTIPLIER = getFloatPref(prefs, PREF_DISPLAYPORT_VB_MULTIPLIER, 1500);
+            SIZE_MULTIPLIER = getFloatPref(prefs, PREF_DISPLAYPORT_VB_MULTIPLIER, 2000);
             VELOCITY_THRESHOLD = GeckoAppShell.getDpi() * getFloatPref(prefs, PREF_DISPLAYPORT_VB_VELOCITY_THRESHOLD, 32);
             REVERSE_BUFFER = getFloatPref(prefs, PREF_DISPLAYPORT_VB_REVERSE_BUFFER, 200);
             DANGER_ZONE_BASE_X_MULTIPLIER = getFloatPref(prefs, PREF_DISPLAYPORT_VB_DANGER_X_BASE, 1000);

From 1d4a9b9d3f6a7a1c2c2dd698635375ab71598bf7 Mon Sep 17 00:00:00 2001
From: Gabor Krizsanits <gkrizsanits@mozilla.com>
Date: Sat, 28 Apr 2012 09:12:27 -0400
Subject: [PATCH 098/162] Bug 735280 - Part 1: Connect XPCWrappedNativeScope
 and Components. r=bholley

---
 js/xpconnect/src/XPCComponents.cpp         |  8 +++++---
 js/xpconnect/src/XPCWrappedNativeScope.cpp | 17 +++++++++++++----
 js/xpconnect/src/xpcprivate.h              |  7 +++++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index a712e196782..15f8ac927b5 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -4245,8 +4245,9 @@ nsXPCComponents::GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
     return NS_ERROR_NOT_AVAILABLE;
 }
 
-nsXPCComponents::nsXPCComponents()
-    :   mInterfaces(nsnull),
+nsXPCComponents::nsXPCComponents(XPCWrappedNativeScope* aScope)
+    :   mScope(aScope),
+        mInterfaces(nsnull),
         mInterfacesByID(nsnull),
         mClasses(nsnull),
         mClassesByID(nsnull),
@@ -4256,6 +4257,7 @@ nsXPCComponents::nsXPCComponents()
         mConstructor(nsnull),
         mUtils(nsnull)
 {
+    MOZ_ASSERT(aScope, "aScope must not be null");
 }
 
 nsXPCComponents::~nsXPCComponents()
@@ -4434,7 +4436,7 @@ nsXPCComponents::AttachNewComponentsObject(XPCCallContext& ccx,
     if (!aGlobal)
         return false;
 
-    nsXPCComponents* components = new nsXPCComponents();
+    nsXPCComponents* components = new nsXPCComponents(aScope);
     if (!components)
         return false;
 
diff --git a/js/xpconnect/src/XPCWrappedNativeScope.cpp b/js/xpconnect/src/XPCWrappedNativeScope.cpp
index 6c5db66ee82..111dcf92632 100644
--- a/js/xpconnect/src/XPCWrappedNativeScope.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeScope.cpp
@@ -190,11 +190,15 @@ XPCWrappedNativeScope::IsDyingScope(XPCWrappedNativeScope *scope)
 void
 XPCWrappedNativeScope::SetComponents(nsXPCComponents* aComponents)
 {
-    NS_IF_ADDREF(aComponents);
-    NS_IF_RELEASE(mComponents);
     mComponents = aComponents;
 }
 
+nsXPCComponents*
+XPCWrappedNativeScope::GetComponents()
+{
+    return mComponents;
+}
+
 // Dummy JS class to let wrappers w/o an xpc prototype share
 // scopes. By doing this we avoid allocating a new scope for every
 // wrapper on creation of the wrapper, and most wrappers won't need
@@ -308,9 +312,14 @@ XPCWrappedNativeScope::~XPCWrappedNativeScope()
     if (mContext)
         mContext->RemoveScope(this);
 
+    // This should not be necessary, since the Components object should die
+    // with the scope but just in case.
+    if (mComponents)
+        mComponents->mScope = nsnull;
+
     // XXX we should assert that we are dead or that xpconnect has shutdown
     // XXX might not want to do this at xpconnect shutdown time???
-    NS_IF_RELEASE(mComponents);
+    mComponents = nsnull;
 
     JSRuntime *rt = mRuntime->GetJSRuntime();
     mGlobalJSObject.finalize(rt);
@@ -906,7 +915,7 @@ XPCWrappedNativeScope::DebugDump(PRInt16 depth)
     XPC_LOG_INDENT();
         XPC_LOG_ALWAYS(("mRuntime @ %x", mRuntime));
         XPC_LOG_ALWAYS(("mNext @ %x", mNext));
-        XPC_LOG_ALWAYS(("mComponents @ %x", mComponents));
+        XPC_LOG_ALWAYS(("mComponents @ %x", mComponents.get()));
         XPC_LOG_ALWAYS(("mGlobalJSObject @ %x", mGlobalJSObject.get()));
         XPC_LOG_ALWAYS(("mPrototypeJSObject @ %x", mPrototypeJSObject.get()));
         XPC_LOG_ALWAYS(("mPrototypeNoHelper @ %x", mPrototypeNoHelper));
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 10ee1125e64..0aef096b843 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -1592,6 +1592,7 @@ public:
     IsDyingScope(XPCWrappedNativeScope *scope);
 
     void SetComponents(nsXPCComponents* aComponents);
+    nsXPCComponents *GetComponents();
     void SetGlobal(XPCCallContext& ccx, JSObject* aGlobal, nsISupports* aNative);
 
     static void InitStatics() { gScopes = nsnull; gDyingScopes = nsnull; }
@@ -1641,7 +1642,7 @@ private:
     Native2WrappedNativeMap*         mWrappedNativeMap;
     ClassInfo2WrappedNativeProtoMap* mWrappedNativeProtoMap;
     ClassInfo2WrappedNativeProtoMap* mMainThreadWrappedNativeProtoMap;
-    nsXPCComponents*                 mComponents;
+    nsRefPtr<nsXPCComponents>        mComponents;
     XPCWrappedNativeScope*           mNext;
     // The JS global object for this scope.  If non-null, this will be the
     // default parent for the XPCWrappedNatives that have us as the scope,
@@ -3894,10 +3895,12 @@ public:
     virtual ~nsXPCComponents();
 
 private:
-    nsXPCComponents();
+    nsXPCComponents(XPCWrappedNativeScope* aScope);
     void ClearMembers();
 
 private:
+    friend class XPCWrappedNativeScope;
+    XPCWrappedNativeScope*          mScope;
     nsXPCComponents_Interfaces*     mInterfaces;
     nsXPCComponents_InterfacesByID* mInterfacesByID;
     nsXPCComponents_Classes*        mClasses;

From f599d5227b96f260dc603016a44c071daaa39fbe Mon Sep 17 00:00:00 2001
From: Gabor Krizsanits <gkrizsanits@mozilla.com>
Date: Sat, 28 Apr 2012 09:12:27 -0400
Subject: [PATCH 099/162] Bug 735280 - Part 2: Add pre-create to
 nsXPComponents. r=bholley

---
 js/xpconnect/src/XPCComponents.cpp | 34 ++++++++++++++++++++++--------
 js/xpconnect/src/nsXPConnect.cpp   |  4 ++--
 js/xpconnect/src/xpcprivate.h      |  6 +++---
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index 15f8ac927b5..d4a94e49ea1 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -4193,7 +4193,8 @@ NS_IMETHODIMP
 nsXPCComponents::GetHelperForLanguage(PRUint32 language,
                                       nsISupports **retval)
 {
-    *retval = nsnull;
+    *retval = static_cast<nsIXPCComponents*>(this);
+    NS_ADDREF(this);
     return NS_OK;
 }
 
@@ -4341,6 +4342,7 @@ nsXPCComponents::GetManager(nsIComponentManager * *aManager)
 #define                             XPC_MAP_WANT_NEWRESOLVE
 #define                             XPC_MAP_WANT_GETPROPERTY
 #define                             XPC_MAP_WANT_SETPROPERTY
+#define                             XPC_MAP_WANT_PRECREATE
 #define XPC_MAP_FLAGS               nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE
 #include "xpc_map_end.h" /* This will #undef the above */
 
@@ -4429,16 +4431,20 @@ nsXPCComponents::SetProperty(nsIXPConnectWrappedNative *wrapper,
 
 // static
 JSBool
-nsXPCComponents::AttachNewComponentsObject(XPCCallContext& ccx,
-                                           XPCWrappedNativeScope* aScope,
-                                           JSObject* aGlobal)
+nsXPCComponents::AttachComponentsObject(XPCCallContext& ccx,
+                                        XPCWrappedNativeScope* aScope,
+                                        JSObject* aGlobal)
 {
     if (!aGlobal)
         return false;
 
-    nsXPCComponents* components = new nsXPCComponents(aScope);
-    if (!components)
-        return false;
+    nsXPCComponents* components = aScope->GetComponents();
+    if (!components) {
+        components = new nsXPCComponents(aScope);
+        if (!components)
+            return false;
+        aScope->SetComponents(components);
+    }
 
     nsCOMPtr<nsIXPCComponents> cholder(components);
 
@@ -4454,8 +4460,6 @@ nsXPCComponents::AttachNewComponentsObject(XPCCallContext& ccx,
     if (!wrapper)
         return false;
 
-    aScope->SetComponents(components);
-
     jsid id = ccx.GetRuntime()->GetStringID(XPCJSRuntime::IDX_COMPONENTS);
     JSObject* obj;
 
@@ -4530,3 +4534,15 @@ nsXPCComponents::CanSetProperty(const nsIID * iid, const PRUnichar *propertyName
     *_retval = nsnull;
     return NS_OK;
 }
+
+NS_IMETHODIMP
+nsXPCComponents::PreCreate(nsISupports *nativeObj, JSContext *cx, JSObject *globalObj, JSObject **parentObj)
+{
+  // this should never happen
+  if (!mScope) {
+      NS_WARNING("mScope must not be null when nsXPCComponents::PreCreate is called");
+      return NS_ERROR_FAILURE;
+  }
+  *parentObj = mScope->GetGlobalJSObject();
+  return NS_OK;
+}
\ No newline at end of file
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 6b643f59b63..b07aae4d996 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -1020,7 +1020,7 @@ nsXPConnect::InitClasses(JSContext * aJSContext, JSObject * aGlobalJSObj)
 
     scope->RemoveWrappedNativeProtos();
 
-    if (!nsXPCComponents::AttachNewComponentsObject(ccx, scope, aGlobalJSObj))
+    if (!nsXPCComponents::AttachComponentsObject(ccx, scope, aGlobalJSObj))
         return UnexpectedFailure(NS_ERROR_FAILURE);
 
     if (XPCPerThreadData::IsMainThread(ccx)) {
@@ -1222,7 +1222,7 @@ nsXPConnect::InitClassesWithNewWrappedGlobal(JSContext * aJSContext,
 
     if (!(aFlags & nsIXPConnect::OMIT_COMPONENTS_OBJECT)) {
         // XPCCallContext gives us an active request needed to save/restore.
-        if (!nsXPCComponents::AttachNewComponentsObject(ccx, wrappedGlobal->GetScope(), global))
+        if (!nsXPCComponents::AttachComponentsObject(ccx, wrappedGlobal->GetScope(), global))
             return UnexpectedFailure(NS_ERROR_FAILURE);
 
         if (XPCPerThreadData::IsMainThread(ccx)) {
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 0aef096b843..16e20129f84 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -3886,9 +3886,9 @@ public:
 
 public:
     static JSBool
-    AttachNewComponentsObject(XPCCallContext& ccx,
-                              XPCWrappedNativeScope* aScope,
-                              JSObject* aGlobal);
+    AttachComponentsObject(XPCCallContext& ccx,
+                           XPCWrappedNativeScope* aScope,
+                           JSObject* aGlobal);
 
     void SystemIsBeingShutDown() {ClearMembers();}
 

From f3b232d770f07bb19a443541631ac978243f7a5e Mon Sep 17 00:00:00 2001
From: Gabor Krizsanits <gkrizsanits@mozilla.com>
Date: Sat, 28 Apr 2012 09:12:28 -0400
Subject: [PATCH 100/162] Bug 735280 - Part 3: Components object specific
 wrapper. r=bholley

---
 caps/tests/mochitest/test_bug246699.html     | 11 +++--
 js/src/tests/js1_5/Regress/regress-328897.js |  6 +--
 js/xpconnect/src/XPCComponents.cpp           | 14 ++++---
 js/xpconnect/src/XPCWrappedNative.cpp        |  6 +++
 js/xpconnect/tests/unit/test_components.js   | 43 ++++++++++++++++++++
 js/xpconnect/tests/unit/xpcshell.ini         |  1 +
 js/xpconnect/wrappers/AccessCheck.cpp        | 25 ++++++++++++
 js/xpconnect/wrappers/AccessCheck.h          |  6 +++
 js/xpconnect/wrappers/FilteringWrapper.cpp   |  8 +++-
 js/xpconnect/wrappers/WrapperFactory.cpp     | 23 +++++++++++
 js/xpconnect/wrappers/WrapperFactory.h       |  6 +++
 11 files changed, 136 insertions(+), 13 deletions(-)
 create mode 100644 js/xpconnect/tests/unit/test_components.js

diff --git a/caps/tests/mochitest/test_bug246699.html b/caps/tests/mochitest/test_bug246699.html
index e06f60d6b2f..8bbb3d5aedf 100644
--- a/caps/tests/mochitest/test_bug246699.html
+++ b/caps/tests/mochitest/test_bug246699.html
@@ -5,14 +5,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=246699
 -->
 <head>
   <title>Test for Bug 246699</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=246699">Mozilla Bug 246699</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-<iframe id="load-frame"></iframe>  
+<iframe id="load-frame"></iframe>
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -21,9 +21,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=246699
  ** Test for Bug 246699
  ** (should produce stack information for caps errors)
  **/
+function isError(e)
+{
+  return e.constructor.name === "Error" || e.constructor.name === "TypeError";
+}
+
 function hasStack(e)
 {
-  return e.constructor.name === "Error" && /inciteCaps/.test(e.stack);
+  return isError(e) && /inciteCaps/.test(e.stack);
 }
 
 function inciteCaps(f)
diff --git a/js/src/tests/js1_5/Regress/regress-328897.js b/js/src/tests/js1_5/Regress/regress-328897.js
index 58cabcf845c..d264ba617f9 100644
--- a/js/src/tests/js1_5/Regress/regress-328897.js
+++ b/js/src/tests/js1_5/Regress/regress-328897.js
@@ -1,4 +1,3 @@
-// |reftest| fails-if(browserIsRemote)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -52,7 +51,7 @@ if (typeof window == 'undefined')
 }
 else
 {
-  expect = /(Script error.|Permission denied for <file:\/\/> to get property XPCComponents.classes)/;
+  expect = /(Script error.|Permission denied to access property 'classes')/;
 
   window._onerror = window.onerror;
   window.onerror = (function (msg, page, line) { 
@@ -64,7 +63,8 @@ else
 
   gDelayTestDriverEnd = true;
 
-  window.location="javascript:Components.classes";
+  // Trying to set Components.classes will trigger a Permission denied exception
+  window.location="javascript:Components.classes = 42";
   actual = 'No Error';
 }
 
diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index d4a94e49ea1..dd58600296e 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -60,6 +60,7 @@
 #include "nsContentUtils.h"
 #include "jsgc.h"
 #include "jsfriendapi.h"
+#include "AccessCheck.h"
 #include "mozilla/dom/bindings/Utils.h"
 
 using namespace mozilla;
@@ -4461,12 +4462,13 @@ nsXPCComponents::AttachComponentsObject(XPCCallContext& ccx,
         return false;
 
     jsid id = ccx.GetRuntime()->GetStringID(XPCJSRuntime::IDX_COMPONENTS);
-    JSObject* obj;
-
-    return NS_SUCCEEDED(wrapper->GetJSObject(&obj)) &&
-           obj && JS_DefinePropertyById(ccx, aGlobal, id, OBJECT_TO_JSVAL(obj),
-                                        nsnull, nsnull,
-                                        JSPROP_PERMANENT | JSPROP_READONLY);
+    JSObject* obj = wrapper->GetSameCompartmentSecurityWrapper(ccx);
+    if (!wrapper)
+        return false;
+   
+    return JS_DefinePropertyById(ccx, aGlobal, id, OBJECT_TO_JSVAL(obj),
+                                 nsnull, nsnull,
+                                 JSPROP_PERMANENT | JSPROP_READONLY);
 }
 
 /* void lookupMethod (); */
diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
index 89391e50e47..8a4680bb1f5 100644
--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -1683,6 +1683,8 @@ XPCWrappedNative::ReparentWrapperIfFound(XPCCallContext& ccx,
                 JSObject *ww = wrapper->GetWrapper();
                 if (ww) {
                     JSObject *newwrapper;
+                    MOZ_ASSERT(!xpc::WrapperFactory::IsComponentsObject(flat), 
+                               "Components object should never get here");
                     if (xpc::WrapperFactory::IsLocationObject(flat)) {
                         newwrapper = xpc::WrapperFactory::WrapLocationObject(ccx, newobj);
                         if (!newwrapper)
@@ -2240,6 +2242,10 @@ XPCWrappedNative::GetSameCompartmentSecurityWrapper(JSContext *cx)
         wrapper = xpc::WrapperFactory::WrapSOWObject(cx, flat);
         if (!wrapper)
             return NULL;
+    } else if (xpc::WrapperFactory::IsComponentsObject(flat)) {
+        wrapper = xpc::WrapperFactory::WrapComponentsObject(cx, flat);
+        if (!wrapper)
+            return NULL;
     }
 
     // If we made a wrapper, cache it and return it.
diff --git a/js/xpconnect/tests/unit/test_components.js b/js/xpconnect/tests/unit/test_components.js
new file mode 100644
index 00000000000..72fdb13f4ab
--- /dev/null
+++ b/js/xpconnect/tests/unit/test_components.js
@@ -0,0 +1,43 @@
+function run_test() {
+  var Cu = Components.utils;
+  var sb1 = Cu.Sandbox("http://www.blah.com");
+  var sb2 = Cu.Sandbox("http://www.blah.com");
+  var sb3 = Cu.Sandbox(this);
+  var sb4 = Cu.Sandbox("http://www.other.com");
+  var rv;
+
+  // non-chrome accessing chrome Components
+  sb1.C = Components;
+  rv = Cu.evalInSandbox("C.utils", sb1);
+  do_check_eq(rv, undefined);  
+  rv = Cu.evalInSandbox("C.interfaces", sb1);
+  do_check_neq(rv, undefined);
+
+  // non-chrome accessing own Components
+  rv = Cu.evalInSandbox("Components.utils", sb1);
+  do_check_eq(rv, undefined);
+  rv = Cu.evalInSandbox("Components.interfaces", sb1);
+  do_check_neq(rv, undefined); 
+
+  // non-chrome same origin
+  var C2 = Cu.evalInSandbox("Components", sb2);
+  do_check_neq(rv, C2.utils); 
+  sb1.C2 = C2;
+  rv = Cu.evalInSandbox("C2.utils", sb1);
+  do_check_eq(rv, undefined);
+  rv = Cu.evalInSandbox("C2.interfaces", sb1);
+  do_check_neq(rv, undefined);
+
+  // chrome accessing chrome
+  sb3.C = Components;
+  rv = Cu.evalInSandbox("C.utils", sb3);
+  do_check_eq(rv, Cu);
+
+  // non-chrome cross origin
+  sb4.C2 = C2;
+  rv = Cu.evalInSandbox("C2.interfaces", sb1);
+  do_check_neq(rv, undefined);
+  rv = Cu.evalInSandbox("C2.utils", sb1);
+  do_check_eq(rv, undefined);
+
+}
\ No newline at end of file
diff --git a/js/xpconnect/tests/unit/xpcshell.ini b/js/xpconnect/tests/unit/xpcshell.ini
index b2c08672164..372aa569ac4 100644
--- a/js/xpconnect/tests/unit/xpcshell.ini
+++ b/js/xpconnect/tests/unit/xpcshell.ini
@@ -25,3 +25,4 @@ fail-if = os == "android"
 [test_unload.js]
 [test_attributes.js]
 [test_params.js]
+[test_components.js]
diff --git a/js/xpconnect/wrappers/AccessCheck.cpp b/js/xpconnect/wrappers/AccessCheck.cpp
index 4eb1af9bf6a..85a30506988 100644
--- a/js/xpconnect/wrappers/AccessCheck.cpp
+++ b/js/xpconnect/wrappers/AccessCheck.cpp
@@ -607,4 +607,29 @@ ExposedPropertiesOnly::check(JSContext *cx, JSObject *wrapper, jsid id, Wrapper:
     return true; // Allow
 }
 
+bool
+ComponentsObjectPolicy::check(JSContext *cx, JSObject *wrapper, jsid id, Wrapper::Action act,
+                              Permission &perm) 
+{
+    perm = DenyAccess;
+    JSAutoEnterCompartment ac;
+    if (!ac.enter(cx, wrapper))
+        return false;
+
+    if (JSID_IS_STRING(id) && act == Wrapper::GET) {
+        JSFlatString *flatId = JSID_TO_FLAT_STRING(id);
+        if (JS_FlatStringEqualsAscii(flatId, "isSuccessCode") ||
+            JS_FlatStringEqualsAscii(flatId, "lookupMethod") ||
+            JS_FlatStringEqualsAscii(flatId, "interfaces") ||
+            JS_FlatStringEqualsAscii(flatId, "interfacesByID") ||
+            JS_FlatStringEqualsAscii(flatId, "results"))
+        {
+            perm = PermitPropertyAccess;
+            return true;
+        }
+    }
+
+    return PermitIfUniversalXPConnect(cx, id, act, perm);  // Deny
+}
+
 }
diff --git a/js/xpconnect/wrappers/AccessCheck.h b/js/xpconnect/wrappers/AccessCheck.h
index aec1bee51ab..4f02b6adf18 100644
--- a/js/xpconnect/wrappers/AccessCheck.h
+++ b/js/xpconnect/wrappers/AccessCheck.h
@@ -175,4 +175,10 @@ struct ExposedPropertiesOnly : public Policy {
                       Permission &perm);
 };
 
+// Components specific policy
+struct ComponentsObjectPolicy : public Policy {
+    static bool check(JSContext *cx, JSObject *wrapper, jsid id, js::Wrapper::Action act,
+                      Permission &perm);
+};
+
 }
diff --git a/js/xpconnect/wrappers/FilteringWrapper.cpp b/js/xpconnect/wrappers/FilteringWrapper.cpp
index e1a0978adfb..21fef1df977 100644
--- a/js/xpconnect/wrappers/FilteringWrapper.cpp
+++ b/js/xpconnect/wrappers/FilteringWrapper.cpp
@@ -151,7 +151,10 @@ FilteringWrapper<Base, Policy>::enter(JSContext *cx, JSObject *wrapper, jsid id,
                                LocationPolicy>
 #define XLW   FilteringWrapper<XrayWrapper<CrossCompartmentSecurityWrapper>, \
                                LocationPolicy>
-
+#define CW FilteringWrapper<SameCompartmentSecurityWrapper, \
+                            ComponentsObjectPolicy>
+#define XCW FilteringWrapper<CrossCompartmentSecurityWrapper, \
+                            ComponentsObjectPolicy>
 template<> SOW SOW::singleton(WrapperFactory::SCRIPT_ACCESS_ONLY_FLAG |
                               WrapperFactory::SOW_FLAG);
 template<> SCSOW SCSOW::singleton(WrapperFactory::SCRIPT_ACCESS_ONLY_FLAG |
@@ -168,6 +171,9 @@ template<> NNXOW NNXOW::singleton(WrapperFactory::SCRIPT_ACCESS_ONLY_FLAG |
 template<> LW  LW::singleton(WrapperFactory::SHADOWING_FORBIDDEN);
 template<> XLW XLW::singleton(WrapperFactory::SHADOWING_FORBIDDEN);
 
+template<> CW CW::singleton(0);
+template<> XCW XCW::singleton(0);
+
 template class SOW;
 template class COW;
 template class XOW;
diff --git a/js/xpconnect/wrappers/WrapperFactory.cpp b/js/xpconnect/wrappers/WrapperFactory.cpp
index cdbb30dcabe..e8a9e02f092 100644
--- a/js/xpconnect/wrappers/WrapperFactory.cpp
+++ b/js/xpconnect/wrappers/WrapperFactory.cpp
@@ -366,6 +366,9 @@ WrapperFactory::Rewrap(JSContext *cx, JSObject *obj, JSObject *wrappedProto, JSO
             wrapper = &FilteringWrapper<XrayProxy, CrossOriginAccessiblePropertiesOnly>::singleton;
         } else if (mozilla::dom::bindings::IsDOMClass(JS_GetClass(obj))) {
             wrapper = &FilteringWrapper<XrayDOM, CrossOriginAccessiblePropertiesOnly>::singleton;
+        } else if (IsComponentsObject(obj)) {
+            wrapper = &FilteringWrapper<CrossCompartmentSecurityWrapper,
+                                        ComponentsObjectPolicy>::singleton;
         } else {
             wrapper = &FilteringWrapper<CrossCompartmentSecurityWrapper,
                                         ExposedPropertiesOnly>::singleton;
@@ -400,6 +403,9 @@ WrapperFactory::Rewrap(JSContext *cx, JSObject *obj, JSObject *wrappedProto, JSO
         if (AccessCheck::needsSystemOnlyWrapper(obj)) {
             wrapper = &FilteringWrapper<CrossCompartmentSecurityWrapper,
                                         OnlyIfSubjectIsSystem>::singleton;
+        } else if (IsComponentsObject(obj)) {
+            wrapper = &FilteringWrapper<CrossCompartmentSecurityWrapper,
+                                        ComponentsObjectPolicy>::singleton;
         } else if (!targetdata || !targetdata->wantXrays ||
                    (type = GetXrayType(obj)) == NotXray) {
             // Do the double-wrapping if need be.
@@ -524,4 +530,21 @@ WrapperFactory::WrapSOWObject(JSContext *cx, JSObject *obj)
     return wrapperObj;
 }
 
+bool
+WrapperFactory::IsComponentsObject(JSObject *obj)
+{
+    const char *name = js::GetObjectClass(obj)->name;
+    return name[0] == 'n' && !strcmp(name, "nsXPCComponents");
+}
+
+JSObject *
+WrapperFactory::WrapComponentsObject(JSContext *cx, JSObject *obj)
+{
+    JSObject *wrapperObj =
+        Wrapper::New(cx, obj, JS_GetPrototype(obj), JS_GetGlobalForObject(cx, obj),
+                     &FilteringWrapper<SameCompartmentSecurityWrapper, ComponentsObjectPolicy>::singleton);
+
+    return wrapperObj;
+}
+
 }
diff --git a/js/xpconnect/wrappers/WrapperFactory.h b/js/xpconnect/wrappers/WrapperFactory.h
index 4eac5777cf0..798ad8e9517 100644
--- a/js/xpconnect/wrappers/WrapperFactory.h
+++ b/js/xpconnect/wrappers/WrapperFactory.h
@@ -110,6 +110,12 @@ class WrapperFactory {
 
     // Wrap a (same compartment) object in a SOW.
     static JSObject *WrapSOWObject(JSContext *cx, JSObject *obj);
+
+    // Return true if this is a Components object.
+    static bool IsComponentsObject(JSObject *obj);
+
+    // Wrap a (same compartment) Components object.
+    static JSObject *WrapComponentsObject(JSContext *cx, JSObject *obj);
 };
 
 extern js::Wrapper WaiveXrayWrapperWrapper;

From e5b8bb42a80314bdc7b38c8c67b1310a40ddeaa6 Mon Sep 17 00:00:00 2001
From: Paul ADENOT <paul@paul.cx>
Date: Sat, 28 Apr 2012 11:01:10 -0400
Subject: [PATCH 101/162] Bug 480376 - Implement mozHasAudio to indicate when
 there's no audio track available. r=cpearce

---
 .../html/content/public/nsHTMLMediaElement.h  |  5 ++-
 .../html/content/src/nsHTMLAudioElement.cpp   |  2 +-
 .../html/content/src/nsHTMLMediaElement.cpp   |  6 ++-
 .../html/content/src/nsHTMLVideoElement.cpp   |  8 ++++
 content/media/nsBuiltinDecoder.cpp            |  5 ++-
 content/media/nsBuiltinDecoder.h              |  3 +-
 .../media/nsBuiltinDecoderStateMachine.cpp    | 10 +++--
 content/media/test/Makefile.in                |  1 +
 content/media/test/manifest.js                |  9 ++++
 content/media/test/test_mozHasAudio.html      | 41 +++++++++++++++++++
 .../html/nsIDOMHTMLVideoElement.idl           |  5 ++-
 11 files changed, 83 insertions(+), 12 deletions(-)
 create mode 100644 content/media/test/test_mozHasAudio.html

diff --git a/content/html/content/public/nsHTMLMediaElement.h b/content/html/content/public/nsHTMLMediaElement.h
index 33ef53536cc..0c40ac5ae14 100644
--- a/content/html/content/public/nsHTMLMediaElement.h
+++ b/content/html/content/public/nsHTMLMediaElement.h
@@ -132,7 +132,7 @@ public:
   // Called by the video decoder object, on the main thread,
   // when it has read the metadata containing video dimensions,
   // etc.
-  void MetadataLoaded(PRUint32 aChannels, PRUint32 aRate);
+  void MetadataLoaded(PRUint32 aChannels, PRUint32 aRate, bool aHasAudio);
 
   // Called by the video decoder object, on the main thread,
   // when it has read the first frame of the video
@@ -794,6 +794,9 @@ protected:
 
   // The CORS mode when loading the media element
   mozilla::CORSMode mCORSMode;
+
+  // True if the media has an audio track
+  bool mHasAudio;
 };
 
 #endif
diff --git a/content/html/content/src/nsHTMLAudioElement.cpp b/content/html/content/src/nsHTMLAudioElement.cpp
index 74d01bf26a3..d43ad8db685 100644
--- a/content/html/content/src/nsHTMLAudioElement.cpp
+++ b/content/html/content/src/nsHTMLAudioElement.cpp
@@ -177,7 +177,7 @@ nsHTMLAudioElement::MozSetup(PRUint32 aChannels, PRUint32 aRate)
     return rv;
   }
 
-  MetadataLoaded(aChannels, aRate);
+  MetadataLoaded(aChannels, aRate, true);
   mAudioStream->SetVolume(mVolume);
   return NS_OK;
 }
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index 4cf4f207d51..c3f02cf2f34 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -1459,7 +1459,8 @@ nsHTMLMediaElement::nsHTMLMediaElement(already_AddRefed<nsINodeInfo> aNodeInfo)
     mShuttingDown(false),
     mLoadIsSuspended(false),
     mMediaSecurityVerified(false),
-    mCORSMode(CORS_NONE)
+    mCORSMode(CORS_NONE),
+    mHasAudio(false)
 {
 #ifdef PR_LOGGING
   if (!gMediaElementLog) {
@@ -2258,10 +2259,11 @@ void nsHTMLMediaElement::ProcessMediaFragmentURI()
   }
 }
 
-void nsHTMLMediaElement::MetadataLoaded(PRUint32 aChannels, PRUint32 aRate)
+void nsHTMLMediaElement::MetadataLoaded(PRUint32 aChannels, PRUint32 aRate, bool aHasAudio)
 {
   mChannels = aChannels;
   mRate = aRate;
+  mHasAudio = aHasAudio;
   ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_METADATA);
   DispatchAsyncEvent(NS_LITERAL_STRING("durationchange"));
   DispatchAsyncEvent(NS_LITERAL_STRING("loadedmetadata"));
diff --git a/content/html/content/src/nsHTMLVideoElement.cpp b/content/html/content/src/nsHTMLVideoElement.cpp
index 81fd842ebd6..f23ed99c471 100644
--- a/content/html/content/src/nsHTMLVideoElement.cpp
+++ b/content/html/content/src/nsHTMLVideoElement.cpp
@@ -219,3 +219,11 @@ NS_IMETHODIMP nsHTMLVideoElement::GetMozFrameDelay(double *aMozFrameDelay) {
   *aMozFrameDelay = container ?  container->GetFrameDelay() : 0;
   return NS_OK;
 }
+
+
+/* readonly attribute bool mozHasAudio */
+NS_IMETHODIMP nsHTMLVideoElement::GetMozHasAudio(bool *aHasAudio) {
+  NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
+  *aHasAudio = mHasAudio;
+  return NS_OK;
+}
diff --git a/content/media/nsBuiltinDecoder.cpp b/content/media/nsBuiltinDecoder.cpp
index ba261462c5e..dc0af2eb8d2 100644
--- a/content/media/nsBuiltinDecoder.cpp
+++ b/content/media/nsBuiltinDecoder.cpp
@@ -408,7 +408,8 @@ void nsBuiltinDecoder::AudioAvailable(float* aFrameBuffer,
 }
 
 void nsBuiltinDecoder::MetadataLoaded(PRUint32 aChannels,
-                                      PRUint32 aRate)
+                                      PRUint32 aRate,
+                                      bool aHasAudio)
 {
   NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
   if (mShuttingDown) {
@@ -435,7 +436,7 @@ void nsBuiltinDecoder::MetadataLoaded(PRUint32 aChannels,
     // Make sure the element and the frame (if any) are told about
     // our new size.
     Invalidate();
-    mElement->MetadataLoaded(aChannels, aRate);
+    mElement->MetadataLoaded(aChannels, aRate, aHasAudio);
   }
 
   if (!mResourceLoaded) {
diff --git a/content/media/nsBuiltinDecoder.h b/content/media/nsBuiltinDecoder.h
index 833846067fc..e1e44f43399 100644
--- a/content/media/nsBuiltinDecoder.h
+++ b/content/media/nsBuiltinDecoder.h
@@ -555,7 +555,8 @@ public:
   // Called when the metadata from the media file has been read.
   // Call on the main thread only.
   void MetadataLoaded(PRUint32 aChannels,
-                      PRUint32 aRate);
+                      PRUint32 aRate,
+                      bool aHasAudio);
 
   // Called when the first frame has been loaded.
   // Call on the main thread only.
diff --git a/content/media/nsBuiltinDecoderStateMachine.cpp b/content/media/nsBuiltinDecoderStateMachine.cpp
index 64a0a80c790..2881398d8d3 100644
--- a/content/media/nsBuiltinDecoderStateMachine.cpp
+++ b/content/media/nsBuiltinDecoderStateMachine.cpp
@@ -152,21 +152,23 @@ private:
   nsCOMPtr<nsBuiltinDecoder> mDecoder;
 public:
   nsAudioMetadataEventRunner(nsBuiltinDecoder* aDecoder, PRUint32 aChannels,
-                             PRUint32 aRate) :
+                             PRUint32 aRate, bool aHasAudio) :
     mDecoder(aDecoder),
     mChannels(aChannels),
-    mRate(aRate)
+    mRate(aRate),
+    mHasAudio(aHasAudio)
   {
   }
 
   NS_IMETHOD Run()
   {
-    mDecoder->MetadataLoaded(mChannels, mRate);
+    mDecoder->MetadataLoaded(mChannels, mRate, mHasAudio);
     return NS_OK;
   }
 
   const PRUint32 mChannels;
   const PRUint32 mRate;
+  const bool mHasAudio;
 };
 
 // Owns the global state machine thread and counts of
@@ -1515,7 +1517,7 @@ nsresult nsBuiltinDecoderStateMachine::DecodeMetadata()
     mDecoder->RequestFrameBufferLength(frameBufferLength);
   }
   nsCOMPtr<nsIRunnable> metadataLoadedEvent =
-    new nsAudioMetadataEventRunner(mDecoder, mInfo.mAudioChannels, mInfo.mAudioRate);
+    new nsAudioMetadataEventRunner(mDecoder, mInfo.mAudioChannels, mInfo.mAudioRate, HasAudio());
   NS_DispatchToMainThread(metadataLoadedEvent, NS_DISPATCH_NORMAL);
 
   if (mState == DECODER_STATE_DECODING_METADATA) {
diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in
index 3abd920a883..fdc058c47e3 100644
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -156,6 +156,7 @@ _TEST_FILES = \
 		test_video_to_canvas.html \
 		use_large_cache.js \
 		test_audiowrite.html \
+		test_mozHasAudio.html \
 		$(NULL)
 
 # Don't run in suite
diff --git a/content/media/test/manifest.js b/content/media/test/manifest.js
index 00a1171be10..0a3e6e2df4c 100644
--- a/content/media/test/manifest.js
+++ b/content/media/test/manifest.js
@@ -47,6 +47,15 @@ var gPausedAfterEndedTests = gSmallTests.concat([
   { name:"small-shot.ogg", type:"video/ogg", duration:0.276 }
 ]);
 
+// Test the mozHasAudio property
+var gMozHasAudioTests = [
+  { name:"big.wav", type:"audio/x-wav", duration:9.278981, size:102444, hasAudio:undefined },
+  { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.233, size:28942, hasAudio:false },
+  { name:"short-video.ogv", type:"video/ogg", duration:1.081, hasAudio:true },
+  { name:"seek.webm", type:"video/webm", duration:3.966, size:215529, hasAudio:false },
+  { name:"bogus.duh", type:"bogus/duh" }
+];
+
 // These are files that we want to make sure we can play through.  We can
 // also check metadata.  Put files of the same type together in this list so if
 // something crashes we have some idea of which backend is responsible.
diff --git a/content/media/test/test_mozHasAudio.html b/content/media/test/test_mozHasAudio.html
new file mode 100644
index 00000000000..fff84baaad4
--- /dev/null
+++ b/content/media/test/test_mozHasAudio.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test playback of media files that should play OK</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="manifest.js"></script>
+</head>
+<body>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+var manager = new MediaTestManager;
+
+function onloadedmetadata(e) {
+  var t = e.target;
+  is(t.mozHasAudio, t.hasAudio, "The element reports the wrong audio property." + t.token);
+  manager.finished(t.token);
+}
+
+function startTest(test, token) {
+  var elemType = /^audio/.test(test.type) ? "audio" : "video";
+  var element = document.createElement(elemType);
+
+  element.token = token;
+  manager.started(token);
+
+  element.src = test.name;
+  element.name = test.name;
+  element.hasAudio = test.hasAudio;
+  element.addEventListener("loadedmetadata", onloadedmetadata, false);
+
+  element.load();
+}
+
+manager.runTests(gMozHasAudioTests, startTest);
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/interfaces/html/nsIDOMHTMLVideoElement.idl b/dom/interfaces/html/nsIDOMHTMLVideoElement.idl
index f3a813f3f57..a1734b3b523 100644
--- a/dom/interfaces/html/nsIDOMHTMLVideoElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLVideoElement.idl
@@ -48,7 +48,7 @@
  * @status UNDER_DEVELOPMENT
  */
 
-[scriptable, uuid(E3763903-928B-47C4-AC3B-C47EB43884CA)]
+[scriptable, uuid(0a1c8b44-12a4-4316-b39f-feeee48475f8)]
 interface nsIDOMHTMLVideoElement : nsIDOMHTMLMediaElement
 {
            attribute long width; 
@@ -75,5 +75,8 @@ interface nsIDOMHTMLVideoElement : nsIDOMHTMLMediaElement
 
   // Time which the last painted video frame was late by, in seconds.
   readonly attribute double mozFrameDelay;
+
+  // True if the video has an audio track available.
+  readonly attribute bool mozHasAudio;
 };
 

From 8b4cc5ac7909a5530705fccbed32e378531ffe5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=83=C2=A9d=C3=83=C2=A9ric=20Wang?= <fred.wang@free.fr>
Date: Sat, 28 Apr 2012 11:02:22 -0400
Subject: [PATCH 102/162] Bug 657279 - maction: transmit automatic data when
 the selected child changes. r=karlt

---
 layout/mathml/nsMathMLmactionFrame.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/layout/mathml/nsMathMLmactionFrame.cpp b/layout/mathml/nsMathMLmactionFrame.cpp
index eb0069fdcfa..d4b383d1572 100644
--- a/layout/mathml/nsMathMLmactionFrame.cpp
+++ b/layout/mathml/nsMathMLmactionFrame.cpp
@@ -217,6 +217,7 @@ nsMathMLmactionFrame::GetSelectedFrame()
 
   mChildCount = count;
   mSelection = selection;
+  TransmitAutomaticData();
 
   return mSelectedFrame;
 }

From 156b3376b018c865fed975ffd7fea3cc13a0e311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=83=C2=A9d=C3=83=C2=A9ric=20Wang?= <fred.wang@free.fr>
Date: Sat, 28 Apr 2012 11:02:57 -0400
Subject: [PATCH 103/162] Bug 657279 - Reftests. r=karlt

---
 .../maction-dynamic-embellished-op-ref.html   | 30 ++++++++++
 .../maction-dynamic-embellished-op.html       | 56 +++++++++++++++++++
 layout/reftests/mathml/reftest.list           |  3 +-
 3 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 layout/reftests/mathml/maction-dynamic-embellished-op-ref.html
 create mode 100644 layout/reftests/mathml/maction-dynamic-embellished-op.html

diff --git a/layout/reftests/mathml/maction-dynamic-embellished-op-ref.html b/layout/reftests/mathml/maction-dynamic-embellished-op-ref.html
new file mode 100644
index 00000000000..cbab1da1cc8
--- /dev/null
+++ b/layout/reftests/mathml/maction-dynamic-embellished-op-ref.html
@@ -0,0 +1,30 @@
+<html>
+
+<head>
+<title>dynamic maction and embellished op</title>
+</head>
+
+<body>
+
+  <p>'<math><maction id="m1" selection="2"><mi>a</mi><mo>b</mo></maction></math>'</p>
+  <p>'<math><maction id="m2" selection="2"><mo>b</mo><mi>a</mi></maction></math>'</p>
+ 
+  <p>"<math><maction id="m3"><mo>b</mo></maction></math>"</p>
+  <p>"<math><maction id="m3bis"><mi>a</mi><mo>b</mo></maction></math>"</p>
+
+  <p>{<math><maction id="m4"><mi>a</mi></maction></math>}</p>
+  <p>{<math><maction id="m4bis"><mo>b</mo><mi>a</mi></maction></math>}</p>
+
+ 
+  <p>[<math>
+    <mstyle id="m5" selection="2"><maction><mi>a</mi><mo>b</mo></maction></mstyle>
+  </math>]</p>
+  <p>[<math>
+    <mstyle id="m6" selection="2"><maction><mo>b</mo><mi>a</mi></maction></mstyle>
+  </math>]</p>
+
+  <p>(<math id="m7" selection="2"><maction><mi>a</mi><mo>b</mo></maction></math>)</p>
+  <p>(<math id="m8" selection="2"><maction><mo>b</mo><mi>a</mi></maction></math>)</p>
+
+</body>
+</html>
diff --git a/layout/reftests/mathml/maction-dynamic-embellished-op.html b/layout/reftests/mathml/maction-dynamic-embellished-op.html
new file mode 100644
index 00000000000..51f95612e8e
--- /dev/null
+++ b/layout/reftests/mathml/maction-dynamic-embellished-op.html
@@ -0,0 +1,56 @@
+<html class="reftest-wait">
+
+<head>
+<title>dynamic maction and embellished op</title>
+</head>
+
+<body>
+
+  <p>'<math><maction id="m1"><mi>a</mi><mo>b</mo></maction></math>'</p>
+  <p>'<math><maction id="m2"><mo>b</mo><mi>a</mi></maction></math>'</p>
+ 
+  <p>"<math><maction id="m3"><mi>a</mi><mo>b</mo></maction></math>"</p>
+  <p>"<math><maction id="m3bis"><mo>b</mo></maction></math>"</p>
+
+  <p>{<math><maction id="m4"><mo>b</mo><mi>a</mi></maction></math>}</p>
+  <p>{<math><maction id="m4bis"><mi>a</mi></maction></math>}</p>
+
+ 
+  <p>[<math>
+    <mstyle id="m5"><maction><mi>a</mi><mo>b</mo></maction></mstyle>
+  </math>]</p>
+  <p>[<math>
+    <mstyle id="m6"><maction><mo>b</mo><mi>a</mi></maction></mstyle>
+  </math>]</p>
+
+  <p>(<math id="m7"><maction><mi>a</mi><mo>b</mo></maction></math>)</p>
+  <p>(<math id="m8"><maction><mo>b</mo><mi>a</mi></maction></math>)</p>
+
+<script>
+function doTest()
+{
+  document.getElementById("m1").setAttribute("selection", "2");
+  document.getElementById("m2").setAttribute("selection", "2");
+
+  var m3 = document.getElementById("m3");
+  var m3bis = document.getElementById("m3bis");
+  m3bis.insertBefore(m3.removeChild(m3.firstChild), m3bis.firstChild);
+
+  var m4 = document.getElementById("m4");
+  var m4bis = document.getElementById("m4bis");
+  m4bis.insertBefore(m4.removeChild(m4.firstChild), m4bis.firstChild);
+
+  document.getElementById("m5").setAttribute("selection", "2");
+  document.getElementById("m6").setAttribute("selection", "2");
+
+  document.getElementById("m7").setAttribute("selection", "2");
+  document.getElementById("m8").setAttribute("selection", "2");
+
+  document.documentElement.removeAttribute("class");
+}
+
+window.addEventListener("MozReftestInvalidate", doTest, false);
+</script>
+
+</body>
+</html>
diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list
index 98d8dc1918e..db07143703a 100644
--- a/layout/reftests/mathml/reftest.list
+++ b/layout/reftests/mathml/reftest.list
@@ -97,4 +97,5 @@ fails == mstyle-5.xhtml mstyle-5-ref.xhtml # See bug 569125#c29
 == munderover-empty-scripts.html munderover-empty-scripts-ref.html
 == positive-namedspace.html positive-namedspace-ref.html
 == mtable-width.html mtable-width-ref.html
-== maction-selection.html maction-selection-ref.html
\ No newline at end of file
+== maction-selection.html maction-selection-ref.html
+== maction-dynamic-embellished-op.html maction-dynamic-embellished-op-ref.html

From 2b5b26450c55b081c79de8aceadcae5502b1ed8e Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Sat, 28 Apr 2012 11:04:36 -0400
Subject: [PATCH 104/162] Bug 673383 - Output stdout in regular command line on
 Windows. r=ted

---
 toolkit/xre/nsNativeAppSupportWin.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/toolkit/xre/nsNativeAppSupportWin.cpp b/toolkit/xre/nsNativeAppSupportWin.cpp
index 004fc1666db..e7a076cda32 100644
--- a/toolkit/xre/nsNativeAppSupportWin.cpp
+++ b/toolkit/xre/nsNativeAppSupportWin.cpp
@@ -366,6 +366,21 @@ NS_IMPL_RELEASE_INHERITED(nsNativeAppSupportWin, nsNativeAppSupportBase)
 
 void
 nsNativeAppSupportWin::CheckConsole() {
+    // Try to attach console to the parent process.
+    // It will succeed when the parent process is a command line,
+    // so that stdio will be displayed in it.
+    if (AttachConsole(ATTACH_PARENT_PROCESS)) {
+        // Change std handles to refer to new console handles.
+        // Before doing so, ensure that stdout/stderr haven't been redirected to a valid file
+        if (_fileno(stdout) == -1 || _get_osfhandle(fileno(stdout)) == -1)
+            freopen("CONOUT$", "w", stdout);
+        if (_fileno(stderr) == -1 || _get_osfhandle(fileno(stderr)) == -1)
+            freopen("CONERR$", "w", stderr);
+        if (_fileno(stdin) == -1 || _get_osfhandle(fileno(stdin)) == -1)
+            freopen("CONIN$", "r", stdin);
+        return;
+    }
+
     for ( int i = 1; i < gArgc; i++ ) {
         if ( strcmp( "-console", gArgv[i] ) == 0
              ||

From e522c2f6d40dc35a00bb3c90f2e1b8c1ff0b4eb0 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Sat, 28 Apr 2012 11:09:55 -0400
Subject: [PATCH 105/162] Bug 726279 - Generalize use of Services.jsm in
 nsSearchService. r=dteller, dao

---
 toolkit/components/search/nsSearchService.js | 99 +++++++-------------
 1 file changed, 33 insertions(+), 66 deletions(-)

diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js
index 82663d9a6ce..e84ca7193b1 100644
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -220,18 +220,6 @@ function isUsefulLine(aLine) {
   return !(/^\s*($|#)/i.test(aLine));
 }
 
-__defineGetter__("gObsSvc", function() {
-  delete this.gObsSvc;
-  return this.gObsSvc = Cc["@mozilla.org/observer-service;1"].
-                        getService(Ci.nsIObserverService);
-});
-
-__defineGetter__("gPrefSvc", function() {
-  delete this.gPrefSvc;
-  return this.gPrefSvc = Cc["@mozilla.org/preferences-service;1"].
-                         getService(Ci.nsIPrefBranch);
-});
-
 __defineGetter__("FileUtils", function() {
   delete this.FileUtils;
   Components.utils.import("resource://gre/modules/FileUtils.jsm");
@@ -260,9 +248,7 @@ const SEARCH_LOG_PREFIX = "*** Search: ";
  */
 function DO_LOG(aText) {
   dump(SEARCH_LOG_PREFIX + aText + "\n");
-  var consoleService = Cc["@mozilla.org/consoleservice;1"].
-                       getService(Ci.nsIConsoleService);
-  consoleService.logStringMessage(aText);
+  Services.console.logStringMessage(aText);
 }
 
 #ifdef DEBUG
@@ -539,15 +525,11 @@ function makeURI(aURLSpec, aCharset) {
  * @param aKey
  *        The directory service key indicating the directory to get.
  */
-let _dirSvc = null;
 function getDir(aKey, aIFace) {
   if (!aKey)
     FAIL("getDir requires a directory key!");
 
-  if (!_dirSvc)
-    _dirSvc = Cc["@mozilla.org/file/directory_service;1"].
-               getService(Ci.nsIProperties);
-  return _dirSvc.get(aKey, aIFace || Ci.nsIFile);
+  return Services.dirsvc.get(aKey, aIFace || Ci.nsIFile);
 }
 
 /**
@@ -685,7 +667,7 @@ function getLocale() {
     return locale;
 
   // Not localized
-  return gPrefSvc.getCharPref(localePref);
+  return Services.prefs.getCharPref(localePref);
 }
 
 /**
@@ -697,7 +679,7 @@ function getLocale() {
 function getLocalizedPref(aPrefName, aDefault) {
   const nsIPLS = Ci.nsIPrefLocalizedString;
   try {
-    return gPrefSvc.getComplexValue(aPrefName, nsIPLS).data;
+    return Services.prefs.getComplexValue(aPrefName, nsIPLS).data;
   } catch (ex) {}
 
   return aDefault;
@@ -714,7 +696,7 @@ function setLocalizedPref(aPrefName, aValue) {
     var pls = Components.classes["@mozilla.org/pref-localizedstring;1"]
                         .createInstance(Ci.nsIPrefLocalizedString);
     pls.data = aValue;
-    gPrefSvc.setComplexValue(aPrefName, nsIPLS, pls);
+    Services.prefs.setComplexValue(aPrefName, nsIPLS, pls);
   } catch (ex) {}
 }
 
@@ -726,7 +708,7 @@ function setLocalizedPref(aPrefName, aValue) {
  */
 function getBoolPref(aName, aDefault) {
   try {
-    return gPrefSvc.getBoolPref(aName);
+    return Services.prefs.getBoolPref(aName);
   } catch (ex) {
     return aDefault;
   }
@@ -775,7 +757,7 @@ function sanitizeName(aName) {
  *        The name of the pref.
  **/
 function getMozParamPref(prefName)
-  gPrefSvc.getCharPref(BROWSER_SEARCH_PREF + "param." + prefName);
+  Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "param." + prefName);
 
 /**
  * Notifies watchers of SEARCH_ENGINE_TOPIC about changes to an engine or to
@@ -792,7 +774,7 @@ let gEnginesLoaded = false;
 function notifyAction(aEngine, aVerb) {
   if (gEnginesLoaded) {
     LOG("NOTIFY: Engine: \"" + aEngine.name + "\"; Verb: \"" + aVerb + "\"");
-    gObsSvc.notifyObservers(aEngine, SEARCH_ENGINE_TOPIC, aVerb);
+    Services.obs.notifyObservers(aEngine, SEARCH_ENGINE_TOPIC, aVerb);
   }
 }
 
@@ -833,7 +815,7 @@ function ParamSubstitution(aParamValue, aSearchTerms, aEngine) {
 
   var distributionID = MOZ_DISTRIBUTION_ID;
   try {
-    distributionID = gPrefSvc.getCharPref(BROWSER_SEARCH_PREF + "distributionID");
+    distributionID = Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "distributionID");
   }
   catch (ex) { }
 
@@ -1291,9 +1273,7 @@ Engine.prototype = {
   },
 
   _confirmAddEngine: function SRCH_SVC_confirmAddEngine() {
-    var sbs = Cc["@mozilla.org/intl/stringbundle;1"].
-              getService(Ci.nsIStringBundleService);
-    var stringBundle = sbs.createBundle(SEARCH_BUNDLE);
+    var stringBundle = Services.strings.createBundle(SEARCH_BUNDLE);
     var titleMessage = stringBundle.GetStringFromName("addEngineConfirmTitle");
 
     // Display only the hostname portion of the URL.
@@ -1307,8 +1287,7 @@ Engine.prototype = {
     var addButtonLabel =
         stringBundle.GetStringFromName("addEngineAddButtonLabel");
 
-    var ps = Cc["@mozilla.org/embedcomp/prompt-service;1"].
-             getService(Ci.nsIPromptService);
+    var ps = Services.prompt;
     var buttonFlags = (ps.BUTTON_TITLE_IS_STRING * ps.BUTTON_POS_0) +
                       (ps.BUTTON_TITLE_CANCEL    * ps.BUTTON_POS_1) +
                        ps.BUTTON_POS_0_DEFAULT;
@@ -1344,13 +1323,10 @@ Engine.prototype = {
         LOG("updating " + aEngine._engineToUpdate.name + " failed");
         return;
       }
-      var sbs = Cc["@mozilla.org/intl/stringbundle;1"].
-                getService(Ci.nsIStringBundleService);
-
-      var brandBundle = sbs.createBundle(BRAND_BUNDLE);
+      var brandBundle = Services.strings.createBundle(BRAND_BUNDLE);
       var brandName = brandBundle.GetStringFromName("brandShortName");
 
-      var searchBundle = sbs.createBundle(SEARCH_BUNDLE);
+      var searchBundle = Services.strings.createBundle(SEARCH_BUNDLE);
       var msgStringName = aErrorString || "error_loading_engine_msg2";
       var titleStringName = aTitleString || "error_loading_engine_title";
       var title = searchBundle.GetStringFromName(titleStringName);
@@ -1358,9 +1334,7 @@ Engine.prototype = {
                                                    [brandName, aEngine._location],
                                                    2);
 
-      var ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
-               getService(Ci.nsIWindowWatcher);
-      ww.getNewPrompter(null).alert(title, text);
+      Services.ww.getNewPrompter(null).alert(title, text);
     }
 
     if (!aBytes) {
@@ -1406,9 +1380,7 @@ Engine.prototype = {
     // engine load, then we display a "this is a duplicate engine" prompt,
     // otherwise we fail silently.
     if (!engineToUpdate) {
-      var ss = Cc["@mozilla.org/browser/search-service;1"].
-               getService(Ci.nsIBrowserSearchService);
-      if (ss.getEngineByName(aEngine.name)) {
+      if (Services.search.getEngineByName(aEngine.name)) {
         if (aEngine._confirm)
           onError("error_duplicate_engine_msg", "error_invalid_engine_title");
 
@@ -1698,8 +1670,7 @@ Engine.prototype = {
   },
 
   _isDefaultEngine: function SRCH_ENG__isDefaultEngine() {
-    let defaultPrefB = gPrefSvc.QueryInterface(Ci.nsIPrefService)
-                               .getDefaultBranch(BROWSER_SEARCH_PREF);
+    let defaultPrefB = Services.prefs.getDefaultBranch(BROWSER_SEARCH_PREF);
     let nsIPLS = Ci.nsIPrefLocalizedString;
     let defaultEngine;
     try {
@@ -2577,8 +2548,7 @@ SearchService.prototype = {
 
     let cache = {};
     let locale = getLocale();
-    let buildID = Cc["@mozilla.org/xre/app-info;1"].
-                  getService(Ci.nsIXULAppInfo).platformBuildID;
+    let buildID = Services.appinfo.platformBuildID;
 
     // Allows us to force a cache refresh should the cache format change.
     cache.version = CACHE_VERSION;
@@ -2695,8 +2665,7 @@ SearchService.prototype = {
     function notInToLoad(aCachePath, aIndex)
       aCachePath != toLoad[aIndex].path;
 
-    let buildID = Cc["@mozilla.org/xre/app-info;1"].
-                  getService(Ci.nsIXULAppInfo).platformBuildID;
+    let buildID = Services.appinfo.platformBuildID;
     let cachePaths = [path for (path in cache.directories)];
 
     let rebuildCache = !cache.directories ||
@@ -2937,7 +2906,7 @@ SearchService.prototype = {
 
     let rootURIPref = ""
     try {
-      rootURIPref = gPrefSvc.getCharPref(BROWSER_SEARCH_PREF + "jarURIs");
+      rootURIPref = Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "jarURIs");
     } catch (ex) {}
 
     if (!rootURIPref) {
@@ -3003,7 +2972,7 @@ SearchService.prototype = {
 
     // Set the useDB pref to indicate that from now on we should use the order
     // information stored in the database.
-    gPrefSvc.setBoolPref(BROWSER_SEARCH_PREF + "useDBForOrder", true);
+    Services.prefs.setBoolPref(BROWSER_SEARCH_PREF + "useDBForOrder", true);
 
     var engines = this._getSortedEngines(true);
 
@@ -3062,10 +3031,10 @@ SearchService.prototype = {
 
       try {
         var extras =
-          gPrefSvc.getChildList(BROWSER_SEARCH_PREF + "order.extra.");
+          Services.prefs.getChildList(BROWSER_SEARCH_PREF + "order.extra.");
 
         for each (prefName in extras) {
-          engineName = gPrefSvc.getCharPref(prefName);
+          engineName = Services.prefs.getCharPref(prefName);
 
           engine = this._engines[engineName];
           if (!engine || engine.name in addedEngines)
@@ -3260,10 +3229,10 @@ SearchService.prototype = {
 
     // First, look at the "browser.search.order.extra" branch.
     try {
-      var extras = gPrefSvc.getChildList(BROWSER_SEARCH_PREF + "order.extra.");
+      var extras = Services.prefs.getChildList(BROWSER_SEARCH_PREF + "order.extra.");
 
       for each (var prefName in extras) {
-        engineName = gPrefSvc.getCharPref(prefName);
+        engineName = Services.prefs.getCharPref(prefName);
 
         if (!(engineName in engineOrder))
           engineOrder[engineName] = i++;
@@ -3489,7 +3458,7 @@ SearchService.prototype = {
     var currentEnginePref = BROWSER_SEARCH_PREF + "selectedEngine";
 
     if (this._currentEngine == this.defaultEngine) {
-      gPrefSvc.clearUserPref(currentEnginePref);
+      Services.prefs.clearUserPref(currentEnginePref);
     }
     else {
       setLocalizedPref(currentEnginePref, this._currentEngine.name);
@@ -3574,13 +3543,13 @@ SearchService.prototype = {
   },
 
   _addObservers: function SRCH_SVC_addObservers() {
-    gObsSvc.addObserver(this, SEARCH_ENGINE_TOPIC, false);
-    gObsSvc.addObserver(this, QUIT_APPLICATION_TOPIC, false);
+    Services.obs.addObserver(this, SEARCH_ENGINE_TOPIC, false);
+    Services.obs.addObserver(this, QUIT_APPLICATION_TOPIC, false);
   },
 
   _removeObservers: function SRCH_SVC_removeObservers() {
-    gObsSvc.removeObserver(this, SEARCH_ENGINE_TOPIC);
-    gObsSvc.removeObserver(this, QUIT_APPLICATION_TOPIC);
+    Services.obs.removeObserver(this, SEARCH_ENGINE_TOPIC);
+    Services.obs.removeObserver(this, QUIT_APPLICATION_TOPIC);
   },
 
   QueryInterface: function SRCH_SVC_QI(aIID) {
@@ -3787,9 +3756,9 @@ var engineMetadataService = {
 
         let callback = function(result) {
           if (Components.isSuccessCode(result)) {
-            gObsSvc.notifyObservers(null,
-                                    SEARCH_SERVICE_TOPIC,
-                                    SEARCH_SERVICE_METADATA_WRITTEN);
+            Services.obs.notifyObservers(null,
+                                         SEARCH_SERVICE_TOPIC,
+                                         SEARCH_SERVICE_METADATA_WRITTEN);
           }
           LOG("epsWriteCommit: done " + result);
         };
@@ -3814,9 +3783,7 @@ const SEARCH_UPDATE_LOG_PREFIX = "*** Search update: ";
 function ULOG(aText) {
   if (getBoolPref(BROWSER_SEARCH_PREF + "update.log", false)) {
     dump(SEARCH_UPDATE_LOG_PREFIX + aText + "\n");
-    var consoleService = Cc["@mozilla.org/consoleservice;1"].
-                         getService(Ci.nsIConsoleService);
-    consoleService.logStringMessage(aText);
+    Services.console.logStringMessage(aText);
   }
 }
 

From 1fc24a471706bd59cd768760d49e608b99616ebc Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Fri, 27 Apr 2012 09:44:53 +0800
Subject: [PATCH 106/162] Bug 730840 - Use getBrowserURL() in Firefox tests to
 ease porting them. r=dao

---
 browser/base/content/test/browser_locationBarCommand.js      | 2 +-
 .../places/tests/browser/browser_toolbar_migration.js        | 5 +++--
 .../browser/browser_privatebrowsing_lastpbcontextexited.js   | 2 +-
 .../devtools/webconsole/test/browser_webconsole_chrome.js    | 4 +---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/browser/base/content/test/browser_locationBarCommand.js b/browser/base/content/test/browser_locationBarCommand.js
index 1c2d885cd04..147b7a51de0 100644
--- a/browser/base/content/test/browser_locationBarCommand.js
+++ b/browser/base/content/test/browser_locationBarCommand.js
@@ -32,7 +32,7 @@ function runAltLeftClickTest() {
 }
 
 function runShiftLeftClickTest() {
-  let listener = new WindowListener("chrome://browser/content/browser.xul", function(aWindow) {
+  let listener = new WindowListener(getBrowserURL(), function(aWindow) {
     Services.wm.removeListener(listener);
     addPageShowListener(aWindow.gBrowser, function() {
       info("URL should be loaded in a new window");
diff --git a/browser/components/places/tests/browser/browser_toolbar_migration.js b/browser/components/places/tests/browser/browser_toolbar_migration.js
index 074eb93af56..d2b893eb631 100644
--- a/browser/components/places/tests/browser/browser_toolbar_migration.js
+++ b/browser/components/places/tests/browser/browser_toolbar_migration.js
@@ -8,6 +8,7 @@
 
 let bg = Cc["@mozilla.org/browser/browserglue;1"].getService(Ci.nsIObserver);
 let gOriginalMigrationVersion;
+const BROWSER_URL = getBrowserURL();
 
 let localStore = {
   get RDF() Cc["@mozilla.org/rdf/rdf-service;1"].getService(Ci.nsIRDFService),
@@ -16,10 +17,10 @@ let localStore = {
   get toolbar()
   {
     delete this.toolbar;
-    let toolbar = this.RDF.GetResource("chrome://browser/content/browser.xul#PersonalToolbar");
+    let toolbar = this.RDF.GetResource(BROWSER_URL + "#PersonalToolbar");
     // Add the entry to the persisted set for this document if it's not there.
     // See nsXULDocument::Persist.
-    let doc = this.RDF.GetResource("chrome://browser/content/browser.xul");
+    let doc = this.RDF.GetResource(BROWSER_URL);
     let persist = this.RDF.GetResource("http://home.netscape.com/NC-rdf#persist");
     if (!this.store.HasAssertion(doc, persist, toolbar, true)) {
       this.store.Assert(doc, persist, toolbar, true);
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_lastpbcontextexited.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_lastpbcontextexited.js
index 7e512a0d567..cdffd6fd539 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_lastpbcontextexited.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_lastpbcontextexited.js
@@ -37,7 +37,7 @@
 function test() {
   // We need to open a new window for this so that its docshell would get destroyed
   // when clearing the PB mode flag.
-  let newWin = window.openDialog("chrome://browser/content/", "_blank", "chrome,all,dialog=no");
+  let newWin = window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no");
   waitForExplicitFinish();
   SimpleTest.waitForFocus(function() {
     let notificationCount = 0;
diff --git a/browser/devtools/webconsole/test/browser_webconsole_chrome.js b/browser/devtools/webconsole/test/browser_webconsole_chrome.js
index eccb4f916c6..f0e4c29a729 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_chrome.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_chrome.js
@@ -40,10 +40,8 @@
 
 // Tests that code completion works properly.
 
-const TEST_URI = "chrome://browser/content/browser.xul";
-
 function test() {
-  addTab(TEST_URI);
+  addTab(getBrowserURL());
   browser.addEventListener("DOMContentLoaded", testChrome, false);
 }
 

From 16b88cfda6cd0d4f59cf62d87609f01ef4cd7334 Mon Sep 17 00:00:00 2001
From: Joey Armstrong <joey@mozilla.com>
Date: Sat, 28 Apr 2012 11:16:12 -0400
Subject: [PATCH 107/162] Bug 743243 - Add isTargetStem makefile function.
 r=ted

---
 config/makefiles/autotargets.mk        |  5 +-
 config/makefiles/makeutils.mk          | 63 +++++++++++++++++++++++---
 config/makefiles/test/Makefile.in      | 27 ++++++++---
 config/makefiles/test/check_XinY.mk    | 47 +++++++++++++++++++
 js/src/config/makefiles/autotargets.mk |  5 +-
 js/src/config/makefiles/makeutils.mk   | 63 +++++++++++++++++++++++---
 6 files changed, 182 insertions(+), 28 deletions(-)
 create mode 100644 config/makefiles/test/check_XinY.mk

diff --git a/config/makefiles/autotargets.mk b/config/makefiles/autotargets.mk
index 667727d64f2..0573218e00d 100644
--- a/config/makefiles/autotargets.mk
+++ b/config/makefiles/autotargets.mk
@@ -50,8 +50,5 @@ endif
 
 AUTO_DEPS +=$(GENERATED_DIRS_DEPS)
 
-
 # Complain loudly if deps have not loaded so getargv != $(NULL)
-ifndef getargv
-  $(error config/makefiles/makeutil.mk has not been included)
-endif
+$(call requiredfunction,getargv)
diff --git a/config/makefiles/makeutils.mk b/config/makefiles/makeutils.mk
index 544ee8d5d00..faf6c58aae5 100644
--- a/config/makefiles/makeutils.mk
+++ b/config/makefiles/makeutils.mk
@@ -5,13 +5,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# Usage: $(call banner,foo bar tans)
-banner =\
-$(info )\
-$(info ***************************************************************************)\
-$(info ** BANNER: $(1) $(2) $(3) $(4) $(5) $(6) $(7) $(8) $(9))\
-$(info ***************************************************************************)\
-
 ## Identify function argument types
 istype =$(if $(value ${1}),list,scalar)
 isval  =$(if $(filter-out list,$(call istype,${1})),true)
@@ -35,6 +28,62 @@ argv +=)
 ## getarglist() would be a more accurate name but is longer to type
 getargv = $(if $(call isvar,$(1)),$($(1)),$(argv))
 
+###########################################################################
+# Strip [n] leading options from an argument list.  This will allow passing
+# extra args to user functions that will not propogate to sub-$(call )'s
+# Usage: $(call subargv,2)
+subargv =$(wordlist $(1),$(words $(getargv)),$(getargv))
+
+###########################################################################
+# Intent: Display a distinct banner heading in the output stream
+# Usage: $(call banner,BUILDING: foo bar tans)
+# Debug:
+#   target-preqs = \
+#     $(call banner,target-preqs-BEGIN) \
+#     foo bar tans \
+#     $(call banner,target-preqs-END) \
+#     $(NULL)
+#   target: $(target-preqs)
+
+banner =\
+$(info )\
+$(info ***************************************************************************)\
+$(info ** $(getargv))\
+$(info ***************************************************************************)\
+$(NULL)
+
+#####################################################################
+# Intent: Determine if a string or pattern is contained in a list
+# Usage: strcmp  - $(call if_XinY,clean,$(MAKECMDGOALS))
+#      : pattern - $(call if_XinY,clean%,$(MAKECMDGOALS))
+is_XinY =$(filter $(1),$(call subargv,3,$(getargv)))
+
+#####################################################################
+# Provide an alternate var to support testing
+ifdef MAKEUTILS_UNIT_TEST
+  mcg_goals=TEST_MAKECMDGOALS
+else
+  mcg_goals=MAKECMDGOALS
+endif
+
+# Intent: Conditionals for detecting common/tier target use
+#   Todo: are check, install, test needed ?
+isTargetStem       = $(sort $(foreach pat, $(1)% %$(1), $(call is_XinY,$(pat),${$(mcg_goals)})))
+isTargetStemClean  = $(call isTargetStem,clean)
+isTargetStemExport = $(call isTargetStem,export)
+isTargetStemLibs   = $(call isTargetStem,libs)
+isTargetStemTools  = $(call isTargetStem,tools)
+
+##################################################
+# Intent: Validation functions / unit test helpers
+
+errorifneq =$(if $(subst $(strip $(1)),$(NULL),$(strip $(2))),$(error expected [$(1)] but found [$(2)]))
+
+# Intent: verify function declaration exists
+requiredfunction =$(foreach func,$(1) $(2) $(3) $(4) $(5) $(6) $(7) $(8) $(9),$(if $(value $(func)),$(NULL),$(error required function [$(func)] is unavailable)))
+
+
+
 ## http://www.gnu.org/software/make/manual/make.html#Call-Function
 ## Usage: o = $(call map,origin,o map $(MAKE))
 map = $(foreach val,$(2),$(call $(1),$(val)))
diff --git a/config/makefiles/test/Makefile.in b/config/makefiles/test/Makefile.in
index f0042fbcdfc..edfe4820657 100644
--- a/config/makefiles/test/Makefile.in
+++ b/config/makefiles/test/Makefile.in
@@ -10,6 +10,8 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
+
+MAKEUTILS_UNIT_TEST = 1
 include $(topsrcdir)/config/makefiles/makeutils.mk
 
 ##------------------_##
@@ -29,9 +31,10 @@ all::
 check::
 	@true
 
+###########################################################################
 ## Logic processed at compile time so be selective about when to test
-ifneq ($(NULL),$(findstring check,$(MAKECMDGOALS))) #{
-
+## Verify istype, isval, isvar, getargv, subargv
+ifneq ($(NULL),$(findstring check,$(MAKECMDGOALS))) #
 
 ifdef VERBOSE
 
@@ -45,11 +48,14 @@ $(info Running test: istype, getargv)
 $(info ===========================================================================)
 endif
 
-## Silent errors are oh so much fun
-ifndef istype
-  $(error makeutils.mk was not included)
+ifndef requiredfunction
+  $(error requiredfunction is not defined)
 endif
 
+include $(topsrcdir)/config/makefiles/test/check_XinY.mk
+
+$(call requiredfunc,istype isvar isval)
+
 # arg_scalar = [scalar|literal]
 arg_list = foo bar
 arg_ref  = arg_list
@@ -124,4 +130,13 @@ ifdef MANUAL_TEST #{
   $(error TEST FAILED: processing should not reach this point)
 endif #}
 
-endif #} check in MAKECMDGOALS
+# Verify subargv expansion
+##########################
+subargs=foo bar tans fans
+subargs_exp=tans fans
+subargs_found=$(call subargv,4,$(subargs))
+ifneq ($(subargs_exp),$(subargs_found))
+  $(error subargv(4,$(subargs)): expected [$(subargs_exp)] found [$(subargs_found)])
+endif
+ 
+endif #} unit_test: istype, isvar, isval, getargv, subargv
diff --git a/config/makefiles/test/check_XinY.mk b/config/makefiles/test/check_XinY.mk
new file mode 100644
index 00000000000..57ffdb373b1
--- /dev/null
+++ b/config/makefiles/test/check_XinY.mk
@@ -0,0 +1,47 @@
+# -*- makefile -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Verify dependencies are available
+$(call requiredfunction,getargv subargv is_XinY errorifneq)
+
+#############################
+ifdef VERBOSE
+  $(warning )
+  $(call banner,Unit test: is_XinY)
+endif
+
+zero := 0
+one  := 1
+
+# Verify 'invalid' is not matched
+val  := invalid
+$(call errorifneq,$(zero),$(words $(call is_XinY,foo,$(val))))
+$(call errorifneq,$(zero),$(words $(call is_XinY,clean,$(val))))
+$(call errorifneq,$(zero),$(words $(call is_XinY,clean%,$(val))))
+
+# verify strcmp('clean')
+val  := clean
+$(call errorifneq,$(zero),$(words $(call is_XinY,foo,$(val))))
+$(call errorifneq,$(one),$(words $(call is_XinY,clean,$(val))))
+$(call errorifneq,$(one,$(words $(call is_XinY,clean%,$(val)))))
+$(call errorifneq,$(one),$(words $(call is_XinY,%clean,$(val))))
+
+# List match for 'clean'
+val     := blah clean distclean FcleanG clean-level-1
+wanted  := clean distclean clean-level-1
+$(call errorifneq,$(zero),$(words $(call is_XinY_debug,foo,$(val))))
+$(call errorifneq,$(one),$(words $(call is_XinY,clean,$(val))))
+$(call errorifneq,$(one),$(words $(call is_XinY,distclean,$(val))))
+
+# pattern match 'clean'
+#     match: clean, distclean, clean-level-1
+#   exclude: FcleanG
+TEST_MAKECMDGOALS := $(val)
+$(call errorifneq,3,$(words $(call isTargetStemClean)))
+
+TEST_MAKECMDGOALS := invalid
+$(call errorifneq,$(zero),$(words $(call isTargetStemClean)))
+
diff --git a/js/src/config/makefiles/autotargets.mk b/js/src/config/makefiles/autotargets.mk
index 667727d64f2..0573218e00d 100644
--- a/js/src/config/makefiles/autotargets.mk
+++ b/js/src/config/makefiles/autotargets.mk
@@ -50,8 +50,5 @@ endif
 
 AUTO_DEPS +=$(GENERATED_DIRS_DEPS)
 
-
 # Complain loudly if deps have not loaded so getargv != $(NULL)
-ifndef getargv
-  $(error config/makefiles/makeutil.mk has not been included)
-endif
+$(call requiredfunction,getargv)
diff --git a/js/src/config/makefiles/makeutils.mk b/js/src/config/makefiles/makeutils.mk
index 544ee8d5d00..faf6c58aae5 100644
--- a/js/src/config/makefiles/makeutils.mk
+++ b/js/src/config/makefiles/makeutils.mk
@@ -5,13 +5,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# Usage: $(call banner,foo bar tans)
-banner =\
-$(info )\
-$(info ***************************************************************************)\
-$(info ** BANNER: $(1) $(2) $(3) $(4) $(5) $(6) $(7) $(8) $(9))\
-$(info ***************************************************************************)\
-
 ## Identify function argument types
 istype =$(if $(value ${1}),list,scalar)
 isval  =$(if $(filter-out list,$(call istype,${1})),true)
@@ -35,6 +28,62 @@ argv +=)
 ## getarglist() would be a more accurate name but is longer to type
 getargv = $(if $(call isvar,$(1)),$($(1)),$(argv))
 
+###########################################################################
+# Strip [n] leading options from an argument list.  This will allow passing
+# extra args to user functions that will not propogate to sub-$(call )'s
+# Usage: $(call subargv,2)
+subargv =$(wordlist $(1),$(words $(getargv)),$(getargv))
+
+###########################################################################
+# Intent: Display a distinct banner heading in the output stream
+# Usage: $(call banner,BUILDING: foo bar tans)
+# Debug:
+#   target-preqs = \
+#     $(call banner,target-preqs-BEGIN) \
+#     foo bar tans \
+#     $(call banner,target-preqs-END) \
+#     $(NULL)
+#   target: $(target-preqs)
+
+banner =\
+$(info )\
+$(info ***************************************************************************)\
+$(info ** $(getargv))\
+$(info ***************************************************************************)\
+$(NULL)
+
+#####################################################################
+# Intent: Determine if a string or pattern is contained in a list
+# Usage: strcmp  - $(call if_XinY,clean,$(MAKECMDGOALS))
+#      : pattern - $(call if_XinY,clean%,$(MAKECMDGOALS))
+is_XinY =$(filter $(1),$(call subargv,3,$(getargv)))
+
+#####################################################################
+# Provide an alternate var to support testing
+ifdef MAKEUTILS_UNIT_TEST
+  mcg_goals=TEST_MAKECMDGOALS
+else
+  mcg_goals=MAKECMDGOALS
+endif
+
+# Intent: Conditionals for detecting common/tier target use
+#   Todo: are check, install, test needed ?
+isTargetStem       = $(sort $(foreach pat, $(1)% %$(1), $(call is_XinY,$(pat),${$(mcg_goals)})))
+isTargetStemClean  = $(call isTargetStem,clean)
+isTargetStemExport = $(call isTargetStem,export)
+isTargetStemLibs   = $(call isTargetStem,libs)
+isTargetStemTools  = $(call isTargetStem,tools)
+
+##################################################
+# Intent: Validation functions / unit test helpers
+
+errorifneq =$(if $(subst $(strip $(1)),$(NULL),$(strip $(2))),$(error expected [$(1)] but found [$(2)]))
+
+# Intent: verify function declaration exists
+requiredfunction =$(foreach func,$(1) $(2) $(3) $(4) $(5) $(6) $(7) $(8) $(9),$(if $(value $(func)),$(NULL),$(error required function [$(func)] is unavailable)))
+
+
+
 ## http://www.gnu.org/software/make/manual/make.html#Call-Function
 ## Usage: o = $(call map,origin,o map $(MAKE))
 map = $(foreach val,$(2),$(call $(1),$(val)))

From 8f502c652e0089c4a5d6b6ff8ebe5ef8fbe50ed9 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Sat, 28 Apr 2012 11:22:06 -0400
Subject: [PATCH 108/162] Bug 515785 - Use new icons for each task in Win7 Jump
 list tasks. r=bbondy

---
 browser/app/Makefile.in                   |   4 ++++
 browser/app/splash.rc                     |   3 +++
 browser/branding/aurora/Makefile.in       |   3 +++
 browser/branding/aurora/newtab.ico        | Bin 0 -> 1150 bytes
 browser/branding/aurora/newwindow.ico     | Bin 0 -> 1150 bytes
 browser/branding/aurora/pbmode.ico        | Bin 0 -> 1150 bytes
 browser/branding/nightly/Makefile.in      |   3 +++
 browser/branding/nightly/newtab.ico       | Bin 0 -> 1150 bytes
 browser/branding/nightly/newwindow.ico    | Bin 0 -> 1150 bytes
 browser/branding/nightly/pbmode.ico       | Bin 0 -> 1150 bytes
 browser/branding/official/Makefile.in     |   3 +++
 browser/branding/official/newtab.ico      | Bin 0 -> 1150 bytes
 browser/branding/official/newwindow.ico   | Bin 0 -> 1150 bytes
 browser/branding/official/pbmode.ico      | Bin 0 -> 1150 bytes
 browser/branding/unofficial/Makefile.in   |   3 +++
 browser/branding/unofficial/newtab.ico    | Bin 0 -> 1150 bytes
 browser/branding/unofficial/newwindow.ico | Bin 0 -> 1150 bytes
 browser/branding/unofficial/pbmode.ico    | Bin 0 -> 1150 bytes
 browser/modules/WindowsJumpLists.jsm      |   6 +++---
 toolkit/xre/nsNativeAppSupportWin.h       |   3 +++
 20 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 browser/branding/aurora/newtab.ico
 create mode 100644 browser/branding/aurora/newwindow.ico
 create mode 100644 browser/branding/aurora/pbmode.ico
 create mode 100644 browser/branding/nightly/newtab.ico
 create mode 100644 browser/branding/nightly/newwindow.ico
 create mode 100644 browser/branding/nightly/pbmode.ico
 create mode 100644 browser/branding/official/newtab.ico
 create mode 100644 browser/branding/official/newwindow.ico
 create mode 100644 browser/branding/official/pbmode.ico
 create mode 100644 browser/branding/unofficial/newtab.ico
 create mode 100644 browser/branding/unofficial/newwindow.ico
 create mode 100644 browser/branding/unofficial/pbmode.ico

diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index 4096b41fea3..4a94cc54970 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -62,6 +62,10 @@ DEFINES += \
   -DAPP_VERSION="$(MOZ_APP_VERSION)" \
   -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" \
   -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" \
+  -DNEWWINDOW_ICO=\"$(DIST)/branding/newwindow.ico\" \
+  -DNEWTAB_ICO=\"$(DIST)/branding/newtab.ico\" \
+  -DPBMODE_ICO=\"$(DIST)/branding/pbmode.ico\" \
+
   $(NULL)
 
 ifdef LIBXUL_SDK #{
diff --git a/browser/app/splash.rc b/browser/app/splash.rc
index f1140c112ca..cdaa720cced 100644
--- a/browser/app/splash.rc
+++ b/browser/app/splash.rc
@@ -45,6 +45,9 @@
 IDI_APPICON ICON FIREFOX_ICO
 IDI_DOCUMENT ICON DOCUMENT_ICO
 IDI_APPLICATION ICON FIREFOX_ICO
+IDI_NEWWINDOW ICON NEWWINDOW_ICO
+IDI_NEWTAB ICON NEWTAB_ICO
+IDI_PBMODE ICON PBMODE_ICO
 
 STRINGTABLE DISCARDABLE
 BEGIN
diff --git a/browser/branding/aurora/Makefile.in b/browser/branding/aurora/Makefile.in
index 8b179e94610..7c4c245003d 100644
--- a/browser/branding/aurora/Makefile.in
+++ b/browser/branding/aurora/Makefile.in
@@ -58,6 +58,9 @@ WINDOWS_BRANDING_FILES = \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
+	newwindow.ico \
+	newtab.ico \
+	pbmode.ico \
 	$(NULL)
 
 OSX_BRANDING_FILES = \
diff --git a/browser/branding/aurora/newtab.ico b/browser/branding/aurora/newtab.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6e3fee6229beba45996cfd9be6cc839258ec86d3
GIT binary patch
literal 1150
zcma)*O=#3W7>1`>by4!8Rf~eHSfzivNnydiiwCJLyIBztq@EN+MM@7st77p7JQR-}
zd(opO^`JNLP+<=WiYN%Bq9Ta3wXQDRZDywV{NA`i3~_D3Gx_G7_f3YGi4aYE+qU3#
zt2o;%#6}@R7sC=Ozjb~HkqX<tn*Ciy%fYl!@LY4$bIdDC!Zk1F(nfw?yJh29dU*Tk
z!q-VHXW!9Ms7+7miTmSE@{XCyyXJ+3nW;tj?LEZ_lusb8qhFn#lAdb~7hG#Z&V8gL
zI!3YtlE$DR>p9kW_5Bk?2{eC~=^o35{OLzMsFC#?V@Q=hQ<U|mI;ibZC+)b|6M`CA
z)PovXug^TEetw}S=J74GVX%!hkG6-Ph8FdpMwa*OjH=8~687m$1d_&7WtNcTH9RS+
zKNi*e9K}f;X(bTX(dUd`bgdJ7cJ{n}Ht|SHUtzCwwcHS_CA=?7k00bR#_sI4wN`((
zv8$Ld2kzXuenZzP)QIu1i&x=AX6N>GCLiYI%qnIzpWS2HpQlE^18+Tp>@sErlPYAa
zqgvK@e*Xp@c<UKtn;5)jC9maSC4H^24hcwE^9vdK5WMvavH<UC?(ebs-oAQ%Pb;N@
zAfPDF-n=N?J<w~r@YXZP;tJ=mx3k5_rEMqg^8f7E#VF7)=Cq16?8kh=ERhh`xcVO-
KEFsD<ko^TfWs>s%

literal 0
HcmV?d00001

diff --git a/browser/branding/aurora/newwindow.ico b/browser/branding/aurora/newwindow.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a30093564c1bf0b4d905de41e46cadc3fdff9832
GIT binary patch
literal 1150
zcmb7^%}Z2K7>AGK!o_gz2w4>PfhK*<oyBaemYOpw7xu9hQK)DUQ6V9;sFWxu@DC7O
zxM<-*MG+N~OvWTc{5MK-?#w+OZ}0EOfvyl-XL!zg&wGB);hw`VLe%j$n-x5^iJ^KS
z&Iuu|Fx=wKai5D24Q@;fU6(RVJ)yi;3WHC@d@zxUF!<b^llS4GuFg)C<H~Pi;|irg
zMF$4Xo$K;$DK9_j=#Sl;pQ6pV$#ig5MTfc+$`8P*h`ujOld1el1+sA97V~o4sw$P2
zX2?Vb2|At?2%PLA3kNRW*Bh&9w7vX=O!Y9q)wcx#C;Q04fm;lN*H+hPXKj{D?Z|O<
zpo3aoT&B*kYYsf4=hu;i1DE$0wK}GsU+2igkwZRcrlyB2baABBfoJsmI<j!!^8Jrk
zt!Ve#qI)O2mnS=Tfq<X;>ay&><vV<CjiSA+6}Kn$^)&RIC*bG4x-2_z`FHo!8cqA#
z>x7yHpM}e3c;ft>4cb2iaNzca@{zTMG~eB6fCIM}%3-aw(JCg*clR%~>Jhzv_1N{^
zy&QJ6zrRdCE2a4SLp?V#w|{Ib&l}Abn(~7zoZejKR-wHy=+0$smU6)WpJy-)$ijiU
TdPa!Ry2M{XVuH2*K_tXqq7?GF

literal 0
HcmV?d00001

diff --git a/browser/branding/aurora/pbmode.ico b/browser/branding/aurora/pbmode.ico
new file mode 100644
index 0000000000000000000000000000000000000000..d21799475a2322e259313ecd560ccb842e81d79d
GIT binary patch
literal 1150
zcmd5)TTGH+82;_BTy4#pPFojVwrs1*?z-!`t&6&_9Fstu8lDJ3{QW_b03kt<gMy%(
z1c5{mCxXXHDD6VCSVx;_xz<*TnZrH(zr;meHZS_Vz3;pCefK=?;rj?8hrW4v1g-Ol
zk^=;BoFIrZw9p|sl8MuXAaZx~o~i<E2q#2l{442|*vJ10A8Bho>y_RSxX5a@g(Pz=
zWKnK+6|2}#c|%|<yIHV%&TRk5DfcnIvT??y5TrfrVp!$Xu-@mVdYXADo4f+P4nDdh
zrRmPP;#te>qWmlmgD>RPj5=FI-=i)K;zMR6hRql>HDP(ei5D?DB7HJE4;wK*tV7Ik
z4|*{>)m>hAp5eIcnuC(8#az&cfKdXkt`UBN6a$@&m>=oELfArcQ3&Yk;ce$5XcXbG
zPX)d3)+&P+3dMa<rviR`1D%t-8@H%~QLEPBQa5~_^t5Bbt${}^S_^8M9DbEJXjjyJ
z@M`PO-&TdLs-o-WyCqMSA{O+u)Fc@`=8z=0&q(pUF|$m0JD?Mlea&Pt+8{1@GwW@I
zS-_pJP-R~h$GTuw@?dP>q)d$!Nj0Cf<#-^#%F_^*Cp}OJSdeh9ZfW@Jq^$f}N>8$p
z2zJ0CDc{ghrK#zDIT((YF&h#?dMu9H@IL+!n=5f_EX6S6)6=_=f_aySU5Ti(74bnG
zdSz9c-BQlBzmrV$HC3(-XoOn}Ap<rR!}$4j8mkK-ynf_Ea>j>eBUX&|D&bbuZ@Cqs
zPfn%qhl%2DxA1vu=S)*O|G&Ss=%k%09~sbyHvKwrI-nuf1MSqhS4*b78tPZLqa~cs
zt4=Xn0KFrBGhfacdxe5O`0S1h9L_;oP2rKOKgi)6W@1@?FD>ZKFYS{2Lv)4xwB%&u
O^u@m`UO1Y;FxcOwbD@d=

literal 0
HcmV?d00001

diff --git a/browser/branding/nightly/Makefile.in b/browser/branding/nightly/Makefile.in
index 8b179e94610..7c4c245003d 100644
--- a/browser/branding/nightly/Makefile.in
+++ b/browser/branding/nightly/Makefile.in
@@ -58,6 +58,9 @@ WINDOWS_BRANDING_FILES = \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
+	newwindow.ico \
+	newtab.ico \
+	pbmode.ico \
 	$(NULL)
 
 OSX_BRANDING_FILES = \
diff --git a/browser/branding/nightly/newtab.ico b/browser/branding/nightly/newtab.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6e3fee6229beba45996cfd9be6cc839258ec86d3
GIT binary patch
literal 1150
zcma)*O=#3W7>1`>by4!8Rf~eHSfzivNnydiiwCJLyIBztq@EN+MM@7st77p7JQR-}
zd(opO^`JNLP+<=WiYN%Bq9Ta3wXQDRZDywV{NA`i3~_D3Gx_G7_f3YGi4aYE+qU3#
zt2o;%#6}@R7sC=Ozjb~HkqX<tn*Ciy%fYl!@LY4$bIdDC!Zk1F(nfw?yJh29dU*Tk
z!q-VHXW!9Ms7+7miTmSE@{XCyyXJ+3nW;tj?LEZ_lusb8qhFn#lAdb~7hG#Z&V8gL
zI!3YtlE$DR>p9kW_5Bk?2{eC~=^o35{OLzMsFC#?V@Q=hQ<U|mI;ibZC+)b|6M`CA
z)PovXug^TEetw}S=J74GVX%!hkG6-Ph8FdpMwa*OjH=8~687m$1d_&7WtNcTH9RS+
zKNi*e9K}f;X(bTX(dUd`bgdJ7cJ{n}Ht|SHUtzCwwcHS_CA=?7k00bR#_sI4wN`((
zv8$Ld2kzXuenZzP)QIu1i&x=AX6N>GCLiYI%qnIzpWS2HpQlE^18+Tp>@sErlPYAa
zqgvK@e*Xp@c<UKtn;5)jC9maSC4H^24hcwE^9vdK5WMvavH<UC?(ebs-oAQ%Pb;N@
zAfPDF-n=N?J<w~r@YXZP;tJ=mx3k5_rEMqg^8f7E#VF7)=Cq16?8kh=ERhh`xcVO-
KEFsD<ko^TfWs>s%

literal 0
HcmV?d00001

diff --git a/browser/branding/nightly/newwindow.ico b/browser/branding/nightly/newwindow.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a30093564c1bf0b4d905de41e46cadc3fdff9832
GIT binary patch
literal 1150
zcmb7^%}Z2K7>AGK!o_gz2w4>PfhK*<oyBaemYOpw7xu9hQK)DUQ6V9;sFWxu@DC7O
zxM<-*MG+N~OvWTc{5MK-?#w+OZ}0EOfvyl-XL!zg&wGB);hw`VLe%j$n-x5^iJ^KS
z&Iuu|Fx=wKai5D24Q@;fU6(RVJ)yi;3WHC@d@zxUF!<b^llS4GuFg)C<H~Pi;|irg
zMF$4Xo$K;$DK9_j=#Sl;pQ6pV$#ig5MTfc+$`8P*h`ujOld1el1+sA97V~o4sw$P2
zX2?Vb2|At?2%PLA3kNRW*Bh&9w7vX=O!Y9q)wcx#C;Q04fm;lN*H+hPXKj{D?Z|O<
zpo3aoT&B*kYYsf4=hu;i1DE$0wK}GsU+2igkwZRcrlyB2baABBfoJsmI<j!!^8Jrk
zt!Ve#qI)O2mnS=Tfq<X;>ay&><vV<CjiSA+6}Kn$^)&RIC*bG4x-2_z`FHo!8cqA#
z>x7yHpM}e3c;ft>4cb2iaNzca@{zTMG~eB6fCIM}%3-aw(JCg*clR%~>Jhzv_1N{^
zy&QJ6zrRdCE2a4SLp?V#w|{Ib&l}Abn(~7zoZejKR-wHy=+0$smU6)WpJy-)$ijiU
TdPa!Ry2M{XVuH2*K_tXqq7?GF

literal 0
HcmV?d00001

diff --git a/browser/branding/nightly/pbmode.ico b/browser/branding/nightly/pbmode.ico
new file mode 100644
index 0000000000000000000000000000000000000000..d21799475a2322e259313ecd560ccb842e81d79d
GIT binary patch
literal 1150
zcmd5)TTGH+82;_BTy4#pPFojVwrs1*?z-!`t&6&_9Fstu8lDJ3{QW_b03kt<gMy%(
z1c5{mCxXXHDD6VCSVx;_xz<*TnZrH(zr;meHZS_Vz3;pCefK=?;rj?8hrW4v1g-Ol
zk^=;BoFIrZw9p|sl8MuXAaZx~o~i<E2q#2l{442|*vJ10A8Bho>y_RSxX5a@g(Pz=
zWKnK+6|2}#c|%|<yIHV%&TRk5DfcnIvT??y5TrfrVp!$Xu-@mVdYXADo4f+P4nDdh
zrRmPP;#te>qWmlmgD>RPj5=FI-=i)K;zMR6hRql>HDP(ei5D?DB7HJE4;wK*tV7Ik
z4|*{>)m>hAp5eIcnuC(8#az&cfKdXkt`UBN6a$@&m>=oELfArcQ3&Yk;ce$5XcXbG
zPX)d3)+&P+3dMa<rviR`1D%t-8@H%~QLEPBQa5~_^t5Bbt${}^S_^8M9DbEJXjjyJ
z@M`PO-&TdLs-o-WyCqMSA{O+u)Fc@`=8z=0&q(pUF|$m0JD?Mlea&Pt+8{1@GwW@I
zS-_pJP-R~h$GTuw@?dP>q)d$!Nj0Cf<#-^#%F_^*Cp}OJSdeh9ZfW@Jq^$f}N>8$p
z2zJ0CDc{ghrK#zDIT((YF&h#?dMu9H@IL+!n=5f_EX6S6)6=_=f_aySU5Ti(74bnG
zdSz9c-BQlBzmrV$HC3(-XoOn}Ap<rR!}$4j8mkK-ynf_Ea>j>eBUX&|D&bbuZ@Cqs
zPfn%qhl%2DxA1vu=S)*O|G&Ss=%k%09~sbyHvKwrI-nuf1MSqhS4*b78tPZLqa~cs
zt4=Xn0KFrBGhfacdxe5O`0S1h9L_;oP2rKOKgi)6W@1@?FD>ZKFYS{2Lv)4xwB%&u
O^u@m`UO1Y;FxcOwbD@d=

literal 0
HcmV?d00001

diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
index 8b179e94610..7c4c245003d 100644
--- a/browser/branding/official/Makefile.in
+++ b/browser/branding/official/Makefile.in
@@ -58,6 +58,9 @@ WINDOWS_BRANDING_FILES = \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
+	newwindow.ico \
+	newtab.ico \
+	pbmode.ico \
 	$(NULL)
 
 OSX_BRANDING_FILES = \
diff --git a/browser/branding/official/newtab.ico b/browser/branding/official/newtab.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6e3fee6229beba45996cfd9be6cc839258ec86d3
GIT binary patch
literal 1150
zcma)*O=#3W7>1`>by4!8Rf~eHSfzivNnydiiwCJLyIBztq@EN+MM@7st77p7JQR-}
zd(opO^`JNLP+<=WiYN%Bq9Ta3wXQDRZDywV{NA`i3~_D3Gx_G7_f3YGi4aYE+qU3#
zt2o;%#6}@R7sC=Ozjb~HkqX<tn*Ciy%fYl!@LY4$bIdDC!Zk1F(nfw?yJh29dU*Tk
z!q-VHXW!9Ms7+7miTmSE@{XCyyXJ+3nW;tj?LEZ_lusb8qhFn#lAdb~7hG#Z&V8gL
zI!3YtlE$DR>p9kW_5Bk?2{eC~=^o35{OLzMsFC#?V@Q=hQ<U|mI;ibZC+)b|6M`CA
z)PovXug^TEetw}S=J74GVX%!hkG6-Ph8FdpMwa*OjH=8~687m$1d_&7WtNcTH9RS+
zKNi*e9K}f;X(bTX(dUd`bgdJ7cJ{n}Ht|SHUtzCwwcHS_CA=?7k00bR#_sI4wN`((
zv8$Ld2kzXuenZzP)QIu1i&x=AX6N>GCLiYI%qnIzpWS2HpQlE^18+Tp>@sErlPYAa
zqgvK@e*Xp@c<UKtn;5)jC9maSC4H^24hcwE^9vdK5WMvavH<UC?(ebs-oAQ%Pb;N@
zAfPDF-n=N?J<w~r@YXZP;tJ=mx3k5_rEMqg^8f7E#VF7)=Cq16?8kh=ERhh`xcVO-
KEFsD<ko^TfWs>s%

literal 0
HcmV?d00001

diff --git a/browser/branding/official/newwindow.ico b/browser/branding/official/newwindow.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a30093564c1bf0b4d905de41e46cadc3fdff9832
GIT binary patch
literal 1150
zcmb7^%}Z2K7>AGK!o_gz2w4>PfhK*<oyBaemYOpw7xu9hQK)DUQ6V9;sFWxu@DC7O
zxM<-*MG+N~OvWTc{5MK-?#w+OZ}0EOfvyl-XL!zg&wGB);hw`VLe%j$n-x5^iJ^KS
z&Iuu|Fx=wKai5D24Q@;fU6(RVJ)yi;3WHC@d@zxUF!<b^llS4GuFg)C<H~Pi;|irg
zMF$4Xo$K;$DK9_j=#Sl;pQ6pV$#ig5MTfc+$`8P*h`ujOld1el1+sA97V~o4sw$P2
zX2?Vb2|At?2%PLA3kNRW*Bh&9w7vX=O!Y9q)wcx#C;Q04fm;lN*H+hPXKj{D?Z|O<
zpo3aoT&B*kYYsf4=hu;i1DE$0wK}GsU+2igkwZRcrlyB2baABBfoJsmI<j!!^8Jrk
zt!Ve#qI)O2mnS=Tfq<X;>ay&><vV<CjiSA+6}Kn$^)&RIC*bG4x-2_z`FHo!8cqA#
z>x7yHpM}e3c;ft>4cb2iaNzca@{zTMG~eB6fCIM}%3-aw(JCg*clR%~>Jhzv_1N{^
zy&QJ6zrRdCE2a4SLp?V#w|{Ib&l}Abn(~7zoZejKR-wHy=+0$smU6)WpJy-)$ijiU
TdPa!Ry2M{XVuH2*K_tXqq7?GF

literal 0
HcmV?d00001

diff --git a/browser/branding/official/pbmode.ico b/browser/branding/official/pbmode.ico
new file mode 100644
index 0000000000000000000000000000000000000000..d21799475a2322e259313ecd560ccb842e81d79d
GIT binary patch
literal 1150
zcmd5)TTGH+82;_BTy4#pPFojVwrs1*?z-!`t&6&_9Fstu8lDJ3{QW_b03kt<gMy%(
z1c5{mCxXXHDD6VCSVx;_xz<*TnZrH(zr;meHZS_Vz3;pCefK=?;rj?8hrW4v1g-Ol
zk^=;BoFIrZw9p|sl8MuXAaZx~o~i<E2q#2l{442|*vJ10A8Bho>y_RSxX5a@g(Pz=
zWKnK+6|2}#c|%|<yIHV%&TRk5DfcnIvT??y5TrfrVp!$Xu-@mVdYXADo4f+P4nDdh
zrRmPP;#te>qWmlmgD>RPj5=FI-=i)K;zMR6hRql>HDP(ei5D?DB7HJE4;wK*tV7Ik
z4|*{>)m>hAp5eIcnuC(8#az&cfKdXkt`UBN6a$@&m>=oELfArcQ3&Yk;ce$5XcXbG
zPX)d3)+&P+3dMa<rviR`1D%t-8@H%~QLEPBQa5~_^t5Bbt${}^S_^8M9DbEJXjjyJ
z@M`PO-&TdLs-o-WyCqMSA{O+u)Fc@`=8z=0&q(pUF|$m0JD?Mlea&Pt+8{1@GwW@I
zS-_pJP-R~h$GTuw@?dP>q)d$!Nj0Cf<#-^#%F_^*Cp}OJSdeh9ZfW@Jq^$f}N>8$p
z2zJ0CDc{ghrK#zDIT((YF&h#?dMu9H@IL+!n=5f_EX6S6)6=_=f_aySU5Ti(74bnG
zdSz9c-BQlBzmrV$HC3(-XoOn}Ap<rR!}$4j8mkK-ynf_Ea>j>eBUX&|D&bbuZ@Cqs
zPfn%qhl%2DxA1vu=S)*O|G&Ss=%k%09~sbyHvKwrI-nuf1MSqhS4*b78tPZLqa~cs
zt4=Xn0KFrBGhfacdxe5O`0S1h9L_;oP2rKOKgi)6W@1@?FD>ZKFYS{2Lv)4xwB%&u
O^u@m`UO1Y;FxcOwbD@d=

literal 0
HcmV?d00001

diff --git a/browser/branding/unofficial/Makefile.in b/browser/branding/unofficial/Makefile.in
index 8b179e94610..7c4c245003d 100644
--- a/browser/branding/unofficial/Makefile.in
+++ b/browser/branding/unofficial/Makefile.in
@@ -58,6 +58,9 @@ WINDOWS_BRANDING_FILES = \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
+	newwindow.ico \
+	newtab.ico \
+	pbmode.ico \
 	$(NULL)
 
 OSX_BRANDING_FILES = \
diff --git a/browser/branding/unofficial/newtab.ico b/browser/branding/unofficial/newtab.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6e3fee6229beba45996cfd9be6cc839258ec86d3
GIT binary patch
literal 1150
zcma)*O=#3W7>1`>by4!8Rf~eHSfzivNnydiiwCJLyIBztq@EN+MM@7st77p7JQR-}
zd(opO^`JNLP+<=WiYN%Bq9Ta3wXQDRZDywV{NA`i3~_D3Gx_G7_f3YGi4aYE+qU3#
zt2o;%#6}@R7sC=Ozjb~HkqX<tn*Ciy%fYl!@LY4$bIdDC!Zk1F(nfw?yJh29dU*Tk
z!q-VHXW!9Ms7+7miTmSE@{XCyyXJ+3nW;tj?LEZ_lusb8qhFn#lAdb~7hG#Z&V8gL
zI!3YtlE$DR>p9kW_5Bk?2{eC~=^o35{OLzMsFC#?V@Q=hQ<U|mI;ibZC+)b|6M`CA
z)PovXug^TEetw}S=J74GVX%!hkG6-Ph8FdpMwa*OjH=8~687m$1d_&7WtNcTH9RS+
zKNi*e9K}f;X(bTX(dUd`bgdJ7cJ{n}Ht|SHUtzCwwcHS_CA=?7k00bR#_sI4wN`((
zv8$Ld2kzXuenZzP)QIu1i&x=AX6N>GCLiYI%qnIzpWS2HpQlE^18+Tp>@sErlPYAa
zqgvK@e*Xp@c<UKtn;5)jC9maSC4H^24hcwE^9vdK5WMvavH<UC?(ebs-oAQ%Pb;N@
zAfPDF-n=N?J<w~r@YXZP;tJ=mx3k5_rEMqg^8f7E#VF7)=Cq16?8kh=ERhh`xcVO-
KEFsD<ko^TfWs>s%

literal 0
HcmV?d00001

diff --git a/browser/branding/unofficial/newwindow.ico b/browser/branding/unofficial/newwindow.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a30093564c1bf0b4d905de41e46cadc3fdff9832
GIT binary patch
literal 1150
zcmb7^%}Z2K7>AGK!o_gz2w4>PfhK*<oyBaemYOpw7xu9hQK)DUQ6V9;sFWxu@DC7O
zxM<-*MG+N~OvWTc{5MK-?#w+OZ}0EOfvyl-XL!zg&wGB);hw`VLe%j$n-x5^iJ^KS
z&Iuu|Fx=wKai5D24Q@;fU6(RVJ)yi;3WHC@d@zxUF!<b^llS4GuFg)C<H~Pi;|irg
zMF$4Xo$K;$DK9_j=#Sl;pQ6pV$#ig5MTfc+$`8P*h`ujOld1el1+sA97V~o4sw$P2
zX2?Vb2|At?2%PLA3kNRW*Bh&9w7vX=O!Y9q)wcx#C;Q04fm;lN*H+hPXKj{D?Z|O<
zpo3aoT&B*kYYsf4=hu;i1DE$0wK}GsU+2igkwZRcrlyB2baABBfoJsmI<j!!^8Jrk
zt!Ve#qI)O2mnS=Tfq<X;>ay&><vV<CjiSA+6}Kn$^)&RIC*bG4x-2_z`FHo!8cqA#
z>x7yHpM}e3c;ft>4cb2iaNzca@{zTMG~eB6fCIM}%3-aw(JCg*clR%~>Jhzv_1N{^
zy&QJ6zrRdCE2a4SLp?V#w|{Ib&l}Abn(~7zoZejKR-wHy=+0$smU6)WpJy-)$ijiU
TdPa!Ry2M{XVuH2*K_tXqq7?GF

literal 0
HcmV?d00001

diff --git a/browser/branding/unofficial/pbmode.ico b/browser/branding/unofficial/pbmode.ico
new file mode 100644
index 0000000000000000000000000000000000000000..d21799475a2322e259313ecd560ccb842e81d79d
GIT binary patch
literal 1150
zcmd5)TTGH+82;_BTy4#pPFojVwrs1*?z-!`t&6&_9Fstu8lDJ3{QW_b03kt<gMy%(
z1c5{mCxXXHDD6VCSVx;_xz<*TnZrH(zr;meHZS_Vz3;pCefK=?;rj?8hrW4v1g-Ol
zk^=;BoFIrZw9p|sl8MuXAaZx~o~i<E2q#2l{442|*vJ10A8Bho>y_RSxX5a@g(Pz=
zWKnK+6|2}#c|%|<yIHV%&TRk5DfcnIvT??y5TrfrVp!$Xu-@mVdYXADo4f+P4nDdh
zrRmPP;#te>qWmlmgD>RPj5=FI-=i)K;zMR6hRql>HDP(ei5D?DB7HJE4;wK*tV7Ik
z4|*{>)m>hAp5eIcnuC(8#az&cfKdXkt`UBN6a$@&m>=oELfArcQ3&Yk;ce$5XcXbG
zPX)d3)+&P+3dMa<rviR`1D%t-8@H%~QLEPBQa5~_^t5Bbt${}^S_^8M9DbEJXjjyJ
z@M`PO-&TdLs-o-WyCqMSA{O+u)Fc@`=8z=0&q(pUF|$m0JD?Mlea&Pt+8{1@GwW@I
zS-_pJP-R~h$GTuw@?dP>q)d$!Nj0Cf<#-^#%F_^*Cp}OJSdeh9ZfW@Jq^$f}N>8$p
z2zJ0CDc{ghrK#zDIT((YF&h#?dMu9H@IL+!n=5f_EX6S6)6=_=f_aySU5Ti(74bnG
zdSz9c-BQlBzmrV$HC3(-XoOn}Ap<rR!}$4j8mkK-ynf_Ea>j>eBUX&|D&bbuZ@Cqs
zPfn%qhl%2DxA1vu=S)*O|G&Ss=%k%09~sbyHvKwrI-nuf1MSqhS4*b78tPZLqa~cs
zt4=Xn0KFrBGhfacdxe5O`0S1h9L_;oP2rKOKgi)6W@1@?FD>ZKFYS{2Lv)4xwB%&u
O^u@m`UO1Y;FxcOwbD@d=

literal 0
HcmV?d00001

diff --git a/browser/modules/WindowsJumpLists.jsm b/browser/modules/WindowsJumpLists.jsm
index 8b9e1fed075..1da39ba72d5 100644
--- a/browser/modules/WindowsJumpLists.jsm
+++ b/browser/modules/WindowsJumpLists.jsm
@@ -141,7 +141,7 @@ var tasksCfg = [
     get title()       _getString("taskbar.tasks.newTab.label"),
     get description() _getString("taskbar.tasks.newTab.description"),
     args:             "-new-tab about:blank",
-    iconIndex:        0, // Fx app icon
+    iconIndex:        3, // New window icon
     open:             true,
     close:            true, // The jump list already has an app launch icon, but
                             // we don't always update the list on shutdown.
@@ -153,7 +153,7 @@ var tasksCfg = [
     get title()       _getString("taskbar.tasks.newWindow.label"),
     get description() _getString("taskbar.tasks.newWindow.description"),
     args:             "-browser",
-    iconIndex:        0, // Fx app icon
+    iconIndex:        2, // New tab icon
     open:             true,
     close:            true, // No point, but we don't always update the list on
                             //  shutdown.  Thus true for consistency.
@@ -174,7 +174,7 @@ var tasksCfg = [
         return _getString("taskbar.tasks.enterPrivacyMode.description");
     },
     args:             "-private-toggle",
-    iconIndex:        0, // Fx app icon
+    iconIndex:        4, // Private browsing mode icon
     get open() {
       // Don't show when inside permanent private browsing mode
       return !_privateBrowsingSvc.autoStarted;
diff --git a/toolkit/xre/nsNativeAppSupportWin.h b/toolkit/xre/nsNativeAppSupportWin.h
index a63a16e7e7f..2ccc5d429aa 100644
--- a/toolkit/xre/nsNativeAppSupportWin.h
+++ b/toolkit/xre/nsNativeAppSupportWin.h
@@ -59,6 +59,9 @@
 
 #define IDI_APPICON 1
 #define IDI_DOCUMENT 2
+#define IDI_NEWWINDOW 3
+#define IDI_NEWTAB 4
+#define IDI_PBMODE 5
 #ifndef IDI_APPLICATION
 #define IDI_APPLICATION 32512
 #endif

From accbc5ecdec0050f26584528ef5f0096147e1737 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Sat, 28 Apr 2012 12:55:59 -0400
Subject: [PATCH 109/162] Bug 749788 - Fix some JNI code bugs. r=blassey

---
 widget/android/AndroidBridge.cpp       |  4 ++--
 widget/android/AndroidJavaWrappers.cpp | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp
index 9227b772fe5..130de6144e2 100644
--- a/widget/android/AndroidBridge.cpp
+++ b/widget/android/AndroidBridge.cpp
@@ -858,7 +858,7 @@ AndroidBridge::Vibrate(const nsTArray<PRUint32>& aPattern)
     if (!env)
         return;
 
-    AutoLocalJNIFrame frame;
+    AutoLocalJNIFrame jniFrame(env);
 
     ALOG_BRIDGE("AndroidBridge::Vibrate");
 
@@ -1669,7 +1669,7 @@ AndroidBridge::GetMessage(PRInt32 aMessageId, PRInt32 aRequestId, PRUint64 aProc
 {
     ALOG_BRIDGE("AndroidBridge::GetMessage");
 
-    JNIEnv *env = env;
+    JNIEnv *env = GetJNIEnv();
     if (!env)
         return;
 
diff --git a/widget/android/AndroidJavaWrappers.cpp b/widget/android/AndroidJavaWrappers.cpp
index b1ff4ab18d3..2aa9e611ebe 100644
--- a/widget/android/AndroidJavaWrappers.cpp
+++ b/widget/android/AndroidJavaWrappers.cpp
@@ -746,7 +746,11 @@ AndroidGeckoSurfaceView::GetSurface()
 jobject
 AndroidGeckoSurfaceView::GetSurfaceHolder()
 {
-    return GetJNIForThread()->CallObjectMethod(wrapped_obj, jGetHolderMethod);
+    JNIEnv *env = GetJNIForThread();
+    if (!env)
+        return nsnull;
+
+    return env->CallObjectMethod(wrapped_obj, jGetHolderMethod);
 }
 
 void
@@ -886,8 +890,13 @@ nsJNIString::nsJNIString(jstring jstr, JNIEnv *jenv)
         return;
     }
     JNIEnv *jni = jenv;
-    if (!jni)
+    if (!jni) {
         jni = AndroidBridge::GetJNIEnv();
+        if (!jni) {
+            SetIsVoid(true);
+            return;
+        }
+    }
     const jchar* jCharPtr = jni->GetStringChars(jstr, NULL);
 
     if (!jCharPtr) {

From 6e5a1b59edd515e836dfe4865d09f607350dba81 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Thu, 26 Apr 2012 18:58:30 -0700
Subject: [PATCH 110/162] Remove an unnecessary jsdate.h #include from
 jsobjinlines.h, and add a new one to vm/GlobalObject.cpp, significantly
 reducing the number of files compiled when jsdate.h changes.  No bug,
 r=sparky

---
 js/src/jsobjinlines.h      | 1 -
 js/src/vm/GlobalObject.cpp | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index afc11b15de0..0486d450a5f 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -47,7 +47,6 @@
 #include "jsarray.h"
 #include "jsbool.h"
 #include "jscntxt.h"
-#include "jsdate.h"
 #include "jsfun.h"
 #include "jsgcmark.h"
 #include "jsiter.h"
diff --git a/js/src/vm/GlobalObject.cpp b/js/src/vm/GlobalObject.cpp
index 256e298e277..4febaf53157 100644
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -41,6 +41,7 @@
 #include "GlobalObject.h"
 
 #include "jscntxt.h"
+#include "jsdate.h"
 #include "jsexn.h"
 #include "jsmath.h"
 #include "json.h"

From 24c016f38cfb21dc1e539f9b879ed5980c88f43a Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Sat, 28 Apr 2012 09:58:30 -0700
Subject: [PATCH 111/162] Fix build warnings introduced by bug 745057, bug
 739380, and bug 746036 (warnings reported as bug 749951 and bug 749933, and
 in bug 746036 itself).  r=chucktesta

---
 js/src/jsapi.cpp         |  2 +-
 js/src/vm/ObjectImpl.cpp | 16 +++++++++++++++-
 js/src/vm/Stack.cpp      |  4 +++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 5ca89117467..0fc2e967f32 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -5234,7 +5234,7 @@ JS_ExecuteScript(JSContext *cx, JSObject *obj, JSScript *scriptArg, jsval *rval)
     CHECK_REQUEST(cx);
     assertSameCompartment(cx, obj);
     if (cx->compartment != obj->compartment())
-        *(int *) 0 = 0xf0;
+        *(volatile int *) 0 = 0xf0;
     AutoLastFrameCheck lfc(cx);
 
     JS::Anchor<JSScript *> script;
diff --git a/js/src/vm/ObjectImpl.cpp b/js/src/vm/ObjectImpl.cpp
index 933272a028e..573fbe21f06 100644
--- a/js/src/vm/ObjectImpl.cpp
+++ b/js/src/vm/ObjectImpl.cpp
@@ -320,6 +320,20 @@ SparseElementsHeader::getOwnElement(JSContext *cx, ObjectImpl *obj, uint32_t ind
     return false;
 }
 
+template<typename T>
+static Value
+ElementToValue(const T t)
+{
+    return NumberValue(t);
+}
+
+template<>
+/* static */ Value
+ElementToValue(const uint8_clamped u)
+{
+    return NumberValue(uint8_t(u));
+}
+
 template<typename T>
 bool
 TypedElementsHeader<T>::getOwnElement(JSContext *cx, ObjectImpl *obj, uint32_t index,
@@ -332,7 +346,7 @@ TypedElementsHeader<T>::getOwnElement(JSContext *cx, ObjectImpl *obj, uint32_t i
         return true;
     }
 
-    *desc = PropDesc(NumberValue(getElement(index)), PropDesc::Writable,
+    *desc = PropDesc(ElementToValue(getElement(index)), PropDesc::Writable,
                      PropDesc::Enumerable, PropDesc::Configurable);
     return false;
 }
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index 94faf03d338..1750c3bf83a 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -1345,13 +1345,15 @@ StackIter::thisv() const
 {
     switch (state_) {
       case DONE:
-        JS_NOT_REACHED("Unexpected state");
+        MOZ_NOT_REACHED("Unexpected state");
         return Value();
       case SCRIPTED:
       case NATIVE:
       case IMPLICIT_NATIVE:
         return fp()->thisValue();
     }
+    MOZ_NOT_REACHED("unexpected state");
+    return Value();
 }
 
 /*****************************************************************************/

From a3ccb97dbfbbed1d37b7d3bd078231a1c46419f9 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Sat, 28 Apr 2012 10:09:27 -0700
Subject: [PATCH 112/162] Fix some optimized-build warnings, neither yet
 reported as far as I know.  No bug, r=themaid

---
 js/src/jsapi-tests/testOOM.cpp | 4 +++-
 js/src/jsproxy.cpp             | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/src/jsapi-tests/testOOM.cpp b/js/src/jsapi-tests/testOOM.cpp
index 4fb257284fe..17d39840324 100644
--- a/js/src/jsapi-tests/testOOM.cpp
+++ b/js/src/jsapi-tests/testOOM.cpp
@@ -1,11 +1,13 @@
 #include "tests.h"
 
+#include "mozilla/Util.h"
+
 BEGIN_TEST(testOOM)
 {
     JSString *jsstr = JS_ValueToString(cx, INT_TO_JSVAL(9));
     jsval tmp = STRING_TO_JSVAL(jsstr);
     JS_SetProperty(cx, global, "rootme", &tmp);
-    const jschar *s = JS_GetStringCharsZ(cx, jsstr);
+    mozilla::DebugOnly<const jschar *> s = JS_GetStringCharsZ(cx, jsstr);
     JS_ASSERT(s[0] == '9' && s[1] == '\0');
     return true;
 }
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index c749e84c691..7da342b665b 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -82,6 +82,7 @@ GetFunctionProxyConstruct(JSObject *proxy)
     return proxy->getSlotRef(JSSLOT_PROXY_CONSTRUCT);
 }
 
+#ifdef DEBUG
 static bool
 OperationInProgress(JSContext *cx, JSObject *proxy)
 {
@@ -93,6 +94,7 @@ OperationInProgress(JSContext *cx, JSObject *proxy)
     }
     return false;
 }
+#endif
 
 ProxyHandler::ProxyHandler(void *family) : mFamily(family)
 {

From 9911527a1824392b984f3adf2afb757800417375 Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Sat, 28 Apr 2012 09:05:41 -0400
Subject: [PATCH 113/162] Bug 743314 - Force CanUploadSubtextures on Maemo6
 harmattan. r=chrislord.net

---
 gfx/gl/GLContext.cpp            | 5 +++++
 gfx/gl/GLContext.h              | 1 +
 gfx/gl/GLContextProviderEGL.cpp | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index d23c9eb6504..79b6d756964 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -641,6 +641,11 @@ GLContext::CanUploadSubTextures()
     if (!mWorkAroundDriverBugs)
         return true;
 
+    // Lock surface feature allows to mmap texture memory and modify it directly
+    // this feature allow us modify texture partially without full upload
+    if (HasLockSurface())
+        return true;
+
     // There are certain GPUs that we don't want to use glTexSubImage2D on
     // because that function can be very slow and/or buggy
     if (Renderer() == RendererAdreno200 || Renderer() == RendererAdreno205)
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 497e2e4852b..c93888963c9 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -731,6 +731,7 @@ public:
     bool CanUploadSubTextures();
     bool CanUploadNonPowerOfTwo();
     bool WantsSmallTiles();
+    virtual bool HasLockSurface() { return false; }
 
     /**
      * If this context wraps a double-buffered target, swap the back
diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index 72301873692..dc567dfb5da 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -597,6 +597,10 @@ public:
         return h;
     }
 
+    virtual bool HasLockSurface() {
+        return sEGLLibrary.HasKHRLockSurface();
+    }
+
 protected:
     friend class GLContextProviderEGL;
 

From 250c2d540c23602df227c32d4f541b90f2a9b2e3 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Sat, 28 Apr 2012 15:35:11 -0400
Subject: [PATCH 114/162] Bug 749624 - Check to make sure
 BrowserApp.selectedTab isn't null. r=mfinkle

---
 mobile/android/chrome/content/browser.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 3e9d4e8092b..8aec57227cd 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -4748,8 +4748,9 @@ var ActivityObserver = {
         break;
     }
 
-    if (BrowserApp.selectedTab.getActive() != isForeground) {
-      BrowserApp.selectedTab.setActive(isForeground);
+    let tab = BrowserApp.selectedTab;
+    if (tab && tab.getActive() != isForeground) {
+      tab.setActive(isForeground);
     }
   }
 };

From 8934d7a58572f35fef1226baf7964e2639e23485 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Sat, 28 Apr 2012 15:46:03 -0400
Subject: [PATCH 115/162] Bug 749582 - Fennec doesn't start in landscape mode.
 r=mfinkle

---
 mobile/android/base/GeckoApp.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 53d13025668..2586a9ca203 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -2080,7 +2080,8 @@ abstract public class GeckoApp
 
         if (mOrientation != newConfig.orientation) {
             mOrientation = newConfig.orientation;
-            mFormAssistPopup.hide();
+            if (mFormAssistPopup != null)
+                mFormAssistPopup.hide();
             refreshActionBar();
         }
     }

From 705bb75e54d26e6e6bf5acaa872b26aabcd51932 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Sat, 28 Apr 2012 17:11:40 -0400
Subject: [PATCH 116/162] Bug 749648 - Null-check the return value of
 MapViewOfFile properly in CheckASLR; r=ehsan

---
 toolkit/xre/nsWindowsDllBlocklist.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toolkit/xre/nsWindowsDllBlocklist.cpp b/toolkit/xre/nsWindowsDllBlocklist.cpp
index c6040218af3..625fa94cba7 100644
--- a/toolkit/xre/nsWindowsDllBlocklist.cpp
+++ b/toolkit/xre/nsWindowsDllBlocklist.cpp
@@ -176,7 +176,8 @@ struct RVAMap {
     mRealView = ::MapViewOfFile(map, FILE_MAP_READ, 0, alignedOffset,
                                 sizeof(T) + (offset - alignedOffset));
 
-    mMappedView = reinterpret_cast<T*>((char*)mRealView + (offset - alignedOffset));
+    mMappedView = mRealView ? reinterpret_cast<T*>((char*)mRealView + (offset - alignedOffset)) :
+                              nsnull;
   }
   ~RVAMap() {
     if (mRealView) {

From c653a4646b5098db94e7479c68bc3fe1634dbc67 Mon Sep 17 00:00:00 2001
From: Eric Wong <ewong3@gmail.com>
Date: Sat, 28 Apr 2012 18:39:14 -0700
Subject: [PATCH 117/162] Bug 724841 - Retain case when sending location bar
 text to search engine service r=bz

---
 docshell/base/nsDocShell.cpp | 51 ++++++++++++++++++++++--------------
 docshell/base/nsDocShell.h   |  3 ++-
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 0a7fde23e54..291a8a25be1 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -3896,6 +3896,10 @@ nsDocShell::LoadURI(const PRUnichar * aURI,
 
     rv = LoadURI(uri, loadInfo, extraFlags, true);
 
+    // Save URI string in case it's needed later when
+    // sending to search engine service in EndPageLoad()
+    mOriginalUriString = uriString; 
+
     return rv;
 }
 
@@ -6355,27 +6359,33 @@ nsDocShell::EndPageLoad(nsIWebProgress * aProgress,
 
                 if (keywordsEnabled && (kNotFound == dotLoc)) {
                     // only send non-qualified hosts to the keyword server
-                    //
-                    // If this string was passed through nsStandardURL by
-                    // chance, then it may have been converted from UTF-8 to
-                    // ACE, which would result in a completely bogus keyword
-                    // query.  Here we try to recover the original Unicode
-                    // value, but this is not 100% correct since the value may
-                    // have been normalized per the IDN normalization rules.
-                    //
-                    // Since we don't have access to the exact original string
-                    // that was entered by the user, this will just have to do.
-                    bool isACE;
-                    nsCAutoString utf8Host;
-                    nsCOMPtr<nsIIDNService> idnSrv =
-                        do_GetService(NS_IDNSERVICE_CONTRACTID);
-                    if (idnSrv &&
-                        NS_SUCCEEDED(idnSrv->IsACE(host, &isACE)) && isACE &&
-                        NS_SUCCEEDED(idnSrv->ConvertACEtoUTF8(host, utf8Host)))
-                        sURIFixup->KeywordToURI(utf8Host,
+                    if (!mOriginalUriString.IsEmpty()) {
+                        sURIFixup->KeywordToURI(mOriginalUriString,
                                                 getter_AddRefs(newURI));
-                    else
-                        sURIFixup->KeywordToURI(host, getter_AddRefs(newURI));
+                    }
+                    else {
+                        //
+                        // If this string was passed through nsStandardURL by
+                        // chance, then it may have been converted from UTF-8 to
+                        // ACE, which would result in a completely bogus keyword
+                        // query.  Here we try to recover the original Unicode
+                        // value, but this is not 100% correct since the value may
+                        // have been normalized per the IDN normalization rules.
+                        //
+                        // Since we don't have access to the exact original string
+                        // that was entered by the user, this will just have to do.
+                        bool isACE;
+                        nsCAutoString utf8Host;
+                        nsCOMPtr<nsIIDNService> idnSrv =
+                            do_GetService(NS_IDNSERVICE_CONTRACTID);
+                        if (idnSrv &&
+                            NS_SUCCEEDED(idnSrv->IsACE(host, &isACE)) && isACE &&
+                            NS_SUCCEEDED(idnSrv->ConvertACEtoUTF8(host, utf8Host)))
+                            sURIFixup->KeywordToURI(utf8Host,
+                                                    getter_AddRefs(newURI));
+                        else
+                            sURIFixup->KeywordToURI(host, getter_AddRefs(newURI));
+                    }
                 } // end keywordsEnabled
             }
 
@@ -8070,6 +8080,7 @@ nsDocShell::InternalLoad(nsIURI * aURI,
                          nsIRequest** aRequest)
 {
     nsresult rv = NS_OK;
+    mOriginalUriString.Truncate();
 
 #ifdef PR_LOGGING
     if (gDocShellLeakLog && PR_LOG_TEST(gDocShellLeakLog, PR_LOG_DEBUG)) {
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index c9b92febdf8..2ca25723952 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -848,7 +848,8 @@ private:
     nsCOMPtr<nsIAtom> mForcedCharset;
     nsCOMPtr<nsIAtom> mParentCharset;
     nsTObserverArray<nsWeakPtr> mPrivacyObservers;
-    PRInt32          mParentCharsetSource;
+    PRInt32           mParentCharsetSource;
+    nsCString         mOriginalUriString;
 
 #ifdef DEBUG
     // We're counting the number of |nsDocShells| to help find leaks

From 7de5a027f931004d4d75465b188459f1d3de84aa Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Sun, 29 Apr 2012 20:34:09 -0400
Subject: [PATCH 118/162] Bug 749658 - Distinguish scrollable from visual
 bounds for nsTextBoxFrame. r=roc

---
 layout/xul/base/src/nsTextBoxFrame.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index f2064355ee4..452ee01005a 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -931,13 +931,14 @@ nsTextBoxFrame::DoLayout(nsBoxLayoutState& aBoxLayoutState)
 
     const nsStyleText* textStyle = GetStyleText();
     
-    nsRect bounds(nsPoint(0, 0), GetSize());
+    nsRect scrollBounds(nsPoint(0, 0), GetSize());
     nsRect textRect = mTextDrawRect;
     
     nsRefPtr<nsFontMetrics> fontMet;
     nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet));
     nsBoundingMetrics metrics = 
-      fontMet->GetInkBoundsForVisualOverflow(mTitle.get(), mTitle.Length(),
+      fontMet->GetInkBoundsForVisualOverflow(mCroppedTitle.get(),
+                                             mCroppedTitle.Length(),
                                              aBoxLayoutState.GetRenderingContext());
 
     textRect.x -= metrics.leftBearing;
@@ -946,12 +947,14 @@ nsTextBoxFrame::DoLayout(nsBoxLayoutState& aBoxLayoutState)
     textRect.y += fontMet->MaxAscent() - metrics.ascent;
     textRect.height = metrics.ascent + metrics.descent;
 
-    bounds.UnionRect(bounds, textRect);
-    nsOverflowAreas overflow(bounds, bounds);
+    // Our scrollable overflow is our bounds; our visual overflow may
+    // extend beyond that.
+    nsRect visualBounds;
+    visualBounds.UnionRect(scrollBounds, textRect);
+    nsOverflowAreas overflow(visualBounds, scrollBounds);
 
     if (textStyle->mTextShadow) {
-      // Our scrollable overflow is our bounds; our visual overflow may
-      // extend beyond that.
+      // text-shadow extends our visual but not scrollable bounds
       nsRect &vis = overflow.VisualOverflow();
       vis.UnionRect(vis, nsLayoutUtils::GetTextShadowRectsUnion(mTextDrawRect, this));
     }

From a46e69ccc76bb7e319e0530e871710c9da7c5e51 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Mon, 30 Apr 2012 14:11:12 -0700
Subject: [PATCH 119/162] Bug 750130 - Telemetry doorhanger appears then
 disappears when onLocationChange is fired during startup. r=bnicholson
 a=android-only

---
 mobile/android/chrome/content/browser.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 8aec57227cd..1a8900b58bf 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -416,7 +416,10 @@ var BrowserApp = {
       link: {
         label: learnMoreLabel,
         url: learnMoreUrl
-      }
+      },
+      // We're adding this doorhanger during startup, before the initial onLocationChange
+      // event fires, so we need to set persistence to make sure it doesn't disappear.
+      persistence: 1
     };
     NativeWindow.doorhanger.show(message, "telemetry-optin", buttons, this.selectedTab.id, options);
   },

From b8fc31fb379bceb1e0e18c75e92e7266713f13e8 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Mon, 30 Apr 2012 13:40:27 -0700
Subject: [PATCH 120/162] Bug 743153 - Use ContentUris.parseId instead of
 RepoUtils.getAndroidIdFromUri. r=rnewman, a=android-only

---
 .../android/AndroidBrowserBookmarksDataAccessor.java      | 3 ++-
 .../android/AndroidBrowserRepositorySession.java          | 3 ++-
 .../repositories/android/PasswordsRepositorySession.java  | 6 +++++-
 .../android/base/sync/repositories/android/RepoUtils.java | 8 --------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java b/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java
index adf54f77403..eab76f2f096 100644
--- a/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java
+++ b/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java
@@ -16,6 +16,7 @@ import org.mozilla.gecko.sync.repositories.NullCursorException;
 import org.mozilla.gecko.sync.repositories.domain.BookmarkRecord;
 import org.mozilla.gecko.sync.repositories.domain.Record;
 
+import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -249,7 +250,7 @@ public class AndroidBrowserBookmarksDataAccessor extends AndroidBrowserRepositor
     record.title = AndroidBrowserBookmarksRepositorySession.SPECIAL_GUIDS_MAP.get(guid);
     record.type = "folder";
     record.androidParentID = parentId;
-    return(RepoUtils.getAndroidIdFromUri(insert(record)));
+    return ContentUris.parseId(insert(record));
   }
 
   @Override
diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java b/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java
index 3b6e779a2f7..4fb586debf8 100644
--- a/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java
+++ b/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java
@@ -26,6 +26,7 @@ import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionGuidsSince
 import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelegate;
 import org.mozilla.gecko.sync.repositories.domain.Record;
 
+import android.content.ContentUris;
 import android.database.Cursor;
 import android.net.Uri;
 
@@ -533,7 +534,7 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
   protected Record insert(Record record) throws NoGuidForIdException, NullCursorException, ParentNotFoundException {
     Record toStore = prepareRecord(record);
     Uri recordURI = dbHelper.insert(toStore);
-    long id = RepoUtils.getAndroidIdFromUri(recordURI);
+    long id = ContentUris.parseId(recordURI);
     Logger.debug(LOG_TAG, "Inserted as " + id);
 
     toStore.androidID = id;
diff --git a/mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java b/mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java
index 1a7ee18666a..3218147ff55 100644
--- a/mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java
+++ b/mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java
@@ -28,6 +28,7 @@ import org.mozilla.gecko.sync.repositories.domain.PasswordRecord;
 import org.mozilla.gecko.sync.repositories.domain.Record;
 
 import android.content.ContentProviderClient;
+import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -445,7 +446,10 @@ public class PasswordsRepositorySession extends
     // record.timeLastUsed = now();
     ContentValues cv = getContentValues(record);
     Uri insertedUri = passwordsProvider.insert(BrowserContractHelpers.PASSWORDS_CONTENT_URI, cv);
-    record.androidID = RepoUtils.getAndroidIdFromUri(insertedUri);
+    if (insertedUri == null) {
+      throw new RemoteException(); // Not much to be done here, save throw.
+    }
+    record.androidID = ContentUris.parseId(insertedUri);
     return record;
   }
 
diff --git a/mobile/android/base/sync/repositories/android/RepoUtils.java b/mobile/android/base/sync/repositories/android/RepoUtils.java
index a6cb5a65174..daa4a2ec37b 100644
--- a/mobile/android/base/sync/repositories/android/RepoUtils.java
+++ b/mobile/android/base/sync/repositories/android/RepoUtils.java
@@ -119,14 +119,6 @@ public class RepoUtils {
     }
   }
 
-  // Returns android id from the URI that we get after inserting a
-  // bookmark into the local Android store.
-  public static long getAndroidIdFromUri(Uri uri) {
-    String path = uri.getPath();
-    int lastSlash = path.lastIndexOf('/');
-    return Long.parseLong(path.substring(lastSlash + 1));
-  }
-
   //Create a HistoryRecord object from a cursor on a row with a Moz History record in it
   public static HistoryRecord historyFromMirrorCursor(Cursor cur) {
 

From 1a489791a060bdf01ba3770905036064674aa8fe Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Mon, 30 Apr 2012 13:40:30 -0700
Subject: [PATCH 121/162] Bug 713524 - Batch bookmark inserts. r=rnewman,
 a=android-only

---
 mobile/android/base/sync/Utils.java           |  63 ++--
 .../Server11RepositorySession.java            |   2 +
 ...roidBrowserBookmarksRepositorySession.java | 143 +++++++--
 .../AndroidBrowserHistoryDataAccessor.java    |  46 +--
 ...ndroidBrowserHistoryRepositorySession.java |  51 ++-
 .../AndroidBrowserRepositoryDataAccessor.java |  53 ++++
 .../AndroidBrowserRepositorySession.java      |  34 +-
 .../android/BookmarksInsertionManager.java    | 298 ++++++++++++++++++
 mobile/android/sync/java-sources.mn           |   2 +-
 9 files changed, 569 insertions(+), 123 deletions(-)
 create mode 100644 mobile/android/base/sync/repositories/android/BookmarksInsertionManager.java

diff --git a/mobile/android/base/sync/Utils.java b/mobile/android/base/sync/Utils.java
index e5d89a209fd..9df412493f7 100644
--- a/mobile/android/base/sync/Utils.java
+++ b/mobile/android/base/sync/Utils.java
@@ -1,40 +1,6 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Android Sync Client.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Jason Voll <jvoll@mozilla.com>
- * Richard Newman <rnewman@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.sync;
 
@@ -46,6 +12,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -309,4 +276,26 @@ public class Utils {
     }
     return out;
   }
+
+  // Because TextUtils.join is not stubbed.
+  public static String toDelimitedString(String delimiter, Collection<String> items) {
+    if (items == null || items.size() == 0) {
+      return "";
+    }
+
+    StringBuilder sb = new StringBuilder();
+    int i = 0;
+    int c = items.size();
+    for (String string : items) {
+      sb.append(string);
+      if (++i < c) {
+        sb.append(delimiter);
+      }
+    }
+    return sb.toString();
+  }
+
+  public static String toCommaSeparatedString(Collection<String> items) {
+    return toDelimitedString(", ", items);
+  }
 }
diff --git a/mobile/android/base/sync/repositories/Server11RepositorySession.java b/mobile/android/base/sync/repositories/Server11RepositorySession.java
index 93b3da1c3ec..aa739391e8c 100644
--- a/mobile/android/base/sync/repositories/Server11RepositorySession.java
+++ b/mobile/android/base/sync/repositories/Server11RepositorySession.java
@@ -223,6 +223,8 @@ public class Server11RepositorySession extends RepositorySession {
   }
 
   private String flattenIDs(String[] guids) {
+    // Consider using Utils.toDelimitedString if and when the signature changes
+    // to Collection<String> guids.
     if (guids.length == 0) {
       return "";
     }
diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java b/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java
index 7df2559180c..fde1dc60926 100644
--- a/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java
+++ b/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java
@@ -5,6 +5,7 @@
 package org.mozilla.gecko.sync.repositories.android;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -29,15 +30,20 @@ import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelega
 import org.mozilla.gecko.sync.repositories.domain.BookmarkRecord;
 import org.mozilla.gecko.sync.repositories.domain.Record;
 
+import android.content.ContentUris;
 import android.content.Context;
 import android.database.Cursor;
+import android.net.Uri;
 
-public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepositorySession {
+public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepositorySession
+  implements BookmarksInsertionManager.BookmarkInserter {
 
   public static final int DEFAULT_DELETION_FLUSH_THRESHOLD = 50;
+  public static final int DEFAULT_INSERTION_FLUSH_THRESHOLD = 50;
+
   // TODO: synchronization for these.
-  private HashMap<String, Long> guidToID = new HashMap<String, Long>();
-  private HashMap<Long, String> idToGuid = new HashMap<Long, String>();
+  private HashMap<String, Long> parentGuidToIDMap = new HashMap<String, Long>();
+  private HashMap<Long, String> parentIDToGuidMap = new HashMap<Long, String>();
 
   /**
    * Some notes on reparenting/reordering.
@@ -101,6 +107,7 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
   private AndroidBrowserBookmarksDataAccessor dataAccessor;
 
   protected BookmarksDeletionManager deletionManager;
+  protected BookmarksInsertionManager insertionManager;
 
   /**
    * An array of known-special GUIDs.
@@ -227,13 +234,13 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
   }
 
   private String getGUIDForID(long androidID) {
-    String guid = idToGuid.get(androidID);
+    String guid = parentIDToGuidMap.get(androidID);
     trace("  " + androidID + " => " + guid);
     return guid;
   }
 
   private long getIDForGUID(String guid) {
-    Long id = guidToID.get(guid);
+    Long id = parentGuidToIDMap.get(guid);
     if (id == null) {
       Logger.warn(LOG_TAG, "Couldn't find local ID for GUID " + guid);
       return -1;
@@ -419,7 +426,7 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
     if (androidParentGUID == null) {
       Logger.debug(LOG_TAG, "No parent GUID for record " + recordGUID + " with parent " + androidParentID);
       // If the parent has been stored and somehow has a null GUID, throw an error.
-      if (idToGuid.containsKey(androidParentID)) {
+      if (parentIDToGuidMap.containsKey(androidParentID)) {
         Logger.error(LOG_TAG, "Have the parent android ID for the record but the parent's GUID wasn't found.");
         throw new NoGuidForIdException(null);
       }
@@ -480,7 +487,7 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
       return null;
     }
 
-    long androidID = guidToID.get(recordGUID);
+    long androidID = parentGuidToIDMap.get(recordGUID);
     JSONArray childArray = getChildrenArray(androidID, persist);
     if (childArray == null) {
       return null;
@@ -512,7 +519,7 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
     Logger.debug(LOG_TAG, "Ignoring record with guid: " + bmk.guid + " and type: " + bmk.type);
     return true;
   }
-  
+
   @Override
   public void begin(RepositorySessionBeginDelegate delegate) throws InvalidSessionTransitionException {
     // Check for the existence of special folders
@@ -534,7 +541,7 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
       delegate.onBeginFailed(e);
       return;
     }
-    
+
     // To deal with parent mapping of bookmarks we have to do some
     // hairy stuff. Here's the setup for it.
 
@@ -542,15 +549,15 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
 
     // Fake our root.
     Logger.debug(LOG_TAG, "Tracking places root as ID 0.");
-    idToGuid.put(0L, "places");
-    guidToID.put("places", 0L);
+    parentIDToGuidMap.put(0L, "places");
+    parentGuidToIDMap.put("places", 0L);
     try {
       cur.moveToFirst();
       while (!cur.isAfterLast()) {
         String guid = getGUID(cur);
         long id = RepoUtils.getLongFromCursor(cur, BrowserContract.Bookmarks._ID);
-        guidToID.put(guid, id);
-        idToGuid.put(id, guid);
+        parentGuidToIDMap.put(guid, id);
+        parentIDToGuidMap.put(id, guid);
         Logger.debug(LOG_TAG, "GUID " + guid + " maps to " + id);
         cur.moveToNext();
       }
@@ -558,14 +565,88 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
       cur.close();
     }
     deletionManager = new BookmarksDeletionManager(dataAccessor, DEFAULT_DELETION_FLUSH_THRESHOLD);
+
+    // We just crawled the database enumerating all folders; we'll start the
+    // insertion manager with exactly these folders as the known parents (the
+    // collection is copied) in the manager constructor.
+    insertionManager = new BookmarksInsertionManager(DEFAULT_INSERTION_FLUSH_THRESHOLD, parentGuidToIDMap.keySet(), this);
+
     Logger.debug(LOG_TAG, "Done with initial setup of bookmarks session.");
     super.begin(delegate);
   }
 
+  /**
+   * Implement method of BookmarksInsertionManager.BookmarkInserter.
+   */
+  @Override
+  public boolean insertFolder(BookmarkRecord record) {
+    // A folder that is *not* deleted needs its androidID updated, so that
+    // updateBookkeeping can re-parent, etc.
+    Record toStore = prepareRecord(record);
+    try {
+      Uri recordURI = dbHelper.insert(toStore);
+      if (recordURI == null) {
+        delegate.onRecordStoreFailed(new RuntimeException("Got null URI inserting folder with guid " + toStore.guid + "."));
+        return false;
+      }
+      toStore.androidID = ContentUris.parseId(recordURI);
+      Logger.debug(LOG_TAG, "Inserted folder with guid " + toStore.guid + " as androidID " + toStore.androidID);
+
+      updateBookkeeping(toStore);
+    } catch (Exception e) {
+      delegate.onRecordStoreFailed(e);
+      return false;
+    }
+    trackRecord(toStore);
+    delegate.onRecordStoreSucceeded(toStore);
+    return true;
+  }
+
+  /**
+   * Implement method of BookmarksInsertionManager.BookmarkInserter.
+   */
+  @Override
+  public void bulkInsertNonFolders(Collection<BookmarkRecord> records) {
+    // All of these records are *not* deleted and *not* folders, so we don't
+    // need to update androidID at all!
+    // TODO: persist records that fail to insert for later retry.
+    ArrayList<Record> toStores = new ArrayList<Record>(records.size());
+    for (Record record : records) {
+      toStores.add(prepareRecord(record));
+    }
+
+    try {
+      int stored = dataAccessor.bulkInsert(toStores);
+      if (stored != toStores.size()) {
+        // Something failed; most pessimistic action is to declare that all insertions failed.
+        // TODO: perform the bulkInsert in a transaction and rollback unless all insertions succeed?
+        for (Record failed : toStores) {
+          delegate.onRecordStoreFailed(new RuntimeException("Possibly failed to bulkInsert non-folder with guid " + failed.guid + "."));
+        }
+        return;
+      }
+    } catch (NullCursorException e) {
+      delegate.onRecordStoreFailed(e); // TODO: include which records failed.
+      return;
+    }
+
+    // Success For All!
+    for (Record succeeded : toStores) {
+      try {
+        updateBookkeeping(succeeded);
+      } catch (Exception e) {
+        Logger.warn(LOG_TAG, "Got exception updating bookkeeping of non-folder with guid " + succeeded.guid + ".", e);
+      }
+      trackRecord(succeeded);
+      delegate.onRecordStoreSucceeded(succeeded);
+    }
+  }
+
   @Override
   public void finish(RepositorySessionFinishDelegate delegate) throws InactiveSessionException {
-    // Allow this to be GCed.
+    // Allow these to be GCed.
     deletionManager = null;
+    insertionManager = null;
 
     // Override finish to do this check; make sure all records
     // needing re-parenting have been re-parented.
@@ -671,8 +752,8 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
    * @param bmk
    */
   private void handleParenting(BookmarkRecord bmk) {
-    if (guidToID.containsKey(bmk.parentID)) {
-      bmk.androidParentID = guidToID.get(bmk.parentID);
+    if (parentGuidToIDMap.containsKey(bmk.parentID)) {
+      bmk.androidParentID = parentGuidToIDMap.get(bmk.parentID);
 
       // Might as well set a basic position from the downloaded children array.
       JSONArray children = parentToChildArray.get(bmk.parentID);
@@ -684,7 +765,7 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
       }
     }
     else {
-      bmk.androidParentID = guidToID.get("unfiled");
+      bmk.androidParentID = parentGuidToIDMap.get("unfiled");
       ArrayList<String> children;
       if (missingParentToChildren.containsKey(bmk.parentID)) {
         children = missingParentToChildren.get(bmk.parentID);
@@ -719,8 +800,8 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
     // Mappings between ID and GUID.
     // TODO: update our persisted children arrays!
     // TODO: if our Android ID just changed, replace parents for all of our children.
-    guidToID.put(bmk.guid,      bmk.androidID);
-    idToGuid.put(bmk.androidID, bmk.guid);
+    parentGuidToIDMap.put(bmk.guid,      bmk.androidID);
+    parentIDToGuidMap.put(bmk.androidID, bmk.guid);
 
     JSONArray childArray = bmk.children;
 
@@ -742,6 +823,15 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
     }
   }
 
+  @Override
+  protected void insert(Record record) throws NoGuidForIdException, NullCursorException, ParentNotFoundException {
+    try {
+      insertionManager.enqueueRecord((BookmarkRecord) record);
+    } catch (Exception e) {
+      throw new NullCursorException(e);
+    }
+  }
+
   @Override
   protected void storeRecordDeletion(final Record record, final Record existingRecord) {
     if (SPECIAL_GUIDS_MAP.containsKey(record.guid)) {
@@ -755,10 +845,18 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
     deletionManager.deleteRecord(bookmarkRecord.guid, isFolder, parentGUID);
   }
 
-  protected void flushDeletions() {
+  protected void flushQueues() {
+    long now = now();
+    Logger.debug(LOG_TAG, "Applying remaining insertions.");
+    try {
+      insertionManager.finishUp();
+      Logger.debug(LOG_TAG, "Done applying remaining insertions.");
+    } catch (Exception e) {
+      Logger.warn(LOG_TAG, "Unable to apply remaining insertions.", e);
+    }
+
     Logger.debug(LOG_TAG, "Applying deletions.");
     try {
-      long now = now();
       untrackGUIDs(deletionManager.flushAll(getIDForGUID("unfiled"), now));
       Logger.debug(LOG_TAG, "Done applying deletions.");
     } catch (Exception e) {
@@ -769,7 +867,7 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
   @SuppressWarnings("unchecked")
   private void finishUp() {
     try {
-      flushDeletions();
+      flushQueues();
       Logger.debug(LOG_TAG, "Have " + parentToChildArray.size() + " folders whose children might need repositioning.");
       for (Entry<String, JSONArray> entry : parentToChildArray.entrySet()) {
         String guid = entry.getKey();
@@ -824,6 +922,7 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
       try {
         // Clear our queued deletions.
         deletionManager.clear();
+        insertionManager.clear();
         super.run();
       } catch (Exception ex) {
         delegate.onWipeFailed(ex);
diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryDataAccessor.java b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryDataAccessor.java
index 85b903881ca..c72605d9e6e 100644
--- a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryDataAccessor.java
+++ b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryDataAccessor.java
@@ -18,7 +18,6 @@ import org.mozilla.gecko.sync.repositories.domain.Record;
 
 import android.content.ContentValues;
 import android.content.Context;
-import android.database.Cursor;
 import android.net.Uri;
 
 public class AndroidBrowserHistoryDataAccessor extends
@@ -108,17 +107,15 @@ public class AndroidBrowserHistoryDataAccessor extends
    * This inserts all the records (using <code>ContentProvider.bulkInsert</code>),
    * then inserts all the visit information (using the data extender's
    * <code>bulkInsert</code>, which internally uses a single database
-   * transaction), and then optionally updates the <code>androidID</code> of
-   * each record.
+   * transaction).
    *
    * @param records
-   *          The records to insert.
-   * @param fetchFreshAndroidIDs
-   *          <code>true</code> to update the <code>androidID</code> of each
-   *          record; <code>false</code> to invalidate them all.
+   *          the records to insert.
+   * @return
+   *          the number of records actually inserted.
    * @throws NullCursorException
    */
-  public void bulkInsert(ArrayList<HistoryRecord> records, boolean fetchFreshAndroidIDs) throws NullCursorException {
+  public int bulkInsert(ArrayList<HistoryRecord> records) throws NullCursorException {
     if (records.isEmpty()) {
       Logger.debug(LOG_TAG, "No records to insert, returning.");
     }
@@ -149,37 +146,6 @@ public class AndroidBrowserHistoryDataAccessor extends
     }
     // Then update the history visits.
     dataExtender.bulkInsert(records);
-
-    // And finally patch up the androidIDs.
-    if (!fetchFreshAndroidIDs) {
-      return;
-    }
-
-    // We do this here to save a few loops.
-    String guidIn = RepoUtils.computeSQLInClause(guids.length, BrowserContract.History.GUID);
-    Cursor cursor = queryHelper.safeQuery("", GUID_AND_ID, guidIn, guids, null);
-    int guidIndex = cursor.getColumnIndexOrThrow(BrowserContract.History.GUID);
-    int androidIDIndex = cursor.getColumnIndexOrThrow(BrowserContract.History._ID);
-
-    try {
-      cursor.moveToFirst();
-      while (!cursor.isAfterLast()) {
-        String guid = cursor.getString(guidIndex);
-        int androidID = cursor.getInt(androidIDIndex);
-        cursor.moveToNext();
-
-        Record record = guidToRecord.get(guid);
-        if (record == null) {
-          // Should never happen!
-          Logger.warn(LOG_TAG, "Failed to update androidID for record with guid " + guid + ".");
-          continue;
-        }
-        record.androidID = androidID;
-      }
-    } finally {
-      if (cursor != null) {
-        cursor.close();
-      }
-    }
+    return inserted;
   }
 }
diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java
index 66b7e53bc69..df7a559b120 100644
--- a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java
+++ b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java
@@ -127,13 +127,19 @@ public class AndroidBrowserHistoryRepositorySession extends AndroidBrowserReposi
 
   @Override
   public void abort() {
-    ((AndroidBrowserHistoryDataAccessor) dbHelper).closeExtender();
+    if (dbHelper != null) {
+      ((AndroidBrowserHistoryDataAccessor) dbHelper).closeExtender();
+      dbHelper = null;
+    }
     super.abort();
   }
 
   @Override
   public void finish(final RepositorySessionFinishDelegate delegate) throws InactiveSessionException {
-    ((AndroidBrowserHistoryDataAccessor) dbHelper).closeExtender();
+    if (dbHelper != null) {
+      ((AndroidBrowserHistoryDataAccessor) dbHelper).closeExtender();
+      dbHelper = null;
+    }
     super.finish(delegate);
   }
 
@@ -148,17 +154,10 @@ public class AndroidBrowserHistoryRepositorySession extends AndroidBrowserReposi
    *
    * @param record
    *          A <code>Record</code> with a GUID that is not present locally.
-   * @return The <code>Record</code> to be inserted. <b>Warning:</b> the
-   *         <code>androidID</code> is not valid! It will be set after the
-   *         records are flushed to the database.
    */
   @Override
-  protected Record insert(Record record) throws NoGuidForIdException, NullCursorException, ParentNotFoundException {
-    HistoryRecord toStore = (HistoryRecord) prepareRecord(record);
-    toStore.androidID = -111; // Hopefully this special value will make it easy to catch future errors.
-    updateBookkeeping(toStore); // Does not use androidID -- just GUID -> String map.
-    enqueueNewRecord(toStore);
-    return toStore;
+  protected void insert(Record record) throws NoGuidForIdException, NullCursorException, ParentNotFoundException {
+    enqueueNewRecord((HistoryRecord) prepareRecord(record));
   }
 
   /**
@@ -198,7 +197,33 @@ public class AndroidBrowserHistoryRepositorySession extends AndroidBrowserReposi
     recordsBuffer = new ArrayList<HistoryRecord>();
     Logger.debug(LOG_TAG, "Flushing " + outgoing.size() + " records to database.");
     // TODO: move bulkInsert to AndroidBrowserDataAccessor?
-    ((AndroidBrowserHistoryDataAccessor) dbHelper).bulkInsert(outgoing, false); // Don't need to update any androidIDs.
+    int inserted = ((AndroidBrowserHistoryDataAccessor) dbHelper).bulkInsert(outgoing);
+    if (inserted != outgoing.size()) {
+      // Something failed; most pessimistic action is to declare that all insertions failed.
+      // TODO: perform the bulkInsert in a transaction and rollback unless all insertions succeed?
+      for (HistoryRecord failed : outgoing) {
+        delegate.onRecordStoreFailed(new RuntimeException("Failed to insert history item with guid " + failed.guid + "."));
+      }
+      return;
+    }
+
+    // All good, everybody succeeded.
+    for (HistoryRecord succeeded : outgoing) {
+      try {
+        // Does not use androidID -- just GUID -> String map.
+        updateBookkeeping(succeeded);
+      } catch (NoGuidForIdException e) {
+        // Should not happen.
+        throw new NullCursorException(e);
+      } catch (ParentNotFoundException e) {
+        // Should not happen.
+        throw new NullCursorException(e);
+      } catch (NullCursorException e) {
+        throw e;
+      }
+      trackRecord(succeeded);
+      delegate.onRecordStoreSucceeded(succeeded); // At this point, we are really inserted.
+    }
   }
 
   @Override
@@ -209,7 +234,7 @@ public class AndroidBrowserHistoryRepositorySession extends AndroidBrowserReposi
         synchronized (recordsBufferMonitor) {
           try {
             flushNewRecords();
-          } catch (NullCursorException e) {
+          } catch (Exception e) {
             Logger.warn(LOG_TAG, "Error flushing records to database.", e);
           }
         }
diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java b/mobile/android/base/sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java
index dfce61855ae..0252612498b 100644
--- a/mobile/android/base/sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java
+++ b/mobile/android/base/sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java
@@ -4,6 +4,8 @@
 
 package org.mozilla.gecko.sync.repositories.android;
 
+import java.util.List;
+
 import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.sync.Logger;
 import org.mozilla.gecko.sync.repositories.NullCursorException;
@@ -177,4 +179,55 @@ public abstract class AndroidBrowserRepositoryDataAccessor {
     }
     Logger.warn(LOG_TAG, "Unexpectedly updated " + updated + " rows for guid " + guid);
   }
+
+  /**
+   * Insert records.
+   * <p>
+   * This inserts all the records (using <code>ContentProvider.bulkInsert</code>),
+   * but does <b>not</b> update the <code>androidID</code> of each record.
+   *
+   * @param records
+   *          the records to insert.
+   * @return
+   *          the number of records actually inserted.
+   * @throws NullCursorException
+   */
+  public int bulkInsert(List<Record> records) throws NullCursorException {
+    if (records.isEmpty()) {
+      Logger.debug(LOG_TAG, "No records to insert, returning.");
+    }
+
+    int size = records.size();
+    ContentValues[] cvs = new ContentValues[size];
+    int index = 0;
+    for (Record record : records) {
+      try {
+        cvs[index] = getContentValues(record);
+        index += 1;
+      } catch (Exception e) {
+        Logger.warn(LOG_TAG, "Got exception in getContentValues for record with guid " + record.guid, e);
+      }
+    }
+
+    if (index != size) {
+      // bulkInsert treats null ContentValues as blank rows, which we don't want
+      // to insert into the database.
+      // We expect exceptions in getContentValues to be exceedingly rare, so we
+      // re-allocate in the (rare) error case and maintain a fast path for the
+      // success case.
+      size = index;
+      ContentValues[] temp = new ContentValues[size];
+      System.arraycopy(cvs, 0, temp, 0, size); // No java.util.Arrays.copyOf in older Android SDKs.
+    }
+
+    int inserted = context.getContentResolver().bulkInsert(getUri(), cvs);
+    if (inserted == size) {
+      Logger.debug(LOG_TAG, "Inserted " + inserted + " records, as expected.");
+    } else {
+      Logger.debug(LOG_TAG, "Inserted " +
+                   inserted + " records but expected " +
+                   size     + " records.");
+    }
+    return inserted;
+  }
 }
diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java b/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java
index 4fb586debf8..81af3d72713 100644
--- a/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java
+++ b/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java
@@ -22,6 +22,7 @@ import org.mozilla.gecko.sync.repositories.Repository;
 import org.mozilla.gecko.sync.repositories.StoreTrackingRepositorySession;
 import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionBeginDelegate;
 import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate;
+import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate;
 import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate;
 import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelegate;
 import org.mozilla.gecko.sync.repositories.domain.Record;
@@ -53,9 +54,9 @@ import android.net.Uri;
  *
  */
 public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepositorySession {
+  public static final String LOG_TAG = "BrowserRepoSession";
 
   protected AndroidBrowserRepositoryDataAccessor dbHelper;
-  public static final String LOG_TAG = "BrowserRepoSession";
   private HashMap<String, String> recordToGuid;
 
   public AndroidBrowserRepositorySession(Repository repository) {
@@ -148,6 +149,13 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
     deferredDelegate.onBeginSucceeded(this);
   }
 
+  @Override
+  public void finish(RepositorySessionFinishDelegate delegate) throws InactiveSessionException {
+    dbHelper = null;
+    recordToGuid = null;
+    super.finish(delegate);
+  }
+
   protected abstract String buildRecordString(Record record);
 
   protected void checkDatabase() throws ProfileDatabaseException, NullCursorException {
@@ -353,6 +361,8 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
     this.fetchSince(0, delegate);
   }
 
+  protected int storeCount = 0;
+
   @Override
   public void store(final Record record) throws NoStoreDelegateException {
     if (delegate == null) {
@@ -363,6 +373,9 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
       throw new IllegalArgumentException("Null record passed to AndroidBrowserRepositorySession.store().");
     }
 
+    storeCount += 1;
+    Logger.debug(LOG_TAG, "Storing record with GUID " + record.guid + " (stored " + storeCount + " records this session).");
+
     // Store Runnables *must* complete synchronously. It's OK, they
     // run on a background thread.
     Runnable command = new Runnable() {
@@ -457,9 +470,7 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
           if (existingRecord == null) {
             // The record is new.
             trace("No match. Inserting.");
-            Record inserted = insert(record);
-            trackRecord(inserted);
-            delegate.onRecordStoreSucceeded(inserted);
+            insert(record);
             return;
           }
 
@@ -531,16 +542,19 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
     delegate.onRecordStoreSucceeded(record);
   }
 
-  protected Record insert(Record record) throws NoGuidForIdException, NullCursorException, ParentNotFoundException {
+  protected void insert(Record record) throws NoGuidForIdException, NullCursorException, ParentNotFoundException {
     Record toStore = prepareRecord(record);
     Uri recordURI = dbHelper.insert(toStore);
-    long id = ContentUris.parseId(recordURI);
-    Logger.debug(LOG_TAG, "Inserted as " + id);
+    if (recordURI == null) {
+      throw new NullCursorException(new RuntimeException("Got null URI inserting record with guid " + record.guid));
+    }
+    toStore.androidID = ContentUris.parseId(recordURI);
 
-    toStore.androidID = id;
     updateBookkeeping(toStore);
-    Logger.debug(LOG_TAG, "insert() returning record " + toStore.guid);
-    return toStore;
+    trackRecord(toStore);
+    delegate.onRecordStoreSucceeded(toStore);
+
+    Logger.debug(LOG_TAG, "Inserted record with guid " + toStore.guid + " as androidID " + toStore.androidID);
   }
 
   protected Record replace(Record newRecord, Record existingRecord) throws NoGuidForIdException, NullCursorException, ParentNotFoundException {
diff --git a/mobile/android/base/sync/repositories/android/BookmarksInsertionManager.java b/mobile/android/base/sync/repositories/android/BookmarksInsertionManager.java
new file mode 100644
index 00000000000..683ee3df863
--- /dev/null
+++ b/mobile/android/base/sync/repositories/android/BookmarksInsertionManager.java
@@ -0,0 +1,298 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.sync.repositories.android;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.mozilla.gecko.sync.Logger;
+import org.mozilla.gecko.sync.Utils;
+import org.mozilla.gecko.sync.repositories.domain.BookmarkRecord;
+
+/**
+ * Queue up insertions:
+ * <ul>
+ * <li>Folder inserts where the parent is known. Do these immediately, because
+ * they allow other records to be inserted. Requires bookkeeping updates. On
+ * insert, flush the next set.</li>
+ * <li>Regular inserts where the parent is known. These can happen whenever.
+ * Batch for speed.</li>
+ * <li>Records where the parent is not known. These can be flushed out when the
+ * parent is known, or entered as orphans. This can be a queue earlier in the
+ * process, so they don't get assigned to Unsorted. Feed into the main batch
+ * when the parent arrives.</li>
+ * </ul>
+ * <p>
+ * Deletions are always done at the end so that orphaning is minimized, and
+ * that's why we are batching folders and non-folders separately.
+ * <p>
+ * Updates are always applied as they arrive.
+ * <p>
+ * Note that this class is not thread safe. This should be fine: call it only
+ * from within a store runnable.
+ */
+public class BookmarksInsertionManager {
+  public static final String LOG_TAG = "BookmarkInsert";
+  public static boolean DEBUG = false;
+
+  protected final int flushThreshold;
+  protected final BookmarkInserter inserter;
+
+  /**
+   * Folders that have been successfully inserted.
+   */
+  private final Set<String> insertedFolders = new HashSet<String>();
+
+  /**
+   * Non-folders waiting for bulk insertion.
+   * <p>
+   * We write in insertion order to keep things easy to debug.
+   */
+  private final Set<BookmarkRecord> nonFoldersToWrite = new LinkedHashSet<BookmarkRecord>();
+
+  /**
+   * Map from parent folder GUID to child records (folders and non-folders)
+   * waiting to be enqueued after parent folder is inserted.
+   */
+  private final Map<String, Set<BookmarkRecord>> recordsWaitingForParent = new HashMap<String, Set<BookmarkRecord>>();
+
+  /**
+   * Create an instance to be used for tracking insertions in a bookmarks
+   * repository session.
+   *
+   * @param flushThreshold
+   *        When this many non-folder records have been stored for insertion,
+   *        an incremental flush occurs.
+   * @param insertedFolders
+   *        The GUIDs of all the folders already inserted into the database.
+   * @param inserter
+   *        The <code>BookmarkInsert</code> to use.
+   */
+  public BookmarksInsertionManager(int flushThreshold, Collection<String> insertedFolders, BookmarkInserter inserter) {
+    this.flushThreshold = flushThreshold;
+    this.insertedFolders.addAll(insertedFolders);
+    this.inserter = inserter;
+  }
+
+  protected void addRecordWithUnwrittenParent(BookmarkRecord record) {
+    Set<BookmarkRecord> destination = recordsWaitingForParent.get(record.parentID);
+    if (destination == null) {
+      destination = new LinkedHashSet<BookmarkRecord>();
+      recordsWaitingForParent.put(record.parentID, destination);
+    }
+    destination.add(record);
+  }
+
+  /**
+   * If <code>record</code> is a folder, insert it immediately; if it is a
+   * non-folder, enqueue it. Then do the same for any records waiting for this record.
+   *
+   * @param record
+   *          the <code>BookmarkRecord</code> to enqueue.
+   */
+  protected void recursivelyEnqueueRecordAndChildren(BookmarkRecord record) {
+    if (record.isFolder()) {
+      if (!inserter.insertFolder(record)) {
+        Logger.warn(LOG_TAG, "Folder with known parent with guid " + record.parentID + " failed to insert!");
+        return;
+      }
+      Logger.debug(LOG_TAG, "Folder with known parent with guid " + record.parentID + " inserted; adding to inserted folders.");
+      insertedFolders.add(record.guid);
+    } else {
+      Logger.debug(LOG_TAG, "Non-folder has known parent with guid " + record.parentID + "; adding to insertion queue.");
+      nonFoldersToWrite.add(record);
+    }
+
+    // Now process record's children.
+    Set<BookmarkRecord> waiting = recordsWaitingForParent.remove(record.guid);
+    if (waiting == null) {
+      return;
+    }
+    for (BookmarkRecord waiter : waiting) {
+      recursivelyEnqueueRecordAndChildren(waiter);
+    }
+  }
+
+  /**
+   * Enqueue a folder.
+   *
+   * @param record
+   *          the folder to enqueue.
+   */
+  protected void enqueueFolder(BookmarkRecord record) {
+    Logger.debug(LOG_TAG, "Inserting folder with guid " + record.guid);
+
+    if (!insertedFolders.contains(record.parentID)) {
+      Logger.debug(LOG_TAG, "Folder has unknown parent with guid " + record.parentID + "; keeping until we see the parent.");
+      addRecordWithUnwrittenParent(record);
+      return;
+    }
+
+    // Parent is known; add as much of the tree as this roots.
+    recursivelyEnqueueRecordAndChildren(record);
+    flushNonFoldersIfNecessary();
+  }
+
+  /**
+   * Enqueue a non-folder.
+   *
+   * @param record
+   *          the non-folder to enqueue.
+   */
+  protected void enqueueNonFolder(BookmarkRecord record) {
+    Logger.debug(LOG_TAG, "Inserting non-folder with guid " + record.guid);
+
+    if (!insertedFolders.contains(record.parentID)) {
+      Logger.debug(LOG_TAG, "Non-folder has unknown parent with guid " + record.parentID + "; keeping until we see the parent.");
+      addRecordWithUnwrittenParent(record);
+      return;
+    }
+
+    // Parent is known; add to insertion queue and maybe write.
+    Logger.debug(LOG_TAG, "Non-folder has known parent with guid " + record.parentID + "; adding to insertion queue.");
+    nonFoldersToWrite.add(record);
+    flushNonFoldersIfNecessary();
+  }
+
+  /**
+   * Enqueue a bookmark record for eventual insertion.
+   *
+   * @param record
+   *          the <code>BookmarkRecord</code> to enqueue.
+   */
+  public void enqueueRecord(BookmarkRecord record) {
+    if (record.isFolder()) {
+      enqueueFolder(record);
+    } else {
+      enqueueNonFolder(record);
+    }
+    if (DEBUG) {
+      dumpState();
+    }
+  }
+
+  /**
+   * Flush non-folders; empties the insertion queue entirely.
+   */
+  protected void flushNonFolders() {
+    inserter.bulkInsertNonFolders(nonFoldersToWrite); // All errors are handled in bulkInsertNonFolders.
+    nonFoldersToWrite.clear();
+  }
+
+  /**
+   * Flush non-folder insertions if there are many of them; empties the
+   * insertion queue entirely.
+   */
+  protected void flushNonFoldersIfNecessary() {
+    int num = nonFoldersToWrite.size();
+    if (num < flushThreshold) {
+      Logger.debug(LOG_TAG, "Incremental flush called with " + num + " < " + flushThreshold + " non-folders; not flushing.");
+      return;
+    }
+    Logger.debug(LOG_TAG, "Incremental flush called with " + num + " non-folders; flushing.");
+    flushNonFolders();
+  }
+
+  /**
+   * Insert all remaining folders followed by all remaining non-folders,
+   * regardless of whether parent records have been successfully inserted.
+   */
+  public void finishUp() {
+    // Iterate through all waiting records, writing the folders and collecting
+    // the non-folders for bulk insertion.
+    int numFolders = 0;
+    int numNonFolders = 0;
+    for (Set<BookmarkRecord> records : recordsWaitingForParent.values()) {
+      for (BookmarkRecord record : records) {
+        if (!record.isFolder()) {
+          numNonFolders += 1;
+          nonFoldersToWrite.add(record);
+          continue;
+        }
+
+        numFolders += 1;
+        if (!inserter.insertFolder(record)) {
+          Logger.warn(LOG_TAG, "Folder with known parent with guid " + record.parentID + " failed to insert!");
+          continue;
+        }
+
+        Logger.debug(LOG_TAG, "Folder with known parent with guid " + record.parentID + " inserted; adding to inserted folders.");
+        insertedFolders.add(record.guid);
+      }
+    }
+    recordsWaitingForParent.clear();
+    flushNonFolders();
+
+    Logger.debug(LOG_TAG, "finishUp inserted " +
+        numFolders + " folders without known parents and " +
+        numNonFolders + " non-folders without known parents.");
+    if (DEBUG) {
+      dumpState();
+    }
+  }
+
+  public void clear() {
+    this.insertedFolders.clear();
+    this.nonFoldersToWrite.clear();
+    this.recordsWaitingForParent.clear();
+  }
+
+  // For debugging.
+  public boolean isClear() {
+    return nonFoldersToWrite.isEmpty() && recordsWaitingForParent.isEmpty();
+  }
+
+  // For debugging.
+  public void dumpState() {
+    ArrayList<String> readies = new ArrayList<String>();
+    for (BookmarkRecord record : nonFoldersToWrite) {
+      readies.add(record.guid);
+    }
+    String ready = Utils.toCommaSeparatedString(new ArrayList<String>(readies));
+
+    ArrayList<String> waits = new ArrayList<String>();
+    for (Set<BookmarkRecord> recs : recordsWaitingForParent.values()) {
+      for (BookmarkRecord rec : recs) {
+        waits.add(rec.guid);
+      }
+    }
+    String waiting = Utils.toCommaSeparatedString(waits);
+    String known = Utils.toCommaSeparatedString(insertedFolders);
+
+    Logger.debug(LOG_TAG, "Q=(" + ready + "), W = (" + waiting + "), P=(" + known + ")");
+  }
+
+  public interface BookmarkInserter {
+    /**
+     * Insert a single folder.
+     * <p>
+     * All exceptions should be caught and all delegate callbacks invoked here.
+     *
+     * @param record
+     *          the record to insert.
+     * @return
+     *          <code>true</code> if the folder was inserted; <code>false</code> otherwise.
+     */
+    public boolean insertFolder(BookmarkRecord record);
+
+    /**
+     * Insert many non-folders. Each non-folder's parent was already present in
+     * the database before this <code>BookmarkInsertionsManager</code> was
+     * created, or had <code>insertFolder</code> called with it as argument (and
+     * possibly was not inserted).
+     * <p>
+     * All exceptions should be caught and all delegate callbacks invoked here.
+     *
+     * @param record
+     *          the record to insert.
+     */
+    public void bulkInsertNonFolders(Collection<BookmarkRecord> records);
+  }
+}
diff --git a/mobile/android/sync/java-sources.mn b/mobile/android/sync/java-sources.mn
index df356680104..a754cef2a55 100644
--- a/mobile/android/sync/java-sources.mn
+++ b/mobile/android/sync/java-sources.mn
@@ -1 +1 @@
-sync/AlreadySyncingException.java sync/CollectionKeys.java sync/CommandProcessor.java sync/CommandRunner.java sync/CredentialsSource.java sync/crypto/CryptoException.java sync/crypto/CryptoInfo.java sync/crypto/HKDF.java sync/crypto/HMACVerificationException.java sync/crypto/KeyBundle.java sync/crypto/MissingCryptoInputException.java sync/crypto/NoKeyBundleException.java sync/crypto/PersistedCrypto5Keys.java sync/CryptoRecord.java sync/DelayedWorkTracker.java sync/delegates/ClientsDataDelegate.java sync/delegates/FreshStartDelegate.java sync/delegates/GlobalSessionCallback.java sync/delegates/InfoCollectionsDelegate.java sync/delegates/KeyUploadDelegate.java sync/delegates/MetaGlobalDelegate.java sync/delegates/WipeServerDelegate.java sync/EngineSettings.java sync/ExtendedJSONObject.java sync/GlobalSession.java sync/HTTPFailureException.java sync/InfoCollections.java sync/jpake/BigIntegerHelper.java sync/jpake/Gx3OrGx4IsZeroOrOneException.java sync/jpake/IncorrectZkpException.java sync/jpake/JPakeClient.java sync/jpake/JPakeCrypto.java sync/jpake/JPakeJson.java sync/jpake/JPakeNoActivePairingException.java sync/jpake/JPakeNumGenerator.java sync/jpake/JPakeNumGeneratorRandom.java sync/jpake/JPakeParty.java sync/jpake/JPakeRequest.java sync/jpake/JPakeRequestDelegate.java sync/jpake/JPakeResponse.java sync/jpake/stage/CompleteStage.java sync/jpake/stage/ComputeFinalStage.java sync/jpake/stage/ComputeKeyVerificationStage.java sync/jpake/stage/ComputeStepOneStage.java sync/jpake/stage/ComputeStepTwoStage.java sync/jpake/stage/DecryptDataStage.java sync/jpake/stage/DeleteChannel.java sync/jpake/stage/GetChannelStage.java sync/jpake/stage/GetRequestStage.java sync/jpake/stage/JPakeStage.java sync/jpake/stage/PutRequestStage.java sync/jpake/stage/VerifyPairingStage.java sync/jpake/Zkp.java sync/KeyBundleProvider.java sync/Logger.java sync/MetaGlobal.java sync/MetaGlobalException.java sync/MetaGlobalMissingEnginesException.java sync/MetaGlobalNotSetException.java sync/middleware/Crypto5MiddlewareRepository.java sync/middleware/Crypto5MiddlewareRepositorySession.java sync/middleware/MiddlewareRepository.java sync/middleware/MiddlewareRepositorySession.java sync/net/BaseResource.java sync/net/CompletedEntity.java sync/net/ConnectionMonitorThread.java sync/net/HandleProgressException.java sync/net/HttpResponseObserver.java sync/net/Resource.java sync/net/ResourceDelegate.java sync/net/SyncResourceDelegate.java sync/net/SyncResponse.java sync/net/SyncStorageCollectionRequest.java sync/net/SyncStorageCollectionRequestDelegate.java sync/net/SyncStorageRecordRequest.java sync/net/SyncStorageRequest.java sync/net/SyncStorageRequestDelegate.java sync/net/SyncStorageRequestIncrementalDelegate.java sync/net/SyncStorageResponse.java sync/net/TLSSocketFactory.java sync/net/WBOCollectionRequestDelegate.java sync/net/WBORequestDelegate.java sync/NoCollectionKeysSetException.java sync/NodeAuthenticationException.java sync/NonArrayJSONException.java sync/NonObjectJSONException.java sync/NullClusterURLException.java sync/PersistedMetaGlobal.java sync/PrefsSource.java sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java sync/repositories/android/AndroidBrowserBookmarksRepository.java sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java sync/repositories/android/AndroidBrowserHistoryDataAccessor.java sync/repositories/android/AndroidBrowserHistoryDataExtender.java sync/repositories/android/AndroidBrowserHistoryRepository.java sync/repositories/android/AndroidBrowserHistoryRepositorySession.java sync/repositories/android/AndroidBrowserRepository.java sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java sync/repositories/android/AndroidBrowserRepositorySession.java sync/repositories/android/BookmarksDeletionManager.java sync/repositories/android/BrowserContractHelpers.java sync/repositories/android/CachedSQLiteOpenHelper.java sync/repositories/android/ClientsDatabase.java sync/repositories/android/ClientsDatabaseAccessor.java sync/repositories/android/FennecControlHelper.java sync/repositories/android/FennecTabsRepository.java sync/repositories/android/FormHistoryRepositorySession.java sync/repositories/android/PasswordsRepositorySession.java sync/repositories/android/RepoUtils.java sync/repositories/BookmarkNeedsReparentingException.java sync/repositories/BookmarksRepository.java sync/repositories/ConstrainedServer11Repository.java sync/repositories/delegates/DeferrableRepositorySessionCreationDelegate.java sync/repositories/delegates/DeferredRepositorySessionBeginDelegate.java sync/repositories/delegates/DeferredRepositorySessionFetchRecordsDelegate.java sync/repositories/delegates/DeferredRepositorySessionFinishDelegate.java sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java sync/repositories/delegates/RepositorySessionBeginDelegate.java sync/repositories/delegates/RepositorySessionCleanDelegate.java sync/repositories/delegates/RepositorySessionCreationDelegate.java sync/repositories/delegates/RepositorySessionFetchRecordsDelegate.java sync/repositories/delegates/RepositorySessionFinishDelegate.java sync/repositories/delegates/RepositorySessionGuidsSinceDelegate.java sync/repositories/delegates/RepositorySessionStoreDelegate.java sync/repositories/delegates/RepositorySessionWipeDelegate.java sync/repositories/domain/BookmarkRecord.java sync/repositories/domain/BookmarkRecordFactory.java sync/repositories/domain/ClientRecord.java sync/repositories/domain/ClientRecordFactory.java sync/repositories/domain/FormHistoryRecord.java sync/repositories/domain/HistoryRecord.java sync/repositories/domain/HistoryRecordFactory.java sync/repositories/domain/PasswordRecord.java sync/repositories/domain/Record.java sync/repositories/domain/TabsRecord.java sync/repositories/HashSetStoreTracker.java sync/repositories/HistoryRepository.java sync/repositories/IdentityRecordFactory.java sync/repositories/InactiveSessionException.java sync/repositories/InvalidBookmarkTypeException.java sync/repositories/InvalidRequestException.java sync/repositories/InvalidSessionTransitionException.java sync/repositories/MultipleRecordsForGuidException.java sync/repositories/NoContentProviderException.java sync/repositories/NoGuidForIdException.java sync/repositories/NoStoreDelegateException.java sync/repositories/NullCursorException.java sync/repositories/ParentNotFoundException.java sync/repositories/ProfileDatabaseException.java sync/repositories/RecordFactory.java sync/repositories/RecordFilter.java sync/repositories/Repository.java sync/repositories/RepositorySession.java sync/repositories/RepositorySessionBundle.java sync/repositories/Server11Repository.java sync/repositories/Server11RepositorySession.java sync/repositories/StoreTracker.java sync/repositories/StoreTrackingRepositorySession.java sync/setup/activities/AccountActivity.java sync/setup/activities/ActivityUtils.java sync/setup/activities/SetupFailureActivity.java sync/setup/activities/SetupSuccessActivity.java sync/setup/activities/SetupSyncActivity.java sync/setup/Constants.java sync/setup/InvalidSyncKeyException.java sync/setup/SyncAccounts.java sync/setup/SyncAuthenticatorService.java sync/stage/AbstractNonRepositorySyncStage.java sync/stage/AndroidBrowserBookmarksServerSyncStage.java sync/stage/AndroidBrowserHistoryServerSyncStage.java sync/stage/CheckPreconditionsStage.java sync/stage/CompletedStage.java sync/stage/EnsureClusterURLStage.java sync/stage/EnsureCrypto5KeysStage.java sync/stage/FennecTabsServerSyncStage.java sync/stage/FetchInfoCollectionsStage.java sync/stage/FetchMetaGlobalStage.java sync/stage/FormHistoryServerSyncStage.java sync/stage/GlobalSyncStage.java sync/stage/NoSuchStageException.java sync/stage/NoSyncIDException.java sync/stage/PasswordsServerSyncStage.java sync/stage/ServerSyncStage.java sync/stage/SyncClientsEngineStage.java sync/StubActivity.java sync/syncadapter/SyncAdapter.java sync/syncadapter/SyncService.java sync/SyncConfiguration.java sync/SyncConfigurationException.java sync/SyncException.java sync/synchronizer/ConcurrentRecordConsumer.java sync/synchronizer/RecordConsumer.java sync/synchronizer/RecordsChannel.java sync/synchronizer/RecordsChannelDelegate.java sync/synchronizer/RecordsConsumerDelegate.java sync/synchronizer/SerialRecordConsumer.java sync/synchronizer/SessionNotBegunException.java sync/synchronizer/Synchronizer.java sync/synchronizer/SynchronizerDelegate.java sync/synchronizer/SynchronizerSession.java sync/synchronizer/SynchronizerSessionDelegate.java sync/synchronizer/UnbundleError.java sync/synchronizer/UnexpectedSessionException.java sync/SynchronizerConfiguration.java sync/SynchronizerConfigurations.java sync/ThreadPool.java sync/UnexpectedJSONException.java sync/UnknownSynchronizerConfigurationVersionException.java sync/Utils.java
+sync/AlreadySyncingException.java sync/CollectionKeys.java sync/CommandProcessor.java sync/CommandRunner.java sync/CredentialsSource.java sync/crypto/CryptoException.java sync/crypto/CryptoInfo.java sync/crypto/HKDF.java sync/crypto/HMACVerificationException.java sync/crypto/KeyBundle.java sync/crypto/MissingCryptoInputException.java sync/crypto/NoKeyBundleException.java sync/crypto/PersistedCrypto5Keys.java sync/CryptoRecord.java sync/DelayedWorkTracker.java sync/delegates/ClientsDataDelegate.java sync/delegates/FreshStartDelegate.java sync/delegates/GlobalSessionCallback.java sync/delegates/InfoCollectionsDelegate.java sync/delegates/KeyUploadDelegate.java sync/delegates/MetaGlobalDelegate.java sync/delegates/WipeServerDelegate.java sync/EngineSettings.java sync/ExtendedJSONObject.java sync/GlobalSession.java sync/HTTPFailureException.java sync/InfoCollections.java sync/jpake/BigIntegerHelper.java sync/jpake/Gx3OrGx4IsZeroOrOneException.java sync/jpake/IncorrectZkpException.java sync/jpake/JPakeClient.java sync/jpake/JPakeCrypto.java sync/jpake/JPakeJson.java sync/jpake/JPakeNoActivePairingException.java sync/jpake/JPakeNumGenerator.java sync/jpake/JPakeNumGeneratorRandom.java sync/jpake/JPakeParty.java sync/jpake/JPakeRequest.java sync/jpake/JPakeRequestDelegate.java sync/jpake/JPakeResponse.java sync/jpake/stage/CompleteStage.java sync/jpake/stage/ComputeFinalStage.java sync/jpake/stage/ComputeKeyVerificationStage.java sync/jpake/stage/ComputeStepOneStage.java sync/jpake/stage/ComputeStepTwoStage.java sync/jpake/stage/DecryptDataStage.java sync/jpake/stage/DeleteChannel.java sync/jpake/stage/GetChannelStage.java sync/jpake/stage/GetRequestStage.java sync/jpake/stage/JPakeStage.java sync/jpake/stage/PutRequestStage.java sync/jpake/stage/VerifyPairingStage.java sync/jpake/Zkp.java sync/KeyBundleProvider.java sync/Logger.java sync/MetaGlobal.java sync/MetaGlobalException.java sync/MetaGlobalMissingEnginesException.java sync/MetaGlobalNotSetException.java sync/middleware/Crypto5MiddlewareRepository.java sync/middleware/Crypto5MiddlewareRepositorySession.java sync/middleware/MiddlewareRepository.java sync/middleware/MiddlewareRepositorySession.java sync/net/BaseResource.java sync/net/CompletedEntity.java sync/net/ConnectionMonitorThread.java sync/net/HandleProgressException.java sync/net/HttpResponseObserver.java sync/net/Resource.java sync/net/ResourceDelegate.java sync/net/SyncResourceDelegate.java sync/net/SyncResponse.java sync/net/SyncStorageCollectionRequest.java sync/net/SyncStorageCollectionRequestDelegate.java sync/net/SyncStorageRecordRequest.java sync/net/SyncStorageRequest.java sync/net/SyncStorageRequestDelegate.java sync/net/SyncStorageRequestIncrementalDelegate.java sync/net/SyncStorageResponse.java sync/net/TLSSocketFactory.java sync/net/WBOCollectionRequestDelegate.java sync/net/WBORequestDelegate.java sync/NoCollectionKeysSetException.java sync/NodeAuthenticationException.java sync/NonArrayJSONException.java sync/NonObjectJSONException.java sync/NullClusterURLException.java sync/PersistedMetaGlobal.java sync/PrefsSource.java sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java sync/repositories/android/AndroidBrowserBookmarksRepository.java sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java sync/repositories/android/AndroidBrowserHistoryDataAccessor.java sync/repositories/android/AndroidBrowserHistoryDataExtender.java sync/repositories/android/AndroidBrowserHistoryRepository.java sync/repositories/android/AndroidBrowserHistoryRepositorySession.java sync/repositories/android/AndroidBrowserRepository.java sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java sync/repositories/android/AndroidBrowserRepositorySession.java sync/repositories/android/BookmarksDeletionManager.java sync/repositories/android/BookmarksInsertionManager.java sync/repositories/android/BrowserContractHelpers.java sync/repositories/android/CachedSQLiteOpenHelper.java sync/repositories/android/ClientsDatabase.java sync/repositories/android/ClientsDatabaseAccessor.java sync/repositories/android/FennecControlHelper.java sync/repositories/android/FennecTabsRepository.java sync/repositories/android/FormHistoryRepositorySession.java sync/repositories/android/PasswordsRepositorySession.java sync/repositories/android/RepoUtils.java sync/repositories/BookmarkNeedsReparentingException.java sync/repositories/BookmarksRepository.java sync/repositories/ConstrainedServer11Repository.java sync/repositories/delegates/DeferrableRepositorySessionCreationDelegate.java sync/repositories/delegates/DeferredRepositorySessionBeginDelegate.java sync/repositories/delegates/DeferredRepositorySessionFetchRecordsDelegate.java sync/repositories/delegates/DeferredRepositorySessionFinishDelegate.java sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java sync/repositories/delegates/RepositorySessionBeginDelegate.java sync/repositories/delegates/RepositorySessionCleanDelegate.java sync/repositories/delegates/RepositorySessionCreationDelegate.java sync/repositories/delegates/RepositorySessionFetchRecordsDelegate.java sync/repositories/delegates/RepositorySessionFinishDelegate.java sync/repositories/delegates/RepositorySessionGuidsSinceDelegate.java sync/repositories/delegates/RepositorySessionStoreDelegate.java sync/repositories/delegates/RepositorySessionWipeDelegate.java sync/repositories/domain/BookmarkRecord.java sync/repositories/domain/BookmarkRecordFactory.java sync/repositories/domain/ClientRecord.java sync/repositories/domain/ClientRecordFactory.java sync/repositories/domain/FormHistoryRecord.java sync/repositories/domain/HistoryRecord.java sync/repositories/domain/HistoryRecordFactory.java sync/repositories/domain/PasswordRecord.java sync/repositories/domain/Record.java sync/repositories/domain/TabsRecord.java sync/repositories/HashSetStoreTracker.java sync/repositories/HistoryRepository.java sync/repositories/IdentityRecordFactory.java sync/repositories/InactiveSessionException.java sync/repositories/InvalidBookmarkTypeException.java sync/repositories/InvalidRequestException.java sync/repositories/InvalidSessionTransitionException.java sync/repositories/MultipleRecordsForGuidException.java sync/repositories/NoContentProviderException.java sync/repositories/NoGuidForIdException.java sync/repositories/NoStoreDelegateException.java sync/repositories/NullCursorException.java sync/repositories/ParentNotFoundException.java sync/repositories/ProfileDatabaseException.java sync/repositories/RecordFactory.java sync/repositories/RecordFilter.java sync/repositories/Repository.java sync/repositories/RepositorySession.java sync/repositories/RepositorySessionBundle.java sync/repositories/Server11Repository.java sync/repositories/Server11RepositorySession.java sync/repositories/StoreTracker.java sync/repositories/StoreTrackingRepositorySession.java sync/setup/activities/AccountActivity.java sync/setup/activities/ActivityUtils.java sync/setup/activities/SetupFailureActivity.java sync/setup/activities/SetupSuccessActivity.java sync/setup/activities/SetupSyncActivity.java sync/setup/Constants.java sync/setup/InvalidSyncKeyException.java sync/setup/SyncAccounts.java sync/setup/SyncAuthenticatorService.java sync/stage/AbstractNonRepositorySyncStage.java sync/stage/AndroidBrowserBookmarksServerSyncStage.java sync/stage/AndroidBrowserHistoryServerSyncStage.java sync/stage/CheckPreconditionsStage.java sync/stage/CompletedStage.java sync/stage/EnsureClusterURLStage.java sync/stage/EnsureCrypto5KeysStage.java sync/stage/FennecTabsServerSyncStage.java sync/stage/FetchInfoCollectionsStage.java sync/stage/FetchMetaGlobalStage.java sync/stage/FormHistoryServerSyncStage.java sync/stage/GlobalSyncStage.java sync/stage/NoSuchStageException.java sync/stage/NoSyncIDException.java sync/stage/PasswordsServerSyncStage.java sync/stage/ServerSyncStage.java sync/stage/SyncClientsEngineStage.java sync/StubActivity.java sync/syncadapter/SyncAdapter.java sync/syncadapter/SyncService.java sync/SyncConfiguration.java sync/SyncConfigurationException.java sync/SyncException.java sync/synchronizer/ConcurrentRecordConsumer.java sync/synchronizer/RecordConsumer.java sync/synchronizer/RecordsChannel.java sync/synchronizer/RecordsChannelDelegate.java sync/synchronizer/RecordsConsumerDelegate.java sync/synchronizer/SerialRecordConsumer.java sync/synchronizer/SessionNotBegunException.java sync/synchronizer/Synchronizer.java sync/synchronizer/SynchronizerDelegate.java sync/synchronizer/SynchronizerSession.java sync/synchronizer/SynchronizerSessionDelegate.java sync/synchronizer/UnbundleError.java sync/synchronizer/UnexpectedSessionException.java sync/SynchronizerConfiguration.java sync/SynchronizerConfigurations.java sync/ThreadPool.java sync/UnexpectedJSONException.java sync/UnknownSynchronizerConfigurationVersionException.java sync/Utils.java

From b91ec7039a10d3c6c65d61597d589897adcc29b4 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Mon, 30 Apr 2012 13:40:34 -0700
Subject: [PATCH 122/162] Bug 749857 - Don't upload history records without URI
 or visits. r=liuche, a=android-only

---
 .../sync/repositories/android/RepoUtils.java  | 42 ++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/mobile/android/base/sync/repositories/android/RepoUtils.java b/mobile/android/base/sync/repositories/android/RepoUtils.java
index daa4a2ec37b..9c00af623a9 100644
--- a/mobile/android/base/sync/repositories/android/RepoUtils.java
+++ b/mobile/android/base/sync/repositories/android/RepoUtils.java
@@ -119,20 +119,42 @@ public class RepoUtils {
     }
   }
 
-  //Create a HistoryRecord object from a cursor on a row with a Moz History record in it
+  /**
+   * Create a HistoryRecord object from a cursor row.
+   *
+   * @return a HistoryRecord, or null if this row would produce
+   *         an invalid record (e.g., with a null URI or no visits).
+   */
   public static HistoryRecord historyFromMirrorCursor(Cursor cur) {
+    final String guid = getStringFromCursor(cur, BrowserContract.SyncColumns.GUID);
+    if (guid == null) {
+      Logger.debug(LOG_TAG, "Skipping history record with null GUID.");
+      return null;
+    }
 
-    String guid = getStringFromCursor(cur, BrowserContract.SyncColumns.GUID);
-    String collection = "history";
-    long lastModified = getLongFromCursor(cur, BrowserContract.SyncColumns.DATE_MODIFIED);
-    boolean deleted = getLongFromCursor(cur, BrowserContract.SyncColumns.IS_DELETED) == 1 ? true : false;
-    HistoryRecord rec = new HistoryRecord(guid, collection, lastModified, deleted);
+    final String historyURI = getStringFromCursor(cur, BrowserContract.History.URL);
+    if (historyURI == null || (historyURI.length() == 0)) {
+      Logger.debug(LOG_TAG, "Skipping history record " + guid + " with null or empty URI.");
+      return null;
+    }
 
-    rec.title = getStringFromCursor(cur, BrowserContract.History.TITLE);
-    rec.histURI = getStringFromCursor(cur, BrowserContract.History.URL);
-    rec.androidID = getLongFromCursor(cur, BrowserContract.History._ID);
+    final long visitCount = getLongFromCursor(cur, BrowserContract.History.VISITS);
+    if (visitCount <= 0) {
+      Logger.debug(LOG_TAG, "Skipping history record " + guid + " with <= 0 visit count.");
+      return null;
+    }
+
+    final String collection = "history";
+    final long lastModified = getLongFromCursor(cur, BrowserContract.SyncColumns.DATE_MODIFIED);
+    final boolean deleted = getLongFromCursor(cur, BrowserContract.SyncColumns.IS_DELETED) == 1 ? true : false;
+
+    final HistoryRecord rec = new HistoryRecord(guid, collection, lastModified, deleted);
+
+    rec.androidID         = getLongFromCursor(cur, BrowserContract.History._ID);
     rec.fennecDateVisited = getLongFromCursor(cur, BrowserContract.History.DATE_LAST_VISITED);
-    rec.fennecVisitCount = getLongFromCursor(cur, BrowserContract.History.VISITS);
+    rec.fennecVisitCount  = visitCount;
+    rec.histURI           = historyURI;
+    rec.title             = getStringFromCursor(cur, BrowserContract.History.TITLE);
 
     return logHistory(rec);
   }

From b1963d1ebdaf74e1f722c2ff107eeacd7f72a597 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@mozilla.com>
Date: Mon, 30 Apr 2012 15:02:11 -0700
Subject: [PATCH 123/162] Bug 749231: Set the devtools.debugger.log pref in
 head_dbg.js, so we always get packet logs. r=past

---
 toolkit/devtools/debugger/tests/unit/head_dbg.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/toolkit/devtools/debugger/tests/unit/head_dbg.js b/toolkit/devtools/debugger/tests/unit/head_dbg.js
index 57374f6e952..6ff2ff35720 100644
--- a/toolkit/devtools/debugger/tests/unit/head_dbg.js
+++ b/toolkit/devtools/debugger/tests/unit/head_dbg.js
@@ -7,9 +7,14 @@ const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
+Cu.import("resource://gre/modules/Services.jsm");
+
+// Always log packets when running tests. runxpcshelltests.py will throw
+// the output away anyway, unless you give it the --verbose flag.
+Services.prefs.setBoolPref("devtools.debugger.log", true);
+
 Cu.import("resource:///modules/devtools/dbg-server.jsm");
 Cu.import("resource:///modules/devtools/dbg-client.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
 
 
 function check_except(func)

From 418a5c4cb28bee9461a9b8d47e6f5fc62dadc90c Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Tue, 1 May 2012 13:45:32 +0200
Subject: [PATCH 124/162] Bug 744388 - [Page Thumbnails] implement a custom
 storage, don't use the file cache; r=dietrich

---
 browser/components/nsBrowserGlue.js           |   6 +
 browser/components/thumbnails/PageThumbs.jsm  | 195 +++++++++++-------
 .../thumbnails/PageThumbsProtocol.js          |   8 +
 .../components/thumbnails/test/Makefile.in    |   1 +
 .../test/browser_thumbnails_redirect.js       |  33 +--
 .../test/browser_thumbnails_storage.js        |  89 ++++++++
 browser/components/thumbnails/test/head.js    |   2 +-
 7 files changed, 227 insertions(+), 107 deletions(-)
 create mode 100644 browser/components/thumbnails/test/browser_thumbnails_storage.js

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index e6b32521231..c1e0ac38a16 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -68,6 +68,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "BookmarkHTMLUtils",
 XPCOMUtils.defineLazyModuleGetter(this, "webappsUI", 
                                   "resource:///modules/webappsUI.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "PageThumbs",
+                                  "resource:///modules/PageThumbs.jsm");
+
 const PREF_PLUGINS_NOTIFYUSER = "plugins.update.notifyUser";
 const PREF_PLUGINS_UPDATEURL  = "plugins.update.url";
 
@@ -358,6 +361,8 @@ BrowserGlue.prototype = {
     // Initialize webapps UI
     webappsUI.init();
 
+    PageThumbs.init();
+
     Services.obs.notifyObservers(null, "browser-ui-startup-complete", "");
   },
 
@@ -379,6 +384,7 @@ BrowserGlue.prototype = {
   _onProfileShutdown: function BG__onProfileShutdown() {
     this._shutdownPlaces();
     this._sanitizer.onShutdown();
+    PageThumbs.uninit();
   },
 
   // All initial windows have opened.
diff --git a/browser/components/thumbnails/PageThumbs.jsm b/browser/components/thumbnails/PageThumbs.jsm
index 4cefd4befdc..92b364fb3b9 100644
--- a/browser/components/thumbnails/PageThumbs.jsm
+++ b/browser/components/thumbnails/PageThumbs.jsm
@@ -4,7 +4,7 @@
 
 "use strict";
 
-let EXPORTED_SYMBOLS = ["PageThumbs", "PageThumbsCache"];
+let EXPORTED_SYMBOLS = ["PageThumbs", "PageThumbsStorage", "PageThumbsCache"];
 
 const Cu = Components.utils;
 const Cc = Components.classes;
@@ -12,6 +12,11 @@ const Ci = Components.interfaces;
 
 const HTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
 
+/**
+ * Name of the directory in the profile that contains the thumbnails.
+ */
+const THUMBNAIL_DIRECTORY = "thumbnails";
+
 /**
  * The default background color for page thumbnails.
  */
@@ -25,12 +30,28 @@ XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
   "resource://gre/modules/Services.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
+  "resource://gre/modules/FileUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
+  "resource://gre/modules/PlacesUtils.jsm");
+
+XPCOMUtils.defineLazyGetter(this, "gCryptoHash", function () {
+  return Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash);
+});
+
+XPCOMUtils.defineLazyGetter(this, "gUnicodeConverter", function () {
+  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+                    .createInstance(Ci.nsIScriptableUnicodeConverter);
+  converter.charset = 'utf8';
+  return converter;
+});
+
 /**
  * Singleton providing functionality for capturing web page thumbnails and for
  * accessing them if already cached.
  */
 let PageThumbs = {
-
   /**
    * The calculated width and height of the thumbnails.
    */
@@ -52,6 +73,14 @@ let PageThumbs = {
    */
   get contentType() "image/png",
 
+  init: function PageThumbs_init() {
+    PlacesUtils.history.addObserver(PageThumbsHistoryObserver, false);
+  },
+
+  uninit: function PageThumbs_uninit() {
+    PlacesUtils.history.removeObserver(PageThumbsHistoryObserver);
+  },
+
   /**
    * Gets the thumbnail image's url for a given web page's url.
    * @param aUrl The web page's url that is depicted in the thumbnail.
@@ -124,32 +153,14 @@ let PageThumbs = {
           //    Sync and therefore also redirect sources appear on the newtab
           //    page. We also want thumbnails for those.
           if (url != originalURL)
-            PageThumbsCache._copy(url, originalURL);
+            PageThumbsStorage.copy(url, originalURL);
         }
 
         if (aCallback)
           aCallback(aSuccessful);
       }
 
-      // Get a writeable cache entry.
-      PageThumbsCache.getWriteEntry(url, function (aEntry) {
-        if (!aEntry) {
-          finish(false);
-          return;
-        }
-
-        let outputStream = aEntry.openOutputStream(0);
-
-        // Write the image data to the cache entry.
-        NetUtil.asyncCopy(aInputStream, outputStream, function (aResult) {
-          let success = Components.isSuccessCode(aResult);
-          if (success)
-            aEntry.markValid();
-
-          aEntry.close();
-          finish(success);
-        });
-      });
+      PageThumbsStorage.write(url, aInputStream, finish);
     });
   },
 
@@ -208,6 +219,88 @@ let PageThumbs = {
   }
 };
 
+let PageThumbsStorage = {
+  getFileForURL: function Storage_getFileForURL(aURL) {
+    let hash = this._calculateMD5Hash(aURL);
+    let parts = [THUMBNAIL_DIRECTORY, hash[0], hash[1], hash.slice(2) + ".png"];
+    return FileUtils.getFile("ProfD", parts);
+  },
+
+  write: function Storage_write(aURL, aDataStream, aCallback) {
+    let file = this.getFileForURL(aURL);
+    let fos = FileUtils.openSafeFileOutputStream(file);
+
+    NetUtil.asyncCopy(aDataStream, fos, function (aResult) {
+      FileUtils.closeSafeFileOutputStream(fos);
+      aCallback(Components.isSuccessCode(aResult));
+    });
+  },
+
+  copy: function Storage_copy(aSourceURL, aTargetURL) {
+    let sourceFile = this.getFileForURL(aSourceURL);
+    let targetFile = this.getFileForURL(aTargetURL);
+
+    try {
+      sourceFile.copyTo(targetFile.parent, targetFile.leafName);
+    } catch (e) {
+      /* We might not be permitted to write to the file. */
+    }
+  },
+
+  remove: function Storage_remove(aURL) {
+    try {
+      this.getFileForURL(aURL).remove(false);
+    } catch (e) {
+      /* The file might not exist or we're not permitted to remove it. */
+    }
+  },
+
+  wipe: function Storage_wipe() {
+    try {
+      FileUtils.getDir("ProfD", [THUMBNAIL_DIRECTORY]).remove(true);
+    } catch (e) {
+      /* The file might not exist or we're not permitted to remove it. */
+    }
+  },
+
+  _calculateMD5Hash: function Storage_calculateMD5Hash(aValue) {
+    let hash = gCryptoHash;
+    let value = gUnicodeConverter.convertToByteArray(aValue);
+
+    hash.init(hash.MD5);
+    hash.update(value, value.length);
+    return this._convertToHexString(hash.finish(false));
+  },
+
+  _convertToHexString: function Storage_convertToHexString(aData) {
+    let hex = "";
+    for (let i = 0; i < aData.length; i++)
+      hex += ("0" + aData.charCodeAt(i).toString(16)).slice(-2);
+    return hex;
+  },
+
+};
+
+let PageThumbsHistoryObserver = {
+  onDeleteURI: function Thumbnails_onDeleteURI(aURI, aGUID) {
+    PageThumbsStorage.remove(aURI.spec);
+  },
+
+  onClearHistory: function Thumbnails_onClearHistory() {
+    PageThumbsStorage.wipe();
+  },
+
+  onTitleChanged: function () {},
+  onBeginUpdateBatch: function () {},
+  onEndUpdateBatch: function () {},
+  onVisit: function () {},
+  onBeforeDeleteURI: function () {},
+  onPageChanged: function () {},
+  onDeleteVisits: function () {},
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
+};
+
 /**
  * A singleton handling the storage of page thumbnails.
  */
@@ -222,64 +315,6 @@ let PageThumbsCache = {
     this._openCacheEntry(aKey, Ci.nsICache.ACCESS_READ, aCallback);
   },
 
-  /**
-   * Calls the given callback with a cache entry opened for writing.
-   * @param aKey The key identifying the desired cache entry.
-   * @param aCallback The callback that is called when the cache entry is ready.
-   */
-  getWriteEntry: function Cache_getWriteEntry(aKey, aCallback) {
-    // Try to open the desired cache entry.
-    this._openCacheEntry(aKey, Ci.nsICache.ACCESS_WRITE, aCallback);
-  },
-
-  /**
-   * Copies an existing cache entry's data to a new cache entry.
-   * @param aSourceKey The key that contains the data to copy.
-   * @param aTargetKey The key that will be the copy of aSourceKey's data.
-   */
-  _copy: function Cache_copy(aSourceKey, aTargetKey) {
-    let sourceEntry, targetEntry, waitingCount = 2;
-
-    function finish() {
-      if (sourceEntry)
-        sourceEntry.close();
-
-      if (targetEntry)
-        targetEntry.close();
-    }
-
-    function copyDataWhenReady() {
-      if (--waitingCount > 0)
-        return;
-
-      if (!sourceEntry || !targetEntry) {
-        finish();
-        return;
-      }
-
-      let inputStream = sourceEntry.openInputStream(0);
-      let outputStream = targetEntry.openOutputStream(0);
-
-      // Copy the image data to a new entry.
-      NetUtil.asyncCopy(inputStream, outputStream, function (aResult) {
-        if (Components.isSuccessCode(aResult))
-          targetEntry.markValid();
-
-        finish();
-      });
-    }
-
-    this.getReadEntry(aSourceKey, function (aSourceEntry) {
-      sourceEntry = aSourceEntry;
-      copyDataWhenReady();
-    });
-
-    this.getWriteEntry(aTargetKey, function (aTargetEntry) {
-      targetEntry = aTargetEntry;
-      copyDataWhenReady();
-    });
-  },
-
   /**
    * Opens the cache entry identified by the given key.
    * @param aKey The key identifying the desired cache entry.
diff --git a/browser/components/thumbnails/PageThumbsProtocol.js b/browser/components/thumbnails/PageThumbsProtocol.js
index 4cf06067b73..d72e8279857 100644
--- a/browser/components/thumbnails/PageThumbsProtocol.js
+++ b/browser/components/thumbnails/PageThumbsProtocol.js
@@ -72,6 +72,14 @@ Protocol.prototype = {
    * @return The newly created channel.
    */
   newChannel: function Proto_newChannel(aURI) {
+    let {url} = parseURI(aURI);
+    let file = PageThumbsStorage.getFileForURL(url);
+
+    if (file.exists()) {
+      let fileuri = Services.io.newFileURI(file);
+      return Services.io.newChannelFromURI(fileuri);
+    }
+
     return new Channel(aURI);
   },
 
diff --git a/browser/components/thumbnails/test/Makefile.in b/browser/components/thumbnails/test/Makefile.in
index ac00a023a67..c7af21dc9a5 100644
--- a/browser/components/thumbnails/test/Makefile.in
+++ b/browser/components/thumbnails/test/Makefile.in
@@ -14,6 +14,7 @@ include $(topsrcdir)/config/rules.mk
 _BROWSER_FILES = \
 	browser_thumbnails_capture.js \
 	browser_thumbnails_redirect.js \
+	browser_thumbnails_storage.js \
 	browser_thumbnails_bug726727.js \
 	head.js \
 	background_red.html \
diff --git a/browser/components/thumbnails/test/browser_thumbnails_redirect.js b/browser/components/thumbnails/test/browser_thumbnails_redirect.js
index 54803e1e348..7bc420c1ed6 100644
--- a/browser/components/thumbnails/test/browser_thumbnails_redirect.js
+++ b/browser/components/thumbnails/test/browser_thumbnails_redirect.js
@@ -4,9 +4,6 @@
 const URL = "http://mochi.test:8888/browser/browser/components/thumbnails/" +
             "test/background_red_redirect.sjs";
 
-let cacheService = Cc["@mozilla.org/network/cache-service;1"]
-                   .getService(Ci.nsICacheService);
-
 /**
  * These tests ensure that we save and provide thumbnails for redirecting sites.
  */
@@ -19,33 +16,17 @@ function runTests() {
   yield addTab(URL);
   yield captureAndCheckColor(255, 0, 0, "we have a red thumbnail");
 
-  // Wait until the referrer's thumbnail's cache entry has been written.
-  yield whenCacheEntryExists(URL);
+  // Wait until the referrer's thumbnail's file has been written.
+  yield whenFileExists(URL);
   yield checkThumbnailColor(URL, 255, 0, 0, "referrer has a red thumbnail");
 }
 
-function whenCacheEntryExists(aKey) {
+function whenFileExists(aURL) {
   let callback = next;
 
-  checkCacheEntryExists(aKey, function (aExists) {
-    if (!aExists)
-      callback = function () whenCacheEntryExists(aKey);
+  let file = PageThumbsStorage.getFileForURL(aURL);
+  if (!file.exists())
+    callback = function () whenFileExists(aURL);
 
-    executeSoon(callback);
-  });
-}
-
-function checkCacheEntryExists(aKey, aCallback) {
-  PageThumbsCache.getReadEntry(aKey, function (aEntry) {
-    let inputStream = aEntry && aEntry.openInputStream(0);
-    let exists = inputStream && inputStream.available();
-
-    if (inputStream)
-      inputStream.close();
-
-    if (aEntry)
-      aEntry.close();
-
-    aCallback(exists);
-  });
+  executeSoon(callback);
 }
diff --git a/browser/components/thumbnails/test/browser_thumbnails_storage.js b/browser/components/thumbnails/test/browser_thumbnails_storage.js
new file mode 100644
index 00000000000..db91a980173
--- /dev/null
+++ b/browser/components/thumbnails/test/browser_thumbnails_storage.js
@@ -0,0 +1,89 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const URL = "http://mochi.test:8888/";
+const URL_COPY = URL + "#copy";
+
+XPCOMUtils.defineLazyGetter(this, "Sanitizer", function () {
+  let tmp = {};
+  Cc["@mozilla.org/moz/jssubscript-loader;1"]
+    .getService(Ci.mozIJSSubScriptLoader)
+    .loadSubScript("chrome://browser/content/sanitize.js", tmp);
+  return tmp.Sanitizer;
+});
+
+/**
+ * These tests ensure that the thumbnail storage is working as intended.
+ * Newly captured thumbnails should be saved as files and they should as well
+ * be removed when the user sanitizes their history.
+ */
+function runTests() {
+  clearHistory();
+
+  // create a thumbnail
+  yield addTab(URL);
+  yield whenFileExists();
+  gBrowser.removeTab(gBrowser.selectedTab);
+
+  // clear all browser history
+  yield clearHistory();
+
+  // create a thumbnail
+  yield addTab(URL);
+  yield whenFileExists();
+  gBrowser.removeTab(gBrowser.selectedTab);
+
+  // make sure copy() updates an existing file
+  PageThumbsStorage.copy(URL, URL_COPY);
+  let copy = PageThumbsStorage.getFileForURL(URL_COPY);
+  let mtime = copy.lastModifiedTime -= 60;
+
+  PageThumbsStorage.copy(URL, URL_COPY);
+  isnot(PageThumbsStorage.getFileForURL(URL_COPY).lastModifiedTime, mtime,
+        "thumbnail file was updated");
+
+  // clear last 10 mins of history
+  yield clearHistory(true);
+  ok(!copy.exists(), "copy of thumbnail has been removed");
+}
+
+function clearHistory(aUseRange) {
+  let s = new Sanitizer();
+  s.prefDomain = "privacy.cpd.";
+
+  let prefs = gPrefService.getBranch(s.prefDomain);
+  prefs.setBoolPref("history", true);
+  prefs.setBoolPref("downloads", false);
+  prefs.setBoolPref("cache", false);
+  prefs.setBoolPref("cookies", false);
+  prefs.setBoolPref("formdata", false);
+  prefs.setBoolPref("offlineApps", false);
+  prefs.setBoolPref("passwords", false);
+  prefs.setBoolPref("sessions", false);
+  prefs.setBoolPref("siteSettings", false);
+
+  if (aUseRange) {
+    let usec = Date.now() * 1000;
+    s.range = [usec - 10 * 60 * 1000 * 1000, usec];
+  }
+
+  s.sanitize();
+  s.range = null;
+
+  executeSoon(function () {
+    if (PageThumbsStorage.getFileForURL(URL).exists())
+      clearHistory(aFile, aUseRange);
+    else
+      next();
+  });
+}
+
+function whenFileExists() {
+  let callback = whenFileExists;
+
+  let file = PageThumbsStorage.getFileForURL(URL);
+  if (file.exists() && file.fileSize)
+    callback = next;
+
+  executeSoon(callback);
+}
diff --git a/browser/components/thumbnails/test/head.js b/browser/components/thumbnails/test/head.js
index 6bfd76e7d30..6a4ee10335d 100644
--- a/browser/components/thumbnails/test/head.js
+++ b/browser/components/thumbnails/test/head.js
@@ -4,7 +4,7 @@
 let tmp = {};
 Cu.import("resource:///modules/PageThumbs.jsm", tmp);
 let PageThumbs = tmp.PageThumbs;
-let PageThumbsCache = tmp.PageThumbsCache;
+let PageThumbsStorage = tmp.PageThumbsStorage;
 
 registerCleanupFunction(function () {
   while (gBrowser.tabs.length > 1)

From 0bc7df75cbc4e8895aa8e7ca9a63a806c44ae560 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Tue, 1 May 2012 16:34:57 +0100
Subject: [PATCH 125/162] Backout 080fc3a7cdfe (bug 744388) for xpcshell
 failures

---
 browser/components/nsBrowserGlue.js           |   6 -
 browser/components/thumbnails/PageThumbs.jsm  | 197 +++++++-----------
 .../thumbnails/PageThumbsProtocol.js          |   8 -
 .../components/thumbnails/test/Makefile.in    |   1 -
 .../test/browser_thumbnails_redirect.js       |  33 ++-
 .../test/browser_thumbnails_storage.js        |  89 --------
 browser/components/thumbnails/test/head.js    |   2 +-
 7 files changed, 108 insertions(+), 228 deletions(-)
 delete mode 100644 browser/components/thumbnails/test/browser_thumbnails_storage.js

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index c1e0ac38a16..e6b32521231 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -68,9 +68,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "BookmarkHTMLUtils",
 XPCOMUtils.defineLazyModuleGetter(this, "webappsUI", 
                                   "resource:///modules/webappsUI.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "PageThumbs",
-                                  "resource:///modules/PageThumbs.jsm");
-
 const PREF_PLUGINS_NOTIFYUSER = "plugins.update.notifyUser";
 const PREF_PLUGINS_UPDATEURL  = "plugins.update.url";
 
@@ -361,8 +358,6 @@ BrowserGlue.prototype = {
     // Initialize webapps UI
     webappsUI.init();
 
-    PageThumbs.init();
-
     Services.obs.notifyObservers(null, "browser-ui-startup-complete", "");
   },
 
@@ -384,7 +379,6 @@ BrowserGlue.prototype = {
   _onProfileShutdown: function BG__onProfileShutdown() {
     this._shutdownPlaces();
     this._sanitizer.onShutdown();
-    PageThumbs.uninit();
   },
 
   // All initial windows have opened.
diff --git a/browser/components/thumbnails/PageThumbs.jsm b/browser/components/thumbnails/PageThumbs.jsm
index 92b364fb3b9..3330718d4e1 100644
--- a/browser/components/thumbnails/PageThumbs.jsm
+++ b/browser/components/thumbnails/PageThumbs.jsm
@@ -4,7 +4,7 @@
 
 "use strict";
 
-let EXPORTED_SYMBOLS = ["PageThumbs", "PageThumbsStorage", "PageThumbsCache"];
+let EXPORTED_SYMBOLS = ["PageThumbs", "PageThumbsCache"];
 
 const Cu = Components.utils;
 const Cc = Components.classes;
@@ -12,11 +12,6 @@ const Ci = Components.interfaces;
 
 const HTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
 
-/**
- * Name of the directory in the profile that contains the thumbnails.
- */
-const THUMBNAIL_DIRECTORY = "thumbnails";
-
 /**
  * The default background color for page thumbnails.
  */
@@ -30,28 +25,12 @@ XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
   "resource://gre/modules/Services.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
-  "resource://gre/modules/FileUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
-  "resource://gre/modules/PlacesUtils.jsm");
-
-XPCOMUtils.defineLazyGetter(this, "gCryptoHash", function () {
-  return Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash);
-});
-
-XPCOMUtils.defineLazyGetter(this, "gUnicodeConverter", function () {
-  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-                    .createInstance(Ci.nsIScriptableUnicodeConverter);
-  converter.charset = 'utf8';
-  return converter;
-});
-
 /**
  * Singleton providing functionality for capturing web page thumbnails and for
  * accessing them if already cached.
  */
 let PageThumbs = {
+
   /**
    * The calculated width and height of the thumbnails.
    */
@@ -73,14 +52,6 @@ let PageThumbs = {
    */
   get contentType() "image/png",
 
-  init: function PageThumbs_init() {
-    PlacesUtils.history.addObserver(PageThumbsHistoryObserver, false);
-  },
-
-  uninit: function PageThumbs_uninit() {
-    PlacesUtils.history.removeObserver(PageThumbsHistoryObserver);
-  },
-
   /**
    * Gets the thumbnail image's url for a given web page's url.
    * @param aUrl The web page's url that is depicted in the thumbnail.
@@ -153,14 +124,32 @@ let PageThumbs = {
           //    Sync and therefore also redirect sources appear on the newtab
           //    page. We also want thumbnails for those.
           if (url != originalURL)
-            PageThumbsStorage.copy(url, originalURL);
+            PageThumbsCache._copy(url, originalURL);
         }
 
         if (aCallback)
           aCallback(aSuccessful);
       }
 
-      PageThumbsStorage.write(url, aInputStream, finish);
+      // Get a writeable cache entry.
+      PageThumbsCache.getWriteEntry(url, function (aEntry) {
+        if (!aEntry) {
+          finish(false);
+          return;
+        }
+
+        let outputStream = aEntry.openOutputStream(0);
+
+        // Write the image data to the cache entry.
+        NetUtil.asyncCopy(aInputStream, outputStream, function (aResult) {
+          let success = Components.isSuccessCode(aResult);
+          if (success)
+            aEntry.markValid();
+
+          aEntry.close();
+          finish(success);
+        });
+      });
     });
   },
 
@@ -208,7 +197,7 @@ let PageThumbs = {
    */
   _getThumbnailSize: function PageThumbs_getThumbnailSize() {
     if (!this._thumbnailWidth || !this._thumbnailHeight) {
-      let screenManager = Cc["@mozilla.org/gfx/screenmanager;1"]
+      let screenManager = Cc["@mozilla.org/gfx/screenmanager;1"]
                             .getService(Ci.nsIScreenManager);
       let left = {}, top = {}, width = {}, height = {};
       screenManager.primaryScreen.GetRect(left, top, width, height);
@@ -219,88 +208,6 @@ let PageThumbs = {
   }
 };
 
-let PageThumbsStorage = {
-  getFileForURL: function Storage_getFileForURL(aURL) {
-    let hash = this._calculateMD5Hash(aURL);
-    let parts = [THUMBNAIL_DIRECTORY, hash[0], hash[1], hash.slice(2) + ".png"];
-    return FileUtils.getFile("ProfD", parts);
-  },
-
-  write: function Storage_write(aURL, aDataStream, aCallback) {
-    let file = this.getFileForURL(aURL);
-    let fos = FileUtils.openSafeFileOutputStream(file);
-
-    NetUtil.asyncCopy(aDataStream, fos, function (aResult) {
-      FileUtils.closeSafeFileOutputStream(fos);
-      aCallback(Components.isSuccessCode(aResult));
-    });
-  },
-
-  copy: function Storage_copy(aSourceURL, aTargetURL) {
-    let sourceFile = this.getFileForURL(aSourceURL);
-    let targetFile = this.getFileForURL(aTargetURL);
-
-    try {
-      sourceFile.copyTo(targetFile.parent, targetFile.leafName);
-    } catch (e) {
-      /* We might not be permitted to write to the file. */
-    }
-  },
-
-  remove: function Storage_remove(aURL) {
-    try {
-      this.getFileForURL(aURL).remove(false);
-    } catch (e) {
-      /* The file might not exist or we're not permitted to remove it. */
-    }
-  },
-
-  wipe: function Storage_wipe() {
-    try {
-      FileUtils.getDir("ProfD", [THUMBNAIL_DIRECTORY]).remove(true);
-    } catch (e) {
-      /* The file might not exist or we're not permitted to remove it. */
-    }
-  },
-
-  _calculateMD5Hash: function Storage_calculateMD5Hash(aValue) {
-    let hash = gCryptoHash;
-    let value = gUnicodeConverter.convertToByteArray(aValue);
-
-    hash.init(hash.MD5);
-    hash.update(value, value.length);
-    return this._convertToHexString(hash.finish(false));
-  },
-
-  _convertToHexString: function Storage_convertToHexString(aData) {
-    let hex = "";
-    for (let i = 0; i < aData.length; i++)
-      hex += ("0" + aData.charCodeAt(i).toString(16)).slice(-2);
-    return hex;
-  },
-
-};
-
-let PageThumbsHistoryObserver = {
-  onDeleteURI: function Thumbnails_onDeleteURI(aURI, aGUID) {
-    PageThumbsStorage.remove(aURI.spec);
-  },
-
-  onClearHistory: function Thumbnails_onClearHistory() {
-    PageThumbsStorage.wipe();
-  },
-
-  onTitleChanged: function () {},
-  onBeginUpdateBatch: function () {},
-  onEndUpdateBatch: function () {},
-  onVisit: function () {},
-  onBeforeDeleteURI: function () {},
-  onPageChanged: function () {},
-  onDeleteVisits: function () {},
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
-};
-
 /**
  * A singleton handling the storage of page thumbnails.
  */
@@ -315,6 +222,64 @@ let PageThumbsCache = {
     this._openCacheEntry(aKey, Ci.nsICache.ACCESS_READ, aCallback);
   },
 
+  /**
+   * Calls the given callback with a cache entry opened for writing.
+   * @param aKey The key identifying the desired cache entry.
+   * @param aCallback The callback that is called when the cache entry is ready.
+   */
+  getWriteEntry: function Cache_getWriteEntry(aKey, aCallback) {
+    // Try to open the desired cache entry.
+    this._openCacheEntry(aKey, Ci.nsICache.ACCESS_WRITE, aCallback);
+  },
+
+  /**
+   * Copies an existing cache entry's data to a new cache entry.
+   * @param aSourceKey The key that contains the data to copy.
+   * @param aTargetKey The key that will be the copy of aSourceKey's data.
+   */
+  _copy: function Cache_copy(aSourceKey, aTargetKey) {
+    let sourceEntry, targetEntry, waitingCount = 2;
+
+    function finish() {
+      if (sourceEntry)
+        sourceEntry.close();
+
+      if (targetEntry)
+        targetEntry.close();
+    }
+
+    function copyDataWhenReady() {
+      if (--waitingCount > 0)
+        return;
+
+      if (!sourceEntry || !targetEntry) {
+        finish();
+        return;
+      }
+
+      let inputStream = sourceEntry.openInputStream(0);
+      let outputStream = targetEntry.openOutputStream(0);
+
+      // Copy the image data to a new entry.
+      NetUtil.asyncCopy(inputStream, outputStream, function (aResult) {
+        if (Components.isSuccessCode(aResult))
+          targetEntry.markValid();
+
+        finish();
+      });
+    }
+
+    this.getReadEntry(aSourceKey, function (aSourceEntry) {
+      sourceEntry = aSourceEntry;
+      copyDataWhenReady();
+    });
+
+    this.getWriteEntry(aTargetKey, function (aTargetEntry) {
+      targetEntry = aTargetEntry;
+      copyDataWhenReady();
+    });
+  },
+
   /**
    * Opens the cache entry identified by the given key.
    * @param aKey The key identifying the desired cache entry.
diff --git a/browser/components/thumbnails/PageThumbsProtocol.js b/browser/components/thumbnails/PageThumbsProtocol.js
index d72e8279857..4cf06067b73 100644
--- a/browser/components/thumbnails/PageThumbsProtocol.js
+++ b/browser/components/thumbnails/PageThumbsProtocol.js
@@ -72,14 +72,6 @@ Protocol.prototype = {
    * @return The newly created channel.
    */
   newChannel: function Proto_newChannel(aURI) {
-    let {url} = parseURI(aURI);
-    let file = PageThumbsStorage.getFileForURL(url);
-
-    if (file.exists()) {
-      let fileuri = Services.io.newFileURI(file);
-      return Services.io.newChannelFromURI(fileuri);
-    }
-
     return new Channel(aURI);
   },
 
diff --git a/browser/components/thumbnails/test/Makefile.in b/browser/components/thumbnails/test/Makefile.in
index c7af21dc9a5..ac00a023a67 100644
--- a/browser/components/thumbnails/test/Makefile.in
+++ b/browser/components/thumbnails/test/Makefile.in
@@ -14,7 +14,6 @@ include $(topsrcdir)/config/rules.mk
 _BROWSER_FILES = \
 	browser_thumbnails_capture.js \
 	browser_thumbnails_redirect.js \
-	browser_thumbnails_storage.js \
 	browser_thumbnails_bug726727.js \
 	head.js \
 	background_red.html \
diff --git a/browser/components/thumbnails/test/browser_thumbnails_redirect.js b/browser/components/thumbnails/test/browser_thumbnails_redirect.js
index 7bc420c1ed6..54803e1e348 100644
--- a/browser/components/thumbnails/test/browser_thumbnails_redirect.js
+++ b/browser/components/thumbnails/test/browser_thumbnails_redirect.js
@@ -4,6 +4,9 @@
 const URL = "http://mochi.test:8888/browser/browser/components/thumbnails/" +
             "test/background_red_redirect.sjs";
 
+let cacheService = Cc["@mozilla.org/network/cache-service;1"]
+                   .getService(Ci.nsICacheService);
+
 /**
  * These tests ensure that we save and provide thumbnails for redirecting sites.
  */
@@ -16,17 +19,33 @@ function runTests() {
   yield addTab(URL);
   yield captureAndCheckColor(255, 0, 0, "we have a red thumbnail");
 
-  // Wait until the referrer's thumbnail's file has been written.
-  yield whenFileExists(URL);
+  // Wait until the referrer's thumbnail's cache entry has been written.
+  yield whenCacheEntryExists(URL);
   yield checkThumbnailColor(URL, 255, 0, 0, "referrer has a red thumbnail");
 }
 
-function whenFileExists(aURL) {
+function whenCacheEntryExists(aKey) {
   let callback = next;
 
-  let file = PageThumbsStorage.getFileForURL(aURL);
-  if (!file.exists())
-    callback = function () whenFileExists(aURL);
+  checkCacheEntryExists(aKey, function (aExists) {
+    if (!aExists)
+      callback = function () whenCacheEntryExists(aKey);
 
-  executeSoon(callback);
+    executeSoon(callback);
+  });
+}
+
+function checkCacheEntryExists(aKey, aCallback) {
+  PageThumbsCache.getReadEntry(aKey, function (aEntry) {
+    let inputStream = aEntry && aEntry.openInputStream(0);
+    let exists = inputStream && inputStream.available();
+
+    if (inputStream)
+      inputStream.close();
+
+    if (aEntry)
+      aEntry.close();
+
+    aCallback(exists);
+  });
 }
diff --git a/browser/components/thumbnails/test/browser_thumbnails_storage.js b/browser/components/thumbnails/test/browser_thumbnails_storage.js
deleted file mode 100644
index db91a980173..00000000000
--- a/browser/components/thumbnails/test/browser_thumbnails_storage.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const URL = "http://mochi.test:8888/";
-const URL_COPY = URL + "#copy";
-
-XPCOMUtils.defineLazyGetter(this, "Sanitizer", function () {
-  let tmp = {};
-  Cc["@mozilla.org/moz/jssubscript-loader;1"]
-    .getService(Ci.mozIJSSubScriptLoader)
-    .loadSubScript("chrome://browser/content/sanitize.js", tmp);
-  return tmp.Sanitizer;
-});
-
-/**
- * These tests ensure that the thumbnail storage is working as intended.
- * Newly captured thumbnails should be saved as files and they should as well
- * be removed when the user sanitizes their history.
- */
-function runTests() {
-  clearHistory();
-
-  // create a thumbnail
-  yield addTab(URL);
-  yield whenFileExists();
-  gBrowser.removeTab(gBrowser.selectedTab);
-
-  // clear all browser history
-  yield clearHistory();
-
-  // create a thumbnail
-  yield addTab(URL);
-  yield whenFileExists();
-  gBrowser.removeTab(gBrowser.selectedTab);
-
-  // make sure copy() updates an existing file
-  PageThumbsStorage.copy(URL, URL_COPY);
-  let copy = PageThumbsStorage.getFileForURL(URL_COPY);
-  let mtime = copy.lastModifiedTime -= 60;
-
-  PageThumbsStorage.copy(URL, URL_COPY);
-  isnot(PageThumbsStorage.getFileForURL(URL_COPY).lastModifiedTime, mtime,
-        "thumbnail file was updated");
-
-  // clear last 10 mins of history
-  yield clearHistory(true);
-  ok(!copy.exists(), "copy of thumbnail has been removed");
-}
-
-function clearHistory(aUseRange) {
-  let s = new Sanitizer();
-  s.prefDomain = "privacy.cpd.";
-
-  let prefs = gPrefService.getBranch(s.prefDomain);
-  prefs.setBoolPref("history", true);
-  prefs.setBoolPref("downloads", false);
-  prefs.setBoolPref("cache", false);
-  prefs.setBoolPref("cookies", false);
-  prefs.setBoolPref("formdata", false);
-  prefs.setBoolPref("offlineApps", false);
-  prefs.setBoolPref("passwords", false);
-  prefs.setBoolPref("sessions", false);
-  prefs.setBoolPref("siteSettings", false);
-
-  if (aUseRange) {
-    let usec = Date.now() * 1000;
-    s.range = [usec - 10 * 60 * 1000 * 1000, usec];
-  }
-
-  s.sanitize();
-  s.range = null;
-
-  executeSoon(function () {
-    if (PageThumbsStorage.getFileForURL(URL).exists())
-      clearHistory(aFile, aUseRange);
-    else
-      next();
-  });
-}
-
-function whenFileExists() {
-  let callback = whenFileExists;
-
-  let file = PageThumbsStorage.getFileForURL(URL);
-  if (file.exists() && file.fileSize)
-    callback = next;
-
-  executeSoon(callback);
-}
diff --git a/browser/components/thumbnails/test/head.js b/browser/components/thumbnails/test/head.js
index 6a4ee10335d..6bfd76e7d30 100644
--- a/browser/components/thumbnails/test/head.js
+++ b/browser/components/thumbnails/test/head.js
@@ -4,7 +4,7 @@
 let tmp = {};
 Cu.import("resource:///modules/PageThumbs.jsm", tmp);
 let PageThumbs = tmp.PageThumbs;
-let PageThumbsStorage = tmp.PageThumbsStorage;
+let PageThumbsCache = tmp.PageThumbsCache;
 
 registerCleanupFunction(function () {
   while (gBrowser.tabs.length > 1)

From 9c8b622b2b7d675f25ec7270c9151a284653399f Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Tue, 1 May 2012 13:45:32 +0200
Subject: [PATCH 126/162] Bug 744388 - [Page Thumbnails] implement a custom
 storage, don't use the file cache; r=dietrich

---
 browser/components/nsBrowserGlue.js           |   6 +
 browser/components/thumbnails/PageThumbs.jsm  | 201 +++++++++++-------
 .../thumbnails/PageThumbsProtocol.js          |   8 +
 .../components/thumbnails/test/Makefile.in    |   1 +
 .../test/browser_thumbnails_redirect.js       |  33 +--
 .../test/browser_thumbnails_storage.js        |  89 ++++++++
 browser/components/thumbnails/test/head.js    |   2 +-
 7 files changed, 234 insertions(+), 106 deletions(-)
 create mode 100644 browser/components/thumbnails/test/browser_thumbnails_storage.js

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index e6b32521231..c1e0ac38a16 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -68,6 +68,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "BookmarkHTMLUtils",
 XPCOMUtils.defineLazyModuleGetter(this, "webappsUI", 
                                   "resource:///modules/webappsUI.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "PageThumbs",
+                                  "resource:///modules/PageThumbs.jsm");
+
 const PREF_PLUGINS_NOTIFYUSER = "plugins.update.notifyUser";
 const PREF_PLUGINS_UPDATEURL  = "plugins.update.url";
 
@@ -358,6 +361,8 @@ BrowserGlue.prototype = {
     // Initialize webapps UI
     webappsUI.init();
 
+    PageThumbs.init();
+
     Services.obs.notifyObservers(null, "browser-ui-startup-complete", "");
   },
 
@@ -379,6 +384,7 @@ BrowserGlue.prototype = {
   _onProfileShutdown: function BG__onProfileShutdown() {
     this._shutdownPlaces();
     this._sanitizer.onShutdown();
+    PageThumbs.uninit();
   },
 
   // All initial windows have opened.
diff --git a/browser/components/thumbnails/PageThumbs.jsm b/browser/components/thumbnails/PageThumbs.jsm
index 3330718d4e1..64dc943ff6d 100644
--- a/browser/components/thumbnails/PageThumbs.jsm
+++ b/browser/components/thumbnails/PageThumbs.jsm
@@ -4,7 +4,7 @@
 
 "use strict";
 
-let EXPORTED_SYMBOLS = ["PageThumbs", "PageThumbsCache"];
+let EXPORTED_SYMBOLS = ["PageThumbs", "PageThumbsStorage", "PageThumbsCache"];
 
 const Cu = Components.utils;
 const Cc = Components.classes;
@@ -12,6 +12,11 @@ const Ci = Components.interfaces;
 
 const HTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
 
+/**
+ * Name of the directory in the profile that contains the thumbnails.
+ */
+const THUMBNAIL_DIRECTORY = "thumbnails";
+
 /**
  * The default background color for page thumbnails.
  */
@@ -25,11 +30,29 @@ XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
   "resource://gre/modules/Services.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
+  "resource://gre/modules/FileUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
+  "resource://gre/modules/PlacesUtils.jsm");
+
+XPCOMUtils.defineLazyGetter(this, "gCryptoHash", function () {
+  return Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash);
+});
+
+XPCOMUtils.defineLazyGetter(this, "gUnicodeConverter", function () {
+  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+                    .createInstance(Ci.nsIScriptableUnicodeConverter);
+  converter.charset = 'utf8';
+  return converter;
+});
+
 /**
  * Singleton providing functionality for capturing web page thumbnails and for
  * accessing them if already cached.
  */
 let PageThumbs = {
+  _initialized: false,
 
   /**
    * The calculated width and height of the thumbnails.
@@ -52,6 +75,20 @@ let PageThumbs = {
    */
   get contentType() "image/png",
 
+  init: function PageThumbs_init() {
+    if (!this._initialized) {
+      this._initialized = true;
+      PlacesUtils.history.addObserver(PageThumbsHistoryObserver, false);
+    }
+  },
+
+  uninit: function PageThumbs_uninit() {
+    if (this._initialized) {
+      this._initialized = false;
+      PlacesUtils.history.removeObserver(PageThumbsHistoryObserver);
+    }
+  },
+
   /**
    * Gets the thumbnail image's url for a given web page's url.
    * @param aUrl The web page's url that is depicted in the thumbnail.
@@ -124,32 +161,14 @@ let PageThumbs = {
           //    Sync and therefore also redirect sources appear on the newtab
           //    page. We also want thumbnails for those.
           if (url != originalURL)
-            PageThumbsCache._copy(url, originalURL);
+            PageThumbsStorage.copy(url, originalURL);
         }
 
         if (aCallback)
           aCallback(aSuccessful);
       }
 
-      // Get a writeable cache entry.
-      PageThumbsCache.getWriteEntry(url, function (aEntry) {
-        if (!aEntry) {
-          finish(false);
-          return;
-        }
-
-        let outputStream = aEntry.openOutputStream(0);
-
-        // Write the image data to the cache entry.
-        NetUtil.asyncCopy(aInputStream, outputStream, function (aResult) {
-          let success = Components.isSuccessCode(aResult);
-          if (success)
-            aEntry.markValid();
-
-          aEntry.close();
-          finish(success);
-        });
-      });
+      PageThumbsStorage.write(url, aInputStream, finish);
     });
   },
 
@@ -208,6 +227,88 @@ let PageThumbs = {
   }
 };
 
+let PageThumbsStorage = {
+  getFileForURL: function Storage_getFileForURL(aURL) {
+    let hash = this._calculateMD5Hash(aURL);
+    let parts = [THUMBNAIL_DIRECTORY, hash[0], hash[1], hash.slice(2) + ".png"];
+    return FileUtils.getFile("ProfD", parts);
+  },
+
+  write: function Storage_write(aURL, aDataStream, aCallback) {
+    let file = this.getFileForURL(aURL);
+    let fos = FileUtils.openSafeFileOutputStream(file);
+
+    NetUtil.asyncCopy(aDataStream, fos, function (aResult) {
+      FileUtils.closeSafeFileOutputStream(fos);
+      aCallback(Components.isSuccessCode(aResult));
+    });
+  },
+
+  copy: function Storage_copy(aSourceURL, aTargetURL) {
+    let sourceFile = this.getFileForURL(aSourceURL);
+    let targetFile = this.getFileForURL(aTargetURL);
+
+    try {
+      sourceFile.copyTo(targetFile.parent, targetFile.leafName);
+    } catch (e) {
+      /* We might not be permitted to write to the file. */
+    }
+  },
+
+  remove: function Storage_remove(aURL) {
+    try {
+      this.getFileForURL(aURL).remove(false);
+    } catch (e) {
+      /* The file might not exist or we're not permitted to remove it. */
+    }
+  },
+
+  wipe: function Storage_wipe() {
+    try {
+      FileUtils.getDir("ProfD", [THUMBNAIL_DIRECTORY]).remove(true);
+    } catch (e) {
+      /* The file might not exist or we're not permitted to remove it. */
+    }
+  },
+
+  _calculateMD5Hash: function Storage_calculateMD5Hash(aValue) {
+    let hash = gCryptoHash;
+    let value = gUnicodeConverter.convertToByteArray(aValue);
+
+    hash.init(hash.MD5);
+    hash.update(value, value.length);
+    return this._convertToHexString(hash.finish(false));
+  },
+
+  _convertToHexString: function Storage_convertToHexString(aData) {
+    let hex = "";
+    for (let i = 0; i < aData.length; i++)
+      hex += ("0" + aData.charCodeAt(i).toString(16)).slice(-2);
+    return hex;
+  },
+
+};
+
+let PageThumbsHistoryObserver = {
+  onDeleteURI: function Thumbnails_onDeleteURI(aURI, aGUID) {
+    PageThumbsStorage.remove(aURI.spec);
+  },
+
+  onClearHistory: function Thumbnails_onClearHistory() {
+    PageThumbsStorage.wipe();
+  },
+
+  onTitleChanged: function () {},
+  onBeginUpdateBatch: function () {},
+  onEndUpdateBatch: function () {},
+  onVisit: function () {},
+  onBeforeDeleteURI: function () {},
+  onPageChanged: function () {},
+  onDeleteVisits: function () {},
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
+};
+
 /**
  * A singleton handling the storage of page thumbnails.
  */
@@ -222,64 +323,6 @@ let PageThumbsCache = {
     this._openCacheEntry(aKey, Ci.nsICache.ACCESS_READ, aCallback);
   },
 
-  /**
-   * Calls the given callback with a cache entry opened for writing.
-   * @param aKey The key identifying the desired cache entry.
-   * @param aCallback The callback that is called when the cache entry is ready.
-   */
-  getWriteEntry: function Cache_getWriteEntry(aKey, aCallback) {
-    // Try to open the desired cache entry.
-    this._openCacheEntry(aKey, Ci.nsICache.ACCESS_WRITE, aCallback);
-  },
-
-  /**
-   * Copies an existing cache entry's data to a new cache entry.
-   * @param aSourceKey The key that contains the data to copy.
-   * @param aTargetKey The key that will be the copy of aSourceKey's data.
-   */
-  _copy: function Cache_copy(aSourceKey, aTargetKey) {
-    let sourceEntry, targetEntry, waitingCount = 2;
-
-    function finish() {
-      if (sourceEntry)
-        sourceEntry.close();
-
-      if (targetEntry)
-        targetEntry.close();
-    }
-
-    function copyDataWhenReady() {
-      if (--waitingCount > 0)
-        return;
-
-      if (!sourceEntry || !targetEntry) {
-        finish();
-        return;
-      }
-
-      let inputStream = sourceEntry.openInputStream(0);
-      let outputStream = targetEntry.openOutputStream(0);
-
-      // Copy the image data to a new entry.
-      NetUtil.asyncCopy(inputStream, outputStream, function (aResult) {
-        if (Components.isSuccessCode(aResult))
-          targetEntry.markValid();
-
-        finish();
-      });
-    }
-
-    this.getReadEntry(aSourceKey, function (aSourceEntry) {
-      sourceEntry = aSourceEntry;
-      copyDataWhenReady();
-    });
-
-    this.getWriteEntry(aTargetKey, function (aTargetEntry) {
-      targetEntry = aTargetEntry;
-      copyDataWhenReady();
-    });
-  },
-
   /**
    * Opens the cache entry identified by the given key.
    * @param aKey The key identifying the desired cache entry.
diff --git a/browser/components/thumbnails/PageThumbsProtocol.js b/browser/components/thumbnails/PageThumbsProtocol.js
index 4cf06067b73..d72e8279857 100644
--- a/browser/components/thumbnails/PageThumbsProtocol.js
+++ b/browser/components/thumbnails/PageThumbsProtocol.js
@@ -72,6 +72,14 @@ Protocol.prototype = {
    * @return The newly created channel.
    */
   newChannel: function Proto_newChannel(aURI) {
+    let {url} = parseURI(aURI);
+    let file = PageThumbsStorage.getFileForURL(url);
+
+    if (file.exists()) {
+      let fileuri = Services.io.newFileURI(file);
+      return Services.io.newChannelFromURI(fileuri);
+    }
+
     return new Channel(aURI);
   },
 
diff --git a/browser/components/thumbnails/test/Makefile.in b/browser/components/thumbnails/test/Makefile.in
index ac00a023a67..c7af21dc9a5 100644
--- a/browser/components/thumbnails/test/Makefile.in
+++ b/browser/components/thumbnails/test/Makefile.in
@@ -14,6 +14,7 @@ include $(topsrcdir)/config/rules.mk
 _BROWSER_FILES = \
 	browser_thumbnails_capture.js \
 	browser_thumbnails_redirect.js \
+	browser_thumbnails_storage.js \
 	browser_thumbnails_bug726727.js \
 	head.js \
 	background_red.html \
diff --git a/browser/components/thumbnails/test/browser_thumbnails_redirect.js b/browser/components/thumbnails/test/browser_thumbnails_redirect.js
index 54803e1e348..7bc420c1ed6 100644
--- a/browser/components/thumbnails/test/browser_thumbnails_redirect.js
+++ b/browser/components/thumbnails/test/browser_thumbnails_redirect.js
@@ -4,9 +4,6 @@
 const URL = "http://mochi.test:8888/browser/browser/components/thumbnails/" +
             "test/background_red_redirect.sjs";
 
-let cacheService = Cc["@mozilla.org/network/cache-service;1"]
-                   .getService(Ci.nsICacheService);
-
 /**
  * These tests ensure that we save and provide thumbnails for redirecting sites.
  */
@@ -19,33 +16,17 @@ function runTests() {
   yield addTab(URL);
   yield captureAndCheckColor(255, 0, 0, "we have a red thumbnail");
 
-  // Wait until the referrer's thumbnail's cache entry has been written.
-  yield whenCacheEntryExists(URL);
+  // Wait until the referrer's thumbnail's file has been written.
+  yield whenFileExists(URL);
   yield checkThumbnailColor(URL, 255, 0, 0, "referrer has a red thumbnail");
 }
 
-function whenCacheEntryExists(aKey) {
+function whenFileExists(aURL) {
   let callback = next;
 
-  checkCacheEntryExists(aKey, function (aExists) {
-    if (!aExists)
-      callback = function () whenCacheEntryExists(aKey);
+  let file = PageThumbsStorage.getFileForURL(aURL);
+  if (!file.exists())
+    callback = function () whenFileExists(aURL);
 
-    executeSoon(callback);
-  });
-}
-
-function checkCacheEntryExists(aKey, aCallback) {
-  PageThumbsCache.getReadEntry(aKey, function (aEntry) {
-    let inputStream = aEntry && aEntry.openInputStream(0);
-    let exists = inputStream && inputStream.available();
-
-    if (inputStream)
-      inputStream.close();
-
-    if (aEntry)
-      aEntry.close();
-
-    aCallback(exists);
-  });
+  executeSoon(callback);
 }
diff --git a/browser/components/thumbnails/test/browser_thumbnails_storage.js b/browser/components/thumbnails/test/browser_thumbnails_storage.js
new file mode 100644
index 00000000000..db91a980173
--- /dev/null
+++ b/browser/components/thumbnails/test/browser_thumbnails_storage.js
@@ -0,0 +1,89 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const URL = "http://mochi.test:8888/";
+const URL_COPY = URL + "#copy";
+
+XPCOMUtils.defineLazyGetter(this, "Sanitizer", function () {
+  let tmp = {};
+  Cc["@mozilla.org/moz/jssubscript-loader;1"]
+    .getService(Ci.mozIJSSubScriptLoader)
+    .loadSubScript("chrome://browser/content/sanitize.js", tmp);
+  return tmp.Sanitizer;
+});
+
+/**
+ * These tests ensure that the thumbnail storage is working as intended.
+ * Newly captured thumbnails should be saved as files and they should as well
+ * be removed when the user sanitizes their history.
+ */
+function runTests() {
+  clearHistory();
+
+  // create a thumbnail
+  yield addTab(URL);
+  yield whenFileExists();
+  gBrowser.removeTab(gBrowser.selectedTab);
+
+  // clear all browser history
+  yield clearHistory();
+
+  // create a thumbnail
+  yield addTab(URL);
+  yield whenFileExists();
+  gBrowser.removeTab(gBrowser.selectedTab);
+
+  // make sure copy() updates an existing file
+  PageThumbsStorage.copy(URL, URL_COPY);
+  let copy = PageThumbsStorage.getFileForURL(URL_COPY);
+  let mtime = copy.lastModifiedTime -= 60;
+
+  PageThumbsStorage.copy(URL, URL_COPY);
+  isnot(PageThumbsStorage.getFileForURL(URL_COPY).lastModifiedTime, mtime,
+        "thumbnail file was updated");
+
+  // clear last 10 mins of history
+  yield clearHistory(true);
+  ok(!copy.exists(), "copy of thumbnail has been removed");
+}
+
+function clearHistory(aUseRange) {
+  let s = new Sanitizer();
+  s.prefDomain = "privacy.cpd.";
+
+  let prefs = gPrefService.getBranch(s.prefDomain);
+  prefs.setBoolPref("history", true);
+  prefs.setBoolPref("downloads", false);
+  prefs.setBoolPref("cache", false);
+  prefs.setBoolPref("cookies", false);
+  prefs.setBoolPref("formdata", false);
+  prefs.setBoolPref("offlineApps", false);
+  prefs.setBoolPref("passwords", false);
+  prefs.setBoolPref("sessions", false);
+  prefs.setBoolPref("siteSettings", false);
+
+  if (aUseRange) {
+    let usec = Date.now() * 1000;
+    s.range = [usec - 10 * 60 * 1000 * 1000, usec];
+  }
+
+  s.sanitize();
+  s.range = null;
+
+  executeSoon(function () {
+    if (PageThumbsStorage.getFileForURL(URL).exists())
+      clearHistory(aFile, aUseRange);
+    else
+      next();
+  });
+}
+
+function whenFileExists() {
+  let callback = whenFileExists;
+
+  let file = PageThumbsStorage.getFileForURL(URL);
+  if (file.exists() && file.fileSize)
+    callback = next;
+
+  executeSoon(callback);
+}
diff --git a/browser/components/thumbnails/test/head.js b/browser/components/thumbnails/test/head.js
index 6bfd76e7d30..6a4ee10335d 100644
--- a/browser/components/thumbnails/test/head.js
+++ b/browser/components/thumbnails/test/head.js
@@ -4,7 +4,7 @@
 let tmp = {};
 Cu.import("resource:///modules/PageThumbs.jsm", tmp);
 let PageThumbs = tmp.PageThumbs;
-let PageThumbsCache = tmp.PageThumbsCache;
+let PageThumbsStorage = tmp.PageThumbsStorage;
 
 registerCleanupFunction(function () {
   while (gBrowser.tabs.length > 1)

From ffb841b71562dda6f71d7427f68c5ab651cea663 Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Tue, 1 May 2012 12:25:34 -0700
Subject: [PATCH 127/162] Bug 750843 - Update marionette for ICS emulator,
 a=testonly, npotb

---
 testing/marionette/client/marionette/emulator.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/testing/marionette/client/marionette/emulator.py b/testing/marionette/client/marionette/emulator.py
index fff221e8825..7df2a98aad2 100644
--- a/testing/marionette/client/marionette/emulator.py
+++ b/testing/marionette/client/marionette/emulator.py
@@ -36,24 +36,24 @@ class Emulator(object):
             raise Exception('Must define B2G_HOME or pass the homedir parameter')
 
         self.adb = os.path.join(self.homedir,
-                                'glue/gonk/out/host/linux-x86/bin/adb')
+                                'glue/gonk-ics/out/host/linux-x86/bin/adb')
         if not os.access(self.adb, os.F_OK):
             self.adb = os.path.join(self.homedir, 'bin/adb')
 
         self.binary = os.path.join(self.homedir,
-                                   'glue/gonk/out/host/linux-x86/bin/emulator')
+                                   'glue/gonk-ics/out/host/linux-x86/bin/emulator')
         if not os.access(self.binary, os.F_OK):
             self.binary = os.path.join(self.homedir, 'bin/emulator')
         self._check_file(self.binary)
 
         self.kernelImg = os.path.join(self.homedir,
-                                      'boot/kernel-android-qemu/arch/arm/boot/zImage')
+                                      'glue/gonk-ics/prebuilts/qemu-kernel/arm/kernel-qemu-armv7')
         if not os.access(self.kernelImg, os.F_OK):
-            self.kernelImg = os.path.join(self.homedir, 'zImage')
+            self.kernelImg = os.path.join(self.homedir, 'kernel-qemu-armv7')
         self._check_file(self.kernelImg)
 
         self.sysDir = os.path.join(self.homedir, 
-                                   'glue/gonk/out/target/product/generic/')
+                                   'glue/gonk-ics/out/target/product/generic/')
         if not os.access(self.sysDir, os.F_OK):
             self.sysDir = os.path.join(self.homedir, 'generic/')
         self._check_file(self.sysDir)

From 950cdb2c59bd42a9b553977cd427883e5d5f76b1 Mon Sep 17 00:00:00 2001
From: Malini Das <mdas@mozilla.com>
Date: Tue, 1 May 2012 12:37:34 -0700
Subject: [PATCH 128/162] Bug 750553 - Rename getAttributeValue to
 getElementAttribute, r=jgriffin, a=testonly, npotb

---
 testing/marionette/atoms/atoms.js                  | 4 ++--
 testing/marionette/client/marionette/marionette.py | 2 +-
 testing/marionette/marionette-actors.js            | 8 ++++----
 testing/marionette/marionette-listener.js          | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/testing/marionette/atoms/atoms.js b/testing/marionette/atoms/atoms.js
index f09d9c04cf9..406851dfc08 100644
--- a/testing/marionette/atoms/atoms.js
+++ b/testing/marionette/atoms/atoms.js
@@ -150,8 +150,8 @@ function Z(a,b,c){a.va=i;return Rb(a,b,a.A,pd(a,b),c,h)}function pd(a,b){if(!(b
 (b=zb(a),b=new C(b.width/2,b.height/2));c=c||new od;c.move(a,b);c.z!==k&&g(new y(13,"Cannot press more then one button or an already pressed button."));c.z=0;c.ha=c.m();!qb()&&(P(c.m(),"OPTION")||P(c.m(),"SELECT"))?a=i:(a=E(c.m()).activeElement,a=(b=Z(c,lc))&&a!=E(c.m()).activeElement?l:b);if(a&&(a=c.ba||c.l,b=E(a).activeElement,a!=b)){if(b&&u(b.blur))try{b.blur()}catch(B){g(B)}u(a.focus)&&a.focus()}c.z===k&&g(new y(13,"Cannot release a button when no button is pressed."));Z(c,nc);if(0==c.z&&c.m()==
 c.ha){b=c.A;d=pd(c,ic);if(Ob(c.l,i)&&Hb(c.l)){a=k;if(Yb)for(e=c.l;e;e=e.parentNode)if(P(e,"A")){a=e;break}else{a:{if(P(e,"INPUT")&&(f=e.type.toLowerCase(),"submit"==f||"image"==f)){f=i;break a}if(P(e,"BUTTON")&&(f=e.type.toLowerCase(),"submit"==f)){f=i;break a}f=l}if(f)break}if(e=Bb(c.l)){e=c.l;Bb(e)||g(new y(15,"Element is not selectable"));f="selected";m=e.type&&e.type.toLowerCase();if("checkbox"==m||"radio"==m)f="checked";e=!!Eb(e,f)}if(c.ba&&(f=c.ba,!e||f.multiple))c.l.selected=!e,Ub(f,hc);Rb(c,
 ic,b,d)&&a&&ac(a)&&(b=a.href,d=G(E(a)),a.target?d.open(b,a.target):d.location.href=b)}c.Z&&Z(c,kc);c.Z=!c.Z}else 2==c.z&&Z(c,jc);c.z=k;c.ha=k}var ud=["_"],$=q;!(ud[0]in $)&&$.execScript&&$.execScript("var "+ud[0]);for(var wd;ud.length&&(wd=ud.shift());)!ud.length&&r(td)?$[wd]=td:$=$[wd]?$[wd]:$[wd]={};; return this._.apply(null,arguments);}.apply({navigator:typeof window!='undefined'?window.navigator:null}, arguments);}
-//getAttributeValue
-var getAttributeValue = function(){return function(){var f=null,g=!1,h=this;
+//getElementAttribute
+var getElementAttribute = function(){return function(){var f=null,g=!1,h=this;
 function i(a){var c=typeof a;if("object"==c)if(a){if(a instanceof Array)return"array";if(a instanceof Object)return c;var b=Object.prototype.toString.call(a);if("[object Window]"==b)return"object";if("[object Array]"==b||"number"==typeof a.length&&"undefined"!=typeof a.splice&&"undefined"!=typeof a.propertyIsEnumerable&&!a.propertyIsEnumerable("splice"))return"array";if("[object Function]"==b||"undefined"!=typeof a.call&&"undefined"!=typeof a.propertyIsEnumerable&&!a.propertyIsEnumerable("call"))return"function"}else return"null";else if("function"==
 c&&"undefined"==typeof a.call)return"object";return c}function j(a,c){function b(){}b.prototype=c.prototype;a.f=c.prototype;a.prototype=new b};function k(a,c){for(var b=1;b<arguments.length;b++)var d=(""+arguments[b]).replace(/\$/g,"$$$$"),a=a.replace(/\%s/,d);return a}function l(a){return a.replace(/^[\s\xa0]+|[\s\xa0]+$/g,"")};var m,n="",o=/rv\:([^\);]+)(\)|;)/.exec(h.navigator?h.navigator.userAgent:f);m=n=o?o[1]:"";var p={};function q(a,c){this.code=a;this.message=c||"";this.name=r[a]||r[13];var b=Error(this.message);b.name=this.name;this.stack=b.stack||""}j(q,Error);
 var r={7:"NoSuchElementError",8:"NoSuchFrameError",9:"UnknownCommandError",10:"StaleElementReferenceError",11:"ElementNotVisibleError",12:"InvalidElementStateError",13:"UnknownError",15:"ElementNotSelectableError",19:"XPathLookupError",23:"NoSuchWindowError",24:"InvalidCookieDomainError",25:"UnableToSetCookieError",26:"ModalDialogOpenedError",27:"NoModalDialogOpenError",28:"ScriptTimeoutError",32:"InvalidSelectorError",33:"SqlDatabaseError",34:"MoveTargetOutOfBoundsError"};
diff --git a/testing/marionette/client/marionette/marionette.py b/testing/marionette/client/marionette/marionette.py
index b632f692580..e63fcf00c1d 100644
--- a/testing/marionette/client/marionette/marionette.py
+++ b/testing/marionette/client/marionette/marionette.py
@@ -70,7 +70,7 @@ class HTMLElement(object):
         return self.marionette.find_elements(method, target, self.id)
 
     def get_attribute(self, attribute):
-        return self.marionette._send_message('getAttributeValue', 'value', element=self.id, name=attribute)
+        return self.marionette._send_message('getElementAttribute', 'value', element=self.id, name=attribute)
 
     def click(self):
         return self.marionette._send_message('clickElement', 'ok', element=self.id)
diff --git a/testing/marionette/marionette-actors.js b/testing/marionette/marionette-actors.js
index 11fb8c9229b..89deec69e77 100644
--- a/testing/marionette/marionette-actors.js
+++ b/testing/marionette/marionette-actors.js
@@ -845,18 +845,18 @@ MarionetteDriverActor.prototype = {
    *        the element that will be inspected
    *        'name' member holds the name of the attribute to retrieve
    */
-  getAttributeValue: function MDA_getAttributeValue(aRequest) {
+  getElementAttribute: function MDA_getElementAttribute(aRequest) {
     if (this.context == "chrome") {
       try {
         let el = this.curBrowser.elementManager.getKnownElement(aRequest.element, this.getCurrentWindow());
-        this.sendResponse(utils.getAttributeValue(el, aRequest.name));
+        this.sendResponse(utils.getElementAttribute(el, aRequest.name));
       }
       catch (e) {
         this.sendError(e.message, e.num, e.stack);
       }
     }
     else {
-      this.sendAsync("getAttributeValue", {element: aRequest.element, name: aRequest.name});
+      this.sendAsync("getElementAttribute", {element: aRequest.element, name: aRequest.name});
     }
   },
 
@@ -1137,7 +1137,7 @@ MarionetteDriverActor.prototype.requestTypes = {
   "findElement": MarionetteDriverActor.prototype.findElement,
   "findElements": MarionetteDriverActor.prototype.findElements,
   "clickElement": MarionetteDriverActor.prototype.clickElement,
-  "getAttributeValue": MarionetteDriverActor.prototype.getAttributeValue,
+  "getElementAttribute": MarionetteDriverActor.prototype.getElementAttribute,
   "getElementText": MarionetteDriverActor.prototype.getElementText,
   "isElementDisplayed": MarionetteDriverActor.prototype.isElementDisplayed,
   "isElementEnabled": MarionetteDriverActor.prototype.isElementEnabled,
diff --git a/testing/marionette/marionette-listener.js b/testing/marionette/marionette-listener.js
index ffdabc72c9e..f96c60d857f 100644
--- a/testing/marionette/marionette-listener.js
+++ b/testing/marionette/marionette-listener.js
@@ -61,7 +61,7 @@ function startListeners() {
   addMessageListener("Marionette:findElementContent" + listenerId, findElementContent);
   addMessageListener("Marionette:findElementsContent" + listenerId, findElementsContent);
   addMessageListener("Marionette:clickElement" + listenerId, clickElement);
-  addMessageListener("Marionette:getAttributeValue" + listenerId, getAttributeValue);
+  addMessageListener("Marionette:getElementAttribute" + listenerId, getElementAttribute);
   addMessageListener("Marionette:getElementText" + listenerId, getElementText);
   addMessageListener("Marionette:isElementDisplayed" + listenerId, isElementDisplayed);
   addMessageListener("Marionette:isElementEnabled" + listenerId, isElementEnabled);
@@ -118,7 +118,7 @@ function deleteSession(msg) {
   removeMessageListener("Marionette:findElementContent" + listenerId, findElementContent);
   removeMessageListener("Marionette:findElementsContent" + listenerId, findElementsContent);
   removeMessageListener("Marionette:clickElement" + listenerId, clickElement);
-  removeMessageListener("Marionette:getAttributeValue" + listenerId, getAttributeValue);
+  removeMessageListener("Marionette:getElementAttribute" + listenerId, getElementAttribute);
   removeMessageListener("Marionette:getElementText" + listenerId, getElementText);
   removeMessageListener("Marionette:isElementDisplayed" + listenerId, isElementDisplayed);
   removeMessageListener("Marionette:isElementEnabled" + listenerId, isElementEnabled);
@@ -487,10 +487,10 @@ function clickElement(msg) {
 /**
  * Get a given attribute of an element
  */
-function getAttributeValue(msg) {
+function getElementAttribute(msg) {
   try {
     let el = elementManager.getKnownElement(msg.json.element, win);
-    sendResponse({value: utils.getAttributeValue(el, msg.json.name)});
+    sendResponse({value: utils.getElementAttribute(el, msg.json.name)});
   }
   catch (e) {
     sendError(e.message, e.num, e.stack);

From 12b3118550c477507831507c3c90ad2575496354 Mon Sep 17 00:00:00 2001
From: William Lachance <wlachance@mozilla.com>
Date: Tue, 1 May 2012 12:50:17 -0700
Subject: [PATCH 129/162] Bug 750302 - DeviceManager files should have
 new-style license boilerplate, r=jmaher, a=android-only

---
 build/mobile/devicemanager.py    | 41 +++-----------------------------
 build/mobile/devicemanagerADB.py |  4 ++++
 build/mobile/devicemanagerSUT.py | 41 +++-----------------------------
 build/mobile/droid.py            | 41 +++-----------------------------
 4 files changed, 13 insertions(+), 114 deletions(-)

diff --git a/build/mobile/devicemanager.py b/build/mobile/devicemanager.py
index 4a6ef737852..f735b984c55 100755
--- a/build/mobile/devicemanager.py
+++ b/build/mobile/devicemanager.py
@@ -1,41 +1,6 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.   
-#
-# The Original Code is Test Automation Framework.
-#
-# The Initial Developer of the Original Code is Joel Maher.
-#
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Joel Maher <joel.maher@gmail.com> (Original Developer)
-#   Clint Talbert <cmtalbert@gmail.com>
-#   Mark Cote <mcote@mozilla.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import time
 import hashlib
diff --git a/build/mobile/devicemanagerADB.py b/build/mobile/devicemanagerADB.py
index 37d803ec28f..d93846f8557 100644
--- a/build/mobile/devicemanagerADB.py
+++ b/build/mobile/devicemanagerADB.py
@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import subprocess
 from devicemanager import DeviceManager, DMError, _pop_last_line
 import re
diff --git a/build/mobile/devicemanagerSUT.py b/build/mobile/devicemanagerSUT.py
index d2a26a113b4..c1f3c9f5eb3 100644
--- a/build/mobile/devicemanagerSUT.py
+++ b/build/mobile/devicemanagerSUT.py
@@ -1,41 +1,6 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.   
-#
-# The Original Code is Test Automation Framework.
-#
-# The Initial Developer of the Original Code is Joel Maher.
-#
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Joel Maher <joel.maher@gmail.com> (Original Developer)
-#   Clint Talbert <cmtalbert@gmail.com>
-#   Mark Cote <mcote@mozilla.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import socket
 import SocketServer
diff --git a/build/mobile/droid.py b/build/mobile/droid.py
index ebf07d97337..8b4ba054a3e 100644
--- a/build/mobile/droid.py
+++ b/build/mobile/droid.py
@@ -1,41 +1,6 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Test Automation Framework.
-#
-# The Initial Developer of the Original Code is
-# Mozilla foundation
-#
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Joel Maher <joel.maher@gmail.com> (Original Developer)
-#   William Lachance <wlachance@mozilla.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from devicemanagerADB import DeviceManagerADB
 from devicemanagerSUT import DeviceManagerSUT

From 1773e03d19665de3ad0938549dc7701c7b51c792 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Tue, 1 May 2012 13:59:07 -0700
Subject: [PATCH 130/162] Bug 747023 - Install software notification doorhanger
 popup can appear from page in background tab. r=mfinkle a=android-only

---
 mobile/android/chrome/content/browser.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 1a8900b58bf..d6a854d9aaf 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -3378,6 +3378,11 @@ var XPInstallObserver = {
         break;
       case "addon-install-blocked":
         let installInfo = aSubject.QueryInterface(Ci.amIWebInstallInfo);
+        let win = installInfo.originatingWindow;
+        let tab = BrowserApp.getTabForWindow(win.top);
+        if (!tab)
+          return;
+
         let host = installInfo.originatingURI.host;
 
         let brandShortName = Strings.brand.GetStringFromName("brandShortName");
@@ -3417,7 +3422,7 @@ var XPInstallObserver = {
             }
           }];
         }
-        NativeWindow.doorhanger.show(message, aTopic, buttons);
+        NativeWindow.doorhanger.show(message, aTopic, buttons, tab.id);
         break;
     }
   },

From 7413f29aec0848ca60667f2df9b56566b72272d5 Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@mozilla.com>
Date: Tue, 1 May 2012 14:56:08 -0700
Subject: [PATCH 131/162] Bug 742267 - Restore AwesomeBar's cursor position
 when gaining input focus. r=blassey a=android-only

---
 mobile/android/base/AwesomeBar.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java
index 19b07ea4dc1..23c4a202ff3 100644
--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -40,7 +40,6 @@
 package org.mozilla.gecko;
 
 import android.app.Activity;
-import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -51,7 +50,6 @@ import android.content.res.Configuration;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.Spanned;
@@ -73,7 +71,6 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ExpandableListView;
 import android.widget.ImageButton;
-import android.widget.RelativeLayout;
 import android.widget.ListView;
 import android.widget.TabWidget;
 import android.widget.Toast;
@@ -398,15 +395,21 @@ public class AwesomeBar extends GeckoActivity implements GeckoEventListener {
                 selEnd = mText.getSelectionEnd();
             }
 
-            // Return focus to the edit box, and dispatch the event to it
-            mText.requestFocusFromTouch();
-
             if (selStart >= 0) {
                 // Restore the selection, which gets lost due to the focus switch
                 mText.setSelection(selStart, selEnd);
             }
 
+            // Manually dispatch the key event to the AwesomeBar before restoring (default) input
+            // focus. dispatchKeyEvent() will update AwesomeBar's cursor position.
             mText.dispatchKeyEvent(event);
+            int newCursorPos = mText.getSelectionEnd();
+
+            // requestFocusFromTouch() will select all AwesomeBar text, so we must restore cursor
+            // position so subsequent typing does not overwrite all text.
+            mText.requestFocusFromTouch();
+            mText.setSelection(newCursorPos);
+
             return true;
         }
     }

From 8b6cd6b2c09e9516378447f34a5e42f4e10f2190 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@mozilla.com>
Date: Tue, 1 May 2012 15:19:32 -0700
Subject: [PATCH 132/162] Bug 749215: Install the debug server jsms as
 symlinks, when appropriate. r=rcampbell

---
 toolkit/devtools/debugger/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/devtools/debugger/Makefile.in b/toolkit/devtools/debugger/Makefile.in
index 43508985e69..871e93d4a89 100644
--- a/toolkit/devtools/debugger/Makefile.in
+++ b/toolkit/devtools/debugger/Makefile.in
@@ -72,5 +72,5 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 libs::
-	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
-	$(NSINSTALL) $(srcdir)/server/*.jsm $(FINAL_TARGET)/modules/devtools
+	$(INSTALL) $(IFLAGS1) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
+	$(INSTALL) $(IFLAGS1) $(srcdir)/server/*.jsm $(FINAL_TARGET)/modules/devtools

From 433ec646642484234b42a9b048ff0a4759c2b40a Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@mozilla.com>
Date: Tue, 1 May 2012 15:29:48 -0700
Subject: [PATCH 133/162] Bug 749258: Have toolkit/devtools/debugger xpcshell
 tests register a listener for Components.utils.reportError, so tests fail
 when they throw an exception. r=past

---
 toolkit/devtools/debugger/dbg-client.jsm      |  8 ++--
 .../devtools/debugger/server/dbg-server.js    | 18 +++++++-
 .../devtools/debugger/tests/unit/head_dbg.js  | 46 +++++++++++++++++++
 3 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/toolkit/devtools/debugger/dbg-client.jsm b/toolkit/devtools/debugger/dbg-client.jsm
index 36156207e2d..c81b1699afb 100644
--- a/toolkit/devtools/debugger/dbg-client.jsm
+++ b/toolkit/devtools/debugger/dbg-client.jsm
@@ -375,10 +375,10 @@ DebuggerClient.prototype = {
    */
   request: function DC_request(aRequest, aOnResponse) {
     if (!this._connected) {
-      throw "Have not yet received a hello packet from the server.";
+      throw Error("Have not yet received a hello packet from the server.");
     }
     if (!aRequest.to) {
-      throw "Request packet has no destination.";
+      throw Error("Request packet has no destination.");
     }
 
     this._pendingRequests.push({ to: aRequest.to,
@@ -449,7 +449,7 @@ DebuggerClient.prototype = {
         onResponse(aPacket);
       }
     } catch(ex) {
-      dumpn("Error handling response: " + ex + " - " + ex.stack);
+      dumpn("Error handling response: " + ex + " - stack:\n" + ex.stack);
       Cu.reportError(ex);
     }
 
@@ -536,7 +536,7 @@ ThreadClient.prototype = {
 
   _assertPaused: function TC_assertPaused(aCommand) {
     if (!this.paused) {
-      throw aCommand + " command sent while not paused.";
+      throw Error(aCommand + " command sent while not paused.");
     }
   },
 
diff --git a/toolkit/devtools/debugger/server/dbg-server.js b/toolkit/devtools/debugger/server/dbg-server.js
index 49591d44f2e..6afaaa36771 100644
--- a/toolkit/devtools/debugger/server/dbg-server.js
+++ b/toolkit/devtools/debugger/server/dbg-server.js
@@ -63,6 +63,17 @@ function dbg_assert(cond, e) {
   }
 }
 
+/* Turn the error e into a string, without fail. */
+function safeErrorString(aError) {
+  try {
+    var s = aError.toString();
+    if (typeof s === "string")
+      return s;
+  } catch (ee) { }
+
+  return "<failed trying to find error description>";
+}
+
 loadSubScript.call(this, "chrome://global/content/devtools/dbg-transport.js");
 
 // XPCOM constructors
@@ -445,11 +456,14 @@ DebuggerServerConnection.prototype = {
       } catch(e) {
         Cu.reportError(e);
         ret = { error: "unknownError",
-                message: "An unknown error has occurred while processing request." };
+                message: ("error occurred while processing '" + aPacket.type +
+                          "' request: " + safeErrorString(e)) };
       }
     } else {
       ret = { error: "unrecognizedPacketType",
-              message: 'Actor "' + actor.actorID + '" does not recognize the packet type "' + aPacket.type + '"' };
+              message: ('Actor "' + actor.actorID +
+                        '" does not recognize the packet type "' +
+                        aPacket.type + '"') };
     }
 
     if (!ret) {
diff --git a/toolkit/devtools/debugger/tests/unit/head_dbg.js b/toolkit/devtools/debugger/tests/unit/head_dbg.js
index 6ff2ff35720..eb96facf6ac 100644
--- a/toolkit/devtools/debugger/tests/unit/head_dbg.js
+++ b/toolkit/devtools/debugger/tests/unit/head_dbg.js
@@ -16,6 +16,52 @@ Services.prefs.setBoolPref("devtools.debugger.log", true);
 Cu.import("resource:///modules/devtools/dbg-server.jsm");
 Cu.import("resource:///modules/devtools/dbg-client.jsm");
 
+// Convert an nsIScriptError 'aFlags' value into an appropriate string.
+function scriptErrorFlagsToKind(aFlags) {
+  var kind;
+  if (aFlags & Ci.nsIScriptError.warningFlag)
+    kind = "warning";
+  if (aFlags & Ci.nsIScriptError.exceptionFlag)
+    kind = "exception";
+  else
+    kind = "error";
+
+  if (aFlags & Ci.nsIScriptError.strictFlag)
+    kind = "strict " + kind;
+
+  return kind;
+}
+
+// Register a console listener, so console messages don't just disappear
+// into the ether.
+let errorCount = 0;
+let listener = {
+  observe: function (aMessage) {
+    errorCount++;
+    try {
+      // If we've been given an nsIScriptError, then we can print out
+      // something nicely formatted, for tools like Emacs to pick up.
+      var scriptError = aMessage.QueryInterface(Ci.nsIScriptError);
+      dump(aMessage.sourceName + ":" + aMessage.lineNumber + ": " +
+           scriptErrorFlagsToKind(aMessage.flags) + ": " +
+           aMessage.errorMessage + "\n");
+      var string = aMessage.errorMessage;
+    } catch (x) {
+      // Be a little paranoid with message, as the whole goal here is to lose
+      // no information.
+      try {
+        var string = "" + aMessage.message;
+      } catch (x) {
+        var string = "<error converting error message to string>";
+      }
+    }
+
+    do_throw("head_dbg.js got console message: " + string + "\n");
+  }
+};
+
+let consoleService = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
+consoleService.registerListener(listener);
 
 function check_except(func)
 {

From 282d9a0613f149a973e442b45885e8b0ff9149dd Mon Sep 17 00:00:00 2001
From: Panos Astithas <past@mozilla.com>
Date: Tue, 1 May 2012 15:31:00 -0700
Subject: [PATCH 134/162] Bug 749258: Fix debugger server tests exposed as
 broken when we start listening for errors. r=dcamp

---
 toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js  | 6 ++----
 .../devtools/debugger/tests/unit/test_threadlifetime-05.js  | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js b/toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js
index ab5df24536b..2aecc881b11 100644
--- a/toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js
+++ b/toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js
@@ -27,8 +27,8 @@ function run_test()
 
 function test_breakpoint_running()
 {
-  let path = getFilePath('test_breakpoint-01.js');
-  let location = { url: path, line: gDebuggee.line0 + 3};
+  let path = getFilePath('test_breakpoint-02.js');
+  let location = { url: path, line: gDebuggee.line0 + 2};
 
   gDebuggee.eval("var line0 = Error().lineNumber;\n" +
                  "var a = 1;\n" +  // line0 + 1
@@ -37,8 +37,6 @@ function test_breakpoint_running()
   // Setting the breakpoint later should interrupt the debuggee.
   gThreadClient.addOneTimeListener("paused", function (aEvent, aPacket) {
     do_check_eq(aPacket.type, "paused");
-    do_check_eq(aPacket.frame.where.url, path);
-    do_check_eq(aPacket.frame.where.line, location);
     do_check_eq(aPacket.why.type, "interrupted");
   });
 
diff --git a/toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js b/toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js
index e0796fe830c..a6b056e9b52 100644
--- a/toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js
+++ b/toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js
@@ -70,10 +70,10 @@ function release_grips(aFrameArgs, aThreadGrips)
       arg_grips(aFrameArgs, function (aNewGrips) {
         for (let i = 0; i < aNewGrips.length; i++) {
           do_check_neq(aThreadGrips[i].actor, aNewGrips[i].actor);
-          gThreadClient.resume(function () {
-            finishClient(gClient);
-          });
         }
+        gThreadClient.resume(function () {
+          finishClient(gClient);
+        });
       });
     });
   });

From 661e528427fa7b64d3254e0b4858883a9dbab58a Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@mozilla.com>
Date: Tue, 1 May 2012 16:54:45 -0700
Subject: [PATCH 135/162] Bug 750368: Help 'make xpcshell-tests' find 'mozinfo'
 Python module. r=ted

---
 config/rules.mk              | 6 +++---
 js/src/config/rules.mk       | 6 +++---
 testing/testsuite-targets.mk | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/rules.mk b/config/rules.mk
index c52223500a7..61f5496d149 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -112,7 +112,7 @@ testxpcsrcdir = $(topsrcdir)/testing/xpcshell
 # See also testsuite-targets.mk 'xpcshell-tests' target for global execution.
 xpcshell-tests:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
@@ -142,7 +142,7 @@ xpcshell-tests-remote:
 # attach a debugger and then start the test.
 check-interactive:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
@@ -155,7 +155,7 @@ check-interactive:
 # Execute a single test, specified in $(SOLO_FILE)
 check-one:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index c52223500a7..61f5496d149 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -112,7 +112,7 @@ testxpcsrcdir = $(topsrcdir)/testing/xpcshell
 # See also testsuite-targets.mk 'xpcshell-tests' target for global execution.
 xpcshell-tests:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
@@ -142,7 +142,7 @@ xpcshell-tests-remote:
 # attach a debugger and then start the test.
 check-interactive:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
@@ -155,7 +155,7 @@ check-interactive:
 # Execute a single test, specified in $(SOLO_FILE)
 check-one:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index 9a869a8e436..194ed384ce0 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -239,7 +239,7 @@ GARBAGE += $(addsuffix .log,$(MOCHITESTS) reftest crashtest jstestbrowser)
 # Usage: |make [TEST_PATH=...] [EXTRA_TEST_ARGS=...] xpcshell-tests|.
 xpcshell-tests:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(topsrcdir)/testing/xpcshell/runxpcshelltests.py \
 	  --manifest=$(DEPTH)/_tests/xpcshell/xpcshell.ini \
 	  --build-info-json=$(DEPTH)/mozinfo.json \

From 84df3ed32ee201ba970619ca12c5e33d5e48839f Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Tue, 1 May 2012 20:20:46 -0400
Subject: [PATCH 136/162] Bug 750243 - Make sure target.currentURI is not null
 before saving an image r=wesj a=android-only

---
 mobile/android/chrome/content/browser.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index d6a854d9aaf..8b2f987cdc9 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -1140,8 +1140,6 @@ var NativeWindow = {
     _contextId: 0, // id to assign to new context menu items if they are added
 
     init: function() {
-      this.imageContext = this.SelectorContext("img");
-
       Services.obs.addObserver(this, "Gesture:LongPress", false);
 
       // TODO: These should eventually move into more appropriate classes
@@ -1186,18 +1184,17 @@ var NativeWindow = {
                });
 
       this.add(Strings.browser.GetStringFromName("contextmenu.saveImage"),
-               this.imageContext,
+               this.imageSaveableContext,
                function(aTarget) {
                  let imageCache = Cc["@mozilla.org/image/cache;1"].getService(Ci.imgICache);
                  let props = imageCache.findEntryProperties(aTarget.currentURI, aTarget.ownerDocument.characterSet);
-                 var contentDisposition = "";
-                 var type = "";
+                 let contentDisposition = "";
+                 let type = "";
                  try {
                     String(props.get("content-disposition", Ci.nsISupportsCString));
                     String(props.get("type", Ci.nsISupportsCString));
                  } catch(ex) { }
-                 var browser = BrowserApp.getBrowserForDocument(aTarget.ownerDocument);
-                 ContentAreaUtils.internalSave(aTarget.currentURI.spec, null, null, contentDisposition, type, false, "SaveImageTitle", null, browser.documentURI, true, null);
+                 ContentAreaUtils.internalSave(aTarget.currentURI.spec, null, null, contentDisposition, type, false, "SaveImageTitle", null, aTarget.ownerDocument.documentURIObject, true, null);
                });
     },
 
@@ -1285,6 +1282,16 @@ var NativeWindow = {
       }
     },
 
+    imageSaveableContext: {
+      matches: function imageSaveableContextMatches(aElement) {
+        if (aElement instanceof Ci.nsIImageLoadingContent && aElement.currentURI) {
+          // The image must be loaded to allow saving
+          let request = aElement.getRequest(Ci.nsIImageLoadingContent.CURRENT_REQUEST);
+          return (request && (request.imageStatus & request.STATUS_SIZE_AVAILABLE));
+        }
+      }
+    },
+
     _sendToContent: function(aX, aY) {
       // initially we look for nearby clickable elements. If we don't find one we fall back to using whatever this click was on
       let rootElement = ElementTouchHelper.elementFromPoint(BrowserApp.selectedBrowser.contentWindow, aX, aY);

From e2f3bfa4b8f181a42b68c7651b792d6ad50c4ffe Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Wed, 2 May 2012 15:39:24 +0200
Subject: [PATCH 137/162] Bug 747668. (Ev1) XPFE autocomplete.xml: Move code
 into searchParam. r=neil. DONTBUILD (a=npotb).

---
 .../autocomplete/resources/content/autocomplete.xml         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xpfe/components/autocomplete/resources/content/autocomplete.xml b/xpfe/components/autocomplete/resources/content/autocomplete.xml
index 6cebcfb05cf..873458d5bc4 100644
--- a/xpfe/components/autocomplete/resources/content/autocomplete.xml
+++ b/xpfe/components/autocomplete/resources/content/autocomplete.xml
@@ -139,6 +139,10 @@
                 onset="this.setAttribute('timeout', val); return val;"
                 onget="return parseInt(this.getAttribute('timeout')) || 0;"/>
 
+      <property name="searchParam"
+                onget="return this.getAttribute('autocompletesearchparam') || '';"
+                onset="this.setAttribute('autocompletesearchparam', val); return val;"/>
+
       <method name="onSearchBegin">
         <body><![CDATA[
           this._fireEvent("searchbegin");
@@ -378,7 +382,7 @@
           param: this,
           onStartLookup: function(aSearchString, aPreviousSearchResult, aListener) {
             this.session.startSearch(aSearchString,
-                         this.param.getAttribute("autocompletesearchparam") || "",
+                         this.param.searchParam,
                          aPreviousSearchResult && aPreviousSearchResult.lastResult,
                          aListener);
           },

From 092b14a9ff34c542ccb6a3705ea9bfa2d97027a8 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Tue, 1 May 2012 22:17:31 -0400
Subject: [PATCH 138/162] Bug 735970 - Add xpcshell tests for version
 downgrades. r=rstrong, a=test-only.

---
 .../update/test/unit/data/old_version_mar.mar | Bin 0 -> 421 bytes
 .../unit/data/wrong_product_channel_mar.mar   | Bin 0 -> 421 bytes
 .../update/test/unit/head_update.js.in        |   5 +-
 .../unit/test_0113_versionDowngradeCheck.js   |  65 ++++++++++++++++++
 .../unit/test_0114_productChannelCheck.js     |  65 ++++++++++++++++++
 .../test/unit/xpcshell_updater_windows.ini    |   2 +
 6 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 toolkit/mozapps/update/test/unit/data/old_version_mar.mar
 create mode 100644 toolkit/mozapps/update/test/unit/data/wrong_product_channel_mar.mar
 create mode 100644 toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js
 create mode 100644 toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js

diff --git a/toolkit/mozapps/update/test/unit/data/old_version_mar.mar b/toolkit/mozapps/update/test/unit/data/old_version_mar.mar
new file mode 100644
index 0000000000000000000000000000000000000000..31550698a0fc1c8b2896717f4efd13681e29dc28
GIT binary patch
literal 421
zcmeZu3^HV3VC-N31IDF5iV=bt8DuWLUL~||wWh1^mxFAx7hf}pOtDMeD&I0M`^CHU
z-*<Zz=R4niow>_U-uB@3dvD_%s;swvEfuZ()#iD8!TZx3bG9toV1CH|@4Rkl_GGi;
z#kVK2dH>OyF0uD=!Vk^=vEGZWY<?B=`s1W1&L@8o1vAvO9)>r*-#l&3{@vn1jz@)l
z9et>(xWI5nZQk!%2kqXTR(~n3AJ-$=l<h2TeYwarSN{I8R;gLGK9kh6{?^=Fz2+WI
zv%ikaM$?r$-srDp&3b*g;O#HD4F^AoPn*6px+tz!KWT;`S8nl<JswkU*6opRnq2!+
zNB6YpiKEO)n|_EJi9F{2wW9fBQ`1%^t)J6=y*p!O1`Uf05M5D_T%3`blcQUbT3o_l
a02HD+kVJ}yZ3gkhnN_JN@oAYksSE&h36gpM

literal 0
HcmV?d00001

diff --git a/toolkit/mozapps/update/test/unit/data/wrong_product_channel_mar.mar b/toolkit/mozapps/update/test/unit/data/wrong_product_channel_mar.mar
new file mode 100644
index 0000000000000000000000000000000000000000..1e39cc214f97ccb424d8b3cae314fa061c9782e4
GIT binary patch
literal 421
zcmeZu3^HV3VC-N31IDF5iV=bt8A|#-Ufr4hwY}APazbFrH$TUZwNr$`QYO3Abd>GM
zocN<MIwL&siQ!ZQUgoql)oXrF`cYB(c0%plO>Hv5yBIdF*($Z+S$}6>>-<~ye<l>@
zd~g1Hao#J3_u^)(79Rq7t~{Pow_fDR>myy>Pqn`&zvNGHW=wQ@Tv3s7aK)j{TQ0db
zV`B;m6wWrpd{5rU`(W>zDOXLycqdw_obx@p>sHM2dwb-??7s7_Ep~tBYVCca?D5p5
ziN!3*%01axPd*F3PEKB}@M+(_XDk;gzX;!MogIEsDE7_F!yj1IZ*Ew!LpM%vHtSpa
z%(@fmI?iE-i}G2I9FEvBYuV*C`!zQ!^7r|l@scWnhD8R5PD;wpOR0=c&PdG5OU+@>
a0*X-^NFv3<HiP)$%&OFs__WNNR0aTSzLb9e

literal 0
HcmV?d00001

diff --git a/toolkit/mozapps/update/test/unit/head_update.js.in b/toolkit/mozapps/update/test/unit/head_update.js.in
index a21d67aeee3..4be57247fcf 100644
--- a/toolkit/mozapps/update/test/unit/head_update.js.in
+++ b/toolkit/mozapps/update/test/unit/head_update.js.in
@@ -87,11 +87,14 @@ const APPLY_TO_DIR_SUFFIX = "_applyToDir/";
 const HELPER_BIN_FILE = "TestAUSHelper" + BIN_SUFFIX;
 const MAR_COMPLETE_FILE = "data/complete.mar";
 const MAR_PARTIAL_FILE = "data/partial.mar";
+const MAR_OLD_VERSION_FILE = "data/old_version_mar.mar";
+const MAR_WRONG_CHANNEL_FILE = "data/wrong_product_channel_mar.mar";
 const UPDATER_BIN_FILE = "updater" + BIN_SUFFIX;
 const MAINTENANCE_SERVICE_BIN_FILE = "maintenanceservice.exe";
 const MAINTENANCE_SERVICE_INSTALLER_BIN_FILE = "maintenanceservice_installer.exe";
 const UPDATE_SETTINGS_INI_FILE = "update-settings.ini";
-const UPDATE_SETTINGS_CONTENTS = "[Settings]\nMAR_CHANNEL_ID=xpcshell-test\n"
+const UPDATE_SETTINGS_CONTENTS = "[Settings]\n" +
+                                 "ACCEPTED_MAR_CHANNEL_IDS=xpcshell-test\n"
 const UPDATES_DIR_SUFFIX = "_mar";
 
 const LOG_COMPLETE_SUCCESS = "data/complete_log_success";
diff --git a/toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js b/toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js
new file mode 100644
index 00000000000..a27a51f7b6e
--- /dev/null
+++ b/toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js
@@ -0,0 +1,65 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2012
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Brian R. Bondy <netzen@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+/* Test version downgrade MAR security check */
+
+const TEST_ID = "0113";
+
+// We don't actually care if the MAR has any data, we only care about the
+// application return code and update.status result.
+const TEST_FILES = [];
+
+const VERSION_DOWNGRADE_ERROR = "23";
+
+function run_test() {
+  // Setup an old version MAR file
+  do_register_cleanup(cleanupUpdaterTest);
+  setupUpdaterTest(MAR_OLD_VERSION_FILE);
+
+  // Apply the MAR
+  let exitValue = runUpdate();
+  logTestInfo("testing updater binary process exitValue for failure when " +
+              "applying a version downgrade MAR");
+  // Make sure the updater executed successfully
+  do_check_eq(exitValue, 0);
+  let updatesDir = do_get_file(TEST_ID + UPDATES_DIR_SUFFIX);
+
+  //Make sure we get a version downgrade error
+  let updateStatus = readStatusFile(updatesDir);
+  do_check_eq(updateStatus.split(": ")[1], VERSION_DOWNGRADE_ERROR);
+}
diff --git a/toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js b/toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js
new file mode 100644
index 00000000000..3d5f7174852
--- /dev/null
+++ b/toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js
@@ -0,0 +1,65 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2012
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Brian R. Bondy <netzen@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+/* Test product/channel MAR security check */
+
+const TEST_ID = "0114";
+
+// We don't actually care if the MAR has any data, we only care about the
+// application return code and update.status result.
+const TEST_FILES = [];
+
+const MAR_CHANNEL_MISMATCH_ERROR = "22";
+
+function run_test() {
+  // Setup a wrong channel MAR file
+  do_register_cleanup(cleanupUpdaterTest);
+  setupUpdaterTest(MAR_WRONG_CHANNEL_FILE);
+
+  // Apply the MAR
+  let exitValue = runUpdate();
+  logTestInfo("testing updater binary process exitValue for failure when " +
+              "applying a wrong product and channel MAR file");
+  // Make sure the updater executed successfully
+  do_check_eq(exitValue, 0);
+  let updatesDir = do_get_file(TEST_ID + UPDATES_DIR_SUFFIX);
+
+  //Make sure we get a version downgrade error
+  let updateStatus = readStatusFile(updatesDir);
+  do_check_eq(updateStatus.split(": ")[1], MAR_CHANNEL_MISMATCH_ERROR);
+}
diff --git a/toolkit/mozapps/update/test/unit/xpcshell_updater_windows.ini b/toolkit/mozapps/update/test/unit/xpcshell_updater_windows.ini
index cdda5ec9b4d..8aaa26607b5 100644
--- a/toolkit/mozapps/update/test/unit/xpcshell_updater_windows.ini
+++ b/toolkit/mozapps/update/test/unit/xpcshell_updater_windows.ini
@@ -1,3 +1,5 @@
+[test_0113_versionDowngradeCheck.js]
+[test_0114_productChannelCheck.js]
 [test_0150_appBinReplaced_xp_win_complete.js]
 [test_0151_appBinPatched_xp_win_partial.js]
 [test_0160_appInUse_xp_win_complete.js]

From 92852a5141a8b49f019d799f7e9c28ca72a5d647 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Tue, 1 May 2012 23:23:45 -0400
Subject: [PATCH 139/162] Sync webidl-parser to m-c to pick up Bug 742141. r=me
 a=me

---
 dom/bindings/parser/WebIDL.py            | 12 ++++++------
 dom/bindings/parser/tests/test_attr.py   | 16 +++++++++++++++-
 dom/bindings/parser/tests/test_method.py |  7 ++++++-
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/dom/bindings/parser/WebIDL.py b/dom/bindings/parser/WebIDL.py
index 932263d1641..a0e4e85afad 100644
--- a/dom/bindings/parser/WebIDL.py
+++ b/dom/bindings/parser/WebIDL.py
@@ -1659,7 +1659,7 @@ class IDLMethod(IDLInterfaceMember, IDLScope):
 class Tokenizer(object):
     tokens = [
         "INTEGER",
-        "FLOAT",
+        "FLOATLITERAL",
         "IDENTIFIER",
         "STRING",
         "WHITESPACE",
@@ -1679,7 +1679,7 @@ class Tokenizer(object):
                                        filename=self._filename))
         return t
 
-    def t_FLOAT(self, t):
+    def t_FLOATLITERAL(self, t):
         r'-?(([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([Ee][+-]?[0-9]+)?|[0-9]+[Ee][+-]?[0-9]+)'
         assert False
         return t
@@ -1741,7 +1741,7 @@ class Tokenizer(object):
         "boolean": "BOOLEAN",
         "byte": "BYTE",
         "double": "DOUBLE",
-        "float": "FLOAT_",
+        "float": "FLOAT",
         "long": "LONG",
         "object": "OBJECT",
         "octet": "OCTET",
@@ -2043,7 +2043,7 @@ class Parser(Tokenizer):
 
     def p_ConstValueFloat(self, p):
         """
-            ConstValue : FLOAT
+            ConstValue : FLOATLITERAL
         """
         assert False
         pass
@@ -2464,7 +2464,7 @@ class Parser(Tokenizer):
     def p_Other(self, p):
         """
             Other : INTEGER
-                  | FLOAT
+                  | FLOATLITERAL
                   | IDENTIFIER
                   | STRING
                   | OTHER
@@ -2489,7 +2489,7 @@ class Parser(Tokenizer):
                   | DOUBLE
                   | EXCEPTION
                   | FALSE
-                  | FLOAT_
+                  | FLOAT
                   | GETTER
                   | IMPLEMENTS
                   | INHERIT
diff --git a/dom/bindings/parser/tests/test_attr.py b/dom/bindings/parser/tests/test_attr.py
index fb93d318622..7056f9a413c 100644
--- a/dom/bindings/parser/tests/test_attr.py
+++ b/dom/bindings/parser/tests/test_attr.py
@@ -21,7 +21,9 @@ def WebIDLTest(parser, harness):
                 ("::TestAttr%s::rstr", "rstr", "String%s", True),
                 ("::TestAttr%s::obj", "obj", "Object%s", False),
                 ("::TestAttr%s::robj", "robj", "Object%s", True),
-                ("::TestAttr%s::object", "object", "Object%s", False)]
+                ("::TestAttr%s::object", "object", "Object%s", False),
+                ("::TestAttr%s::f", "f", "Float%s", False),
+                ("::TestAttr%s::rf", "rf", "Float%s", True)]
 
     parser.parse("""
         interface TestAttr {
@@ -46,6 +48,8 @@ def WebIDLTest(parser, harness):
           attribute object obj;
           readonly attribute object robj;
           attribute object _object;
+          attribute float f;
+          readonly attribute float rf;
         };
 
         interface TestAttrNullable {
@@ -70,6 +74,8 @@ def WebIDLTest(parser, harness):
           attribute object? obj;
           readonly attribute object? robj;
           attribute object? _object;
+          attribute float? f;
+          readonly attribute float? rf;
         };
 
         interface TestAttrArray {
@@ -94,6 +100,8 @@ def WebIDLTest(parser, harness):
           attribute object[] obj;
           readonly attribute object[] robj;
           attribute object[] _object;
+          attribute float[] f;
+          readonly attribute float[] rf;
         };
 
         interface TestAttrNullableArray {
@@ -118,6 +126,8 @@ def WebIDLTest(parser, harness):
           attribute object[]? obj;
           readonly attribute object[]? robj;
           attribute object[]? _object;
+          attribute float[]? f;
+          readonly attribute float[]? rf;
         };
 
         interface TestAttrArrayOfNullableTypes {
@@ -142,6 +152,8 @@ def WebIDLTest(parser, harness):
           attribute object?[] obj;
           readonly attribute object?[] robj;
           attribute object?[] _object;
+          attribute float?[] f;
+          readonly attribute float?[] rf;
         };
 
         interface TestAttrNullableArrayOfNullableTypes {
@@ -166,6 +178,8 @@ def WebIDLTest(parser, harness):
           attribute object?[]? obj;
           readonly attribute object?[]? robj;
           attribute object?[]? _object;
+          attribute float?[]? f;
+          readonly attribute float?[]? rf;
         };
     """)
 
diff --git a/dom/bindings/parser/tests/test_method.py b/dom/bindings/parser/tests/test_method.py
index 4d3fbefc650..98aca556f38 100644
--- a/dom/bindings/parser/tests/test_method.py
+++ b/dom/bindings/parser/tests/test_method.py
@@ -15,6 +15,7 @@ def WebIDLTest(parser, harness):
           object getObject();
           void setObject(object arg1);
           void setAny(any arg1);
+          float doFloats(float arg1);
         };
     """)
 
@@ -27,7 +28,7 @@ def WebIDLTest(parser, harness):
                "Should be an IDLInterface")
     harness.check(iface.identifier.QName(), "::TestMethods", "Interface has the right QName")
     harness.check(iface.identifier.name, "TestMethods", "Interface has the right name")
-    harness.check(len(iface.members), 12, "Expect 12 members")
+    harness.check(len(iface.members), 13, "Expect 13 members")
 
     methods = iface.members
 
@@ -112,3 +113,7 @@ def WebIDLTest(parser, harness):
                 "setAny",
        [("Void",
         [("::TestMethods::setAny::arg1", "arg1", "Any", False, False)])])
+    checkMethod(methods[12], "::TestMethods::doFloats",
+                "doFloats",
+       [("Float",
+        [("::TestMethods::doFloats::arg1", "arg1", "Float", False, False)])])

From 4a221c13dbd090e98b55c2e7f6a2b6a64a35b972 Mon Sep 17 00:00:00 2001
From: Marco Zehe <mzehe@mozilla.com>
Date: Wed, 2 May 2012 06:56:40 +0200
Subject: [PATCH 140/162] Proper fix for disabling tests for bug 746970, copy
 and paste error, a=test-only

---
 accessible/tests/mochitest/events/test_focus_general.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accessible/tests/mochitest/events/test_focus_general.xul b/accessible/tests/mochitest/events/test_focus_general.xul
index d069ef688fc..b5c18e8c595 100644
--- a/accessible/tests/mochitest/events/test_focus_general.xul
+++ b/accessible/tests/mochitest/events/test_focus_general.xul
@@ -73,7 +73,7 @@
       // show popup again for the next test
       gQueue.push(new synthClick("popupbutton", new nofocusChecker()));
 
-if (MAC) {
+if (!MAC) {
       // click menubutton of the 'menubutton' button while popup of button open.
       gQueue.push(new synthClick("mbb", new focusChecker("mbb"), { where: "right" }));
       // close popup, focus stays on menubutton, fire focus event

From 7a16971551948ef66109fb9d08dd611974c95c4f Mon Sep 17 00:00:00 2001
From: Myk Melez <myk@mozilla.org>
Date: Wed, 2 May 2012 00:09:10 -0700
Subject: [PATCH 141/162] bug 750568 - whitelist twitter and google identity
 providers in webapp runtime; r=myk, a=js-only

---
 webapprt/ContentPolicy.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webapprt/ContentPolicy.js b/webapprt/ContentPolicy.js
index 392ddeefd1c..37c70468d90 100644
--- a/webapprt/ContentPolicy.js
+++ b/webapprt/ContentPolicy.js
@@ -14,6 +14,9 @@ const allowedOrigins = [
   WebappRT.config.app.origin,
   "https://browserid.org",
   "https://www.facebook.com",
+  "https://accounts.google.com",
+  "https://www.google.com",
+  "https://api.twitter.com",
 ];
 
 function ContentPolicy() {}

From 653e4d480027fb2479ef8f9c7bcf1391e0ed536a Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Wed, 2 May 2012 12:24:40 +0200
Subject: [PATCH 142/162] Bug 635825. (Av1) Re-enable test_notifications.html,
 test_privbrowsing.html and test_prompt.html on SeaMonkey. rs=Callek
 (a=test-only).

---
 toolkit/components/passwordmgr/test/Makefile.in | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/toolkit/components/passwordmgr/test/Makefile.in b/toolkit/components/passwordmgr/test/Makefile.in
index 06eef1902ec..25a8b8d4716 100644
--- a/toolkit/components/passwordmgr/test/Makefile.in
+++ b/toolkit/components/passwordmgr/test/Makefile.in
@@ -82,6 +82,8 @@ MOCHI_TESTS = \
     test_maxforms_1.html \
     test_maxforms_2.html \
     test_maxforms_3.html \
+    test_notifications.html \
+    test_privbrowsing.html \
     test_prompt_async.html \
     test_xhr.html \
     test_xml_load.html \
@@ -112,23 +114,11 @@ MOCHI_CONTENT = \
     subtst_prompt_async.html \
     $(NULL)
 
-# Don't run these tests in suite
-ifndef MOZ_SUITE
-MOCHI_TESTS += \
-    test_privbrowsing.html \
-    test_notifications.html \
-    $(NULL)
 ifneq ($(OS_TARGET),Linux)
 MOCHI_TESTS += \
     test_prompt.html \
     $(NULL)
 endif
-endif
-ifdef MOZ_SUITE
-$(warning test_prompt.html is disabled until doorhanger notfications work. Bug 598360)
-$(warning test_notifications.html is disabled until doorhanger notfications work. Bug 598360)
-$(warning test_privbrowsing.html is disabled due to doorhangers, Bug 598360, and no privatebrowsing support)
-endif
 
 # This test doesn't pass because we can't ensure a cross-platform
 # event that occurs between DOMContentLoaded and Pageload

From 6decdbb6026ef293982d6af9fd910af6f024f39b Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Wed, 2 May 2012 14:14:18 +0200
Subject: [PATCH 143/162] Bug 741070. (Cv1a-FF) Sessionstore tests: Improve and
 merge 'provideWindow()' and 'whenWindowLoaded()' into 'head.js', Add an
 'info()' call, Nits. r=paul (a=test-only).

---
 .../sessionstore/test/browser_394759_basic.js | 30 ----------------
 .../test/browser_394759_behavior.js           | 35 ++-----------------
 .../test/browser_595601-restore_hidden.js     | 14 ++------
 .../sessionstore/test/browser_701377.js       | 14 ++------
 browser/components/sessionstore/test/head.js  | 31 ++++++++++++++++
 5 files changed, 40 insertions(+), 84 deletions(-)

diff --git a/browser/components/sessionstore/test/browser_394759_basic.js b/browser/components/sessionstore/test/browser_394759_basic.js
index 7540698585f..fc162586d75 100644
--- a/browser/components/sessionstore/test/browser_394759_basic.js
+++ b/browser/components/sessionstore/test/browser_394759_basic.js
@@ -35,36 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-function provideWindow(aCallback, aURL, aFeatures) {
-  function callback() {
-    executeSoon(function () {
-      aCallback(win);
-    });
-  }
-
-  let win = openDialog(getBrowserURL(), "", aFeatures || "chrome,all,dialog=no", aURL);
-
-  whenWindowLoaded(win, function () {
-    if (!aURL) {
-      callback();
-      return;
-    }
-    win.gBrowser.selectedBrowser.addEventListener("load", function() {
-      win.gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-      callback();
-    }, true);
-  });
-}
-
-function whenWindowLoaded(aWin, aCallback) {
-  aWin.addEventListener("load", function () {
-    aWin.removeEventListener("load", arguments.callee, false);
-    executeSoon(function () {
-      aCallback(aWin);
-    });
-  }, false);
-}
-
 function test() {
   waitForExplicitFinish();
 
diff --git a/browser/components/sessionstore/test/browser_394759_behavior.js b/browser/components/sessionstore/test/browser_394759_behavior.js
index a2d8f8a84a9..cfecaa5051a 100644
--- a/browser/components/sessionstore/test/browser_394759_behavior.js
+++ b/browser/components/sessionstore/test/browser_394759_behavior.js
@@ -35,43 +35,13 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-function provideWindow(aCallback, aURL, aFeatures) {
-  function callback() {
-    executeSoon(function () {
-      aCallback(win);
-    });
-  }
-
-  let win = openDialog(getBrowserURL(), "", aFeatures || "chrome,all,dialog=no", aURL);
-
-  whenWindowLoaded(win, function () {
-    if (!aURL) {
-      callback();
-      return;
-    }
-    win.gBrowser.selectedBrowser.addEventListener("load", function() {
-      win.gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-      callback();
-    }, true);
-  });
-}
-
-function whenWindowLoaded(aWin, aCallback) {
-  aWin.addEventListener("load", function () {
-    aWin.removeEventListener("load", arguments.callee, false);
-    executeSoon(function () {
-      aCallback(aWin);
-    });
-  }, false);
-}
-
 function test() {
   // This test takes quite some time, and timeouts frequently, so we require
   // more time to run.
   // See Bug 518970.
   requestLongerTimeout(2);
 
-  waitForExplicitFinish();  
+  waitForExplicitFinish();
 
   // helper function that does the actual testing
   function openWindowRec(windowsToOpen, expectedResults, recCallback) {
@@ -94,13 +64,14 @@ function test() {
       executeSoon(recCallback);
       return;
     }
+
     // hack to force window to be considered a popup (toolbar=no didn't work)
     let winData = windowsToOpen.shift();
     let settings = "chrome,dialog=no," +
                    (winData.isPopup ? "all=no" : "all");
     let url = "http://example.com/?window=" + windowsToOpen.length;
 
-    provideWindow(function (win) {
+    provideWindow(function onTestURLLoaded(win) {
       win.close();
       openWindowRec(windowsToOpen, expectedResults, recCallback);
     }, url, settings);
diff --git a/browser/components/sessionstore/test/browser_595601-restore_hidden.js b/browser/components/sessionstore/test/browser_595601-restore_hidden.js
index 3971a51d2a2..b53d92308a7 100644
--- a/browser/components/sessionstore/test/browser_595601-restore_hidden.js
+++ b/browser/components/sessionstore/test/browser_595601-restore_hidden.js
@@ -93,14 +93,6 @@ let TabsProgressListener = {
   }
 }
 
-// ----------
-function whenWindowLoaded(win, callback) {
-  win.addEventListener("load", function onLoad() {
-    win.removeEventListener("load", onLoad, false);
-    executeSoon(callback);
-  }, false);
-}
-
 // ----------
 function newWindowWithState(state, callback) {
   let opts = "chrome,all,dialog=no,height=800,width=800";
@@ -108,10 +100,10 @@ function newWindowWithState(state, callback) {
 
   registerCleanupFunction(function () win.close());
 
-  whenWindowLoaded(win, function () {
-    TabsProgressListener.init(win);
+  whenWindowLoaded(win, function onWindowLoaded(aWin) {
+    TabsProgressListener.init(aWin);
     TabsProgressListener.setCallback(callback);
 
-    ss.setWindowState(win, JSON.stringify(state), true);
+    ss.setWindowState(aWin, JSON.stringify(state), true);
   });
 }
diff --git a/browser/components/sessionstore/test/browser_701377.js b/browser/components/sessionstore/test/browser_701377.js
index e0c363dada4..e526b7eb745 100644
--- a/browser/components/sessionstore/test/browser_701377.js
+++ b/browser/components/sessionstore/test/browser_701377.js
@@ -27,14 +27,6 @@ function test() {
   });
 }
 
-// ----------
-function whenWindowLoaded(aWindow, aCallback) {
-  aWindow.addEventListener("load", function onLoad() {
-    aWindow.removeEventListener("load", onLoad, false);
-    executeSoon(aCallback);
-  }, false);
-}
-
 // ----------
 function newWindowWithState(aState, aCallback) {
   let opts = "chrome,all,dialog=no,height=800,width=800";
@@ -42,8 +34,8 @@ function newWindowWithState(aState, aCallback) {
 
   registerCleanupFunction(function () win.close());
 
-  whenWindowLoaded(win, function () {
-    ss.setWindowState(win, JSON.stringify(aState), true);
-    executeSoon(function () aCallback(win));
+  whenWindowLoaded(win, function onWindowLoaded(aWin) {
+    ss.setWindowState(aWin, JSON.stringify(aState), true);
+    executeSoon(function () aCallback(aWin));
   });
 }
diff --git a/browser/components/sessionstore/test/head.js b/browser/components/sessionstore/test/head.js
index a5f451d52c1..45715bbc10d 100644
--- a/browser/components/sessionstore/test/head.js
+++ b/browser/components/sessionstore/test/head.js
@@ -49,6 +49,28 @@ registerCleanupFunction(function () {
 // session restore tests to be run standalone without triggering errors.
 Cc["@mozilla.org/browser/clh;1"].getService(Ci.nsIBrowserHandler).defaultArgs;
 
+function provideWindow(aCallback, aURL, aFeatures) {
+  function callbackSoon(aWindow) {
+    executeSoon(function executeCallbackSoon() {
+      aCallback(aWindow);
+    });
+  }
+
+  let win = openDialog(getBrowserURL(), "", aFeatures || "chrome,all,dialog=no", aURL);
+  whenWindowLoaded(win, function onWindowLoaded(aWin) {
+    if (!aURL) {
+      info("Loaded a blank window.");
+      callbackSoon(aWin);
+      return;
+    }
+
+    aWin.gBrowser.selectedBrowser.addEventListener("load", function selectedBrowserLoadListener() {
+      aWin.gBrowser.selectedBrowser.removeEventListener("load", selectedBrowserLoadListener, true);
+      callbackSoon(aWin);
+    }, true);
+  });
+}
+
 // This assumes that tests will at least have some state/entries
 function waitForBrowserState(aState, aSetStateCallback) {
   let windows = [window];
@@ -198,6 +220,15 @@ function whenBrowserLoaded(aBrowser, aCallback) {
   }, true);
 }
 
+function whenWindowLoaded(aWindow, aCallback) {
+  aWindow.addEventListener("load", function windowLoadListener() {
+    aWindow.removeEventListener("load", windowLoadListener, false);
+    executeSoon(function executeWhenWindowLoaded() {
+      aCallback(aWindow);
+    });
+  }, false);
+}
+
 var gUniqueCounter = 0;
 function r() {
   return Date.now() + "-" + (++gUniqueCounter);

From 3a458cfe90d314c860dda73bb58ba0fa0f7fcb69 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 2 May 2012 10:51:09 -0400
Subject: [PATCH 144/162] Bug 750722 - Fix missing null check. r=mfinkle
 a=android-only

---
 mobile/android/chrome/content/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 8b2f987cdc9..e12dad1c3f5 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -2567,7 +2567,7 @@ var BrowserEventHandler = {
           this._scrollableElement = this._findScrollableElement(this._scrollableElement, false);
 
         let doc = BrowserApp.selectedBrowser.contentDocument;
-        if (this._scrollableElement == doc.body || this._scrollableElement == doc.documentElement) {
+        if (this._scrollableElement == null || this._scrollableElement == doc.body || this._scrollableElement == doc.documentElement) {
           sendMessageToJava({ gecko: { type: "Panning:CancelOverride" } });
           return;
         }

From 35a7015e386ebc9ed3c9cacc8ed09297059a4d46 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Wed, 2 May 2012 09:07:58 -0700
Subject: [PATCH 145/162] Bug 695204 - Display site security. r=mfinkle
 a=android-only

---
 mobile/android/base/BrowserToolbar.java       |  17 +-
 mobile/android/base/GeckoApp.java             |  30 ++-
 mobile/android/base/Makefile.in               |   8 +
 mobile/android/base/SiteIdentityPopup.java    | 142 ++++++++++++++
 mobile/android/base/Tab.java                  |  20 +-
 .../base/locales/en-US/android_strings.dtd    |  15 ++
 .../resources/drawable-hdpi/larry_blue.png    | Bin 0 -> 5189 bytes
 .../resources/drawable-hdpi/larry_green.png   | Bin 0 -> 5193 bytes
 .../drawable-xhdpi-v11/larry_blue.png         | Bin 0 -> 7443 bytes
 .../drawable-xhdpi-v11/larry_green.png        | Bin 0 -> 7439 bytes
 .../base/resources/drawable/larry_blue.png    | Bin 0 -> 3115 bytes
 .../base/resources/drawable/larry_green.png   | Bin 0 -> 3164 bytes
 .../resources/layout/site_identity_popup.xml  |  82 ++++++++
 .../android/base/resources/values/colors.xml  |   2 +
 mobile/android/base/strings.xml.in            |   4 +
 mobile/android/chrome/content/browser.js      | 180 ++++++++++++++++--
 .../locales/en-US/chrome/browser.properties   |   2 -
 17 files changed, 473 insertions(+), 29 deletions(-)
 create mode 100644 mobile/android/base/SiteIdentityPopup.java
 create mode 100644 mobile/android/base/resources/drawable-hdpi/larry_blue.png
 create mode 100644 mobile/android/base/resources/drawable-hdpi/larry_green.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi-v11/larry_blue.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi-v11/larry_green.png
 create mode 100644 mobile/android/base/resources/drawable/larry_blue.png
 create mode 100644 mobile/android/base/resources/drawable/larry_green.png
 create mode 100644 mobile/android/base/resources/layout/site_identity_popup.xml

diff --git a/mobile/android/base/BrowserToolbar.java b/mobile/android/base/BrowserToolbar.java
index 6e5c7833df5..ab5d0b4b4c1 100644
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -60,6 +60,7 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout.LayoutParams;
 import android.widget.TextView;
 import android.widget.TextSwitcher;
 import android.widget.ViewSwitcher.ViewFactory;
@@ -172,6 +173,18 @@ public class BrowserToolbar {
 
         mFavicon = (ImageButton) mLayout.findViewById(R.id.favicon);
         mSiteSecurity = (ImageButton) mLayout.findViewById(R.id.site_security);
+        mSiteSecurity.setOnClickListener(new Button.OnClickListener() {
+            public void onClick(View view) {
+                int[] lockLocation = new int[2];
+                view.getLocationOnScreen(lockLocation);
+                LayoutParams lockLayoutParams = (LayoutParams) view.getLayoutParams();
+
+                // Calculate the left margin for the arrow based on the position of the lock icon.
+                int leftMargin = lockLocation[0] - lockLayoutParams.rightMargin;
+                GeckoApp.mSiteIdentityPopup.show(leftMargin);
+            }
+        });
+
         mProgressSpinner = (AnimationDrawable) resources.getDrawable(R.drawable.progress_spinner);
         
         mStop = (ImageButton) mLayout.findViewById(R.id.stop);
@@ -322,9 +335,9 @@ public class BrowserToolbar {
     public void setSecurityMode(String mode) {
         mTitleCanExpand = false;
 
-        if (mode.equals("identified")) {
+        if (mode.equals(SiteIdentityPopup.IDENTIFIED)) {
             mSiteSecurity.setImageLevel(1);
-        } else if (mode.equals("verified")) {
+        } else if (mode.equals(SiteIdentityPopup.VERIFIED)) {
             mSiteSecurity.setImageLevel(2);
         } else {
             mSiteSecurity.setImageLevel(0);
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 851654ba4b5..f6cb97744b7 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -138,6 +138,7 @@ abstract public class GeckoApp
 
     public static BrowserToolbar mBrowserToolbar;
     public static DoorHangerPopup mDoorHangerPopup;
+    public static SiteIdentityPopup mSiteIdentityPopup;
     public static FormAssistPopup mFormAssistPopup;
     public Favicons mFavicons;
 
@@ -665,7 +666,7 @@ abstract public class GeckoApp
         tab.setContentType(contentType);
         tab.updateFavicon(null);
         tab.updateFaviconURL(null);
-        tab.updateSecurityMode("unknown");
+        tab.updateIdentityData(null);
         tab.removeTransientDoorHangers();
         tab.setHasTouchListeners(false);
         tab.setCheckerboardColor(Color.WHITE);
@@ -677,7 +678,7 @@ abstract public class GeckoApp
                 if (Tabs.getInstance().isSelectedTab(tab)) {
                     mBrowserToolbar.setTitle(uri);
                     mBrowserToolbar.setFavicon(null);
-                    mBrowserToolbar.setSecurityMode("unknown");
+                    mBrowserToolbar.setSecurityMode(tab.getSecurityMode());
                     mDoorHangerPopup.updatePopup();
                     mBrowserToolbar.setShadowVisibility(!(tab.getURL().startsWith("about:")));
 
@@ -688,17 +689,17 @@ abstract public class GeckoApp
         });
     }
 
-    void handleSecurityChange(final int tabId, final String mode) {
+    void handleSecurityChange(final int tabId, final JSONObject identityData) {
         final Tab tab = Tabs.getInstance().getTab(tabId);
         if (tab == null)
             return;
 
-        tab.updateSecurityMode(mode);
+        tab.updateIdentityData(identityData);
         
         mMainHandler.post(new Runnable() { 
             public void run() {
                 if (Tabs.getInstance().isSelectedTab(tab))
-                    mBrowserToolbar.setSecurityMode(mode);
+                    mBrowserToolbar.setSecurityMode(tab.getSecurityMode());
             }
         });
     }
@@ -871,9 +872,9 @@ abstract public class GeckoApp
                 handleLocationChange(tabId, uri, documentURI, contentType, sameDocument);
             } else if (event.equals("Content:SecurityChange")) {
                 final int tabId = message.getInt("tabID");
-                final String mode = message.getString("mode");
-                Log.i(LOGTAG, "Security Mode - " + mode);
-                handleSecurityChange(tabId, mode);
+                final JSONObject identity = message.getJSONObject("identity");
+                Log.i(LOGTAG, "Security Mode - " + identity.getString("mode"));
+                handleSecurityChange(tabId, identity);
             } else if (event.equals("Content:StateChange")) {
                 final int tabId = message.getInt("tabID");
                 final String uri = message.getString("uri");
@@ -1204,7 +1205,7 @@ abstract public class GeckoApp
             return;
 
         tab.setState("about:home".equals(uri) ? Tab.STATE_SUCCESS : Tab.STATE_LOADING);
-        tab.updateSecurityMode("unknown");
+        tab.updateIdentityData(null);
         if (Tabs.getInstance().isSelectedTab(tab))
             getLayerController().getView().getRenderer().resetCheckerboard();
         mMainHandler.post(new Runnable() {
@@ -1665,6 +1666,7 @@ abstract public class GeckoApp
         mPluginContainer = (AbsoluteLayout) findViewById(R.id.plugin_container);
 
         mDoorHangerPopup = new DoorHangerPopup(this);
+        mSiteIdentityPopup = new SiteIdentityPopup(this);
         mFormAssistPopup = (FormAssistPopup) findViewById(R.id.form_assist_popup);
 
         Log.w(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - UI almost up");
@@ -1955,6 +1957,9 @@ abstract public class GeckoApp
         // Undo whatever we did in onPause.
         super.onResume();
 
+        if (mSiteIdentityPopup != null)
+            mSiteIdentityPopup.dismiss();
+
         int newOrientation = getResources().getConfiguration().orientation;
 
         if (mOrientation != newOrientation) {
@@ -2081,6 +2086,8 @@ abstract public class GeckoApp
             mOrientation = newConfig.orientation;
             if (mFormAssistPopup != null)
                 mFormAssistPopup.hide();
+            if (mSiteIdentityPopup != null)
+                mSiteIdentityPopup.dismiss();
             refreshActionBar();
         }
     }
@@ -2551,6 +2558,11 @@ abstract public class GeckoApp
             return;
         }
 
+        if (mSiteIdentityPopup.isShowing()) {
+            mSiteIdentityPopup.dismiss();
+            return;
+        }
+
         if (mDOMFullScreen) {
             GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("FullScreen:Exit", null));
             return;
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index dd764a517e7..24b32ddd1be 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -110,6 +110,7 @@ FENNEC_JAVA_FILES = \
   sqlite/SQLiteBridgeException.java \
   RemoteTabs.java \
   SetupScreen.java \
+  SiteIdentityPopup.java \
   SurfaceBits.java \
   Tab.java \
   Tabs.java \
@@ -272,6 +273,7 @@ RES_LAYOUT = \
   res/layout/notification_progress_text.xml \
   res/layout/site_setting_title.xml \
   res/layout/setup_screen.xml \
+  res/layout/site_identity_popup.xml \
   res/layout/remote_tabs.xml \
   res/layout/remote_tabs_child.xml \
   res/layout/remote_tabs_group.xml \
@@ -366,6 +368,8 @@ RES_DRAWABLE_BASE = \
   res/drawable/doorhanger_bg.9.png \
   res/drawable/doorhanger_shadow_bg.9.png \
   res/drawable/doorhanger_popup_bg.9.png \
+  res/drawable/larry_blue.png \
+  res/drawable/larry_green.png \
   res/drawable/site_security_identified.png \
   res/drawable/site_security_verified.png \
   res/drawable/urlbar_stop.png \
@@ -423,6 +427,8 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/doorhanger_bg.9.png \
   res/drawable-hdpi/doorhanger_shadow_bg.9.png \
   res/drawable-hdpi/doorhanger_popup_bg.9.png \
+  res/drawable-hdpi/larry_blue.png \
+  res/drawable-hdpi/larry_green.png \
   res/drawable-hdpi/site_security_identified.png \
   res/drawable-hdpi/site_security_verified.png \
   res/drawable-hdpi/urlbar_stop.png \
@@ -492,6 +498,8 @@ RES_DRAWABLE_XHDPI_V11 = \
   res/drawable-xhdpi-v11/doorhanger_shadow_bg.9.png \
   res/drawable-xhdpi-v11/doorhanger_popup_bg.9.png \
   res/drawable-xhdpi-v11/urlbar_stop.png \
+  res/drawable-xhdpi-v11/larry_blue.png \
+  res/drawable-xhdpi-v11/larry_green.png \
   res/drawable-xhdpi-v11/site_security_identified.png \
   res/drawable-xhdpi-v11/site_security_verified.png \
   res/drawable-xhdpi-v11/tabs_button_tail.9.png \
diff --git a/mobile/android/base/SiteIdentityPopup.java b/mobile/android/base/SiteIdentityPopup.java
new file mode 100644
index 00000000000..5255f263977
--- /dev/null
+++ b/mobile/android/base/SiteIdentityPopup.java
@@ -0,0 +1,142 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.drawable.BitmapDrawable;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.PopupWindow;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.RelativeLayout.LayoutParams;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.json.JSONObject;
+import org.json.JSONException;
+
+public class SiteIdentityPopup extends PopupWindow {
+    private static final String LOGTAG = "GeckoSiteIdentityPopup";
+
+    public static final String UNKNOWN = "unknown";
+    public static final String VERIFIED = "verified";
+    public static final String IDENTIFIED = "identified";
+
+    private Context mContext;
+    private Resources mResources;
+    private boolean mInflated;
+
+    private TextView mHost;
+    private TextView mOwner;
+    private TextView mSupplemental;
+    private TextView mVerifier;
+    private TextView mEncrypted;
+
+    private ImageView mLarry;
+    private ImageView mArrow;
+
+    public SiteIdentityPopup(Context aContext) {
+        super(aContext);
+        mContext = aContext;
+        mResources = aContext.getResources();
+        mInflated = false;
+   }
+
+    private void init() {
+        setBackgroundDrawable(new BitmapDrawable());
+        setOutsideTouchable(true);
+        setWindowLayoutMode(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
+
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        RelativeLayout layout = (RelativeLayout) inflater.inflate(R.layout.site_identity_popup, null);
+        setContentView(layout);
+
+        mHost = (TextView) layout.findViewById(R.id.host);
+        mOwner = (TextView) layout.findViewById(R.id.owner);
+        mSupplemental = (TextView) layout.findViewById(R.id.supplemental);
+        mVerifier = (TextView) layout.findViewById(R.id.verifier);
+        mEncrypted = (TextView) layout.findViewById(R.id.encrypted);
+
+        mLarry = (ImageView) layout.findViewById(R.id.larry);
+        mArrow = (ImageView) layout.findViewById(R.id.arrow);
+
+        mInflated = true;
+    }
+
+    public void show(int leftMargin) {
+        JSONObject identityData = Tabs.getInstance().getSelectedTab().getIdentityData();
+        if (identityData == null) {
+            Log.e(LOGTAG, "Tab has no identity data");
+            return;
+        }
+
+        String mode;
+        try {
+            mode = identityData.getString("mode");
+        } catch (JSONException e) {
+            Log.e(LOGTAG, "Exception trying to get identity mode: " + e);
+            return;
+        }
+
+        if (!mode.equals(VERIFIED) && !mode.equals(IDENTIFIED)) {
+            Log.e(LOGTAG, "Can't show site identity popup in non-identified state");
+            return;
+        }
+
+        if (!mInflated)
+            init();
+
+        try {
+            String host = identityData.getString("host");
+            mHost.setText(host);
+
+            String owner = identityData.getString("owner");
+            mOwner.setText(owner);
+
+            String verifier = identityData.getString("verifier");
+            mVerifier.setText(verifier);
+
+            String encrypted = identityData.getString("encrypted");
+            mEncrypted.setText(encrypted);
+        } catch (JSONException e) {
+            Log.e(LOGTAG, "Exception trying to get identity data: " + e);
+            return;
+        }
+
+        try {
+            String supplemental = identityData.getString("supplemental");
+            mSupplemental.setText(supplemental);
+            mSupplemental.setVisibility(View.VISIBLE);
+        } catch (JSONException e) {
+            mSupplemental.setVisibility(View.INVISIBLE);
+        }
+
+        if (mode.equals(VERIFIED)) {
+            // Use a blue theme for SSL
+            mLarry.setImageResource(R.drawable.larry_blue);
+            mHost.setTextColor(mResources.getColor(R.color.identity_verified));
+            mOwner.setTextColor(mResources.getColor(R.color.identity_verified));
+            mSupplemental.setTextColor(mResources.getColor(R.color.identity_verified));
+        } else {
+            // Use a green theme for EV
+            mLarry.setImageResource(R.drawable.larry_green);
+            mHost.setTextColor(mResources.getColor(R.color.identity_identified));
+            mOwner.setTextColor(mResources.getColor(R.color.identity_identified));
+            mSupplemental.setTextColor(mResources.getColor(R.color.identity_identified));
+        }
+
+        // Position the mArrow according to lock position
+        LayoutParams layoutParams = (LayoutParams) mArrow.getLayoutParams();
+        LayoutParams newLayoutParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+        newLayoutParams.setMargins(leftMargin, layoutParams.topMargin, 0, 0);
+        mArrow.setLayoutParams(newLayoutParams);
+
+        // This will place the popup at the correct vertical position
+        showAsDropDown(GeckoApp.mBrowserToolbar.mSiteSecurity);
+    }
+}
diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java
index 58bd868f6c2..861c01ba2f2 100644
--- a/mobile/android/base/Tab.java
+++ b/mobile/android/base/Tab.java
@@ -77,7 +77,7 @@ public final class Tab {
     private String mTitle;
     private Drawable mFavicon;
     private String mFaviconUrl;
-    private String mSecurityMode;
+    private JSONObject mIdentityData;
     private Drawable mThumbnail;
     private List<HistoryEntry> mHistory;
     private int mHistoryIndex;
@@ -119,7 +119,7 @@ public final class Tab {
         mTitle = title;
         mFavicon = null;
         mFaviconUrl = null;
-        mSecurityMode = "unknown";
+        mIdentityData = null;
         mThumbnail = null;
         mHistory = new ArrayList<HistoryEntry>();
         mHistoryIndex = -1;
@@ -270,7 +270,16 @@ public final class Tab {
     }
 
     public String getSecurityMode() {
-        return mSecurityMode;
+        try {
+            return mIdentityData.getString("mode");
+        } catch (Exception e) {
+            // If mIdentityData is null, or we get a JSONException
+            return SiteIdentityPopup.UNKNOWN;
+        }
+    }
+
+    public JSONObject getIdentityData() {
+        return mIdentityData;
     }
 
     public boolean isBookmark() {
@@ -368,8 +377,9 @@ public final class Tab {
         Log.i(LOGTAG, "Updated favicon URL for tab with id: " + mId);
     }
 
-    public void updateSecurityMode(String mode) {
-        mSecurityMode = mode;
+
+    public void updateIdentityData(JSONObject identityData) {
+        mIdentityData = identityData;
     }
 
     private void updateBookmark() {
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 7205aab9ba5..4975c917193 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -126,3 +126,18 @@
 <!ENTITY filepicker_audio_title "Choose or record a sound">
 <!ENTITY filepicker_image_title "Choose or take a picture">
 <!ENTITY filepicker_video_title "Choose or record a video">
+
+<!-- Site identity popup -->
+<!ENTITY identity_connected_to "You are connected to">
+<!-- Localization note (identity_run_by) : This string appears between a
+domain name (above) and an organization name (below). E.g.
+
+example.com
+which is run by
+Example Enterprises, Inc.
+
+The layout of the identity dialog prevents combining this into a single string with
+substitution variables.  If it is difficult to translate the sense of the string
+with that structure, consider a translation which ignores the preceding domain and
+just addresses the organization to follow, e.g. "This site is run by " -->
+<!ENTITY identity_run_by "which is run by">
diff --git a/mobile/android/base/resources/drawable-hdpi/larry_blue.png b/mobile/android/base/resources/drawable-hdpi/larry_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..4007364d42574e6db465b730f0dde1b9a51513e5
GIT binary patch
literal 5189
zcmV-L6uRq)P)<h;3K|Lk000e1NJLTq002$^002}71^@s6Eaw5>0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU_=Sf6CRCwC$TnThl<+V;?5;RbV0VIKd
zAqh$D6z+XskT67zkc1?J$WStp04^#Lsi*;mB9n*+3wsA{!Vp3d85Nn7()RiAy*`IN
zA6Bgk0kO1L8EOGTWWAzmo%ip1{++wefBzGPoLIu@U2Cs<?iv5P|2=+t|0gKuU!Pm*
z6Oz65R9bP}sqE>SPv!tsY&w}!y76RAW&O#V@=Yqi{%L$aZsUGRa19=VbIa<~{jfc0
z!`E5tdAHpvjEk@=I`TqJqoS1UV)VMARKB4o(|0RM`7ZSvsPuLJHXJYGzo(INU>mRX
zUGtivRJ`H8CjV7MVb6=YRT%dZMx!iCkAL}ZHHrdccB|im*Q(n#kNO)Zm2X=;D&c;5
z9qh+#ypP?>_PKnFOTJYY7skjG-gDqH_FuMKu@T0kIJL}@5ikY5fid(q-h-YC_h!$s
z-%55ag3*XRS@T~5W;r+$kZ~wY7PnuLOfK~}ND(rHN+x9>{cRNEx)n1!Fy~E0nR`Gb
zy8Xz0MXBPytH^#z)3;yPkv?xnG`m-DJH`Rm_G0wVpz8Pk1k6cxs*(nb0m(7B{OXCS
z2aHH|%GFh-zD6=GF~uoY0lHsQ6_f~|v6~eocjLwX;ZoC{Pbi~7;k^>7lUB7{0p@^&
z0fUf<z&s$>2ggy0Qn|F@Z(z14aY#ln&W<<48BBTc^yS_ev)}14wD`^LLreBYrIqZz
zGfnuur})h~N6$WFdhQSB;F^2aD@t6&<~#^33{ctOQRy=q^;8Ze2PYPon@aY<`3|rA
zT0<FU=CkM<1p9uFNl^Cs^B0l}f3cJu&t;S?p&UlVy++P#!rAX%w6==v>(b8gfXen{
zl-GB{@&f}(*MHi#X#J<~4b-p1zumXkza2x)LF!);xG#RzYj3lAn+=mVs+L1*Rpu2j
z+xO7g;~pOObQ1_dh}b^k7B0bAkDavoNw%-60b_yywI8D~jLH~Q7)UVb(S|Ti6le5O
zqw5qUj|GesJ1-v@x9n|;#Q1mX_t45}ybiWGQ;qoCp1=C=jA<K=tu0@7q^7j?NDX|8
z+ek$<jJ)bG*w*YPzYA+lI*l5m9i#=_I(jiw-C^q#Wn2@Bz;}Lssif}ILLPIqGA^dD
zLl_s5zTiM6WDP&vsVI}StCZX1-$t6SMNuYhQ<TE3>Tmdled09*eBYP`pN%s{;=tH~
z*Ajz8U!?6;RX2TuqD<bQC?!pQ|83fw#uzSrKE|Q<Gl+4)$rBgF6>hoG0_Fk@JWMD?
z{x~+Phd4B+HeQ4OLp?8^$1?}xY#iJeAC7}FlVB5$4`<BFXERsWaOr4jg)<iHTnDIX
z*Mj=yW01Gfz?Pa5^q_FuBE)E*DGqPo|G@udH869q+dO{8rFyif3yt4k0HC@c2}57_
z+zZ~X&xDoLICujX*CpHY*F6vy!gHuZVGM`kL1t1(v+)#-Y7WgTj1NcL{uxCvM`k#@
z{(+!ML(FD->93!$YvX}gIK%B^T&U^UkE+FpADIKsr5Zq)fnyf~c`A)mVhv*)Is!UV
z7PmZrL<z7i`|>!u)&|T%hjQ11b}_DNO#YJc-WiY9L=7w5;|sEfPCb~o@c6eVO%``x
z5Db%sW3qb#b5s0p_zmY9s;V@Vq7o>IJnm0e_{9mh78r-#xKH~ScL$_@j50`&T^j$$
z-v1SIPtkl}zUttq8RoWBGO17)#yC;bVRn$2m_XYEkDI($WgIZeAm<RmvyQGL$R2d}
z^esNLgg&2oR#9~^<<d*~&5J+(GiZvTxvK8N$lze+V8$&={St?&-PhOv7(P9Fq~_12
zDoB}vIVn!A#s<38vDyeQ0OKDpt$r`NZ$gJLP7eubwSk;*(JYQbZwE1*!Hl~dkYV$p
zBd5gYCp!bjMI|%EDNH^fD$eizaeIt;I)|@}QB}mhOfIe3>OoG4i?k94*Y-1B;vmRQ
zjLN85OTD}Zdr@%Hx9tkFiNMhQ)3^Q?yI-0CK!nOTnl&KvX#6B&T+(8{#NoaUkU04C
z07ns5+3<mA<HUM`-5Z$wAek0^dK#P!qnLIAu7Tl5TVx@g7E-Xm%T>mu6s@ezs8a{r
z0TPEu$pA*>iF1E_ES1D$vT@TQ4W?X{WhX9#^^AX--2;G%aH9rhr@^L(lE8iu6odd6
z@Ve~PpX{30(EK+*QDFZa1BMnDfC9@t;k+_6GbV4*A<LSUE7mq@3sjB!mu~o&UH1f|
zp+=9bHRZxVpkc)U0psZGVmt?u*XqTX0q6E3w1bK{U3i=~IrPr{s~ITyNy4(zmt{83
zw(|7lxEb4yM#SB-o}E99k(Gxz!A1_qlJw+%ek_*bWU8vkAXphM@tKd$0>w^w<-IPw
z6CY>yiZgm}lA6R_e1gguEewn7SHrT5eH_-`7cpQ+J=?#C5qQs091sofh{3>(%VYAM
ze@B!muqQa94zFJVK|<ped~$|e_X4AzgA{Q45fRk!pI|P1eHf)M8pbG-XBvPQr}MGI
z@bPrmM4}2z?PkesvaLMxoy>NiO+oa;viRspcFp}<%6jqp1PA@NpI|P95!@+7aOwKd
z#u3VAC@VZ_zzV2bnO#~8i$Xa*gm{V1t0o%ZH7gsw&MK-omOFFX-&a1o_3SF7iYC6j
z<?O0yjVeulRsDv2t><j<UsKuS-;d|PcG2dutMWIVe@UXY!DC<guvcZ{*I8xtr_yeu
zN(UE2GP;-1ynzqzI3n6PO>*5n#s#N8z9V|p&Wqb0+51B?G{a0~5P8u~EhJ7MaDc>t
z04C2Dj?v?=J)R$XXq#Fyf!{-zmc%dks4gh5;U=PZOY;XaSW^zr?0r8p!{m&fzo*aj
zNNz9}ckn_p?s{PEufPe2NP{mnT6)8b3&~#o-=n8)|DhTF=!gy6JG->zp|!Bg3(`1g
z==Bjd)GIoR6V8+ST!C@n8LN+bU?L#If^k4h3U!L2EiIorDt#z-@b%igfzXc7-IiZ(
zTKvVu6sNye!|J(V#)V`q`j7jjZ2SHa6ir~DVrP;Jd6s4ZE^Yc{^=R)wCmSX|tmnXI
zg#h@rw5Q*m0+R=5GmRYJcP^9Eto0W@yb*^N$~{+Rc+}m?lAikAS2R{in7!v$oVnL5
z&1rMDI>tAuOiNv>_0}TlA<GI<1!zg^89`~J5(;)XGJR$f_qND{;G}{D@dZs+T1M58
z_>Wuz5(p)NlsS7!gRatu7+SXJ)SQQR{o^ZWx`76ps{KDSmu@)W?vZdWRPC$!Onl`%
z25<i@dH(x<>Y}0ycU=eLell+3x5s_;iduDcQG&4|Mbjt@!ZC$Hrljh`npTfCErf4h
z*i_l@d-m*n-W`By7m?}x=J5UXTB#TN@E{|yE;;sVUVN9UX2FJYuY-XG9fvjuxZyCy
z^@+^LmTzl57MD4zfX8c(@!->P9VkPWv96PiV5m_oT7gJX$&x|ecuYir@i>)KR9*b@
ziO>2H`wE`xqSS<sS>v~BBIHgb9qez)OXvOq9ShQMV8~Mkin1Hk6U8D3{L%Y2Daw?s
z-(SjE^6zsv2-x>Jg3Hi*pMQ5&0kb9d)M{-BA{t^=B4TM&$}H|c&{9TV*TQ=R+O?6-
zsdf#di9Q#fX>w_89SBg6P6ucAVK4vrT@YKn7B9GX<VIGI2DiWNt2Nh=!UQMgKb4TP
z`AW+J^?|^n$>om=sf0PM0%=kBi2ivhInWHGXV)_81EpHLAAa)=&Q#f-yL*V||1PJk
z3vBrm!-C;lb&FXwf5hCzYr(Z5#?*XsICC?xC9XhdUX(bhemH@m^ALeeth@RE)pEIA
z%c}k6a8`o=PPn!86_Jr`RmDt+E6!iQs<^1Cq7+~?e{$ocqq!?T7}Z9k9bijD=vxLz
z(n-U3%`8Y2WtQ2ct^X!Jr*GH59NkkB2%RN61G_e_rGTB1^yKe8a(K0Wgf`zeh#f+A
zKZZ%sR2Glrz4BRw1WNMR5@?M_tWGu=X1BKNXjyWsS<hVHm_+7kx(;4G+rr|tXJmE_
z;<8a2{r}OzO9kRH99}=vel^DR>zXoVJ{VJ3|11?*TJ-{P2U`K%L`8KPyXUhdxeZrZ
zz}bi%Po{=2IkA;nj{(MpzY)C^8>01!NWhRtdtnVv8C&hzpz-Qh(1zQ+ZQn~QZo?S#
z7zYnY?=iSw9rWFztq}h#2C8NOdIE`>z`Ru1mT!Nb@wm_Kb<N-K&0%PovAX4rGE@zH
z!S2#8&$H{EWBKtRlzhq*$~alr0{dd8y5Hf@Ql!SNtv&q?s3@%+Q>l}MGYH(G8tX9*
zTSv#-5jV`uP>+jZ`a)F%22Irj9so8B)Us^*<<pbboqQA2c(BJ0z3ataK8T7*dPKs=
z73}$A6X(3OPu86zlP-EJ;mLO)4=v%?BHG-r`(OTSc^=C<)7AxsL8AJjbkmXn3Q${>
z{}9f+jIf?@ixaC3oM`2`J8*XKPhd9@N@H5BDuJM)b_t}7bx$}Ki^V-h%y^ZzJq${G
z?BH$;ibbhHdn@*kfL-g-JE59`n%MLhGVF;r#)725q|$n;9x!0{YWHKg^jcabK=QgX
z8p3FH?Bq4?n{}#Rh}Bu#@?)Zb$Ko;0BqAO>9U9Mp(3k;_9^8#KPE6t*-oVB|*zP{K
z(92QaR=buwdD-3L>%TjLjfr~B2CMvNHmnkp(3Xu8nFq};Ng(=n4lCaUszh78G%H>7
z80*${5y_l`=@$WELv-AngS%-}O%~YF?fyD;EvM$pp=@Gf#R+zhZcf=T3OuA<XCq=5
z&(HG0SVf6JNEc;|H*KL8VtW;}FHqi-z&z0d=cp1#od=EJF_HHf?P|GQ8}Z_2%d;B&
z0XKDavQ;>;|3#gK$#wnRO}BBoH<D2`*ge^UaNQL}C9na}E=jRqUsNE><6|7yIC>Af
zr-euN7^Ek?sBhPDnpB`7l>h@WG=+9L$p8bYRX5TW7R>9BgBi{0J#Nt<iU`x?KeAaw
zM?$M*IxvrhaiX2ExU~|?;<W&~W}2efH3)KP$RbLU$rYH!*@Qfm{+|?Q`}*my5;moW
zEw90{;>>sA?1;dl7}@*W`$B0tB$YU^l?!{6`%RJCwfkIW4uQ1M#%Y_U?XD}@?~GA|
zU2;x)8xgS*HkMVwUQB%E59ds-KwE~AMtj!UfO#~Gi?31{M<s&7=+HYNvul|wUh@@X
zYPA!HAy0}^o)crgADx(FXJFs35gnYGN?4qv5+=HSoaIQlT?>#nS&|JZ#Cnd;GrRT#
z_xKvSHi2V(v@Kt}9``3Z<v1VhdJ;1mqgr33l`u1rJZjUfV%Gu~m*Na8;K2QR*eAMq
z<IEj6judX!04t>Fk{E)Z^iT*%221Gyqd^9*sHT;$O}<)$Q)|?L32e3AA34-M;3`Fr
zRvSkbe!x9p6(KwRplH_~aGyB@K!eRKFYd^C{E&gjL{YU{D`VX2-l$i-)=C((Ld=Uy
zE87hS2P}t#_NpGX+$PSnLDzs9`xr+Xw_)J%kNxH-I3;dhTkYDY6{=lxc(rPUQr`-g
zy5zw#&4;OqS|k8#PzSBy58+jyB;NE=%suB+M)z?^yOyF(G^AW+0;hvr3-6sck24-I
zzmT+fs$I(<r9BEh&{a3Mj$hWtjMX!gFl0C`UpIOwdRqZAG`{o>Qdj5o;<oTwdofy7
z)mIW^*+rxy(5?-d<j+I(*52zi9GYEPSj!}lO3abzzMz}@tr404SkJCydDVE$<_^RM
z#dTeJ-Bz-;SDK}m-P%~R(=cvemDH|<rZ4$$0pNZ^YW>i+Uj9ti-#WZnriv&C-Urbe
ztFXZCrf1xsxxabCwCpeEWOi+M_5KH;%y{1>E!Zf_FJ&GU)z7MvP0%of7RfsU<NCzS
zersdT;nNn2b}fnFYvVRv`~rGTD5ETHIm{)ddt!)^ELp=LI~ViXo1Jly985?R?Aq<-
zr6*q1>n^7u2!<6@YRqjcML-*esI%B&cC}*7&GHH3VU6gC0hJ!j=qX048LcsZJn$+F
zS!aMKiJd{>+R9L3I5=Q8h#rXl*{<J;&V<&FX$lu~i@n6EU5*Ir8!{(?_@A|tIENpd
zadc%kRaMMFI!ie6qcU#9(+78ts`Gniv7AYB*PESj;p1x0u9~?=?FNOe(8u2LziJJ(
zf3{aqX6@y#XWQpL_9%Hx8|?Re@7JD#+i>nIwq3YQtpSSxG}b#DorrN!$@AZ95`$O_
za;eP`i!8E$Hr1maAj|rP^;S@J2F7V}Rcv3C_0fr`meu1=;BA7v!i>S9b1&NZV9`O4
zI|bv!24-2Ih4#qF&a(?>FvaIY2}CELSC{A%jH3l<@wGl!w4sF@`sxf(g+-*Ktpc=O
zOYDtQ^8e|os)4#)fe;beDX|GhhRe08zDs{uDSf|`m2@z5h5*<XTTyT35ZbZC7cC$p
zq}NJDOMrU0u36F^k?Qe#*3OWtMq`_o#Vv0r6yKvn`*uyPK$L?rUYrQAsj#iitec*3
z35;>HsakC95?9}d9pZY@WY=j*)GTb)SvO(sY~hHkY$v|`!Rl!nGQ$2gvs>O#MXUC-
zGn2k!s?&rcw7~|uo<ucDc3yp{C2bLtc~qN6-aAL7xwANj-ZA-$pJ$6ZKEPMg!Z*IM
z7G6#3tJjvOue8Ni)y9?tzS0(7c^h2>^<Doqo)^on$Ma)_*WS|C=NkF?+m8Bl<1;%c
z$k^A{wwDZh{cT5m#JcRwLa?GbJm_Da8~gk}<ayF^Ti(Tj00000NkvXXu0mjfrkW^)

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-hdpi/larry_green.png b/mobile/android/base/resources/drawable-hdpi/larry_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..886aebd5f7409267882e03765e1c95e66484f6b8
GIT binary patch
literal 5193
zcmV-P6t?S$P)<h;3K|Lk000e1NJLTq002$^002}71^@s6Eaw5>0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU_>q$gGRCwC$TzgbkRrUumol!Ga*@))o
zjAmIn<ut!3Gfe|UO?+fc<pc9oD)4=Qq9`J75D|5fAh9%`Q<DgRe7`&t5EN9DUn=qv
zOJ~-ardey6F=y8L`Oo)v_PyuayYIQ@egV0((A8aQulv6D+<o@hkI&xsczOM_+&7C)
zPUYGcj#tM`FRV_PQCPi2qJlGtGt~W*83olz$~mCpWFM}{Ka-%j2lint->+Vu59ew&
zO(XAn;C^9T@4d&DC!T7Fb=O?qMkw8V{+kapbncr!y3dm1>>OL4{d&7{4%X}#zL)L8
zvrk`3c9Zu#a=$R{Awm;BbuGJIRBv?`U$whk^`Y*Pt6>tsF}z=V)h4Z7S3;z<^GYx|
zZ;|%l-lBRNy4J32Ga~PL>V9F|gM^;;9rEyo{0o*l5>p5xfI-Dq9ST!CF#{80JTO$+
zM)x|&HhI_B`$^CBCiL>#D}Mh4W)3jTi9VbWmOvMGo=GH=R?KL4o>`3Rd-__6`{K=y
zDD8IF-OQG@FWk(Mw(D;0LF+y43pX;|wS-_Bt}DNs{(0gDLB8Z!-koR%+&h5Kybt~~
z|7*+$HuU6SXcbDHND8$>)}}DqEXF+nFVGGJhhYy(*OF~mv)-(1iFdo|qR&&Q>CDoD
z(8$5R>>rU=yZR1h0M8iKUe*p?A2O!Fb(n!>GHxt;A$#zV@}>WsHUHTPzraz){R5va
z0P+ibiqNQnR|B79`^RU`f3EzaV?p1+JtrF1y4R-!27+s0!jOGw#+$!601RLZll7fV
z8n(P~z-?z8EZ=L>4QtaGhpD1@v%BbG%=b$}{o~2`nS`bbXa=DL<O2_~`>fIa7ILgt
zC))!<_EAEC%j^@J_E`VRVR2J0+hhHtHQUC=*)~rO?mk=W<jb3O%sfe+{fsG$W4+3H
zuJq~}!n|n7@5w3OoI(Abz8rxIF=SEjxH#xp7!L18OjtvX^)aDM;GjNEXeyx~LQ6~}
z=yYFG8OMeKW8jH~b?!5*TimA`w>M-Sv5pof|Gw|7c_o6~58ITfW-LG3pC7(Fr#$w<
zV`T|hjE<JYkac`kPFXD7CdW>0)@-wD<!fTmy|Gz&mC=7RtBqr|rrRMgPgbzNKnIb&
z7<W~3$`8k@<D;q1rC}ViYAeFWo5eVv^u5dct6R5{j!Tt0uQgd(OWW6ylx?7@Yl%`s
zV0=D7Id-x!(ruc==`EF&T2G5CiDbLHDau_<KBDAeLTOC;f<aXJB*ro2Ym&ryFSkwo
z)v2bW+b5eMb&jnja*zyw16fzO&1}T5bG$`1O~+{)<)9YKt`K`63|%lBrI%ux9MQ9e
zfSv;>W9Lm`T%VFlG0mr1Vk8DI@1M1iMH2dG!6pdJ?3#0IZK_pOq>F|*tk?LM@kGN~
zH%P*#h3{p8^<zWTB*yj1I}@2#)si5+hxaRii7afwOk?}ZLB?(ji(j$vGu<8GJ#*|x
zsy%Ke9~I&LQ~Anza_{gJ;S(a@gMd28xE>it--*EC5)0mWU(JY^k0$~IFtbf}fLYIo
zVnZz&5#ruoysU-X`x{^u8&aKQT%VxO7Z%T6FgDA7*3)^Cv;EprMf+Uu{u{@c+K|f1
zg<Up5#A8t+4|Z*rIKVQh5aKp!ETd1H3tQn{#yAs(>dztkBQyy)*^6R!&Ah;*p1nsl
zURK>uX2wEhl1&(4z%`~bPPIlh9pb>#zM`cP<G?tuo`+%E3C8)*sG|>ZvPW*%`q~$I
zL*PKF#HwMWY9uU5oQfrJPr<?)Fj7omoE|i^Ae~{?=n1BH_c|9*#!XO+!}9Q#%yfWZ
zd34;X!-M%@hcP#yN<r}|e{OBk^e@SCN0<~j*mSysAEMZBfIi#nTC5CJlid+b^Z>~4
zo`RsiV4n@^G`TY^I$g|MD&~{II{#wm{|z1S$TA9Fb)Ip&k`?t9b}-?bI#gdqI&Pxb
zi~}e8iMb1Z`=J`igb588Fw2Qt4-rlmxpi74dEN^q01<izSoA_!PdGHk_PLfQI*$2$
zoz!tg%fnzOB9a5n@)3b(C}Q^spU=)){5LQ*ga&mIa5c87OxZFM&Kke~06<R;maLW-
zw<=<4L|M~D>3A1N979Tm5?Y+H=Z$8*gV`wHJC+SmIJUoN`S*i<`EVq81^^X3&1%?K
ztZ<zOG3Ak0H7+FA)kb}P*tIT)gh&4<C0;%-_sP)%=a_&3i<X`=GqoZp<fU?!&{6Xe
zp@!B!EI!~Xa$h*1|1rC5V_AgYqE?f4CV8b?dNte)%ql`w?vsKgf1&!LM;9e?dQm^`
z50Cjiw9OGW<<en-RI~QE5Hbu1_Qq{9o1Plun@z5Nm(UpM=6IXgpwa0E-u?<R%TxM|
z4d2|_m3Ihi{`ah73;!M*Ik|f9(EbkctY4YkI6+S07qo*G6N(-%ux}QD^YbahpFeW+
zz<uO+3?Z<d6Dc6tvnv_{4_+J;GOhxPz8duF6)|k@&RzU1xi68B9i)KjkKSHgzj#yW
z8%Ssrp%)4H(?|ml<MFgDgJ^rYtRvYFc<04QzdrbR<*NT+7{@4gxwmlXH{_mIsgw<%
z&++#9aTjkYg}td!>P@BVM{7q9+C$TRG3cR`%$x<^X@{;uH+)I(-AWnWX{%XuK4n^7
zMZ(PTOFL6f)NM~YQMWBkUK>+M-Bx;CI^C9!7hg=3)}{0rrFCi2`J&o{G}ndbErMa|
z{Yjo>K+*ZsX|A)WFWgO*4sPgAXdI!iP1^$-m}`Oqe-?I8KkjZB=bfCf#JA!~`e)~_
ze|W3*#x7DAv%_6|Jxv37pKeXjYy(8Dfy3!}*ydq#2BpI}NIU_)mz5LriI=|Mrgzzu
zl(V%rGNeTNx$C=bm0nCsOWnO>U`Hg^n~FPFq2;d!J?~<spQlfYmfbDme6qi=yi#*5
z{T6%_V0$=7S9PmhL4ZZTrR;RuP@>$b3mH|1+3x<hAm|27bz;W#JX~VUkkX;V#R6{u
zd{SU|Mg7*su+4LZbadE*zWOzkBak3_A7RqJv{1C2g<KtFoX@VqD<@YqZ}|Zl2o1%^
zF4LvhwGdl&hX%0ZGxh9w>^yWnDd^eAIlvEmaB#(2AeoR7P=Nu9l%Rr=v%(9JwRdCi
zdQi*dKX7orglz}r{S~_;aT#-5l)3Ge=D3{;ep^YhWm4XPFpa4Io=LJ*57nU{e7S=j
zn9vvEz<S1;V-8Yl%b4K3Xyq%z%NyfvLlQ~_aD!2PC4y8ZtaB%1ys^lujY7m8B>fk9
zt~K+oFxH`%ruKT~t-Q*(U8Bbifvmk{)%uCmL{I!<=aIL*9ya39Wz?r?@A6Rb|88zM
zMN*BxG%euh(8Zc^l17`D!MOx>trKBxa_FTEyVj*lKS$m@i&h7)Vb{Ch{DzC5`%08(
z$jU`WR+36wN5Zw0#WeXY9-7YD%|~m9axQD!D8-`iaVHwrOA5K7KCOA~{1@j?f6Ypr
z&(R$~8G0S9h&WJ5#2+VNL|H1CS)s~WGlT{DOp8`)8A}8EB{bG$Qq%LZ6X6+EEs5ls
za7|pxBh4qt_a8kSauX^RgziA<o(1zkWZ^>9;gx&3v>{BYMmlqC+Yh@Atq!Fi;NT88
zmpw8+U%s;HT0E6ByG9qO87P~=1b#U3u_zDiW4DPNm-Sjdp<V-FC~a7y8PcM(BXlyf
z*~_4Uv)^ZBp=ZjPHVBf^RwXvAXo{AsO<_&^_6~$F-t$*X7;&;8n&^^EhKV5j;Z9wV
zpxrPDqv$qjWwCA)>$Qo)PhQ=08w7+|Y~H!YRvl%<o)vxEu!6ea|1w4y^)4KT7giD%
zqNFYfXY)OlY!%i<T?7lITF?+>NQ%m{_;-uy_HaEPuH0nT8R<3Fmg0JwF1f=OEaJqF
zQF7<$oSN0&vxZ?bm}SmY$UH<c-Jl=J>r<Qd=7vr5;A!_f0zMMS$b*Fv0gaepo^l9y
zNE;=h+tO=CN*$73Q~gF&HMo@AibF9lxGhGE8@1!$J9VCVo*z~~P@+)PlKR7u;&n>|
zP?F*!l{Ic?v)EaQf1OKji5SC119lg%6w2p9+<&fGbsGw>MSAU2bF9=Bk?W!bK5e?{
z1tZ2i{`~l1>i{NdPh~gLH!$>|^5+Z*dkSk3u-@}tNOVa>W5R7P=W62Erc{E9q%U&o
z^kz~Zc*%*Zr?_<0s-QPmrvbe@<%ujBGAep4Xw@XrmiXJCqmA+^s^r>qo#OIPr4BC{
zKi+S|?qlcQzr*KOi|TC#mMvI12E7PYs{G2<bFtflK=1W&Uf4`@2?=AaglcpT)|Xh9
z94KD?PjX*W)b^R>MjzK!p4SrPS3#kr{#dVlS-rjjq|K-TT~zA9rx%SF$4W=1j(T>`
zE*4&?COXs*&}57Ny;0c`=RS3H%ir><VvaLif*Z#CH2yi@HjH_Ga0+>UKz!D${I>sL
zaOn1T9-a?z=t7DuGM)S2{=$$X+4YFfR4jQ?L;Ub<t7O85GH=qr$NR-5?w;F<$GwqK
z#_j+(lVCVN0>S$72^DOq*bso@Gu{|;h?YH!Ow690>rw)Et4`1H9|ZJy)%&-hN}Yn5
ztmx4vIdf3}6huNyEOKSAg%&Z3sT62;TO|`9dHo3ej!^LG^^<Ev327XX;7V{K-N-7L
z_y8QPqi(}&3WN?y$$lf(6J#%nG>Bfyq$seW*WM2c7*_mM)VENMW|Y;}XUnWyo<$u|
z?Wr~Kro}H$g6L13^Gr@|?W#L`sg=k{RDx=x)3j2e)^Naaf!pBA7>B)i6$7+rN+94F
zMtUu;dTlwVjuPrn>-|ABs8?%GY`QXk_Wq6(={!i|vp~owf!<^PMDargXU`>r!TDCa
zae?!>#0Uvs9*J={9_3X69%?%dy(QFZhg|j~34Nh4G1jx~sV(7AlDjDjdw}Y_34|h&
zcF$|&l{3zY;o1(yK;9=}&gJwsNAuy3#5mA#_+v%k8S~eS^co<*px2yjSYab*N@UUR
zrYy{x<|CgYv~n>?2D4v<7!%Y2Wt&FKMb!bo(1?_2qHxFy4^_D%EIRjvN$`08;X1wc
zUf9%OC6_jTTSmYNzQ#|)7!~Zacr0t{Y|SvsguOLx^6>pfDwh7og`7s-K<E$*I-Cu{
zA%$_t*{|p7>sG89<7A}Q@@qCodJP~kZ8Tuj884>W_zuzmqa82~?a71%kW5%I`-ck$
z!$$rPG|m9N_TnWDTQgp-C1%fRHqvXA09z5ghVS=eopJIB7gK8CEm<hcsNmFO!ZxPQ
zXi$f!!!4>|V~v1+z65$r!??uVvvV03iT|?zg6M+iwQy?jHF~X*RH-w3jsHuit*C=H
zcA^4uvr1nznXtKwo>MYmBD4Ztye4^ykzUhD9AD!G`(IuNxic}~iCwgC=I7X7J8?Pg
zTe(`w#)Wkjjemx*Hy-s7{bq{QjF-uORO3w8UdTmgA#C|WqISG?g+lE^+emsSI*yMX
zmfBx(lJiqU{u&_HqQXe58$E?pe5@+tbB-=4wiac=pcEp^fA*+c@_XYY_zlt#=l9i%
zlZGFpOdHt_)YzAg9N;69_snSmqeS(qqSrnpaVYlJJfS)YI!uulb>ag)>Tw8j8eU!W
z55Eu10zFBKUKUWx`3|AURMOg$)FC=<RxWluB)vAYe;8#v!~A@bK3rhvuVG-q#X(de
z$uzvT9YCg;m6K5T@|c(WcisT13)@?ZL9MDhWWZmX7%<XMuYt7jVVHIXh!BlSAp&Zh
zN|Cji;8s!y$g+EN^I0Q&ld|XLvYuaRA1~BvU)DrQ{u+*#8KBAkio_q&x=;95b-U0&
znEmfpmoW}PE@*7Z$MZybt;e2YtJarG1vKm05kA>arGP`n3=uGE<iK}(#u0`cJACrJ
z??ienH9KfZSwoCevLI6CE*-jT6PBmp*&(zLyv5LQ?(U2mnE27_9|z2RCYIN0D;$2q
zTy;^`B)!&w;N6L)4B`WLCpY_znjW>78ms;oOMeO`Jj>~|pOJF=L-;2UQ4)uTyhKTD
z#u)6&iGK3q-_hL}_aJp^cuNeZ^ecqc652*+y9ty5(`jhJGOjKKhhARy=v+*_sF4^=
zKfny~i{3f2R0M2liX2TsNA9P^*C@ZC0cYv(|A}z|#%Yic9n@t1N#c0MZQHvfmqAhd
z@0xtMMR#Xh&-}9+(qOtqn0`&3f=!)vjo+51VUwq3!`JfDw#nD;rc<`bYj_8gtg%`W
zK5F2h_wLTPM|K{0`yfB{g{b_@=^_3!!qi0J7oI9oUv_3`cS5=wgj{oSJ(VLkQNGm(
zJ`!PZB8kFvF`|Fi@Nn(+i~}H(M}K)Vna|}iCa9s7Lo)+}exg#FKK#<mQ>UK=@g6`&
zUeCqV<1Wn%Ha0=Qja^ugsn7p9IEGn;h1V|8|NUKr0C$1J*_5;$t_INlz@dJqr<?(w
zEn{gxqvAx-v+oUb1SO<B<p@M`2H<22wu)@18kJP=(s*yeO0;&wC9F)h3k`+dfN1Mi
zl!>Yg>rjlL^?N1cQV?KIldyP_4AE>~d}S4$j9Hmv5TP#W-;%-imc$9C(nV!jd?_j~
ziOlmiDnvBG^Z37V?xmTkiE)^hD;l1n@(NGMWX1%x=3N?o3UE<jkE$;%-JWrey&F1y
zGpS}ei>IW894$;kOJ;o#PFIVkxD`!lt4?|ACq2U!`>N*I_+D7UyYRiyJ7$?S{cTq*
zeQD3W>1FQpwVfr?roZi~h0n`&7lJ>kdwTt}-2L+ZV0CSOXOKIK00000NkvXXu0mjf
Dm*^cD

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/larry_blue.png b/mobile/android/base/resources/drawable-xhdpi-v11/larry_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fa00fe743d78c53590bf856e37dbcd18199dc1e
GIT binary patch
literal 7443
zcmV+u9qi(XP)<h;3K|Lk000e1NJLTq003wJ003|Z1^@s6@|iVP0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBV3wMj%lRCwC$T?up)Ro3o608v>)maqmx
zC!JpDNC4UQ)j&|z5KKf6M06aLMP+^w2%sQ>y%->b9Z^;toN+ue#~D2{;{48!`>zf}
zac}?yQ3UiKoOAkrx9i>RTen|T2S_(eNS*UecXd}+SH1i0_T8l{mg=#k^m@7?bNu?F
zL+;vicv#Vf!^7@aue}zF0iVIRlf1{{=)P)9-l+W!Ug4blJVo+5`kOK9jt&vmRNGRs
zMYg&(J@ERtfty01f}NqzT`y^4((X{GaF_NTUhmwi4g4NI$L}VI*P=b4Q1PDV@9D9)
zkKa$;s||kaZQDa3aZOEX$P(S^iQ&zd@$&C(UL6W`d@dA%R~YVK^gRp@*?0J(@9{VI
zy-U721F`4wmTCh(hxa+9(R0Fa;(BZ~WQlGdPTGkvIb;6kr(jZH(z1PG!o+)<FFM&U
zkw_Sva7Q4PV0avzcpxGrF#HFe1HMBd!z(P98nQ4kCx)kicZ`p64CMySMKHlInRdUP
zQz)_USUVwJwoiX7<wE?fhCu4Ap%{Z(7jJo+u4dp6D)u;`aPsX^JW&Dw;b6dbcpMOx
z64b5`m5C-${R!KDeCwXwXWzbeuQsOa&|cxQ>GJcbJLT(+=yBowUF5wyX68%h_TRDT
z_`F_oUv2?bSAwp)mKbfsDDLpshsRJ<apF+@;UOXlxQ22Y*F%&Ld^jWl;oPoZ;tABQ
z%bHLKtRmIuRUQiUERVkLw?XW$)AsRmK8A1AEUbwy{NFzZEct6MIhlzPb<XRpy%yV_
zIeVV#7L^#IdWUiyKR!kb2BJivL{A0>xpC#ea5Kxs9gMY*s1>9VCpd;|355ofo;)D_
zqd@|%|9Ua{wk>$>b!vfuvEY>AE~hkBH<{@ddY^C}ItOTkAQu9$5=|g4T_tEb!oKyP
zH;%QNwDzNRlgd7X(Q2X?1=@Q$S{Igm*tSsa7q0o(`pAKkVIqt3bt?;nGK$MbCXkCj
zgtio;z&3aPVLpl6^bT8W0X=c3=%bb!C63X6^CX-=HiMPaYrVMO`**!Aj+rLLos}GL
z>_X4-ug~Jj6|4Jx>Axgut0P8sy=EO|XU_ZJc>6gAPG-+LaI(WA+UreowO1JU9e+<p
z#v|Hy@Vl%>51fPr2k$fFK0Vg4;L|Tb3MG_4*}hmm0ag>}rqM5kLSr_3^IlHD!aj1P
zro|bp#po|C{2!>K+l*N;OMG@+f~~r1#mEt3iWqZ~I0~d+mRJ!7M1sN1$c{lx>5tw1
z^O>>1Pm0Cysg*cqrgPE3&yj;#-@a^))D;QE=p>QAva=>}z=EuwZ~{?F2HvAA2O{MP
zP8zT=6dErqv!ZP$clCOBM_L^7*=k>Sr~>7Dk_Z$wy+@QD>2lZRBSTeSC<RO>m20DT
zgE64W0apZ25m-$YSn72W=MF_3D$6j0BB764gu);3d?+;Gg`bX&TyAPUTeB7%sz8D#
zi9ogb&i`ZIseAwZ1Aw3~CQ9%W!BGTEDcD)GC;A@2Py|#dc!~o)$KSyDlL3}`DIVo!
z4jVThfSZO2^SMym<fKhUpOL<Zl7moOrrnls0;M>{m!yx{^5d~S>$Ph{G=Ta)6h%N^
z23-X%L8v?74o1y&{N7ut!{Tg-7jgbr?-}>0Q-|Mm7u<CF3t~m>{PB~1^Ivx|k!Q6F
z4#FEv0ta0?bnU7C=`WmUr(ZwexWI5iap5@wYRlEFK)@Yr9;l9n^CZO&f|W#J4p8o9
za0g!Cuq`0+em>K0!JB=E$g?^Z9jbtHB*93i*Z<isH-qTy%t8$4aEJXnMlj?G>Nimi
zqSzgkDm+vH-zUvc<@gm|xJOPj#h~!mPOCNer~jJM2PJ?R;UJu#1QIB<|FZXIkJ_$r
zwAo_f;)^aaydTiFXnE4(IOp*5C51pa1hu6XjjIL;gvY}0NHn<XTFrnENJ75kqA&;H
zu?Zqjt!{H)8JNHA{MjDs^kR#ODZ2VSL@Hpsh{9SF-a<~HsJ05-P6ig|^#t_>f(l>b
zN>p`Bi?M-UNW{SESQxe9n&($Jfl|^&mZW=q=Z<q+%@NRJZ^-=|2*rtx2jy_7LLnmf
zttXfy4zl^obq&8ks-KW}X}3oZgNTTO-zLC{1B0ZM7^B5lAO={IE9D5b5x8IuiGcFx
zDT1JQ-Pz2LK(_+tCEKT$E_^<cCgM0j%wj95&xt6rW(xv26KBPx$n#}DWK~WOj{a@$
z-tz~%b_9TNve6jgVhvtVv_*bP#G4~v%yCIYv)xQ2(9kY&kIknxODTae9@jVsI4y}t
z0&LA%4EwJ|E)#JbPeM>Mn_IFjrr&Ifk9;i`N#e0Ms)wjDjmeM+#G11z4#JyHGJzU2
z^p3vED8icU(~By4&nm*vEFMoV)(5i9{>y=cJF3orUh$)aL#-9KF_nlzj)P-cjEWKn
ztT>#EBp?Yq%G%w!@E_kGlE6)CD$d;se~;=cD%LQ>P3NiAsHLS6piLZsTm;HcS!i6$
z(eDu|@#@X#h?(t3zK8?;l->G{4X;pc;fu-$NwE3U#sCskXSP3m;s^0xd15q5iVpGw
z^{a;}Np~<-6xe)vD~@vz9^W##92C|=*QD8}*jAkT7hD5M15Z#bnz=5eh=IyriWonm
zpWZ8jb*Tv@5XIa)#5CnGd(=~KoLwOXxDJBjfryuZK;VmYZe6hE_ZTvvI#sm@X;u$)
z%F#*Z7-hy|9~~9{F-D9V6MZvYx~izRjhLJYNx<)&B)-o@9Qq<@$tMtqIY{}M(C(rA
zhk0gBWvw{3K~hY|RcFs%pV_+vL}{YACrlu`2x<h-Rl}pKP6bZIbd9y+;zJck_$2Ef
zU7kYSW*z1@ODevji6JVd+(^VZ0(vyx`|R2CjXLI+iF5Z#);)P01`ZfqJsdprG84A9
zh{HGv!h~p;JH<bGVEIo!0X_%6yG#VaJcZo4H@2UjHT%zBahONtfOD>)R-0|<@pFwl
zBi4&^4wj-VB`E~L3!|y9-qKi|q~a(fB!t9At~>GN<QKmC8$=pmA8+j1^xS+oS;^jD
z0wE_aSB(4Hj9vLQZ~)~9s%PQ8BFH^U_iaD*#ZT)rNnb3^GeC@{mc*rz89S<Y(RP0n
zRlwkvD$YXp0nzR$vrum#(0}GbfBH~PP^#tfY?w>}`eH)e8`?f2^7}q;K6&g%DkZpk
z0sC3Y&-`q?@3&uw1y(M8J5}CC<75&CHjit`k*`%g4|nj;ibLX1htE!|9^|}sGk<re
zUh_=IiEEoIaS%r*f#J|qj3P1SH*^l&(Q5RHcOW^l!+pOwoIc|>hh?JX2aP)y?i0r>
z5o5X-edRq|b2;v#ech%VW?AolwSs4ua?_KpG=$ozxNDZb?A;qWPyB78+`@fzZfN7P
zXgO-&C)BrG8C!}p!GTZ^rtdGtSTQDxagQ8u%@f5KB0<nLk^?W>0)y}XB>dgmYRt;F
z?fxhi(OMen7f|Jj5D<Ldr1#9#;yn3MPUp&1SN{s&9%aB!PCO|4mXZ){<ojmQsHuIW
ztSXqqEHMfjx`sdRUZqtE#4E$#_*JX?#q;FqyjJR*E0Hk&u^Y%}$dVi;6zS8#(fpp8
zo+#STkKiF;ckr^B(^t&~Y=46oJ;a#P{_Y*07+G#AXOCcURnFyO{qNhRK7V}PjNPYS
z!-6qdbOr;8&7g>E+U{r(8tlguo$b^L&){{&p6KUzK0H2BytXU$_aio*+uwQF;X)JZ
zv|iD+Q){N|Jhy+^izmv8Hy^wA)`hP%uL`M>BJ~mkp{BOXd*YAaJH(6CCkPZx8M0)*
zy=dFFJMaFrRul$lUV}Dkg<_DTNDIdxyQnYu416)8!nEG&qvwG4{SA)AA~h^rgX6-G
z*ou>frJ<p!+Nd*N#iu3Xc4&F+kaaXsT>JEWB761u6J>oLshY||_+tnuk8R}6+XNyH
z3zm$qt11?8sd=kDDK6gq^O;+>YJOI{f-6;kkpiW7-LyymMK&IfISAavpb|qQtNiQw
ztbUJ+Ys^$|P_3L_?i~z70pinhK()wFvA7DipZ#>u(yFOEOqEv6z`9M+OR{GD`73&3
z+<C1+4oV&V>}L;-6)Ujc#%L<9N1`1V{-D+-k9ZozdyL>L3Isb8b*dCeX)$=tZs{BG
z%E6TEaV6;k*PS~KT;~qzb0JWN_Z8eYV#5!AhhwXPlWIxtxii2eZ6}q#rz(f6LLHPk
z;K>71Agvh06>_Z#iAL@~&Qj$e;BPRW+93(eqr*s0SJ2#gZBw-A9dV7fiJ{Ub*A82K
z{7)bT-K@s~&GXI`ueWX!9JZojn{<9JYO6hE+t-69Z$8pR`U7A(+r=nu+~tnFSx;-2
z7Opny(r|RK?<G2=wQ^^_Iv{V$`Ln&tjS*)acBYffBcFIIop4VudYlRk;SPHwH2(O9
z$D~u6t`Kc?dO!8?l93_>x!bxZXXlVCUCa!E{|DU$oYcI>WXFYYQSGs7Du&;)>-1|g
zghHG4Ypu*;=DvUbFm2~|I|e-ZvPWLr$m?$E8nplFy>H;=t&5MJYnU_USxLZ)b?#EK
z$Cjk$m4AN-i~uhSt8;OR+@PwurWs27J1TaJl0<lCk?_7Sl<GFUX`VC;ctuC8t`F}W
zJYt(R@v2@5G*pA1brz!AHR}%xE$Rx9n62*UbziNVuv4=<U=@S|bpcJefzktoJ%07U
zUrN0MO74D%S3$yJpG%C**B=r*vJY4v3<5r3W_fvhl5qkkH}MEDg|Fy&9f8>Yf%7%(
zId!YJ#_kGKKCE{}Zq)RSOD5x^C^hP_5UvmrbDa6Bk6)Lrjk(<K|J3`lhiukNPNN$J
zmITvr(&le=ONb<0uBZ-@I2UV`r1o2SU~b-4%^;u?s_Jh*SEx~&09P<Jv4x7g2q5f_
z{f}&)esbGS-u&O<8b=t!fFgRw$=b}|fAaJ%%xw=d!P3K@S>j{`rL-RSi_AV{=g$HG
zxV+}<3W@4aRW@$x*-yLAEN@i>R!FTbvtAiEa%(gRUPS=9P*e&WlMHENC0EeAs=<ge
zkzjBh>%6euxznN*3fGSDca}%>4mC17LA6msi3MR9=gOaclIFUxzvG_w&I;&f&}p@C
z_YEpLK?H#)8ZYXChAsI^?@QpE6#F<$?|>r++(TCxZ>qu5sN#t{E+SPE=8`L%!dH=d
zUKwBSfYbp|MeBvoc%li9X0Cudzv0%@yX>DIcUz~AD$<L!`C@MpCUda3xB?M99jED~
ziwVfp9~6k{9T(#k8r{YBykrEq48z!5DI-Vl8XuZs<_@ac!8GY%tao5x4PAfkc%Kc%
z{pz@AHcI6Z=j&)14|0`!elT9I8eRo}X|o^}fyJd>x{ziSsofSGm<zw{UZ(H$Mio2$
zAN>xwOQkzhC7gCe?JdtcpqZnU&^z^euROAE*w$!%2Iq3h!FIno3XPvx;w0aPOGWs~
zv$K?0mq}k9)JuiW3kYLDOued7?{u4^>7BkCjCDb_PcLp&qRkVG>Ki<sH|1~#)m9oO
zXhg?7ZmM@udzEMl3+|hDa#V4nSr$=c8UnUYpS)$SN6`q67j&sg0Wq)p=2Fc(hkDig
zmG9=8_(NgwFmScz@6aY1xY`j9Gs*&m2^Q^Hz7?%lzU9?#W`+bs9C#rXhErTZ@6@@`
zSnsG77PlJtLZ&d1i&&JE?Kju-nwE~c005*}JvLu#W(ya6RK~;ixw5SpnBwEse({8i
zF~#Ve-m9W|2Nkptw4%}t*(<~(Hfpst^H(1o%_-Fr*saKyFw&<~WTOAlz>~k$Oz)s0
z-HBOjMtTUHQ=`RJnF>A78@XviAAK=ire#iPER>>3FzK>Z6L}MbUh4j!t}98{-wB(g
zW$HRo)oSO)gLE2;GUtDGm^z$T`A3VfXk`XgVeqCM5j1{$;0*{^O2;w9$dSfHp%bV6
z*i-;6eN<LwWkg(x%<~%2s7vuqjQ#N3Fq+9jE7ouVxWfqY8A{^|x1afJ(EQh2VcGr2
zD+6!cq=^S~IGq7~2!O79mFe5MD5AW(W<GJK!pj`j90e}t3hK-8(ZHeS&6@odbge3s
zQDyEnr1oAMU09ei$Sq4%u`yb2*$M*)e`l#gg&u|#@~&&&<vG#D<$JpNjB?=+?{YA)
zhx;JHz)zU8<L5J@o_ce}n9biG8n7u^Q-qUcR$56XIZN*}+OWihTWmQj>5@(&1y>{1
z)v~Y8idJTGWbRxYBfSHX0V@n?0T}FKUkMspva{kailWmbeoG}wC~Hej>MK%Z7eE?T
zwomO>s6-!KJ@lfm5feZmVP{lf$xyLLol_6_UIA8Gt@E{J8D^j=x29Z*GMYx-+e&4=
zoKo)$Dbw^0+zS<te8JMiiq<0PAZ{_z-&!u9#udaJG^6Mw#*CJE^WWgGJdeFly+L7o
z6-cO(%Vvb9oT&gSt(1f41en1(yc1*F31Pi6RK~ng;sLm3*XS{+i^TvZiZ&|REf-jX
zjA>Ya4^3#~8omuyuc}7Is3SX?$Tpu|XJH8ow*;w-<}H@PMaV@;r%^{BRcbPF3%UXh
zzh1Q2=9udpG-v=bi};3qz4K}0-%w*j6{@HD)pC(l;;5H~)nRE^x<*3*y(L2l5^orp
z!Za3R;xtAGq>7O8@_GK5yApZ_0*4478->7mIi-s=W8$ugs==-063X~>X;|q~^=Vi}
zlM$H&g;$LsYE{Em4)??fl0^t)^XXS96`h`7EJg<t*VshwKzwJY&^tgJ+SG!Z%b5PG
zYD<6;Kp9N*S8bn#m^3Vh@U|TRV|nXl$gVCS->)XFi-oA+rcHumVFH1f&GQdbZU4DA
zs*K(Ng9h~ul@|Da)Jdgr9~FvW^Qj+IP}R+tB57C+TzQ+_%Z{I;;Hg{D#hr=<bReC9
z_|HUun`k@1|E5K&pf)O$idK?KT}3C)C_SvhEOWgB04@X$F*X&?g5?BL5r`uViEJf<
zdTDUoCheAHJ@(!=T)f!*dZ3d6nlu>5;T;>X4&@|Hl95IuOwX$FgN$1JhmToU@m*#7
z9a`U{%7x%?5$!prGFEs3OHP72*JB#iEn+;FUR3^`GZ5P?OSOXODyLaFI$vhFsq!}D
zAUYu)1sIww9v#p)=k}mXAB)jD)-fgN!^@-ojw=}J-?@V7=&O<cMJqxOZBc>JmIU<r
z!KyV--jkd6f8f=QtMuu?P6J=WD7=iK%|v-C3FKtY3{pi@;rmvjmb?lHm<D?1nt`h-
zwm|?=1p}#KOe)kLjU-$!)L2n9rb1#_64;EXu1p-cT@=@D1XCQX7l%n^C&%p&<dk5g
zk@7YbadZ*z;9iFZeh-Nm<D__w#n~3VHGTM2eaM}o1+-<1QNKJhok~Gpls1k)a=K-u
z%9@}7qR4g;t<*D%hwx*p=E_@1And5+2^#w$wuPUcs@Kf=kU<`GN~akcJLL<#6VA#B
z#439pJL0B1PQI#t9_46Ngc|j*B?%9RLcIi4b@#Rum3lN*<SjK0`G#e9<@Jt|K&ace
z_yIqvan9&~ye?J7Yl9(Wrw>95i*rv-Y3#&OseniT1%2b?g&TpwmLxsFOINAa<d&j6
z7`nifV&uGCfZov&2-<F%`C)PNPQ5|C!&~wQ&W4k&(m^hR#1bBmQ#s5k3=lcf=1cw~
z*6K*}I8RjSEr&98Ro5ue7-EAsc2FhtP7Hyl*N$j7+<aynz0-aEThsHmYw5RKO!A6#
zoJ^VuX7j0uVALQ3jRJh7$t#x2@C>}#(!m6-m@fJZtZNPB?hm|qH0!Z<Pe93gi{X!h
zBl?(J;ms~0w@zmyP_#m1DOF1E09ugki_IqGFcij@P_e5LJF|VpiTCvSc>K#9ynGKS
zM3DzpUQa;AWiI!_7OmVJ5=&f{kTM);p04XCFJP!fUUR*ZxBm1&tdvvbFz|Sk%G9P@
z;2;kyq`n?S{EdLpE8!`UDY6EpsU%j06oHK`m)3nGOdyI0!p+CiJA?g)w?LE^^p2{(
zwkxPctW|L)B$O&Oz!}gJ2t(w&1$K3Q%%@Jog*!e@-SdG(YfNG2?||OvSsv><slZ$#
zypX~@-qKjY(cEs#OR)Qmfz+#lK+Z*<pR#EEbTU+W=jMAhb{f7(^LLD#N>5N-NkKD1
zc@Ce$AN$Y_J9#Jv?mGjqj|N2oS6c$19|Y$7_12zG%8*DsBfZmCKDtJgr>#mb!6bM}
z1e;IYD~}f_=aibKPg6sr+H+9zL54-W5xoQcPVQ>s1Vf%%KpkHy##9f&MQDpAce;YH
zX=C&p^#7_afl4Y4b(p#DZ-50_)J45vy#x7qU=*mhgooL&w#XgSw*kFbkx9yPDLjg-
zQu_D-r@;ett1E#r#B)<$mFD|RMtTSQo$h6NXIAwnIEP7<H%C9b<Y{F_^{A>OO5{oo
z3sqMFHJ84Q)kyDjTy^@OSJ7S3&7SGatuH&NFQsO5wm}ZLDoV;9Yr{kTuB*Vzt|xVl
zia06aNi5yl-}l-}t?$_MPMYHB$!+Cp%Yx|Bl=(4u96V(ip2CdBgrCSfF?tNVZ!>Yt
z|GJlHT^yAqE&ka44HuI7Tiv$W(iw*4uSJ&1KSlXc#zP(EeRR}A!rC|-CY2l2S;SQa
zW&%7gElHzm*8IPJp?Z=erv75wh{v3+Mgm=S$C(-v@!HGO5GaWR@|GG~b;w1@eu7uc
zCJ6+!zBEUWgRD8Mvp*seH3Ui$fqE>{9*4lI?PxVej^gnP)z-`&wc*qnXn#44wZ?>&
zmb{H6w!FkPm*MuAJM^tId2391?A^Qc`}i5Q-YnRB;@!dPwZ|bi1F;VwF{-z%&ID@i
ze(LxK*vb;3qu2ryT35n8eva)iu?;4^LV7Q6t%=9?DARrueu%F;Z!g&%6ZYXh0HMI&
zbuH5dCZF(7h0Ui&xUU8@I|CbVI9MSuFL87S)esDd9HVw-*y_v~h=vVl0}YQs3Yn@L
z1q;|*iiR4Nt05kwnkZV_%xifZq{XJHH<7BxPd4jqO0#{aae!e8-Y|on(-}zKqo%JI
zza!q@PYvS_?p5{DvHOj?Yq^8^A^}bWnh~Tr526fL1%YUVf!(jJm8FRwoa1<}9oqbe
zbE1)0ROMc)S_$w)Q*8+ZRo?NE+iB+%Rr6R?$lF`04uN|J$I!SD@9kh#KZO5JAJACs
zImqU#yokf(L7JS%OD|RCFf}-gp2W-}vMxn87FC97wI&eFi&h25=&JRW8kfc3MCxi}
zOU;X&&2q1EN@E+Ot2#j1uO=NtEBZKbRQgEOB+4x9inldWH9%L1Q&qJCEx4|>1hOyC
z>mYYf{oHX{T|tvU_==86B=M_jg>p(`CmyTkR13l#R96{Rdq2pwK<@{cH65g@8y!!|
zA?V{^nWM|ZU@+=0q<Sd3Ghp0a8aobGYYsB%(pcGNH>lcTx>-9j%-Er?yn@ciVBpO!
zXwu_Vql2&pl<J^(K8g;+^v9agM%^V<jbf2Vs(K)5B=A-=$nn*dK%#A01@BLdZ2_pi
z;||95Zcsh%!6+Tr5r{1qHcNa|S%E57z+26eM$*$Jtlrdm()t6D%$h<i3kR}qV6-ZT
z?qgO?_%lTY56}F;Y#;o*4aw+<Wb+iLGl5!?|A61qbHjIdeXyS~eHT0$z)>9u)Wo9I
z9l;|t@B9xQP}QDR9SH=Pq)`0T+>*S^okR>+Xmu?$Tg_Ip)oe9e&2|~L{|8gT)KvY>
RQ@a2F002ovPDHLkV1i3_M$-TQ

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/larry_green.png b/mobile/android/base/resources/drawable-xhdpi-v11/larry_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc037ba197571c069aeed34ea19708d3ca36e04c
GIT binary patch
literal 7439
zcmV+q9q{6bP)<h;3K|Lk000e1NJLTq003wJ003|Z1^@s6@|iVP0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBV3u}MThRCwC$U3qvERkrUy)WI2-aYbBE
zz<qhVaUDR`fHDt7!3C9l3nb}uHvyvT0YV6YumuoMWKl#gfP!`>Bw<M)AP`WN1R;X&
zo2QO%=8c~+&rjbU{qCu{r|R5W_f|(pcQmBF?|#)?Rb5?m&%I~;opU{&-~JZ&Zi(;q
z;J(Z!J}%GhzO{Ttci2Pws65N~{t-VWp2N>sMx*D<-(->B%p})llkeHxx9rI@uEF-v
zzKkc>Gd1=!Y}R&h&Re}-*nVPsxcrNp@F!;$g!i9WXzj7>J3ZGpw(pBv<NIE=hhuxc
zm?K<c?&q6(el507&dfKC(c{*&#{K7q%TCP*vuC=hfh_iR32UvVF6tTDc6?Mgcr-Z-
z`_M73vBzVfV=3W+V?N`1!Ld~99BqZi{p{K#<63Bi#{<^2a2(Eu`2EfQFt3w;%bw@X
z2C~>2u#;O@8?>fy$p5H1-tJJZ_}w6!*CGaVvUq)pmYCS^JQ4~T444M8NNkR^2ikYL
zV*$(-m?^Nw4yT<ApRqIHbCApk^EW^!AHUA)m|@uPcji5kjNdg7$bGw<wQjFwci*d;
zF_d8PED~o_ijoZi(J2wE>sdqghv%bBpe8$yXYDDgoVRyR)gsas?kzQr<?*&?Z&}p>
zW53(lFO+^`w(=8;%C}X_9zT2e(Cb0#iqdm8V(li@1}y)e|JN${;yh-vHJP2^OrnIP
zY|OmIr(}82CeSS<Rj-CiPP`W0`T3+UXh*Pzw&U{&tW7jN!+AJYT$OGdgL8NtHaHL0
z?O>nFznB#+t;+tdW%(l?=bafXR(J1x4>rr(d?4{>D#R(FQ0}M*Mp>UZD|{A#)I|1+
zN(1{{v<Y-SPJ5j4_O$m2BMC<kJS07b9Uza&U7t@0Z~Y{_g8j#3QGEVCu+}kkQkN3!
zY$}WJ*=23aoGnQLq2zZ|DH@_e;WJva3DjEkV9;___4?YE(dno^qtlVV)Py6WrglBz
z&**IIu?41f;d_35O2V-v`F;Nmzb`sIIt;TjZF;w-qd1Fzh2Fs0OAFq8=?r}b)l8rS
zRLwTJmkDSq3`xT8qD~+n4i%Q>s0lE(H94HIpjQdIW;kmDYuMo0sq0FIoW&RLPVD66
z_Di(3i&(p>+09psS+=?VH+dUg_&W>|Xp7!|k++wvW7au-9qi#6^ZGu<esTWG*6-nd
zi}PQxuCac@+KP_`ehFMCssuvfP!$wfN!4rNJ=NLa(81}46G#1}10ShPBeWY?>%8Kl
z{{M;hNgUf@G&}bDC~I|>vi9$+4Ph-khV3P8mqm|2lrShTfwuzTiYv#4OHWP<?>RN+
zhxdwJ8^ErQufaWUUl|(s1>SSm==Ni|tca?QjuQzqyH+u5Fd&;mT?VPFaFk0$$J4?)
zPD}`wSLcL_59Pc+W6{8-5!B~aD+>lyn;KL~tO#VN-doEv9{G6hj3-S8r|sl)I!$Nt
z&$2@_OZtuT9`w3cI7?eo{T_uV`k_$ugyTh(qr<zIb8vT6?pLcm7~`fsw^~&&xEh2j
z%*LT<?P5WoMtN%!JC>iy{r<q2Jj<ymH`_rv*K&xWqjlfud4^Nf?Rvv`%C5unr6;FG
z-C5dNtv;rTIzMNFpqZJoX?FPIPcn14Euth)3|U;<@KIfx7ag7aH7GVP<K^eZL5F65
z>?J^Z$+UxfO1F{hu|RDu+RoC}I(5@c1w{p-tSYy1$=c+5C6;Fp2s>xk=*Oc?pi2uX
zrW^!g83vH}yaBBzn<_@KYe!{E$=-4NZPe9lRITxkO$EWL_2}X#E3O=4cn!)<&iY}=
zx{)0S%QIvUzQoY9Hqj)|C7X7=x*8OjBKABwg2){YosQuGc>o5v&rP<0R09~!$HY*j
zov(6>sE*-i0@u&S73n9r1Jfi>XkaxGJc=?Xe$`gr7?6uFqg8{*B!ujVwr7`ZVkBAD
zAd44$bv6NIuS84;6e$jZ-dpPC5#1yH@Th4|^yIV1nn6({P@|mX0~2;uO*;!R(Qr2r
zcBLCwG$ureLeEn-56UB%kU=8bVn!f4vglLFBI6p#n58^CWkRP^?lEZfR;Yh9vWF-r
z32}pbZJTecNc{%?!(`Du!jkM+pkvqQy_SiJo^4gA0+lDYCs7h&;fwP-yu7M73msju
z@FX4sQ%T?ij|PEQYsOk{)-qTFZE`Mei@+x+zYDT6BpTIHRdNgEusLA;f<`EFkf;;L
z^7u;bdUU5#)ztp%cTDwRqb*h@7^+cF65{y%T0mr#cM!JDQx-g3B!{Reds1-(s;#NQ
z;q<)7L6Tyl#i^78mAZ`r6h{<&X`)Uu7T1r+pf<7cB*1oU-;s|^(<wL@9+x|xvOArf
zgtIP4-h1u#p?~9pBsRV{)d)g<j6OOXIrw6xVD(W}X0SNq|1os+z;;=?uB`^kveM1Q
zQ$<bj-Q2(<aDMJP&sRj<P^Bs*3P@^oi$OcTG6Zb0IFUdxc9zm8Yn!zt!@i}S5mEUG
z2!jz-aT;*6;avK#H=G+1Xt#trXroCWpF_>YDNNPNpbN-CB1Byh2;|dUX_;NO(swYQ
zKgl6y<@Z2skP<SenT;EECw|ZVs|RaWL|uzRZAE@yYI)-*q;>(lo)Tz9uy3_uX2oi|
z_Lde`4cStW@{_G<r#JwJsGX_?D7E+G*<^B=Ksa$shfO?K7avsuA)E-UWU5-4yf&bX
z%hS<C2?R=lt!6(SYXX5S_HgRtj@xw4PPI`H>Enwix8VEo4+nh3{^L2;u8#K0v=-eX
zet}Std|Emd2WmF{KE_%cvN?c!^_jQ!xica`d=7<34Z#XH4060?%R%qY_dj&wbYP{?
zo;?DA)Zjgz1M{q#O~j?sYE8lL>TQ*2oIq`3O&|-WaKp`4j9pbQ=${VZPc%}McR}{U
zA;Ew+Z92DH&hGtqtlp`$Jaa_sm)F%#hXeypa#H#eK#0rJru6Dvcx2p<aI6lL1R1CB
z(DgT7K6&2Teg5k7AqJGQifXj<{nwX{_}60{Z(G6c*^RTdxR?+~?r^tYl?+|N-vGQS
zbTH$~9Y=BxKvWViad^!g_g&wUcUG)7=s>{aJ;a)K<f|R`Zr(rqXQwMm)a+EDg$cPm
zs;+N#c_zD07uK%vL=Q%$CJ<#`R9n%h)iSGt*bun<flvT6!Q*pQy>NtgP`syZHUyJ^
zyy$an)5~(1ukN$=b|wBVjU3B^4%(*uiT{_m^x4yFfW66nJCwi2m9ZoaY!9s6KJ0HQ
z*<wRteac)Lhby0GK|tKBWxY<_*!)Vs#N8Y#b`U`(f#UEeYyDZ9{7}2*>xYkNyFZZ8
z^=Rhn&z^zio6_kh17m*HrN`Y{*fld)OJuDhe}~`I#e3Y!1nKC^rO#B$Jes<7WRzt{
z@LQSki)m|zI{n9;A9wC?*OqIp|HA^0iBSVPp^4|$vBhx}90&zr`p&F9&)Oi?M(_sD
z{4#4#a3|<Zd<NFp0E6%V0REDIN7K%ym~1*bLOicVj<Y=da_iUGeR^^}{SY5@O@0Nl
zM;Y+r9S_3(22O~Z_~&c6Qq%a?GOC~x?_lkfN7~=E7BU6U7C<brh*wBa2JHs>+m7d>
z^HMHzevO3r&2GS>0VUa;3DVijm-d}5m?b+&aVFKFI(@-xFzx@yT3gn}PMq7LlB(Uh
zcnY$^D7tjw)`ceAS$Hse{H|kj3oucPCY_l{WqH<jNIom&=gX?*^W%BSgtJoXK6yss
z8YZxr_gp9>tCjKlmK>d4{%*<0S6sByOG-Y?Sz3N#arySc^OhGKoSn3AP11F>!Byh8
zT!J9f(EiDP-VU~dj1^POC=yYvHNvde7`VIS(^(r1oLOX~(3hQ@Ze(59NoEtR&&8nP
zvjj8xT~0E?L^a&gw&Qb1KpSV63aaZNX|1?2-85Qv4?V*b4OQ00Me7RFrtdzLY2exc
zbp&YCPZ$z)TSfNr*~^C1O6DQ_F@%(#f2?DRRlxGZ>@%Oh;$UXgvd=Ak-L|m<_MV#m
zLm7Kf=rmoXwVTgS49f=`-fNkK+lgsj5{&c<_=OJ-CjZp>(VHi+XS`i8gBoQneyJM}
z1u_n)Zx8Im-KVm`+mB{fy|FR5Rx%IcxmJ_Ftmx@;-tPTZF_B5s_G(cE#jh_;4**zy
z=ZQ&1t`ha3$#EN%yC$Rwxal0e^s^B+;`X2FcP|ckIG@`_a^_&%&_L(r#Yd)o12ayQ
zatQ|gb~Z~34o~=e7=tU<#!PC&t>=fqU6MAv>tS8ibS)7me&rV55P%f}-c6Ndjj<eA
zHio1$8rs=%8mF6Qo+6gy{~43@#D4aS&$6bHCzo#7J8lQC;7Az59VaG+*OmC+;l}Sd
zZH<c$&FvQ2H|r5@4}j`?H){hDp1x-jcy;aS9KP`Svf<zJQFT5>X`?xB4(L*HeB#-X
zs&N*|Q`8t!1YipdyxAUjyS{;VE>$@*EKH!3qEGP&u!n4NZqzncu(pfd4*6%4o|-Pi
z(R6Yf*d55r?!8;z^Gjw?<ITG!|E28sf`W=KmxlMBUJyR`<&yA$)31NeoS^IHEFb;=
zf4Habdf<jdi}PRn7QMWWce{N)C*ZjncX2S~LlqNFnJ`|z(!=cZNE4i%Lc5gXJe0uZ
z><CEg%{0O(S_zJQaA4%mO>eqlJXZ`ZR>>Vu2te-0>{S&JfMeU)Ak2B|g{dBOhKOUk
zm?b~W-FG_I&^+*kAe94}kr%{3@|$){@pHKZLe9(mRRCD*aGtUGCY#FAx4?fF8z6We
zabgC9`Z%_~&nKkN2T5cYF%-HoFQWI_#&P3+QfL_*@BZAqZ?k7?qwvbd4GSbR-}c$$
zZzyX+?jkE9lvtqntk^oZgqt?*e1Fx})G?r8pc*NAvJ2Rafp3D~-c~U)pSwt!^AXjO
z6X#sDlK8hiOi2fA4W_;QpQ(<|GAx&}rbv*gnuZu;#Ug#?lb^6>d`c4oGUUz<lKSG*
z9{mC^-@Ya-yryXI2~Px6P+YHm58n=aAB3_)8<KcDXjDMRoyT&jCS><%Rts84qgl)Q
zC6rW7K8vcf2@KS0Ve}k6n+$jn5v9qNtfaF^Bv3#A*GqC|pvO!Umf813Yl7YxCdUbA
zS*wa2o6j;jytN|bN3O2x?VZ>22hV}d0aiu<=#(wk)8EVsG82nu|M2GfquQUx%rP?K
z3Jy&^1%so2bT+bxkWl<6$q~20G)q(tR2Tx)F%@!@9)tUVBGmN8%e8VRYe`?j-ho*!
zX7Bk01e8u=g#PCFMfbXO(lzULjyMLa4Gl92n3u8G^yUyX-NRVkrX7?0=NOPP<PNaT
zqRKQEfS_0NIYn6oC6e6}Dai}(*ZsNs^>SxaLi55;$BS}@%xvoImvJ5Pf3f@hn`=C1
zb>ZNXG?b0ANQIN5U<-H<GhcNU)KbXz{IX&d@o#KSOh+#PO^njPpMn-7%qM6_HrOM{
z^0v#N5V=H*D(p==IfC42vaxLJ7LYrt|IuR~0*augHzN3+<EYiaI@NdC>V^(BTo}h@
zRxMeZa&Haf5|caq6N<UqQ;l>Q!L@^hel5^YmD?lNc|)U9M)=Uru#X^j;#Yi_oKD?O
zRGD$Iv_M#feaQnq5`k`IHP<##e-r&PnbqkMxIiw!bccc$t3OKX>0%EVYAM(|aD7N2
z7gU2mCI~C-@()&`<sUNZGCM#G*`-Q>uAZDBcW%<lot)(Zm_jq@EVyfGk|HV(4%N(!
zM4)S$x4e2V3)21MX7I_?uT-uRqu>Se`0lQr8UC;=V+xNkIpj`$Y1$U5F;b-j>oQQG
zE_(`~6R*DR_sam?Ny8yQD+4YdWMWW!Ikitj)@l9+!@Moi$sJT^Ot}+quwq9E&Kf#%
zBM}JX#zQX+f8;%rw|j+IgP-l%0Le<;PUQz!)1c)QRAlC7<_(}#N#fu9U_|<^lNo|{
z+R4LHm9hwpP%gatulRVt8M$(mY}?4QQdLt9|JOUA^G*m@a>Fq$k|C|)D6SPA9SBx`
zjS2$Bah%svU3=cWVe^3zKL?35jzU+JFQXIY#zR%IdU1>p+mB|QSh#xReL$SqZw$7Q
zeq~RxY{APJeK<JAWOYU1{iq2q_9`_bRB}R+x{dWlX#xN=mgfUit6t$z<wiO~8mg_h
z8NbxPr`$m1OgMOInxThbg&ud_-*hnpzJDiU5A4FLDURtZ3r92x;WtLW>SWFjZ*CYp
zvheUUgFO@+weLZFUZQ)&>lk&C@V=9#xTvzVMa`6E1&X;q8_GtUWu?r<a_rniDuo6H
z7T7zk8RW9O7IJ$73OJkp7v;D%<};}ygUV*iSk|lBvbbHQvFvt{H7Afu5YsVAW-{ks
zF^2=I>;XB&pJMC)$Rar_c|9P}YfUvhv_&YiSxhT22S?k4R!cZu?ow5JCv<3%rO?oT
zC9Rzxdok!>c4jd8gsgGTFUWBPb_c~M9%OA~zvMsfq$5(c&S^1lnbqlvVbE%ZRCudc
zC6=6o&kARykR+z!@5pZC*-l4w@`Mf`cb?=iFQwc8R=tflY$FMO8kLp%>0Fcq9SjTn
zLwz1@f9pFe#QU?HimtPXbl`fGyIuAOQ2tHttuY$S6c<vqMWrmLSSa3i?mN%bNbaCQ
zBX_b2f~G1RL)oj-2YBu^Pf;#OFf2cjAIUD7m`|A{O&y&SE1;W!E=Hrp;@qO6vek~C
z*X<g7_68TZ1NM%aA+1YdqbWNwF=T&XZB!}|U|8dGpRAPCOI4|S1WAOX2Uh_eF&3lp
z2z+oL$<1gq2qdrFAS*F+)KUVu$sO>sg$_+L6&j6)Trfc#2C-Q9Llq98pFQVUXTbr(
z0z;7o(9kdxUHV=}UZ~C+p?f(OXC-k_rIIXezeC-pMkv~O+}_d39q_ZEy+dUuW!H8t
zRUqQp4x-P{R{d+coEe2-t$wd`_`h^@rE#>18d<7q#VqOzgMG^Q&bvHj2DL6x%2E=j
zE5#lhUS*QjytRFPq1^FHWkUVR7?OMGGrc&d?NTx*m%3ed!(~}ZH}(6rCT@GZQjsiV
zkK>ExzSA2zu`iD_Hg<FJs+_qp!UsREE*SF9W;b8yV(;{|3~61=NCkPe-@&iUqta=q
z_^h5<E+vC7tjAaju%hLMbp)|}Uw-0^@Vll|nnt6x6Fp8PA)rhUmLsyDiMCB>xroEZ
zlyawl**h4xETmXG$;s;O&hcuM71;}qoWm1^T0fYz2Eu#Lv;A5J0rjGDxm)~SQi)MX
zKsf=Q+jME66W-bxL=9tVJJB}S-!2FMOpV<6-TLim@9g?K!;m{_U!6}YD}z$hSDm4#
zsNNETlA0HD;7G5>I<;82GBn^jT^SW8WZ386<q?E;#5k6&2uJpt&jB#w1<sxwa%ai<
zp^0+UMt4QV_Lxx5MWiZ~D%&g;<;>!FPEZ#H51y8}?3rqH4Q{{mkja8p7r|NS!s7fE
zdQ{aZuu506Tdo|X!BNLenDzXFJFBLjEwRu{J_i<C#gZv<Rj2?)6cqjHU0xxw>xsbv
zQ7D%nt1fB8tL^vdJPQsP!S)Q5T2r~>aWhn@4-7gD*e(N9=JDrJAzm*lJUsa%U@Nec
zGxcgvzoH7^L`!O--;a9F-IiRVm<3OaR`3!s^;qa)BRDvN3WHYGj@l%&tf|})2t+Fj
z(;12T2y*9={GDUhpfMUrd7;m(Dtaixi*<kzYOlp=1us>m9;nAXn2RU}(%5x{UU^}N
zx7f8^YbbZLo&>pmYStS)UFFW}8%89Wfy37#Dg<%}gxYOxK1x;D8I`u@se?7}8gl~^
zW<?^aGw?>@*!KH#*Sz@El8vwYH>A7wO?nIr(Q$l)UwaPNx>j$oidr-{hBIJQ!9Z8J
zGcNmCQ|?raQ+T-jN;}TRy6I;ct)eB)6rV%eqc{vt9W7FbEDyB2cHkN3Snf2BneGn2
zlKajBGTcfI*dgenUDuX1k~@XR{K^hinF&;$%Eoq0V8^mUl_HBgb-apX9M6Hdh7+p=
zXMtCG&ae6iuPkhbl3^c7?yTPtSOaO4Xz$1=DsJ#yS!qxuR0jp{qTjNA?2>OjN4;)O
zJzeJ0U~#llCeH8vna3<lp_DsIncR`>9UA^tRr|6rc|N7bUT6Cto0D^o#HehbeiI12
z*=X;0%z8R4)N-fygWHc!I*ZvGs<l*A9Uhc`9+4{aD<i8?b>wI|OMg`ag0h>?VIX(z
z`_qjxc}PSBKfbKs@Whh<2ct{Z=vWzb*U)4FIl)*)I_dISRUpZb1^D;X{~7fBkU!~?
zdM$gWl;8^FD#mgcTV3cc;83wGjZL8_P$SjO><b7Xd1R~gnLwweEq>+z_yRrZq+Vw4
zBr<zvsv&o51dyHnsB_QA@g!;o>FaF!C9r3TBl;{G)AgCfwP5u~gIs;T&DGBa#Reto
zUx(=vvmnHTFP#k1;k<(qQFSXE*H;2v$8DWfI=QoP-|&;N^Hf};!B5zaU%6^A&4ZP}
zA1Y%sQl&~c*jJxr&?Q{vsE8BCR$^&0WBD_i$7VgbpRSxtS4~zOV=FK76_>jR=kYu2
zab;$@Dl=Pw`8ZT@tjQ7t@=|Q|l|YePO<)W|@z?&Iny;dKK5Z0aTc{Q{M7cx*meBx>
z{FXL!Gl4&_X^h&VD}#eh>*Gc$5WoL|ok4Y`_RDKUxPe7N7w`<K69Uorl)Pvb1&zp+
zM;ZteLjvKfsY##`iP%7(7!l~*qSWdl!%OZJY$`<GQX{rDp})UcHM_84>eAhn3mhdb
zcUxsG^Q^sD7Sk+qX_nH=Gd^S4%QChvB_%ekvYW>5^7y$t>z-DLOkQqtTSeBPqN5Xk
z#G>x9QA$G&at21dHB=e=_%kSi0g1~(*-Pd*0LLgTdx_;S@meT-Nsq%G%4_0x_&x4R
z6s0w3gKNy{ileP+DHM33@+QP`CF44C^{^1bNw>-&vWuT$@>Kb+6do3I)Q<Bzyb(Ir
z4OZ$`VgD|uaDxfE@;TBlgD!RB<P1Ai#=5r3iU0vl64M!ZzO7}HYVdKkqt<q^)>{I>
zdf_tUiDIg$pG>tduPR?j^h%2>Gs`8ZYZAPpX*oKaT>T}Gv6!xyI~tT0u9YkP>Pobz
z(qZHzH638yZI(LKZLh;KUe8&aUzv44>-)$ZC$GLGdZNW8Jt-U*Ws$u2p!*C;axH07
zlVVE0@fqaTW7N3dw`;fg9O*DJdz8T=a_~(zd*tjpni3<d2kv02N%a`j11n7`3is(C
zQF2{u9Nj@FEk*z#O7*&FbX8Tc(Y=m@R|p0o;p#Pu6E!2hBbA?auAFeJlO3w6jB;X{
zD%D<|c`}Ypm(S{{&!`?JXg$RNNYvFQ)p?rfl4&|nqg!gdY(LS;V6<{eefK071d?S0
zs<gKD=2I+e8&Fo6m+cz2P_^x66N}Kw^?JmL#ePSw)CIxf=**z&b?ZR!a!E2(%A;zz
z0EA?@fk)g{%T&#tdaq{7<;UFEmR#&fWJLj2?0{R{R_9vZ>Kt81xPh}|&xHW}6^aU4
z_DZUt{>nMC82NN|eyU^10Bsc!uEMKU$rLltMGwb?5N>FmI;rETw9Kv*0SlP}t&4!t
zp$Hy|)WOg8bzOw>cprK_Me)%42KaeI1O=pP?EkXwjsG`k-cztNz&-VmKv#Lpydzjr
zbKq~dK~{Uy`bZ!^l0x#=b)MKEccRf?pk3@~*c!Hmtzm1}8n!y#{vTJ=U)5Dq#e)C<
N002ovPDHLkV1lqOb0h!&

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable/larry_blue.png b/mobile/android/base/resources/drawable/larry_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..d31b1ef9384995cbac057442d3a99033ad1c55d9
GIT binary patch
literal 3115
zcmV+`4Ak?9P)<h;3K|Lk000e1NJLTq001-q001}$1^@s6vbx)l0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU-%}GQ-RA}DqT6<7b*BKX7RMf~r<o!mF
zeX%PjzEM<Q6(5MGAP5)}M51J3##*gakx)kPwd{(#WO?}3_&`yTOp~-#wCS`a)KtZE
z$kZBQXQC*Y)@0`PeB5)~Z!dS(-DN`hNAJux_kHg9o%4Oa?{V&c0sr5u-iF3jKE0B9
zisRN@<hcCH9GBa~aceJd-1<xWITpAMd$_lunLmDu94|S>aipyg{|kVe9sR~9MeKd_
zovNJU#vkH1Ng2n5m+{AP9lr-rkmHDh{P8#qzgLzU?vu7ctoiW3g%uCtSJ!o@(`$$v
z?oemecBtW;U0X%ZGwUD3!}Aul>qsPe^t3nXSjQMBb_}3!$E8{WPzH<wQd$GZW${st
z%Q(YvDJM8?!4Zy&sxXWgd;msuW-Z4pJIQfL`o|xDI$6-J9kfj(F(BvcO$F^Jv<m_q
z1~3w>0Sulw_I<c-Eub(qYOo)-<xlM{)7RFx#jLAj;yOLI%0s>7n7sIY=XlbIz|{@&
z$$R#e%s!ETA!EkoD@wlYR-xIzv&1?Npx_wKlr1x)WQ|2vaa?>I$IU6Z^~GzxvJ7%h
zO(cQtSNX3#dKE_1FRlD7az4aTav-82vYtpOk$qN5p0zfl#G?hE;s~g;6F)pv7kspw
z+#f|`B$3eIyo;A$7JZiPd6%3Ix3GOsJ*Qb)o8Ml(|3>}teXWg4N?RKjm$Wvf>}hRW
zwzstrt}%go_&Bblt%|Cy<$z#zu(8SrusH<OVnUf|b)7YIHavpXx159fo=LkmSwW=(
zr|r0!oOzbxmJ<qJO6)ZGIKRh|bc`2#4eWV#U60CnSOo|(4K~W?N{*Y~NE)u~`XhNR
zFf_mA902#Q9FSeq`eUlaM_zPKtKr)PI|4$$wgbZG9Ii2<VAn}I5}Q;GfPnxbu^F3G
z#RKzSyfZU2|H^r|=e@)tKz4p9dweB(y4odF0~pf@=^C>dV?jK?Hj#o@<6+1bcrDnu
z-EUoU6MVpJkwt*)T_$Hs+~@tefb5SuN3CcH+ScAB{05sfrs~+K!b~b`0R)|7Y9Iv1
zgwS>okOF+b%d!~)S|3d$ibx!=q-4jJ_l00EKq0New-lP^|0eH7SOo}sW&AN1DRw?4
zZgX*PUQ@F*Do11xjTqorNkCTJd1w#pLPph2s_pHUm<@rNj@|hCn>N`HGy=ddI6PzS
z@tcc-)-^T5v4wzy+vp*llGRGhv;V+Mu(oApv;xE>I-`)h>ti(_h0Zvp!i`P@QkcKF
zSeD<^EYsQy2&g}byn8`N0vHstTLA5ws{4ezGt1g<DHYU)WQa=fM`r0cZbso}*Jo=V
zJOHrH6H?QuDp|9E3XUPN#B)KxN78-WFQi&yjeu`6I`>LBaFsl}f{3?;VV3a>;f5t;
z#(?nbK|Dv^nL@<DhLi$q$`3#d^`CgqJNv|KNdeD%FeB1k?OlOuj^7#PKcSL>2_!Pu
z+K-I$PA)wwBO@jx1{^*3r0l!yIyvhkd43I%AUfg$Yy{;_2PKQhuZWaTf#Yl<(}{T6
z0tPlWB8x`I66+<!ozH}M3$rKJn7l*eImm~`+MsS?>gPy19ZEz&C6r!s?8AWdj2JW$
z=iuV^o6vXva9@mVycWH;mHHKP37*}wP3PUy>pQo;dAj@hhD$#_fiybzq9Ls|Cy=7U
z9#Zyf68j~Qm`}0g#&l{!_6a3_nVNm-`L#FBJZnv@{bwHSyGbYL1Q{lg4Zi6$H?bE7
z6|{ia>=c<ApN!+(x1o*@SI<Z8DuJ&Nsx#PbPyAM9h}{_T`K`Nr0rE9ay|GIR{gd=h
z?n1yk7qWrVB;l-o^r5+Alc_;CkxZwF8E2ITc)J1z=oDp^+3b{A8lU8br+0dQR2q|t
zSnT#vwYA0}&`Y4(+P;B)P#-irUiXit`6T*Q&;e1By}E(pB6r;?60<dj<@$e>tiSl<
z6PWVX&piJ|o?faM=0CCAC-=%dzx2u$^2`J?%;q?+^5MsG^gI|GpFszi6J;|6_hcwg
zWem%}g%*9=?JzoU3u#vhZO0V-`4{nIpdu@b2P5V%@sWEU{FOZ8iaRqncJJL?kc&(|
z%y$Ut2T)&#EBX9)ly%h9&cqCL@a&RXMTtjx2b-AwaTq0Z+$`;8*PWC}KtPi~#Z@^q
zQ3-V~x}i@>!9YMJAm!7GU?Y~BeDLW*0D?a>wVF@3RvvwPFL+j_)Wq!AM{hhE2YL;o
zg>59f%-H+mbLQ6oFplV9rhHduKc#6u*z`zsbys_QgR#vCOJC$UIqp=bP?wpCfWCs>
zW}N!rX+qJ}83K=OCs|hLzfk|I6S7;D$0&5BZH3v9aE6!!ymReq((Xzc9Sn=z-_Zaw
z&(zpd+rsohI&S;zuf-mO4@Vy287mc7<xu<Eh$<b`hdMt|lZ;lbHO^yL_!7A7?h_VW
z<IZ4$V51!J9@tGVFzGk|Gim#^8~_8Eu1rt@V*}1+T?i<E#Adr0qnVN^L<LhwU2a9)
z!!uLY?D1WA;8qdj{FAE<u^)VZ%`~(()H~v|FzA$MjfsGz3!{`t<<xBqkIdCaCg@*u
z$LbBVt|~XY3+jiX7$G32=)?>UoTLfcdG9gPQ)qy(5gQR;8DN`~`bS?SpWy9=)d++G
z;5K*D8PaaPxj|y8=bmD0H;IRNyTJud7RX}4VS^_GWKU@?#=$jUCvj$9u|{wP2_p;=
zS<dS;2vZ}WZU?P>|8odHA^H%4z->aO0yi4l&0I}K1M_7seUpgI;i8IIiVk%A8j(mM
zxt@vJKNU;%!cdxy?Eq(<vckWAM*~=hl%p`S3G3KUO&#K9u$vhL*K!se<Lw5g6Ictd
zs=cbR3ZRD3;B&<&*}NlQ2V%@3R(t5F7?I~4gQpeKKy!$&h>2GpsK0q>H_Em8$oN{`
zZhA`68q;bjtVz78h{A$ZwS%*7X?VfC$8w!G5M{aXsJX}W*v(98mxlCS;BR`0E(;4=
zX!I^>H)5fZknWlKT2d7PyK*KnmB=RF*H8WpdwRSwz$g{j%@`C>D23_?&yUUj@D5Gj
zVBm($+-LANLNM%DI4d&Bl-8_H*wOkmsLvYD#2p_qYL^M>4<S2@>}HU#M24ekurUX>
zkawtR4}EDj)xG^wPl;M<Y=dDM%WcS9aRV~clu`1;diicc5(xGn-{1XWM2L~ym@HyO
zkY}A#$y!>gb5!K$BNsLDb|dC&WxC$8gHsI_om&eC+tpkmzZ?_0;RC<)sxN#}_TCum
z;$KKp=8@*AvM|!_3yUt3Yjc?0#8-8-gD;D!Fs5=bLV)*G<(7p$mTvZRX+=t-?=)&N
zD%wFiQ-DD2f_b}H#_T4p%s5UH=1md-n@P33eGrQ{Yz2g8Yb32jI8!yVGgnbEX*V^<
zf9XsIt$3E?y52?oz5=pli%=Z+{(B?4dDCDwY+XtwQbomtfYS>`3K)EU0t)lX)K_4;
zVaqExg21-H*bw$O=`)pffQt4fpwZOkz-|VSrOYWI8(Pl!tg8FWGqtMCdu3IdS6WpY
z9K+s=?g`<v`L5*maPFO2@ujf5hEtXP1T=_-Q-f&v%ZDwk&?2Lyve}%I?N2~rv7#$o
zGqpxy<p)iZMSlVsxU`!8ONITNl2t4CQ-%Dwl2&av#{z$`Wa~TB(Q7O6AkJedrqCJe
z%a$KA`m(t|p(Tq{L06yS|5ky0I^AP|dn-@#_uzQd`}}*bhh%cLzW4t?%nA1^%Zb(E
z*ttR{UR4#Ye5gbgnEUcCP+zuQ3(^YYbFgunTFJweB$n{uG^W2*PAN9J!fR}{!~ikB
zgzMhI-0WwWA*@;~IuNTDhy|evopEuJEjY7<fPM#r({3F8M;v^$nqid`X3We6`xOv$
zE=(i-b47TW>Hj0}wQ#i5g8xWiOFjJwND`ED`nM3m^n@{~{2s&u9fSCwFo=abI0VAi
zut59P{>RXl&4U&YvwlKJu=a1QzHAQkUpJ4RP@sK>{{k|=6}jxamo5MR002ovPDHLk
FV1m`M{F(p&

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable/larry_green.png b/mobile/android/base/resources/drawable/larry_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad6f84c26ab96b7116e45e29fd54c10d67e737e2
GIT binary patch
literal 3164
zcmV-i45RajP)<h;3K|Lk000e1NJLTq001-q001}$1^@s6vbx)l0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU-{z*hZRA}DqT4_{NM-~=EjW}+J3*r`y
z5rZ2>Orp4<fJ+pE3=x;OAff_IH;W)3vNsLtxE?@|Q4x1D0<webn+V9bun3OPlQZ$m
z4^PIBGc*2qQ}?~9?t0Y^>~1E^{FrynJ#Xpi>bh0;-uk}pb-#Z9KlD02$ZrnHzyFs%
zaE&h$xyD!LxQDNjxh8aOe3gW*&tpsB&kd-J=9$Lo(DzYazx!WsXw-Czv5vQE-QE<n
z_;Q6U3NHVt44D@P_h5NXJoqy_htCUJ<oua@E_~(%4o%nRhX-WWg{{u5ja!>rtHKti
zw(MG^`nupj+-hjAW4|WIzFg-#`w|R_44MqI;HkIBIr@3QQ#o(s8S2MUABR4y?u_Lg
z{BVZ5|KbE!)e+5=v;~P~uDHdID{DW@Rd=emqUNYV2qzu-HG;m8tq(ur&@2p8<Al(+
zFmSjg&Iqe1IFtXx6J7i0?T|Tqk<3QIt!*9aH_uJouw`yCn8TKN$s1herEGCuc<oxL
z`|Eu4qle<weT}}?UzgQK_VI)%qvY2s_jIwVL7XFwNEuA1z7AQ!EWxZ4xB7Dx9TD8s
z0{=(TW{mp|eYO_a8hqXnd~{tkw38jN@j~~5buA9a<|C6KJBI9pp601<4q1{V2fNoA
zh@1-NYCBK<l5oX)Gx~f4vSG+(L??ce18v*`miVLlp*r>tp*Qlxg}sW)S;1)+G7hGv
zWdx^R%m_%olo7~Z3l@Z*)6as_ujU7&;Lz3GAvz(2YXx_&EfAH=<6L2bDiyDWsVc=O
z143Z0|FQr*O6h>a8}3f^FHUjQ&ttio=W!yd>WC7Z!KyozTvcZ@YOmtTo*jXZGu7K6
z$RiTdkcfHc9*P4LiGt>^dem-eY>HzBgr^=38HJy8nP1Ts(^cMngzum9P3I6@DCmi$
zih_mS4#CWmAIhVO#J$!4<k%r@w`|$YnB<L_@JvUCjP?iGOv<eH>LC5Y;K-nbQtqW5
zJpG%rbB2^{^$O9IMN>kB4RNQ};;`tXjd%5MsQ+rmSr*$pzKmS$XmQ<Uoq0iO?zX?v
z1C^?1?4D$hL-Yox-UF!cgR_gfm68;Nz5YveatPUIWLC)Rp-QG^@A{EU96fkp(!8|F
zIoRDM*+0>D=jpvdFdHy<;s9%#-K<m*2^(?&uDJOv(JADR8Dqo%Z7uwjc9{@bWafp9
zR;D$X^ykMfJ2mT_Lj-1!&Y@#AL0$HKp^8e_n5##~vB&5spM2z+)#&lBp2CiXJTSSo
z4i?eqyAus6+qAJsy4BrUrA%_pg&%SAvo^#bDE(GwGO}pQ)_p#q4Lo#J8TyWmzQ1MJ
z-RzL-vi1<}{2h<FJ2ifPg?pQ?XKu%#q|X5%I2PHaow7y6cN=BzNTri<Xn)X>YSh*R
z*#sS7mNrrlO1B5jCxxi2l4MOU+4UNIXECxt22cvfsmb7!`5e=P;NxrBF68Y{S3bB7
zI<}_We70#ac4jKFf%^W)%zX!!-^pw^@Qw{Rf{5Y%z@Zg&_Kve|qV{gcrr{ayXP{H#
z@TBZQb{N@FY;e6B*-~WV4RHpJF~~N4wPIS@&C311k}4#?dd*Jmu+=gNwF5r%sR7|8
z6@Dgo&@+(D#Wn*!GwH>I@iPXU*pD4QEcST1(~s;b!L_TxIt1@4JrO*kxN|$k6*j6u
zYTC}$HM~fCOH=J8o`#?2DY%Amr>N<+hMK1!+Ma+wawK>5#<rz6hx(^w`&!qwpRK8B
zKU14uALoh3-t8th5*Q{jZ@*~!W*P>8=}@YTe8M(NEPEQ?#)HcCP<6OMUXmiCK_ET?
ze&i!UE(&$hMwz@R3-}s@p1ZHzl;THG&ngkN1Y8JOLvgdRs3)>X!r(JxJ6AcF-^pm$
z_l~g4_f$6IjKjo|$I<PT2sPhpJ*ZWZ*#aX*B{Hq{Nf}#yf^pzIXy~1)z`LYxLUYOy
z62F+^u9V8PL4{4RM;l+9dkYE;TGpRDgVvm$Ima|HHhEL0PlR0oYO}D1%4U*NA5uzw
zP)b7(=(e{OUQ<IKYTvt7;o4<7aYQiccNX-Wnz=8qvNMVY$)q1>SBkciTa~gWsLe<8
zU<O_-@{R&s0U8vcP$+*E#&eRi9G?nYb=KlMlS<TqX}O-ts?HdG*77jq&&Q!ES|xlh
zI3{NV6AgN>ww(?I=qm{EpjaoX($?@U&@=?`gl_AH^bUUjub+sjTuzhU-@qAxe+V-O
zbewncQGDmRO;)qIS)KmMgst|lG9~RnqLt8428GsYknp0Z194Jzcx5@J{gBhc@*f`V
zsCX96Pc-QdCXD7xsNEcTP%~IbiCjbYKxb7Q@xP?r_Fcy8*hX$XtELn^3VkiCtTYu6
zgHMGhR|w%FgFAWU+n1={Z5SO4xmo6W8KMQoK{k3)dFk=8^kUW@b9TO@@f95^AYp-1
zK*#@7c0@syN|UU*;IfL2Fn-ykoJq~u_Ld%e9u;!*3c~%3%Dr7?lSV=%oe9n)-P*qo
z!XCnk2#`dWWQ}#`V^qQ70b5DYU~&yHT-g!B6*Z~8_YHNPbiMG9vJ&kRByZ?J@;nCh
zH_d#^Z7GgJ+R#K2<xL{qHim}8J1r=0i|&HbpO5=iuMW9aPmWy6Ay9Ode>QLY>5B!s
zer6L`G%KyXNW6&RiXKKiuYRuN^NbcG={;uio`v6|e&w_i;;N?!HP4V`qP!_=4(ljI
z6A01K9eAZDn{}u^E_=(zO&A^#ll;wdQi0TYK+|*70Ugs~@G9di?DYCS0{{i|!Ioqi
zVZ-^v6(>>N+%7+O8H5>ulX*!BlkB||MTc@c9N7Y72fp)MR8C4H9UfAh(gFyaFBk54
zg8?icWh?r-?B)skjoG9T>byCJ^M<TEt1SqEs6s1ryVD%NsUaAAx_q&0>J`WXR+XW5
zcUBw7YV>?J`*SlD2AYF4^j<DnC2GG>=gr}GXFhL0Iur9Ug?gi=x0RlXLU&+w?HJQx
z$1WAP{>&~jDVt=q2v&1;oez1l0_P>qwMfXZuxGd2x&Whhb>2WVE#|A5k4QL?QiJH+
z)<qS9yc&hf8d*T-iS?~)$9W8>JaS5%H)AP8Vad{YSmC(T-?w7|H(uCpeE7U6ZuOIV
z&639`MTCTsDA85sGQ#>bgpb<}&qbv|2+Fl`iOCydRwARr?NY(+H)fMZ_~Ow10P+UP
zKY4{iP`PICG+a_p0;T-DIn<N50Swg{NFYk&UunGonC|S)C(wB#A(06=l-c0%ZmIpJ
zXR%gi5*+8WpsX#ji%^YxW+hn-j}2P^rF-k`5S>?c$buZV&o5L&tbDXTaQXdlX2YW~
zWghlEMafmMBo95aW%H)+sa!Nznv0Rp%9AK6#3@4@B6&3eLwZ2pTXD|J#{-l?;+AA~
zRp%WcZ@wjYbGzJMz2DGIsI_lO&?ozyl%9vdsbz2U0AsuwV{qXZ+yno&Bspd_d89gT
z5^uWiD@QA%dG)E0ompA9ySIKcis`LG`W*AJAIknA&YMjON?Jm@2nJ*aPg8YqLGaOX
zjO1BgI%Mvrv^_`X4ZL2Vi5>|jI!A;JRIc^%K$}PP{R)l7IR|-Tj9z6fj!AaNIH<IH
zpom!Y*eBBVv2UcE$ly79uL!qop`jN`<@?ehV+^N^vHUfWyjsB`qpo&{gq-Gune0DS
z6nY~r4#CLYR8Lz8fK}>Mk0G!9dvgrPxgWv*OC`G|M)c2=9CW7tr6Rh<ZSSHpTnEKC
zd&1_+zOFR%4PS2#>R&1+g)<Te;S5&)!zs~ycLs09L0nX;xfFuP>+34_KCw}(`Y6=I
zjuu%oYL7ze|3Xmd`qCjw(cmaPL+b=A?Pn<hD<iYqs!tuFSA-}xELkH?lUJb{mMqu8
zZ8SvsZ{(0Ao5)h?j}+b3R*1A|3)yV@HsmBwG8u>z9biS3ZUs!LO`kfH$K-|7YDiH7
z^0ydPRied~-tZwq4~x)~>q`U(V}op^7Sy5Pj+}2Jw1YD|^N9qAWT%EnJQSkf5%jO`
z{}_66m|_8O*KcTR^!>M1Z;nCuziy_#p?yf+jQksm&OcdFrRd230000<MNUMnLSTX!
C4I*~{

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/layout/site_identity_popup.xml b/mobile/android/base/resources/layout/site_identity_popup.xml
new file mode 100644
index 00000000000..41ae2782886
--- /dev/null
+++ b/mobile/android/base/resources/layout/site_identity_popup.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+    <RelativeLayout android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dip"
+                    android:layout_alignParentTop="true"
+                    android:background="@drawable/doorhanger_popup_bg">
+
+      <LinearLayout android:id="@+id/identity_info"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="12dip"
+                    android:background="@drawable/doorhanger_bg"
+                    android:orientation="vertical">
+
+          <TextView android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:text="@string/identity_connected_to"/>
+
+          <TextView android:id="@+id/host"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textStyle="bold"/>
+
+          <TextView android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:text="@string/identity_run_by"/>
+
+          <TextView android:id="@+id/owner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textStyle="bold"/>
+
+          <TextView android:id="@+id/supplemental"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+          <TextView android:id="@+id/verifier"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorPrimary"/>
+
+      </LinearLayout>
+
+      <ImageView android:id="@+id/larry"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:padding="12dip"
+                 android:layout_alignParentRight="true"/>
+
+      <TextView android:id="@+id/encrypted"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/identity_info"
+                android:padding="12dip"
+                android:gravity="right"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorPrimary"/>
+
+    </RelativeLayout>
+
+    <ImageView android:id="@+id/arrow"
+               android:layout_width="44dip"
+               android:layout_height="16dip"
+               android:layout_marginTop="9dip"
+               android:layout_alignParentTop="true"
+               android:layout_alignParentRight="true"
+               android:src="@drawable/doorhanger_arrow"
+               android:scaleType="fitXY"/>
+
+</RelativeLayout>
diff --git a/mobile/android/base/resources/values/colors.xml b/mobile/android/base/resources/values/colors.xml
index a66706089e2..5c2538dac4e 100644
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -6,5 +6,7 @@
   <color name="splash_content">#ffffff</color>
   <color name="doorhanger_link">#ACC4D5</color>
   <color name="validation_message_text">#ffffff</color>
+  <color name="identity_verified">#77BAFF</color>
+  <color name="identity_identified">#B7D46A</color>
 </resources>
 
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 1c6ae935bab..6f708b0579f 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -148,4 +148,8 @@
 
   <string name="bookmarkdefaults_title_abouthome">@bookmarks_aboutHome@</string>
   <string name="bookmarkdefaults_url_abouthome">about:home</string>
+
+  <!-- Site identity popup -->
+  <string name="identity_connected_to">&identity_connected_to;</string>
+  <string name="identity_run_by">&identity_run_by;</string>
 </resources>
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index e12dad1c3f5..79f191b0cb9 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -2213,6 +2213,8 @@ Tab.prototype = {
     if (contentWin != contentWin.top)
         return;
 
+    this._hostChanged = true;
+
     let browser = BrowserApp.getBrowserForWindow(contentWin);
     let uri = browser.currentURI.spec;
     let documentURI = "";
@@ -2249,26 +2251,29 @@ Tab.prototype = {
     }
   },
 
+  // Properties used to cache security state used to update the UI
+  _state: null,
+  _hostChanged: false, // onLocationChange will flip this bit
+
   onSecurityChange: function(aWebProgress, aRequest, aState) {
-    let mode = "unknown";
-    if (aState & Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL)
-      mode = "identified";
-    else if (aState & Ci.nsIWebProgressListener.STATE_SECURE_HIGH)
-      mode = "verified";
-    else if (aState & Ci.nsIWebProgressListener.STATE_IS_BROKEN)
-      mode = "mixed";
-    else
-      mode = "unknown";
+    // Don't need to do anything if the data we use to update the UI hasn't changed
+    if (this._state == aState && !this._hostChanged)
+      return;
+
+    this._state = aState;
+    this._hostChanged = false;
+
+    let identity = IdentityHandler.checkIdentity(aState, this.browser);
 
     let message = {
       gecko: {
         type: "Content:SecurityChange",
         tabID: this.id,
-        mode: mode
+        identity: identity
       }
     };
 
-     sendMessageToJava(message);
+    sendMessageToJava(message);
   },
 
   onProgressChange: function(aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress) {
@@ -4605,6 +4610,159 @@ var CharacterEncoding = {
   }
 };
 
+var IdentityHandler = {
+  // Mode strings used to control CSS display
+  IDENTITY_MODE_IDENTIFIED       : "identified", // High-quality identity information
+  IDENTITY_MODE_DOMAIN_VERIFIED  : "verified",   // Minimal SSL CA-signed domain verification
+  IDENTITY_MODE_UNKNOWN          : "unknown",  // No trusted identity information
+
+  // Cache the most recent SSLStatus and Location seen in getIdentityStrings
+  _lastStatus : null,
+  _lastLocation : null,
+
+  /**
+   * Helper to parse out the important parts of _lastStatus (of the SSL cert in
+   * particular) for use in constructing identity UI strings
+  */
+  getIdentityData : function() {
+    let result = {};
+    let status = this._lastStatus.QueryInterface(Components.interfaces.nsISSLStatus);
+    let cert = status.serverCert;
+
+    // Human readable name of Subject
+    result.subjectOrg = cert.organization;
+
+    // SubjectName fields, broken up for individual access
+    if (cert.subjectName) {
+      result.subjectNameFields = {};
+      cert.subjectName.split(",").forEach(function(v) {
+        let field = v.split("=");
+        this[field[0]] = field[1];
+      }, result.subjectNameFields);
+
+      // Call out city, state, and country specifically
+      result.city = result.subjectNameFields.L;
+      result.state = result.subjectNameFields.ST;
+      result.country = result.subjectNameFields.C;
+    }
+
+    // Human readable name of Certificate Authority
+    result.caOrg =  cert.issuerOrganization || cert.issuerCommonName;
+    result.cert = cert;
+
+    return result;
+  },
+
+  getIdentityMode: function getIdentityMode(aState) {
+    if (aState & Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL)
+      return this.IDENTITY_MODE_IDENTIFIED;
+
+    if (aState & Ci.nsIWebProgressListener.STATE_SECURE_HIGH)
+      return this.IDENTITY_MODE_DOMAIN_VERIFIED;
+
+    return this.IDENTITY_MODE_UNKNOWN;
+  },
+
+  /**
+   * Determine the identity of the page being displayed by examining its SSL cert
+   * (if available). Return the data needed to update the UI.
+   */
+  checkIdentity: function checkIdentity(aState, aBrowser) {
+    this._lastStatus = aBrowser.securityUI
+                               .QueryInterface(Components.interfaces.nsISSLStatusProvider)
+                               .SSLStatus;
+
+    // Don't pass in the actual location object, since it can cause us to 
+    // hold on to the window object too long.  Just pass in the fields we
+    // care about. (bug 424829)
+    let locationObj = {};
+    try {
+      let location = aBrowser.contentWindow.location;
+      locationObj.host = location.host;
+      locationObj.hostname = location.hostname;
+      locationObj.port = location.port;
+    } catch (ex) {
+      // Can sometimes throw if the URL being visited has no host/hostname,
+      // e.g. about:blank. The _state for these pages means we won't need these
+      // properties anyways, though.
+    }
+    this._lastLocation = locationObj;
+
+    let mode = this.getIdentityMode(aState);
+    let result = { mode: mode };
+
+    // We can't to do anything else for pages without identity data
+    if (mode == this.IDENTITY_MODE_UNKNOWN)
+      return result;
+
+    // Ideally we'd just make this a Java string
+    result.encrypted = Strings.browser.GetStringFromName("identity.encrypted2");
+    result.host = this.getEffectiveHost();
+
+    let iData = this.getIdentityData();
+    result.verifier = Strings.browser.formatStringFromName("identity.identified.verifier", [iData.caOrg], 1);
+
+    // If the cert is identified, then we can populate the results with credentials
+    if (mode == this.IDENTITY_MODE_IDENTIFIED) {
+      result.owner = iData.subjectOrg;
+
+      // Build an appropriate supplemental block out of whatever location data we have
+      let supplemental = "";
+      if (iData.city)
+        supplemental += iData.city + "\n";
+      if (iData.state && iData.country)
+        supplemental += Strings.browser.formatStringFromName("identity.identified.state_and_country", [iData.state, iData.country], 2);
+      else if (iData.state) // State only
+        supplemental += iData.state;
+      else if (iData.country) // Country only
+        supplemental += iData.country;
+      result.supplemental = supplemental;
+
+      return result;
+    }
+    
+    // Otherwise, we don't know the cert owner
+    result.owner = Strings.browser.GetStringFromName("identity.ownerUnknown2");
+
+    // Cache the override service the first time we need to check it
+    if (!this._overrideService)
+      this._overrideService = Cc["@mozilla.org/security/certoverride;1"].getService(Ci.nsICertOverrideService);
+
+    // Check whether this site is a security exception. XPConnect does the right
+    // thing here in terms of converting _lastLocation.port from string to int, but
+    // the overrideService doesn't like undefined ports, so make sure we have
+    // something in the default case (bug 432241).
+    // .hostname can return an empty string in some exceptional cases -
+    // hasMatchingOverride does not handle that, so avoid calling it.
+    // Updating the tooltip value in those cases isn't critical.
+    // FIXME: Fixing bug 646690 would probably makes this check unnecessary
+    if (this._lastLocation.hostname &&
+        this._overrideService.hasMatchingOverride(this._lastLocation.hostname,
+                                                  (this._lastLocation.port || 443),
+                                                  iData.cert, {}, {}))
+      result.verifier = Strings.browser.GetStringFromName("identity.identified.verified_by_you");
+
+    return result;
+  },
+
+  /**
+   * Return the eTLD+1 version of the current hostname
+   */
+  getEffectiveHost: function getEffectiveHost() {
+    if (!this._IDNService)
+      this._IDNService = Cc["@mozilla.org/network/idn-service;1"]
+                         .getService(Ci.nsIIDNService);
+    try {
+      let baseDomain = Services.eTLD.getBaseDomainFromHost(this._lastLocation.hostname);
+      return this._IDNService.convertToDisplayIDN(baseDomain, {});
+    } catch (e) {
+      // If something goes wrong (e.g. hostname is an IP address) just fail back
+      // to the full domain.
+      return this._lastLocation.hostname;
+    }
+  }
+};
+
 function OverscrollController(aTab) {
   this.tab = aTab;
 }
diff --git a/mobile/android/locales/en-US/chrome/browser.properties b/mobile/android/locales/en-US/chrome/browser.properties
index 150cde853dd..5d9cee0d34c 100644
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -75,8 +75,6 @@ identity.identified.verified_by_you=You have added a security exception for this
 identity.identified.state_and_country=%S, %S
 identity.identified.title_with_country=%S (%S)
 identity.encrypted2=Encrypted
-identity.unencrypted2=Not encrypted
-identity.unknown.tooltip=This website does not supply identity information.
 identity.ownerUnknown2=(unknown)
 
 # Geolocation UI

From bdc6143449cdfb35609d26e8d17a41db2c4f0a05 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Wed, 2 May 2012 09:07:58 -0700
Subject: [PATCH 146/162] Bug 736272 - Add extra awesomeness weight to
 bookmarks. r=lucasr a=android-only

---
 mobile/android/base/db/LocalBrowserDB.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/db/LocalBrowserDB.java b/mobile/android/base/db/LocalBrowserDB.java
index 1ecb26b1862..2667645929e 100644
--- a/mobile/android/base/db/LocalBrowserDB.java
+++ b/mobile/android/base/db/LocalBrowserDB.java
@@ -167,8 +167,10 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
         // approximation using the Cauchy distribution: multiplier = 15^2 / (age^2 + 15^2).
         // Using 15 as our scale parameter, we get a constant 15^2 = 225. Following this math,
         // frecencyScore = numVisits * max(1, 100 * 225 / (age*age + 225)). (See bug 704977)
+        // We also give bookmarks an extra bonus boost by adding 100 points to their frecency score.
         final String age = "(" + Combined.DATE_LAST_VISITED + " - " + System.currentTimeMillis() + ") / 86400000";
-        final String sortOrder = Combined.VISITS + " * MAX(1, 100 * 225 / (" + age + "*" + age + " + 225)) DESC";
+        final String sortOrder = "(CASE WHEN " + Combined.BOOKMARK_ID + " > -1 THEN 100 ELSE 0 END) + " +
+                                 Combined.VISITS + " * MAX(1, 100 * 225 / (" + age + "*" + age + " + 225)) DESC";
 
         Cursor c = cr.query(combinedUriWithLimit(limit),
                             projection,

From 51eee0d0e8bf963bb841f2f466c0c7a1c41489ff Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Wed, 2 May 2012 09:07:58 -0700
Subject: [PATCH 147/162] Bug 749853 - about:* pages (and other unwanted URIs)
 should not be stored in history. r=mfinkle a=android-only

---
 mobile/android/base/GlobalHistory.java | 38 ++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/mobile/android/base/GlobalHistory.java b/mobile/android/base/GlobalHistory.java
index 2e3b362913a..c22d2591581 100644
--- a/mobile/android/base/GlobalHistory.java
+++ b/mobile/android/base/GlobalHistory.java
@@ -45,6 +45,7 @@ import java.lang.ref.SoftReference;
 
 import android.content.ContentResolver;
 import android.database.Cursor;
+import android.net.Uri;
 import android.os.Handler;
 import android.util.Log;
 
@@ -115,12 +116,49 @@ class GlobalHistory {
         GeckoAppShell.notifyUriVisited(uri);
     }
 
+    // Logic ported from nsNavHistory::CanAddURI.
+    // http://mxr.mozilla.org/mozilla-central/source/toolkit/components/places/nsNavHistory.cpp#1272
+    private boolean canAddURI(String uri) {
+        if (uri == null || uri.length() == 0)
+            return false;
+
+        // First, heck the most common cases (HTTP, HTTPS) to avoid most of the work.
+        if (uri.startsWith("http:") || uri.startsWith("https:"))
+            return true;
+
+        String scheme = Uri.parse(uri).getScheme();
+        if (scheme == null)
+            return false;
+
+        // Now check for all bad things.
+        if (scheme.equals("about") ||
+            scheme.equals("imap") ||
+            scheme.equals("news") ||
+            scheme.equals("mailbox") ||
+            scheme.equals("moz-anno") ||
+            scheme.equals("view-source") ||
+            scheme.equals("chrome") ||
+            scheme.equals("resource") ||
+            scheme.equals("data") ||
+            scheme.equals("wyciwyg") ||
+            scheme.equals("javascript"))
+            return false;
+
+        return true;
+    }
+
     public void add(String uri) {
+        if (!canAddURI(uri))
+            return;
+
         BrowserDB.updateVisitedHistory(GeckoApp.mAppContext.getContentResolver(), uri);
         addToGeckoOnly(uri);
     }
 
     public void update(String uri, String title) {
+        if (!canAddURI(uri))
+            return;
+
         ContentResolver resolver = GeckoApp.mAppContext.getContentResolver();
         BrowserDB.updateHistoryTitle(resolver, uri, title);
     }

From 8f5a4b3d71b0aa3402b19f86140c97c3e3b8856d Mon Sep 17 00:00:00 2001
From: Malini Das <mdas@mozilla.com>
Date: Wed, 2 May 2012 10:21:05 -0400
Subject: [PATCH 148/162] Bug 746031 - Support nested iframes correctly in
 Marionette, r=jgriffin, a=npotb,

---
 .../tests/unit/test_switch_frame.py           |  52 ++++++++
 .../marionette/client/marionette/www/test.xul |   2 +
 .../client/marionette/www/test2.xul           |  15 +++
 .../marionette/www/test_inner_iframe.html     |   9 ++
 .../marionette/www/test_nested_iframe.html    |   9 ++
 .../marionette/www/test_nested_iframe.xul     |   6 +
 testing/marionette/marionette-actors.js       | 108 ++++++++++++-----
 testing/marionette/marionette-listener.js     | 112 ++++++++----------
 8 files changed, 221 insertions(+), 92 deletions(-)
 create mode 100644 testing/marionette/client/marionette/www/test2.xul
 create mode 100644 testing/marionette/client/marionette/www/test_inner_iframe.html
 create mode 100644 testing/marionette/client/marionette/www/test_nested_iframe.html
 create mode 100644 testing/marionette/client/marionette/www/test_nested_iframe.xul

diff --git a/testing/marionette/client/marionette/tests/unit/test_switch_frame.py b/testing/marionette/client/marionette/tests/unit/test_switch_frame.py
index c2e6133f9ac..644b7ce1218 100644
--- a/testing/marionette/client/marionette/tests/unit/test_switch_frame.py
+++ b/testing/marionette/client/marionette/tests/unit/test_switch_frame.py
@@ -46,3 +46,55 @@ class TestSwitchFrame(MarionetteTestCase):
         self.assertEqual("Marionette IFrame Test", self.marionette.execute_script("return window.document.title;"))
         self.marionette.switch_to_frame("test_iframe")
         self.assertTrue("test.html" in self.marionette.get_url())
+
+    def test_switch_nested(self):
+        self.assertTrue(self.marionette.execute_script("window.location.href = 'about:blank'; return true;"))
+        self.assertEqual("about:blank", self.marionette.execute_script("return window.location.href;"))
+        test_html = self.marionette.absolute_url("test_nested_iframe.html")
+        self.marionette.navigate(test_html)
+        self.assertNotEqual("about:blank", self.marionette.execute_script("return window.location.href;"))
+        self.assertEqual("Marionette IFrame Test", self.marionette.execute_script("return window.document.title;"))
+        self.marionette.switch_to_frame("test_iframe")
+        self.assertTrue("test_inner_iframe.html" in self.marionette.get_url())
+        self.marionette.switch_to_frame("inner_frame")
+        self.assertTrue("test.html" in self.marionette.get_url())
+        self.marionette.switch_to_frame() # go back to main frame
+        self.assertTrue("test_nested_iframe.html" in self.marionette.get_url())
+        #test that we're using the right window object server-side
+        self.assertTrue("test_nested_iframe.html" in self.marionette.execute_script("return window.location.href;"))
+
+class TestSwitchFrameChrome(MarionetteTestCase):
+    def setUp(self):
+        MarionetteTestCase.setUp(self)
+        self.marionette.set_context("chrome")
+        self.win = self.marionette.get_window()
+        #need to get the file:// path for xul
+        unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
+        tests = os.path.abspath(os.path.join(unit, os.path.pardir))
+        mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
+        xul = "file://" + os.path.join(mpath, "www", "test.xul")
+        self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
+
+    def tearDown(self):
+        self.marionette.execute_script("window.close();")
+        self.marionette.switch_to_window(self.win)
+        MarionetteTestCase.tearDown(self)
+
+    def test_switch_simple(self):
+        self.assertTrue("test.xul" in self.marionette.get_url())
+        self.marionette.switch_to_frame(0)
+        self.assertTrue("test2.xul" in self.marionette.get_url())
+        self.marionette.switch_to_frame()
+        self.assertTrue("test.xul" in self.marionette.get_url())
+        self.marionette.switch_to_frame("iframe")
+        self.assertTrue("test2.xul" in self.marionette.get_url())
+        self.marionette.switch_to_frame()
+        self.assertTrue("test.xul" in self.marionette.get_url())
+        self.marionette.switch_to_frame("iframename")
+        self.assertTrue("test2.xul" in self.marionette.get_url())
+        self.marionette.switch_to_frame()
+        self.assertTrue("test.xul" in self.marionette.get_url())
+        
+    #I can't seem to access a xul iframe within a xul iframe
+    def test_switch_nested(self):
+        pass
diff --git a/testing/marionette/client/marionette/www/test.xul b/testing/marionette/client/marionette/www/test.xul
index 5b8aef24382..bdc991cc7d6 100644
--- a/testing/marionette/client/marionette/www/test.xul
+++ b/testing/marionette/client/marionette/www/test.xul
@@ -12,4 +12,6 @@
     <textbox id="textInput3" class="asdf" size="6" value="test" label="input" />
   </vbox>
      
+  <iframe id="iframe" name="iframename" src="test2.xul"/>
+  <iframe id="iframe" name="iframename" src="test_nested_iframe.xul"/>
 </dialog>
diff --git a/testing/marionette/client/marionette/www/test2.xul b/testing/marionette/client/marionette/www/test2.xul
new file mode 100644
index 00000000000..5b8aef24382
--- /dev/null
+++ b/testing/marionette/client/marionette/www/test2.xul
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE window [
+]>
+
+<dialog id="dia"
+            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <vbox id="things">
+    <checkbox id="testBox"  label="box" />
+    <textbox id="textInput"  size="6" value="test" label="input" />
+    <textbox id="textInput2"  size="6" value="test" label="input" />
+    <textbox id="textInput3" class="asdf" size="6" value="test" label="input" />
+  </vbox>
+     
+</dialog>
diff --git a/testing/marionette/client/marionette/www/test_inner_iframe.html b/testing/marionette/client/marionette/www/test_inner_iframe.html
new file mode 100644
index 00000000000..321c440f0c9
--- /dev/null
+++ b/testing/marionette/client/marionette/www/test_inner_iframe.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+<head>
+<title>Inner Iframe</title>
+</head>
+<body>
+  <iframe src="test.html" id="inner_frame"></iframe> 
+</body>
+</html> 
diff --git a/testing/marionette/client/marionette/www/test_nested_iframe.html b/testing/marionette/client/marionette/www/test_nested_iframe.html
new file mode 100644
index 00000000000..81eb596d26e
--- /dev/null
+++ b/testing/marionette/client/marionette/www/test_nested_iframe.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+<head>
+<title>Marionette IFrame Test</title>
+</head>
+<body>
+  <iframe src="test_inner_iframe.html" id="test_iframe"></iframe> 
+</body>
+</html> 
diff --git a/testing/marionette/client/marionette/www/test_nested_iframe.xul b/testing/marionette/client/marionette/www/test_nested_iframe.xul
new file mode 100644
index 00000000000..ee5d0c87afa
--- /dev/null
+++ b/testing/marionette/client/marionette/www/test_nested_iframe.xul
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE window [
+]>
+
+  <iframe id="iframe" name="iframename" src="test2.xul"/>
+</dialog>
diff --git a/testing/marionette/marionette-actors.js b/testing/marionette/marionette-actors.js
index 89deec69e77..e23143da435 100644
--- a/testing/marionette/marionette-actors.js
+++ b/testing/marionette/marionette-actors.js
@@ -119,6 +119,8 @@ function MarionetteDriverActor(aConnection)
   this.timer = null;
   this.marionetteLog = new MarionetteLogObj();
   this.command_id = null;
+  this.mainFrame = null; //topmost chrome frame
+  this.curFrame = null; //subframe that currently has focus
 
   //register all message listeners
   this.messageManager.addMessageListener("Marionette:ok", this);
@@ -219,10 +221,15 @@ MarionetteDriverActor.prototype = {
    */
   getCurrentWindow: function MDA_getCurrentWindow() {
     let type = null;
-    if (appName != "B2G" && this.context == "content") {
-      type = 'navigator:browser';
+    if (this.curFrame == null) {
+      if (appName != "B2G" && this.context == "content") {
+        type = 'navigator:browser';
+      }
+      return this.windowMediator.getMostRecentWindow(type);
+    }
+    else {
+      return this.curFrame;
     }
-    return this.windowMediator.getMostRecentWindow(type);
   },
 
   /**
@@ -275,6 +282,8 @@ MarionetteDriverActor.prototype = {
    *        True if this is the first time we're talking to this browser
    */
   startBrowser: function MDA_startBrowser(win, newSession) {
+    this.mainFrame = win;
+    this.curFrame = null;
     this.addBrowser(win);
     this.curBrowser.newSession = newSession;
     this.curBrowser.startSession(newSession);
@@ -711,7 +720,7 @@ MarionetteDriverActor.prototype = {
    * Searches based on name, then id.
    *
    * @param object aRequest
-   *        'value' member holds the id of the window to switch to
+   *        'value' member holds the name or id of the window to switch to
    */
   switchToWindow: function MDA_switchToWindow(aRequest) {
     let winEn = this.getWinEnumerator(); 
@@ -738,10 +747,73 @@ MarionetteDriverActor.prototype = {
    * Switch to a given frame within the current window
    *
    * @param object aRequest
-   *        'value' holds the id of the frame to switch to
+   *        'element' is the element to switch to
+   *        'value' if element is not set, then this
+   *                holds either the id, name or index 
+   *                of the frame to switch to
    */
   switchToFrame: function MDA_switchToFrame(aRequest) {
-    this.sendAsync("switchToFrame", aRequest);
+    let curWindow = this.getCurrentWindow();
+    if (this.context == "chrome") {
+      let foundFrame = null;
+      if ((aRequest.value == null) && (aRequest.element == null)) {
+        this.curFrame = null;
+        this.mainFrame.focus();
+        this.sendOk();
+        return;
+      }
+      if (aRequest.element != undefined) {
+        if (this.curBrowser.elementManager.seenItems[aRequest.element] != undefined) {
+          let wantedFrame = this.curBrowser.elementManager.getKnownElement(aRequest.element, curWindow); //HTMLIFrameElement
+          let numFrames = curWindow.frames.length;
+          for (let i = 0; i < numFrames; i++) {
+            if (curWindow.frames[i].frameElement == wantedFrame) {
+              curWindow = curWindow.frames[i]; 
+              this.curFrame = curWindow;
+              this.curFrame.focus();
+              this.sendOk();
+              return;
+          }
+        }
+      }
+    }
+    switch(typeof(aRequest.value)) {
+      case "string" :
+        let foundById = null;
+        let numFrames = curWindow.frames.length;
+        for (let i = 0; i < numFrames; i++) {
+          //give precedence to name
+          let frame = curWindow.frames[i];
+          let frameElement = frame.frameElement;
+          if (frame.name == aRequest.value) {
+            foundFrame = i;
+            break;
+          } else if ((foundById == null) && (frameElement.id == aRequest.value)) {
+            foundById = i;
+          }
+        }
+        if ((foundFrame == null) && (foundById != null)) {
+          foundFrame = foundById;
+        }
+        break;
+      case "number":
+        if (curWindow.frames[aRequest.value] != undefined) {
+          foundFrame = aRequest.value;
+        }
+        break;
+      }
+      if (foundFrame != null) {
+        curWindow = curWindow.frames[foundFrame];
+        this.curFrame = curWindow;
+        this.curFrame.focus();
+        this.sendOk();
+      } else {
+        this.sendError("Unable to locate frame: " + aRequest.value, 8, null);
+      }
+    }
+    else {
+      this.sendAsync("switchToFrame", aRequest);
+    }
   },
 
   /**
@@ -1106,11 +1178,6 @@ MarionetteDriverActor.prototype = {
           }
         }
         return reg;
-      case "Marionette:goUrl":
-        // if content determines that the goUrl call is directed at a top level window (not an iframe)
-        // it calls back into chrome to load the uri.
-        this.curBrowser.loadURI(message.json.value, this);
-        break;
     }
   },
   /**
@@ -1243,25 +1310,6 @@ BrowserObj.prototype = {
     this.tab = this.browser.addTab(uri, true);
   },
 
-  /**
-   * Load a uri in the current tab
-   *
-   * @param string uri
-   *      URI to load
-   * @param EventListener listener
-   *      event listener fired on load
-   */
-  loadURI: function BO_openURI(uri, listener) {
-    if (appName != "B2G") {
-      this.browser.addEventListener("DOMContentLoaded", listener, false);
-      this.browser.loadURI(uri);
-    }
-    else {
-      this.messageManager.addMessageListener("DOMContentLoaded", listener, true);
-      this.browser.selectedBrowser.loadURI(uri);
-    }
-  },
-
   /**
    * Loads content listeners if we don't already have them
    *
diff --git a/testing/marionette/marionette-listener.js b/testing/marionette/marionette-listener.js
index f96c60d857f..9828e20aa47 100644
--- a/testing/marionette/marionette-listener.js
+++ b/testing/marionette/marionette-listener.js
@@ -26,7 +26,7 @@ let marionetteTimeout = null;
 let winUtil = content.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindowUtils);
 let listenerId = null; //unique ID of this listener
 let activeFrame = null;
-let win = content;
+let curWindow = content;
 let elementManager = new ElementManager([]);
 
 /**
@@ -179,6 +179,7 @@ function sendError(message, status, trace, command_id) {
  */
 function resetValues() {
   marionetteTimeout = null;
+  curWin = content;
 }
 
 /**
@@ -227,9 +228,9 @@ function createExecuteContentSandbox(aWindow, marionette, args) {
  */
 function executeScript(msg, directInject) {
   let script = msg.json.value;
-  let marionette = new Marionette(false, win, "content", marionetteLogObj);
+  let marionette = new Marionette(false, curWindow, "content", marionetteLogObj);
 
-  let sandbox = createExecuteContentSandbox(win, marionette, msg.json.args);
+  let sandbox = createExecuteContentSandbox(curWindow, marionette, msg.json.args);
   if (!sandbox)
     return;
 
@@ -299,7 +300,7 @@ function executeJSScript(msg) {
  * method is called, or if it times out.
  */
 function executeWithCallback(msg, timeout) {
-  win.addEventListener("unload", errUnload, false);
+  curWindow.addEventListener("unload", errUnload, false);
   let script = msg.json.value;
   let command_id = msg.json.id;
 
@@ -308,21 +309,21 @@ function executeWithCallback(msg, timeout) {
   // However Selenium code returns 28, see
   // http://code.google.com/p/selenium/source/browse/trunk/javascript/firefox-driver/js/evaluate.js.
   // We'll stay compatible with the Selenium code.
-  let timeoutId = win.setTimeout(function() {
+  let timeoutId = curWindow.setTimeout(function() {
     contentAsyncReturnFunc('timed out', 28);
   }, marionetteTimeout);
-  win.addEventListener('error', function win__onerror(evt) {
-    win.removeEventListener('error', win__onerror, true);
+  curWindow.addEventListener('error', function win__onerror(evt) {
+    curWindow.removeEventListener('error', win__onerror, true);
     contentAsyncReturnFunc(evt, 17);
     return true;
   }, true);
 
   function contentAsyncReturnFunc(value, status) {
-    win.removeEventListener("unload", errUnload, false);
+    curWindow.removeEventListener("unload", errUnload, false);
 
     /* clear all timeouts potentially generated by the script*/
     for(let i=0; i<=timeoutId; i++) {
-      win.clearTimeout(i);
+      curWindow.clearTimeout(i);
     }
 
     sendSyncMessage("Marionette:testLog", {value: elementManager.wrapValue(marionetteLogObj.getLogs())});
@@ -349,9 +350,9 @@ function executeWithCallback(msg, timeout) {
                 "__marionetteFunc.apply(null, __marionetteParams); ";
   }
 
-  let marionette = new Marionette(true, win, "content", marionetteLogObj);
+  let marionette = new Marionette(true, curWindow, "content", marionetteLogObj);
 
-  let sandbox = createExecuteContentSandbox(win, marionette, msg.json.args);
+  let sandbox = createExecuteContentSandbox(curWindow, marionette, msg.json.args);
   if (!sandbox)
     return;
 
@@ -387,37 +388,32 @@ function setSearchTimeout(msg) {
  * All other navigation is handled by the server (in chrome space).
  */
 function goUrl(msg) {
-  if (activeFrame != null) {
-    win.document.location = msg.json.value;
-    //TODO: replace this with event firing when Bug 720714 is resolved
-    let checkTimer = Components.classes["@mozilla.org/timer;1"].createInstance(Components.interfaces.nsITimer);
-    let checkLoad = function () { 
-                      if (win.document.readyState == "complete") { 
-                        sendOk();
-                      } 
-                      else { 
-                        checkTimer.initWithCallback(checkLoad, 100, Components.interfaces.nsITimer.TYPE_ONE_SHOT);
-                      }
-                    };
-    checkLoad();
-  }
-  else {
-    sendAsyncMessage("Marionette:goUrl", {value: msg.json.value});
-  }
+  curWindow.location = msg.json.value;
+  //TODO: replace this with DOMContentLoaded event listening when Bug 720714 is resolved
+  let checkTimer = Components.classes["@mozilla.org/timer;1"].createInstance(Components.interfaces.nsITimer);
+  let checkLoad = function () { 
+                    if (curWindow.document.readyState == "complete") { 
+                      sendOk();
+                    } 
+                    else { 
+                      checkTimer.initWithCallback(checkLoad, 100, Components.interfaces.nsITimer.TYPE_ONE_SHOT);
+                    }
+                  };
+  checkTimer.initWithCallback(checkLoad, 100, Components.interfaces.nsITimer.TYPE_ONE_SHOT);
 }
 
 /**
  * Get the current URI
  */
 function getUrl(msg) {
-  sendResponse({value: win.location.href});
+  sendResponse({value: curWindow.location.href});
 }
 
 /**
  * Go back in history 
  */
 function goBack(msg) {
-  win.history.back();
+  curWindow.history.back();
   sendOk();
 }
 
@@ -425,7 +421,7 @@ function goBack(msg) {
  * Go forward in history 
  */
 function goForward(msg) {
-  win.history.forward();
+  curWindow.history.forward();
   sendOk();
 }
 
@@ -433,7 +429,7 @@ function goForward(msg) {
  * Refresh the page
  */
 function refresh(msg) {
-  win.location.reload(true);
+  curWindow.location.reload(true);
   let listen = function() { removeEventListener("DOMContentLoaded", arguments.callee, false); sendOk() } ;
   addEventListener("DOMContentLoaded", listen, false);
 }
@@ -445,8 +441,7 @@ function findElementContent(msg) {
   let id;
   try {
     let notify = function(id) { sendResponse({value:id});};
-    let curWin = activeFrame ? win.frames[activeFrame] : win;
-    id = elementManager.find(curWin, msg.json, notify, false);
+    id = elementManager.find(curWindow, msg.json, notify, false);
   }
   catch (e) {
     sendError(e.message, e.num, e.stack);
@@ -460,8 +455,7 @@ function findElementsContent(msg) {
   let id;
   try {
     let notify = function(id) { sendResponse({value:id});};
-    let curWin = activeFrame ? win.frames[activeFrame] : win;
-    id = elementManager.find(curWin, msg.json, notify, true);
+    id = elementManager.find(curWindow, msg.json, notify, true);
   }
   catch (e) {
     sendError(e.message, e.num, e.stack);
@@ -474,8 +468,7 @@ function findElementsContent(msg) {
 function clickElement(msg) {
   let el;
   try {
-    //el = elementManager.click(msg.json.element, win);
-    el = elementManager.getKnownElement(msg.json.element, win);
+    el = elementManager.getKnownElement(msg.json.element, curWindow);
     utils.click(el);
     sendOk();
   }
@@ -489,7 +482,7 @@ function clickElement(msg) {
  */
 function getElementAttribute(msg) {
   try {
-    let el = elementManager.getKnownElement(msg.json.element, win);
+    let el = elementManager.getKnownElement(msg.json.element, curWindow);
     sendResponse({value: utils.getElementAttribute(el, msg.json.name)});
   }
   catch (e) {
@@ -502,7 +495,7 @@ function getElementAttribute(msg) {
  */
 function getElementText(msg) {
   try {
-    let el = elementManager.getKnownElement(msg.json.element, win);
+    let el = elementManager.getKnownElement(msg.json.element, curWindow);
     sendResponse({value: utils.getElementText(el)});
   }
   catch (e) {
@@ -515,7 +508,7 @@ function getElementText(msg) {
  */
 function isElementDisplayed(msg) {
   try {
-    let el = elementManager.getKnownElement(msg.json.element, win);
+    let el = elementManager.getKnownElement(msg.json.element, curWindow);
     sendResponse({value: utils.isElementDisplayed(el)});
   }
   catch (e) {
@@ -528,7 +521,7 @@ function isElementDisplayed(msg) {
  */
 function isElementEnabled(msg) {
   try {
-    let el = elementManager.getKnownElement(msg.json.element, win);
+    let el = elementManager.getKnownElement(msg.json.element, curWindow);
     sendResponse({value: utils.isElementEnabled(el)});
   }
   catch (e) {
@@ -541,7 +534,7 @@ function isElementEnabled(msg) {
  */
 function isElementSelected(msg) {
   try {
-    let el = elementManager.getKnownElement(msg.json.element, win);
+    let el = elementManager.getKnownElement(msg.json.element, curWindow);
     sendResponse({value: utils.isElementSelected(el)});
   }
   catch (e) {
@@ -554,7 +547,7 @@ function isElementSelected(msg) {
  */
 function sendKeysToElement(msg) {
   try {
-    let el = elementManager.getKnownElement(msg.json.element, win);
+    let el = elementManager.getKnownElement(msg.json.element, curWindow);
     utils.sendKeysToElement(el, msg.json.value);
     sendOk();
   }
@@ -568,7 +561,7 @@ function sendKeysToElement(msg) {
  */
 function clearElement(msg) {
   try {
-    let el = elementManager.getKnownElement(msg.json.element, win);
+    let el = elementManager.getKnownElement(msg.json.element, curWindow);
     utils.clearElement(el);
     sendOk();
   }
@@ -584,21 +577,19 @@ function clearElement(msg) {
 function switchToFrame(msg) {
   let foundFrame = null;
   if ((msg.json.value == null) && (msg.json.element == null)) {
-    win = content;
-    activeFrame = null;
-    content.focus();
+    curWindow = content;
+    curWindow.focus();
     sendOk();
     return;
   }
   if (msg.json.element != undefined) {
     if (elementManager.seenItems[msg.json.element] != undefined) {
-      let wantedFrame = elementManager.getKnownElement(msg.json.element, win);//HTMLIFrameElement
-      let numFrames = win.frames.length;
+      let wantedFrame = elementManager.getKnownElement(msg.json.element, curWindow); //HTMLIFrameElement
+      let numFrames = curWindow.frames.length;
       for (let i = 0; i < numFrames; i++) {
-        if (win.frames[i].frameElement == wantedFrame) {
-          win = win.frames[i]; 
-          activeFrame = i;
-          win.focus();
+        if (curWindow.frames[i].frameElement == wantedFrame) {
+          curWindow = curWindow.frames[i]; 
+          curWindow.focus();
           sendOk();
           return;
         }
@@ -608,10 +599,10 @@ function switchToFrame(msg) {
   switch(typeof(msg.json.value)) {
     case "string" :
       let foundById = null;
-      let numFrames = win.frames.length;
+      let numFrames = curWindow.frames.length;
       for (let i = 0; i < numFrames; i++) {
         //give precedence to name
-        let frame = win.frames[i];
+        let frame = curWindow.frames[i];
         let frameElement = frame.frameElement;
         if (frameElement.name == msg.json.value) {
           foundFrame = i;
@@ -625,17 +616,14 @@ function switchToFrame(msg) {
       }
       break;
     case "number":
-      if (win.frames[msg.json.value] != undefined) {
+      if (curWindow.frames[msg.json.value] != undefined) {
         foundFrame = msg.json.value;
       }
       break;
   }
-  //TODO: implement index
   if (foundFrame != null) {
-    let frameWindow = win.frames[foundFrame];
-    activeFrame = foundFrame;
-    win = frameWindow;
-    win.focus();
+    curWindow = curWindow.frames[foundFrame];
+    curWindow.focus();
     sendOk();
   } else {
     sendError("Unable to locate frame: " + msg.json.value, 8, null);

From 2ad9bfbe2f6c60c43ee6a75e85daa40a25ff6a35 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 2 May 2012 13:12:46 -0400
Subject: [PATCH 149/162] Bug 722657 - Fix glaring bug in subdocument scrolling
 where scroll amounts got discarded. r=Cwiiis

---
 mobile/android/base/ui/PanZoomController.java |  4 +--
 .../base/ui/SubdocumentScrollHelper.java      | 30 ++++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/mobile/android/base/ui/PanZoomController.java b/mobile/android/base/ui/PanZoomController.java
index 136eecee959..a8d4334f6c0 100644
--- a/mobile/android/base/ui/PanZoomController.java
+++ b/mobile/android/base/ui/PanZoomController.java
@@ -597,14 +597,14 @@ public class PanZoomController
         return getVelocity() < STOPPED_THRESHOLD;
     }
 
-    PointF getDisplacement() {
+    PointF resetDisplacement() {
         return new PointF(mX.resetDisplacement(), mY.resetDisplacement());
     }
 
     private void updatePosition() {
         mX.displace();
         mY.displace();
-        PointF displacement = getDisplacement();
+        PointF displacement = resetDisplacement();
         if (FloatUtils.fuzzyEquals(displacement.x, 0.0f) && FloatUtils.fuzzyEquals(displacement.y, 0.0f)) {
             return;
         }
diff --git a/mobile/android/base/ui/SubdocumentScrollHelper.java b/mobile/android/base/ui/SubdocumentScrollHelper.java
index 5175f018a09..516ea04545e 100644
--- a/mobile/android/base/ui/SubdocumentScrollHelper.java
+++ b/mobile/android/base/ui/SubdocumentScrollHelper.java
@@ -57,15 +57,31 @@ class SubdocumentScrollHelper implements GeckoEventListener {
     private final PanZoomController mPanZoomController;
     private final Handler mUiHandler;
 
+    /* This is the amount of displacement we have accepted but not yet sent to JS; this is
+     * only valid when mOverrideScrollPending is true. */
+    private final PointF mPendingDisplacement;
+
+    /* When this is true, we're sending scroll events to JS to scroll the active subdocument. */
     private boolean mOverridePanning;
+
+    /* When this is true, we have received an ack for the last scroll event we sent to JS, and
+     * are ready to send the next scroll event. Note we only ever have one scroll event inflight
+     * at a time. */
     private boolean mOverrideScrollAck;
+
+    /* When this is true, we have a pending scroll that we need to send to JS; we were unable
+     * to send it when it was initially requested because mOverrideScrollAck was not true. */
     private boolean mOverrideScrollPending;
+
+    /* When this is true, the last scroll event we sent actually did some amount of scrolling on
+     * the subdocument; we use this to decide when we have reached the end of the subdocument. */
     private boolean mScrollSucceeded;
 
     SubdocumentScrollHelper(PanZoomController controller) {
         mPanZoomController = controller;
         // mUiHandler will be bound to the UI thread since that's where this constructor runs
         mUiHandler = new Handler();
+        mPendingDisplacement = new PointF();
 
         GeckoAppShell.registerGeckoEventListener(MESSAGE_PANNING_OVERRIDE, this);
         GeckoAppShell.registerGeckoEventListener(MESSAGE_CANCEL_OVERRIDE, this);
@@ -79,12 +95,11 @@ class SubdocumentScrollHelper implements GeckoEventListener {
 
         if (! mOverrideScrollAck) {
             mOverrideScrollPending = true;
+            mPendingDisplacement.x += displacement.x;
+            mPendingDisplacement.y += displacement.y;
             return true;
         }
 
-        mOverrideScrollAck = false;
-        mOverrideScrollPending = false;
-
         JSONObject json = new JSONObject();
         try {
             json.put("x", displacement.x);
@@ -94,6 +109,13 @@ class SubdocumentScrollHelper implements GeckoEventListener {
         }
         GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent(MESSAGE_SCROLL, json.toString()));
 
+        mOverrideScrollAck = false;
+        mOverrideScrollPending = false;
+        // clear the |mPendingDisplacement| after serializing |displacement| to
+        // JSON because they might be the same object
+        mPendingDisplacement.x = 0;
+        mPendingDisplacement.y = 0;
+
         return true;
     }
 
@@ -128,7 +150,7 @@ class SubdocumentScrollHelper implements GeckoEventListener {
                         mOverrideScrollAck = true;
                         mScrollSucceeded = message.getBoolean("scrolled");
                         if (mOverridePanning && mOverrideScrollPending) {
-                            scrollBy(mPanZoomController.getDisplacement());
+                            scrollBy(mPendingDisplacement);
                         }
                     }
                 } catch (Exception e) {

From 3f611e64de917dd316d9db3f032039ab01948310 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 2 May 2012 13:17:38 -0400
Subject: [PATCH 150/162] Bug 732364 - Ensure _elementCanScroll doesn't return
 true when the irrelevant axis is scrollable. r=Cwiiis

---
 mobile/android/chrome/content/browser.js | 28 ++++++++++--------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 79f191b0cb9..0c0ef00ce60 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -2567,6 +2567,13 @@ var BrowserEventHandler = {
       // the user wanted, and neither can any non-root sub-frame, cancel the
       // override so that Java can handle panning the main document.
       let data = JSON.parse(aData);
+
+      // round the scroll amounts because they come in as floats and might be
+      // subject to minor rounding errors because of zoom values. I've seen values
+      // like 0.99 come in here and get truncated to 0; this avoids that problem.
+      data.x = Math.round(data.x);
+      data.y = Math.round(data.y);
+
       if (this._firstScrollEvent) {
         while (this._scrollableElement != null && !this._elementCanScroll(this._scrollableElement, data.x, data.y))
           this._scrollableElement = this._findScrollableElement(this._scrollableElement, false);
@@ -2829,24 +2836,11 @@ var BrowserEventHandler = {
   },
 
   _elementCanScroll: function(elem, x, y) {
-    let scrollX = true;
-    let scrollY = true;
+    let scrollX = (x < 0 && elem.scrollLeft > 0)
+               || (x > 0 && elem.scrollLeft < (elem.scrollWidth - elem.clientWidth));
 
-    if (x < 0) {
-      if (elem.scrollLeft <= 0) {
-        scrollX = false;
-      }
-    } else if (elem.scrollLeft >= (elem.scrollWidth - elem.clientWidth)) {
-      scrollX = false;
-    }
-
-    if (y < 0) {
-      if (elem.scrollTop <= 0) {
-        scrollY = false;
-      }
-    } else if (elem.scrollTop >= (elem.scrollHeight - elem.clientHeight)) {
-      scrollY = false;
-    }
+    let scrollY = (y < 0 && elem.scrollTop > 0)
+               || (y > 0 && elem.scrollTop < (elem.scrollHeight - elem.clientHeight));
 
     return scrollX || scrollY;
   }

From 133387b28964e3b2c1ac31c7cbb0da03ee322148 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 2 May 2012 13:18:36 -0400
Subject: [PATCH 151/162] Bug 732364 - Apply axis locking to subdocument
 scrolling as well. r=Cwiiis a=android-only

---
 mobile/android/base/ui/Axis.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/ui/Axis.java b/mobile/android/base/ui/Axis.java
index aa1dc3a83c9..18403ccf764 100644
--- a/mobile/android/base/ui/Axis.java
+++ b/mobile/android/base/ui/Axis.java
@@ -227,8 +227,14 @@ abstract class Axis {
      * possible and this axis has not been scroll locked while panning. Otherwise, returns false.
      */
     private boolean scrollable() {
-        return getViewportLength() <= getPageLength() - MIN_SCROLLABLE_DISTANCE &&
-               !mScrollingDisabled;
+        // If we're scrolling a subdocument, ignore the viewport length restrictions (since those
+        // apply to the top-level document) and only take into account axis locking.
+        if (mSubscroller.scrolling()) {
+            return !mScrollingDisabled;
+        } else {
+            return getViewportLength() <= getPageLength() - MIN_SCROLLABLE_DISTANCE &&
+                   !mScrollingDisabled;
+        }
     }
 
     /*
@@ -305,8 +311,9 @@ abstract class Axis {
 
     // Performs displacement of the viewport position according to the current velocity.
     void displace() {
-        if (!mSubscroller.scrolling() && !scrollable())
+        if (!scrollable()) {
             return;
+        }
 
         if (mFlingState == FlingStates.PANNING)
             mDisplacement += (mLastTouchPos - mTouchPos) * getEdgeResistance();

From 6560fa5a33ddeba21d0cc961344d8f3233daea38 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Wed, 2 May 2012 13:24:53 -0400
Subject: [PATCH 152/162] bug 744070 - Page starts out zoomed, doesn't
 resize/scroll correctly r=mbrubeck a=android-only

---
 mobile/android/chrome/content/browser.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 0c0ef00ce60..cd9867e8057 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -3592,14 +3592,11 @@ var ViewportHandler = {
     if (doctype && /(WAP|WML|Mobile)/.test(doctype.publicId))
       return { defaultZoom: 1, autoSize: true, allowZoom: true, autoScale: true };
 
-    let windowUtils = aWindow.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-    let handheldFriendly = windowUtils.getDocumentMetadata("HandheldFriendly");
-    if (handheldFriendly == "true")
-      return { defaultZoom: 1, autoSize: true, allowZoom: true, autoScale: true };
-
     if (aWindow.document instanceof XULDocument)
       return { defaultZoom: 1, autoSize: true, allowZoom: false, autoScale: false };
 
+    let windowUtils = aWindow.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
+
     // viewport details found here
     // http://developer.apple.com/safari/library/documentation/AppleApplications/Reference/SafariHTMLRef/Articles/MetaTags.html
     // http://developer.apple.com/safari/library/documentation/AppleApplications/Reference/SafariWebContent/UsingtheViewport/UsingtheViewport.html
@@ -3618,6 +3615,15 @@ var ViewportHandler = {
     let allowZoomStr = windowUtils.getDocumentMetadata("viewport-user-scalable");
     let allowZoom = !/^(0|no|false)$/.test(allowZoomStr); // WebKit allows 0, "no", or "false"
 
+
+    if (scale == NaN && minScale == NaN && maxScale == NaN && allowZoomStr == "" && widthStr == "" && heightStr == "") {
+	// Only check for HandheldFriendly if we don't have a viewport meta tag
+	let handheldFriendly = windowUtils.getDocumentMetadata("HandheldFriendly");
+
+	if (handheldFriendly == "true")
+	    return { defaultZoom: 1, autoSize: true, allowZoom: true, autoScale: true };
+    }
+
     scale = this.clamp(scale, kViewportMinScale, kViewportMaxScale);
     minScale = this.clamp(minScale, kViewportMinScale, kViewportMaxScale);
     maxScale = this.clamp(maxScale, kViewportMinScale, kViewportMaxScale);

From ed9fc1209a00c1e877e77e8b5294ab2df35d2e7c Mon Sep 17 00:00:00 2001
From: Edward Lee <edilee@mozilla.com>
Date: Wed, 2 May 2012 10:35:31 -0700
Subject: [PATCH 153/162] Bug 750568 - Cannot use twitter or google accounts
 within the desktop runtime - Needs to be whitelisted on origins allowed
 [r=myk, a=js-only] Also allow plain https twitter.com

---
 webapprt/ContentPolicy.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapprt/ContentPolicy.js b/webapprt/ContentPolicy.js
index 37c70468d90..b71aff196e7 100644
--- a/webapprt/ContentPolicy.js
+++ b/webapprt/ContentPolicy.js
@@ -16,6 +16,7 @@ const allowedOrigins = [
   "https://www.facebook.com",
   "https://accounts.google.com",
   "https://www.google.com",
+  "https://twitter.com",
   "https://api.twitter.com",
 ];
 

From b79e9be2f400f68617b408f6c8aa3f7d4a611df4 Mon Sep 17 00:00:00 2001
From: Armen Zambrano Gasparnian <armenzg@mozilla.com>
Date: Wed, 2 May 2012 14:21:36 -0400
Subject: [PATCH 154/162] Bug 748996 - talos_from_code.py needs to generate
 more detailed error messages. a=NPOTB DONTBUILD r=catlee

---
 testing/talos/talos_from_code.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/talos/talos_from_code.py b/testing/talos/talos_from_code.py
index 25d9334f0b0..a581656c896 100644
--- a/testing/talos/talos_from_code.py
+++ b/testing/talos/talos_from_code.py
@@ -48,8 +48,8 @@ def main():
         entity = get_value(jsonFilename, key)
         if passesRestrictions(options.talos_json_url, entity["url"]):
             # the key is at the same time the filename e.g. talos.zip
+            print "INFO: Downloading %s as %s" % (entity["url"], os.path.join(entity["path"], key))
             download_file(entity["url"], entity["path"], key)
-            print "INFO: %s -> %s" % (entity["url"], os.path.join(entity["path"], key))
         else:
             print "ERROR: You have tried to download a file " + \
                   "from: %s " % fileUrl + \

From 333952f12ea175f804e9b42767df50e4a0ad307a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 2 May 2012 20:39:06 +0200
Subject: [PATCH 155/162] Bug 750980 - Implement visibleTabs cache. r=ttaubert
 a=non-libxul

---
 browser/base/content/tabbrowser.xml | 37 +++++++++++++++++++----------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index c80b387b89b..9436d942ca4 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -92,13 +92,17 @@
       <field name="tabs" readonly="true">
         this.tabContainer.childNodes;
       </field>
+
       <property name="visibleTabs" readonly="true">
         <getter><![CDATA[
-          return Array.filter(this.tabs, function(tab) {
-            return !tab.hidden && !tab.closing;
-          });
+          if (!this._visibleTabs)
+            this._visibleTabs = Array.filter(this.tabs,
+                                             function (tab) !tab.hidden && !tab.closing);
+          return this._visibleTabs;
         ]]></getter>
       </property>
+      <field name="_visibleTabs">null</field>
+
       <field name="mURIFixup" readonly="true">
         Components.classes["@mozilla.org/docshell/urifixup;1"]
                   .getService(Components.interfaces.nsIURIFixup);
@@ -151,9 +155,6 @@
         false
 #endif
       </field>
-      <field name="_browsers">
-        null
-      </field>
 
       <field name="_autoScrollPopup">
         null
@@ -1240,8 +1241,6 @@
               aIsUTF8               = params.isUTF8;
             }
 
-            this._browsers = null; // invalidate cache
-
             // if we're adding tabs, we're past interrupt mode, ditch the owner
             if (this.mCurrentTab.owner)
               this.mCurrentTab.owner = null;
@@ -1291,10 +1290,11 @@
               }, 0, this.tabContainer);
             }
 
-            this.tabContainer.appendChild(t);
-
-            // invalidate cache, because tabContainer is about to change
+            // invalidate caches
             this._browsers = null;
+            this._visibleTabs = null;
+
+            this.tabContainer.appendChild(t);
 
             // If this new tab is owned by another, assert that relationship
             if (aOwner)
@@ -1625,6 +1625,7 @@
 
             aTab.closing = true;
             this._removingTabs.push(aTab);
+            this._visibleTabs = null; // invalidate cache
             if (newTab)
               this.addTab(BROWSER_NEW_TAB_URL, {skipAnimation: true});
             else
@@ -2009,7 +2010,10 @@
         <![CDATA[
           if (aTab.hidden) {
             aTab.removeAttribute("hidden");
+            this._visibleTabs = null; // invalidate cache
+
             this.tabContainer.adjustTabstrip();
+
             let event = document.createEvent("Events");
             event.initEvent("TabShow", true, false);
             aTab.dispatchEvent(event);
@@ -2025,7 +2029,10 @@
           if (!aTab.hidden && !aTab.pinned && !aTab.selected &&
               !aTab.closing) {
             aTab.setAttribute("hidden", "true");
+            this._visibleTabs = null; // invalidate cache
+
             this.tabContainer.adjustTabstrip();
+
             let event = document.createEvent("Events");
             event.initEvent("TabHide", true, false);
             aTab.dispatchEvent(event);
@@ -2081,6 +2088,7 @@
           ]]>
         </getter>
       </property>
+      <field name="_browsers">null</field>
 
       <!-- Moves a tab to a new browser window, unless it's already the only tab
            in the current window, in which case this will do nothing. -->
@@ -2126,11 +2134,14 @@
 
           aIndex = aIndex < aTab._tPos ? aIndex: aIndex+1;
           this.mCurrentTab._selected = false;
+
+          // invalidate caches
+          this._browsers = null;
+          this._visibleTabs = null;
+
           // use .item() instead of [] because dragging to the end of the strip goes out of
           // bounds: .item() returns null (so it acts like appendChild), but [] throws
           this.tabContainer.insertBefore(aTab, this.tabs.item(aIndex));
-          // invalidate cache, because tabContainer is about to change
-          this._browsers = null;
 
           for (let i = 0; i < this.tabs.length; i++) {
             this.tabs[i]._tPos = i;

From 5089e33a24b9c0a50bbd169abce5490794e54ce4 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 2 May 2012 11:40:42 -0700
Subject: [PATCH 156/162] Bug 747354 - Only show completed downloads in the
 download manager. r=mfinkle, a=mobile-only

---
 mobile/android/chrome/content/aboutDownloads.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/mobile/android/chrome/content/aboutDownloads.js b/mobile/android/chrome/content/aboutDownloads.js
index c42da6f074a..ab85bd46a69 100644
--- a/mobile/android/chrome/content/aboutDownloads.js
+++ b/mobile/android/chrome/content/aboutDownloads.js
@@ -81,6 +81,7 @@ let Downloads = {
     switch (aTopic) {
       case "dl-failed":
       case "dl-cancel":
+        break;
       case "dl-done":
         if (!this._getElementForDownload(download.id)) {
           let item = this._createItem(downloadTemplate, {
@@ -102,10 +103,10 @@ let Downloads = {
       this._stmt.finalize();
 
     this._stmt = this._dlmgr.DBConnection.createStatement(
-      "SELECT id, name, source, state, startTime, endTime, referrer, " +
-             "currBytes, maxBytes, state IN (?1, ?2, ?3, ?4, ?5) isActive " +
+      "SELECT id, name, source, startTime, endTime, referrer, " +
+             "currBytes, maxBytes " +
       "FROM moz_downloads " +
-      "WHERE NOT isActive " +
+      "WHERE state = :download_state " +
       "ORDER BY endTime DESC");
   },
 
@@ -177,11 +178,7 @@ let Downloads = {
     clearTimeout(this._timeoutID);
 
     this._stmt.reset();
-    this._stmt.bindInt32Parameter(0, Ci.nsIDownloadManager.DOWNLOAD_NOTSTARTED);
-    this._stmt.bindInt32Parameter(1, Ci.nsIDownloadManager.DOWNLOAD_DOWNLOADING);
-    this._stmt.bindInt32Parameter(2, Ci.nsIDownloadManager.DOWNLOAD_PAUSED);
-    this._stmt.bindInt32Parameter(3, Ci.nsIDownloadManager.DOWNLOAD_QUEUED);
-    this._stmt.bindInt32Parameter(4, Ci.nsIDownloadManager.DOWNLOAD_SCANNING);
+    this._stmt.params.download_state = Ci.nsIDownloadManager.DOWNLOAD_FINISHED;
 
     // Take a quick break before we actually start building the list
     let self = this;

From d9f31121e6e4ca1c9786a0c9bb2694a45c3b323c Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 2 May 2012 11:55:37 -0700
Subject: [PATCH 157/162] Bug 744518 - Use touch events to trigger tap
 highlight. r=kats. a=mobile-only

---
 mobile/android/base/ui/PanZoomController.java |  6 --
 mobile/android/chrome/content/browser.js      | 55 +++++++++++--------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/mobile/android/base/ui/PanZoomController.java b/mobile/android/base/ui/PanZoomController.java
index a8d4334f6c0..cde96f1a7f7 100644
--- a/mobile/android/base/ui/PanZoomController.java
+++ b/mobile/android/base/ui/PanZoomController.java
@@ -947,12 +947,6 @@ public class PanZoomController
         sendPointToGecko("Gesture:LongPress", motionEvent);
     }
 
-    @Override
-    public boolean onDown(MotionEvent motionEvent) {
-        sendPointToGecko("Gesture:ShowPress", motionEvent);
-        return false;
-    }
-
     @Override
     public boolean onSingleTapConfirmed(MotionEvent motionEvent) {
         GeckoApp.mFormAssistPopup.hide();
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index cd9867e8057..4a6f82ecdbe 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -2526,13 +2526,44 @@ Tab.prototype = {
 var BrowserEventHandler = {
   init: function init() {
     Services.obs.addObserver(this, "Gesture:SingleTap", false);
-    Services.obs.addObserver(this, "Gesture:ShowPress", false);
     Services.obs.addObserver(this, "Gesture:CancelTouch", false);
     Services.obs.addObserver(this, "Gesture:DoubleTap", false);
     Services.obs.addObserver(this, "Gesture:Scroll", false);
     Services.obs.addObserver(this, "dom-touch-listener-added", false);
 
     BrowserApp.deck.addEventListener("DOMUpdatePageReport", PopupBlockerObserver.onUpdatePageReport, false);
+    BrowserApp.deck.addEventListener("touchstart", this, false);
+  },
+
+  handleEvent: function(aEvent) {
+    if (!BrowserApp.isBrowserContentDocumentDisplayed() || aEvent.touches.length > 1 || aEvent.defaultPrevented)
+      return;
+
+    let closest = aEvent.target;
+
+    if (closest) {
+      // If we've pressed a scrollable element, let Java know that we may
+      // want to override the scroll behaviour (for document sub-frames)
+      this._scrollableElement = this._findScrollableElement(closest, true);
+      this._firstScrollEvent = true;
+
+      if (this._scrollableElement != null) {
+        // Discard if it's the top-level scrollable, we let Java handle this
+        let doc = BrowserApp.selectedBrowser.contentDocument;
+        if (this._scrollableElement != doc.body && this._scrollableElement != doc.documentElement)
+          sendMessageToJava({ gecko: { type: "Panning:Override" } });
+      }
+    }
+
+    if (!ElementTouchHelper.isElementClickable(closest))
+      closest = ElementTouchHelper.elementFromPoint(BrowserApp.selectedBrowser.contentWindow,
+                                                    aEvent.changedTouches[0].screenX,
+                                                    aEvent.changedTouches[0].screenY);
+    if (!closest)
+      closest = aEvent.target;
+
+    if (closest)
+      this._doTapHighlight(closest);
   },
 
   observe: function(aSubject, aTopic, aData) {
@@ -2596,32 +2627,12 @@ var BrowserEventHandler = {
       }
     } else if (aTopic == "Gesture:CancelTouch") {
       this._cancelTapHighlight();
-    } else if (aTopic == "Gesture:ShowPress") {
-      let data = JSON.parse(aData);
-      let closest = ElementTouchHelper.elementFromPoint(BrowserApp.selectedBrowser.contentWindow, data.x, data.y);
-      if (!closest)
-        closest = ElementTouchHelper.anyElementFromPoint(BrowserApp.selectedBrowser.contentWindow, data.x, data.y);
-      if (closest) {
-        this._doTapHighlight(closest);
-
-        // If we've pressed a scrollable element, let Java know that we may
-        // want to override the scroll behaviour (for document sub-frames)
-        this._scrollableElement = this._findScrollableElement(closest, true);
-        this._firstScrollEvent = true;
-
-        if (this._scrollableElement != null) {
-          // Discard if it's the top-level scrollable, we let Java handle this
-          let doc = BrowserApp.selectedBrowser.contentDocument;
-          if (this._scrollableElement != doc.body && this._scrollableElement != doc.documentElement)
-            sendMessageToJava({ gecko: { type: "Panning:Override" } });
-        }
-      }
     } else if (aTopic == "Gesture:SingleTap") {
       let element = this._highlightElement;
       if (element && !SelectHelper.handleClick(element)) {
         try {
           let data = JSON.parse(aData);
-  
+
           this._sendMouseEvent("mousemove", element, data.x, data.y);
           this._sendMouseEvent("mousedown", element, data.x, data.y);
           this._sendMouseEvent("mouseup",   element, data.x, data.y);

From cbe821f3a9329e6f56c61dc6e82a94e75b742330 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 2 May 2012 15:37:08 -0400
Subject: [PATCH 158/162] Backout the latest merge from fx-team because of Ts
 regressions (no bug)

---
 browser/components/nsBrowserGlue.js           |   6 -
 browser/components/thumbnails/PageThumbs.jsm  | 203 +++++++-----------
 .../thumbnails/PageThumbsProtocol.js          |   8 -
 .../components/thumbnails/test/Makefile.in    |   1 -
 .../test/browser_thumbnails_redirect.js       |  33 ++-
 .../test/browser_thumbnails_storage.js        |  89 --------
 browser/components/thumbnails/test/head.js    |   2 +-
 config/rules.mk                               |   6 +-
 js/src/config/rules.mk                        |   6 +-
 testing/testsuite-targets.mk                  |   2 +-
 toolkit/devtools/debugger/Makefile.in         |   4 +-
 toolkit/devtools/debugger/dbg-client.jsm      |   8 +-
 .../devtools/debugger/server/dbg-server.js    |  18 +-
 .../devtools/debugger/tests/unit/head_dbg.js  |  53 +----
 .../debugger/tests/unit/test_breakpoint-02.js |   6 +-
 .../tests/unit/test_threadlifetime-05.js      |   6 +-
 16 files changed, 130 insertions(+), 321 deletions(-)
 delete mode 100644 browser/components/thumbnails/test/browser_thumbnails_storage.js

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index c1e0ac38a16..e6b32521231 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -68,9 +68,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "BookmarkHTMLUtils",
 XPCOMUtils.defineLazyModuleGetter(this, "webappsUI", 
                                   "resource:///modules/webappsUI.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "PageThumbs",
-                                  "resource:///modules/PageThumbs.jsm");
-
 const PREF_PLUGINS_NOTIFYUSER = "plugins.update.notifyUser";
 const PREF_PLUGINS_UPDATEURL  = "plugins.update.url";
 
@@ -361,8 +358,6 @@ BrowserGlue.prototype = {
     // Initialize webapps UI
     webappsUI.init();
 
-    PageThumbs.init();
-
     Services.obs.notifyObservers(null, "browser-ui-startup-complete", "");
   },
 
@@ -384,7 +379,6 @@ BrowserGlue.prototype = {
   _onProfileShutdown: function BG__onProfileShutdown() {
     this._shutdownPlaces();
     this._sanitizer.onShutdown();
-    PageThumbs.uninit();
   },
 
   // All initial windows have opened.
diff --git a/browser/components/thumbnails/PageThumbs.jsm b/browser/components/thumbnails/PageThumbs.jsm
index 64dc943ff6d..4cefd4befdc 100644
--- a/browser/components/thumbnails/PageThumbs.jsm
+++ b/browser/components/thumbnails/PageThumbs.jsm
@@ -4,7 +4,7 @@
 
 "use strict";
 
-let EXPORTED_SYMBOLS = ["PageThumbs", "PageThumbsStorage", "PageThumbsCache"];
+let EXPORTED_SYMBOLS = ["PageThumbs", "PageThumbsCache"];
 
 const Cu = Components.utils;
 const Cc = Components.classes;
@@ -12,11 +12,6 @@ const Ci = Components.interfaces;
 
 const HTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
 
-/**
- * Name of the directory in the profile that contains the thumbnails.
- */
-const THUMBNAIL_DIRECTORY = "thumbnails";
-
 /**
  * The default background color for page thumbnails.
  */
@@ -30,29 +25,11 @@ XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
   "resource://gre/modules/Services.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
-  "resource://gre/modules/FileUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
-  "resource://gre/modules/PlacesUtils.jsm");
-
-XPCOMUtils.defineLazyGetter(this, "gCryptoHash", function () {
-  return Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash);
-});
-
-XPCOMUtils.defineLazyGetter(this, "gUnicodeConverter", function () {
-  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-                    .createInstance(Ci.nsIScriptableUnicodeConverter);
-  converter.charset = 'utf8';
-  return converter;
-});
-
 /**
  * Singleton providing functionality for capturing web page thumbnails and for
  * accessing them if already cached.
  */
 let PageThumbs = {
-  _initialized: false,
 
   /**
    * The calculated width and height of the thumbnails.
@@ -75,20 +52,6 @@ let PageThumbs = {
    */
   get contentType() "image/png",
 
-  init: function PageThumbs_init() {
-    if (!this._initialized) {
-      this._initialized = true;
-      PlacesUtils.history.addObserver(PageThumbsHistoryObserver, false);
-    }
-  },
-
-  uninit: function PageThumbs_uninit() {
-    if (this._initialized) {
-      this._initialized = false;
-      PlacesUtils.history.removeObserver(PageThumbsHistoryObserver);
-    }
-  },
-
   /**
    * Gets the thumbnail image's url for a given web page's url.
    * @param aUrl The web page's url that is depicted in the thumbnail.
@@ -161,14 +124,32 @@ let PageThumbs = {
           //    Sync and therefore also redirect sources appear on the newtab
           //    page. We also want thumbnails for those.
           if (url != originalURL)
-            PageThumbsStorage.copy(url, originalURL);
+            PageThumbsCache._copy(url, originalURL);
         }
 
         if (aCallback)
           aCallback(aSuccessful);
       }
 
-      PageThumbsStorage.write(url, aInputStream, finish);
+      // Get a writeable cache entry.
+      PageThumbsCache.getWriteEntry(url, function (aEntry) {
+        if (!aEntry) {
+          finish(false);
+          return;
+        }
+
+        let outputStream = aEntry.openOutputStream(0);
+
+        // Write the image data to the cache entry.
+        NetUtil.asyncCopy(aInputStream, outputStream, function (aResult) {
+          let success = Components.isSuccessCode(aResult);
+          if (success)
+            aEntry.markValid();
+
+          aEntry.close();
+          finish(success);
+        });
+      });
     });
   },
 
@@ -216,7 +197,7 @@ let PageThumbs = {
    */
   _getThumbnailSize: function PageThumbs_getThumbnailSize() {
     if (!this._thumbnailWidth || !this._thumbnailHeight) {
-      let screenManager = Cc["@mozilla.org/gfx/screenmanager;1"]
+      let screenManager = Cc["@mozilla.org/gfx/screenmanager;1"]
                             .getService(Ci.nsIScreenManager);
       let left = {}, top = {}, width = {}, height = {};
       screenManager.primaryScreen.GetRect(left, top, width, height);
@@ -227,88 +208,6 @@ let PageThumbs = {
   }
 };
 
-let PageThumbsStorage = {
-  getFileForURL: function Storage_getFileForURL(aURL) {
-    let hash = this._calculateMD5Hash(aURL);
-    let parts = [THUMBNAIL_DIRECTORY, hash[0], hash[1], hash.slice(2) + ".png"];
-    return FileUtils.getFile("ProfD", parts);
-  },
-
-  write: function Storage_write(aURL, aDataStream, aCallback) {
-    let file = this.getFileForURL(aURL);
-    let fos = FileUtils.openSafeFileOutputStream(file);
-
-    NetUtil.asyncCopy(aDataStream, fos, function (aResult) {
-      FileUtils.closeSafeFileOutputStream(fos);
-      aCallback(Components.isSuccessCode(aResult));
-    });
-  },
-
-  copy: function Storage_copy(aSourceURL, aTargetURL) {
-    let sourceFile = this.getFileForURL(aSourceURL);
-    let targetFile = this.getFileForURL(aTargetURL);
-
-    try {
-      sourceFile.copyTo(targetFile.parent, targetFile.leafName);
-    } catch (e) {
-      /* We might not be permitted to write to the file. */
-    }
-  },
-
-  remove: function Storage_remove(aURL) {
-    try {
-      this.getFileForURL(aURL).remove(false);
-    } catch (e) {
-      /* The file might not exist or we're not permitted to remove it. */
-    }
-  },
-
-  wipe: function Storage_wipe() {
-    try {
-      FileUtils.getDir("ProfD", [THUMBNAIL_DIRECTORY]).remove(true);
-    } catch (e) {
-      /* The file might not exist or we're not permitted to remove it. */
-    }
-  },
-
-  _calculateMD5Hash: function Storage_calculateMD5Hash(aValue) {
-    let hash = gCryptoHash;
-    let value = gUnicodeConverter.convertToByteArray(aValue);
-
-    hash.init(hash.MD5);
-    hash.update(value, value.length);
-    return this._convertToHexString(hash.finish(false));
-  },
-
-  _convertToHexString: function Storage_convertToHexString(aData) {
-    let hex = "";
-    for (let i = 0; i < aData.length; i++)
-      hex += ("0" + aData.charCodeAt(i).toString(16)).slice(-2);
-    return hex;
-  },
-
-};
-
-let PageThumbsHistoryObserver = {
-  onDeleteURI: function Thumbnails_onDeleteURI(aURI, aGUID) {
-    PageThumbsStorage.remove(aURI.spec);
-  },
-
-  onClearHistory: function Thumbnails_onClearHistory() {
-    PageThumbsStorage.wipe();
-  },
-
-  onTitleChanged: function () {},
-  onBeginUpdateBatch: function () {},
-  onEndUpdateBatch: function () {},
-  onVisit: function () {},
-  onBeforeDeleteURI: function () {},
-  onPageChanged: function () {},
-  onDeleteVisits: function () {},
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
-};
-
 /**
  * A singleton handling the storage of page thumbnails.
  */
@@ -323,6 +222,64 @@ let PageThumbsCache = {
     this._openCacheEntry(aKey, Ci.nsICache.ACCESS_READ, aCallback);
   },
 
+  /**
+   * Calls the given callback with a cache entry opened for writing.
+   * @param aKey The key identifying the desired cache entry.
+   * @param aCallback The callback that is called when the cache entry is ready.
+   */
+  getWriteEntry: function Cache_getWriteEntry(aKey, aCallback) {
+    // Try to open the desired cache entry.
+    this._openCacheEntry(aKey, Ci.nsICache.ACCESS_WRITE, aCallback);
+  },
+
+  /**
+   * Copies an existing cache entry's data to a new cache entry.
+   * @param aSourceKey The key that contains the data to copy.
+   * @param aTargetKey The key that will be the copy of aSourceKey's data.
+   */
+  _copy: function Cache_copy(aSourceKey, aTargetKey) {
+    let sourceEntry, targetEntry, waitingCount = 2;
+
+    function finish() {
+      if (sourceEntry)
+        sourceEntry.close();
+
+      if (targetEntry)
+        targetEntry.close();
+    }
+
+    function copyDataWhenReady() {
+      if (--waitingCount > 0)
+        return;
+
+      if (!sourceEntry || !targetEntry) {
+        finish();
+        return;
+      }
+
+      let inputStream = sourceEntry.openInputStream(0);
+      let outputStream = targetEntry.openOutputStream(0);
+
+      // Copy the image data to a new entry.
+      NetUtil.asyncCopy(inputStream, outputStream, function (aResult) {
+        if (Components.isSuccessCode(aResult))
+          targetEntry.markValid();
+
+        finish();
+      });
+    }
+
+    this.getReadEntry(aSourceKey, function (aSourceEntry) {
+      sourceEntry = aSourceEntry;
+      copyDataWhenReady();
+    });
+
+    this.getWriteEntry(aTargetKey, function (aTargetEntry) {
+      targetEntry = aTargetEntry;
+      copyDataWhenReady();
+    });
+  },
+
   /**
    * Opens the cache entry identified by the given key.
    * @param aKey The key identifying the desired cache entry.
diff --git a/browser/components/thumbnails/PageThumbsProtocol.js b/browser/components/thumbnails/PageThumbsProtocol.js
index d72e8279857..4cf06067b73 100644
--- a/browser/components/thumbnails/PageThumbsProtocol.js
+++ b/browser/components/thumbnails/PageThumbsProtocol.js
@@ -72,14 +72,6 @@ Protocol.prototype = {
    * @return The newly created channel.
    */
   newChannel: function Proto_newChannel(aURI) {
-    let {url} = parseURI(aURI);
-    let file = PageThumbsStorage.getFileForURL(url);
-
-    if (file.exists()) {
-      let fileuri = Services.io.newFileURI(file);
-      return Services.io.newChannelFromURI(fileuri);
-    }
-
     return new Channel(aURI);
   },
 
diff --git a/browser/components/thumbnails/test/Makefile.in b/browser/components/thumbnails/test/Makefile.in
index c7af21dc9a5..ac00a023a67 100644
--- a/browser/components/thumbnails/test/Makefile.in
+++ b/browser/components/thumbnails/test/Makefile.in
@@ -14,7 +14,6 @@ include $(topsrcdir)/config/rules.mk
 _BROWSER_FILES = \
 	browser_thumbnails_capture.js \
 	browser_thumbnails_redirect.js \
-	browser_thumbnails_storage.js \
 	browser_thumbnails_bug726727.js \
 	head.js \
 	background_red.html \
diff --git a/browser/components/thumbnails/test/browser_thumbnails_redirect.js b/browser/components/thumbnails/test/browser_thumbnails_redirect.js
index 7bc420c1ed6..54803e1e348 100644
--- a/browser/components/thumbnails/test/browser_thumbnails_redirect.js
+++ b/browser/components/thumbnails/test/browser_thumbnails_redirect.js
@@ -4,6 +4,9 @@
 const URL = "http://mochi.test:8888/browser/browser/components/thumbnails/" +
             "test/background_red_redirect.sjs";
 
+let cacheService = Cc["@mozilla.org/network/cache-service;1"]
+                   .getService(Ci.nsICacheService);
+
 /**
  * These tests ensure that we save and provide thumbnails for redirecting sites.
  */
@@ -16,17 +19,33 @@ function runTests() {
   yield addTab(URL);
   yield captureAndCheckColor(255, 0, 0, "we have a red thumbnail");
 
-  // Wait until the referrer's thumbnail's file has been written.
-  yield whenFileExists(URL);
+  // Wait until the referrer's thumbnail's cache entry has been written.
+  yield whenCacheEntryExists(URL);
   yield checkThumbnailColor(URL, 255, 0, 0, "referrer has a red thumbnail");
 }
 
-function whenFileExists(aURL) {
+function whenCacheEntryExists(aKey) {
   let callback = next;
 
-  let file = PageThumbsStorage.getFileForURL(aURL);
-  if (!file.exists())
-    callback = function () whenFileExists(aURL);
+  checkCacheEntryExists(aKey, function (aExists) {
+    if (!aExists)
+      callback = function () whenCacheEntryExists(aKey);
 
-  executeSoon(callback);
+    executeSoon(callback);
+  });
+}
+
+function checkCacheEntryExists(aKey, aCallback) {
+  PageThumbsCache.getReadEntry(aKey, function (aEntry) {
+    let inputStream = aEntry && aEntry.openInputStream(0);
+    let exists = inputStream && inputStream.available();
+
+    if (inputStream)
+      inputStream.close();
+
+    if (aEntry)
+      aEntry.close();
+
+    aCallback(exists);
+  });
 }
diff --git a/browser/components/thumbnails/test/browser_thumbnails_storage.js b/browser/components/thumbnails/test/browser_thumbnails_storage.js
deleted file mode 100644
index db91a980173..00000000000
--- a/browser/components/thumbnails/test/browser_thumbnails_storage.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const URL = "http://mochi.test:8888/";
-const URL_COPY = URL + "#copy";
-
-XPCOMUtils.defineLazyGetter(this, "Sanitizer", function () {
-  let tmp = {};
-  Cc["@mozilla.org/moz/jssubscript-loader;1"]
-    .getService(Ci.mozIJSSubScriptLoader)
-    .loadSubScript("chrome://browser/content/sanitize.js", tmp);
-  return tmp.Sanitizer;
-});
-
-/**
- * These tests ensure that the thumbnail storage is working as intended.
- * Newly captured thumbnails should be saved as files and they should as well
- * be removed when the user sanitizes their history.
- */
-function runTests() {
-  clearHistory();
-
-  // create a thumbnail
-  yield addTab(URL);
-  yield whenFileExists();
-  gBrowser.removeTab(gBrowser.selectedTab);
-
-  // clear all browser history
-  yield clearHistory();
-
-  // create a thumbnail
-  yield addTab(URL);
-  yield whenFileExists();
-  gBrowser.removeTab(gBrowser.selectedTab);
-
-  // make sure copy() updates an existing file
-  PageThumbsStorage.copy(URL, URL_COPY);
-  let copy = PageThumbsStorage.getFileForURL(URL_COPY);
-  let mtime = copy.lastModifiedTime -= 60;
-
-  PageThumbsStorage.copy(URL, URL_COPY);
-  isnot(PageThumbsStorage.getFileForURL(URL_COPY).lastModifiedTime, mtime,
-        "thumbnail file was updated");
-
-  // clear last 10 mins of history
-  yield clearHistory(true);
-  ok(!copy.exists(), "copy of thumbnail has been removed");
-}
-
-function clearHistory(aUseRange) {
-  let s = new Sanitizer();
-  s.prefDomain = "privacy.cpd.";
-
-  let prefs = gPrefService.getBranch(s.prefDomain);
-  prefs.setBoolPref("history", true);
-  prefs.setBoolPref("downloads", false);
-  prefs.setBoolPref("cache", false);
-  prefs.setBoolPref("cookies", false);
-  prefs.setBoolPref("formdata", false);
-  prefs.setBoolPref("offlineApps", false);
-  prefs.setBoolPref("passwords", false);
-  prefs.setBoolPref("sessions", false);
-  prefs.setBoolPref("siteSettings", false);
-
-  if (aUseRange) {
-    let usec = Date.now() * 1000;
-    s.range = [usec - 10 * 60 * 1000 * 1000, usec];
-  }
-
-  s.sanitize();
-  s.range = null;
-
-  executeSoon(function () {
-    if (PageThumbsStorage.getFileForURL(URL).exists())
-      clearHistory(aFile, aUseRange);
-    else
-      next();
-  });
-}
-
-function whenFileExists() {
-  let callback = whenFileExists;
-
-  let file = PageThumbsStorage.getFileForURL(URL);
-  if (file.exists() && file.fileSize)
-    callback = next;
-
-  executeSoon(callback);
-}
diff --git a/browser/components/thumbnails/test/head.js b/browser/components/thumbnails/test/head.js
index 6a4ee10335d..6bfd76e7d30 100644
--- a/browser/components/thumbnails/test/head.js
+++ b/browser/components/thumbnails/test/head.js
@@ -4,7 +4,7 @@
 let tmp = {};
 Cu.import("resource:///modules/PageThumbs.jsm", tmp);
 let PageThumbs = tmp.PageThumbs;
-let PageThumbsStorage = tmp.PageThumbsStorage;
+let PageThumbsCache = tmp.PageThumbsCache;
 
 registerCleanupFunction(function () {
   while (gBrowser.tabs.length > 1)
diff --git a/config/rules.mk b/config/rules.mk
index 515024256b8..9fab64014b6 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -112,7 +112,7 @@ testxpcsrcdir = $(topsrcdir)/testing/xpcshell
 # See also testsuite-targets.mk 'xpcshell-tests' target for global execution.
 xpcshell-tests:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
+	  -I$(topsrcdir)/build \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
@@ -142,7 +142,7 @@ xpcshell-tests-remote:
 # attach a debugger and then start the test.
 check-interactive:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
+	  -I$(topsrcdir)/build \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
@@ -155,7 +155,7 @@ check-interactive:
 # Execute a single test, specified in $(SOLO_FILE)
 check-one:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
+	  -I$(topsrcdir)/build \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 515024256b8..9fab64014b6 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -112,7 +112,7 @@ testxpcsrcdir = $(topsrcdir)/testing/xpcshell
 # See also testsuite-targets.mk 'xpcshell-tests' target for global execution.
 xpcshell-tests:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
+	  -I$(topsrcdir)/build \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
@@ -142,7 +142,7 @@ xpcshell-tests-remote:
 # attach a debugger and then start the test.
 check-interactive:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
+	  -I$(topsrcdir)/build \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
@@ -155,7 +155,7 @@ check-interactive:
 # Execute a single test, specified in $(SOLO_FILE)
 check-one:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
+	  -I$(topsrcdir)/build \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index 194ed384ce0..9a869a8e436 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -239,7 +239,7 @@ GARBAGE += $(addsuffix .log,$(MOCHITESTS) reftest crashtest jstestbrowser)
 # Usage: |make [TEST_PATH=...] [EXTRA_TEST_ARGS=...] xpcshell-tests|.
 xpcshell-tests:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
+	  -I$(topsrcdir)/build \
 	  $(topsrcdir)/testing/xpcshell/runxpcshelltests.py \
 	  --manifest=$(DEPTH)/_tests/xpcshell/xpcshell.ini \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
diff --git a/toolkit/devtools/debugger/Makefile.in b/toolkit/devtools/debugger/Makefile.in
index 871e93d4a89..43508985e69 100644
--- a/toolkit/devtools/debugger/Makefile.in
+++ b/toolkit/devtools/debugger/Makefile.in
@@ -72,5 +72,5 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 libs::
-	$(INSTALL) $(IFLAGS1) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
-	$(INSTALL) $(IFLAGS1) $(srcdir)/server/*.jsm $(FINAL_TARGET)/modules/devtools
+	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
+	$(NSINSTALL) $(srcdir)/server/*.jsm $(FINAL_TARGET)/modules/devtools
diff --git a/toolkit/devtools/debugger/dbg-client.jsm b/toolkit/devtools/debugger/dbg-client.jsm
index c81b1699afb..36156207e2d 100644
--- a/toolkit/devtools/debugger/dbg-client.jsm
+++ b/toolkit/devtools/debugger/dbg-client.jsm
@@ -375,10 +375,10 @@ DebuggerClient.prototype = {
    */
   request: function DC_request(aRequest, aOnResponse) {
     if (!this._connected) {
-      throw Error("Have not yet received a hello packet from the server.");
+      throw "Have not yet received a hello packet from the server.";
     }
     if (!aRequest.to) {
-      throw Error("Request packet has no destination.");
+      throw "Request packet has no destination.";
     }
 
     this._pendingRequests.push({ to: aRequest.to,
@@ -449,7 +449,7 @@ DebuggerClient.prototype = {
         onResponse(aPacket);
       }
     } catch(ex) {
-      dumpn("Error handling response: " + ex + " - stack:\n" + ex.stack);
+      dumpn("Error handling response: " + ex + " - " + ex.stack);
       Cu.reportError(ex);
     }
 
@@ -536,7 +536,7 @@ ThreadClient.prototype = {
 
   _assertPaused: function TC_assertPaused(aCommand) {
     if (!this.paused) {
-      throw Error(aCommand + " command sent while not paused.");
+      throw aCommand + " command sent while not paused.";
     }
   },
 
diff --git a/toolkit/devtools/debugger/server/dbg-server.js b/toolkit/devtools/debugger/server/dbg-server.js
index 6afaaa36771..49591d44f2e 100644
--- a/toolkit/devtools/debugger/server/dbg-server.js
+++ b/toolkit/devtools/debugger/server/dbg-server.js
@@ -63,17 +63,6 @@ function dbg_assert(cond, e) {
   }
 }
 
-/* Turn the error e into a string, without fail. */
-function safeErrorString(aError) {
-  try {
-    var s = aError.toString();
-    if (typeof s === "string")
-      return s;
-  } catch (ee) { }
-
-  return "<failed trying to find error description>";
-}
-
 loadSubScript.call(this, "chrome://global/content/devtools/dbg-transport.js");
 
 // XPCOM constructors
@@ -456,14 +445,11 @@ DebuggerServerConnection.prototype = {
       } catch(e) {
         Cu.reportError(e);
         ret = { error: "unknownError",
-                message: ("error occurred while processing '" + aPacket.type +
-                          "' request: " + safeErrorString(e)) };
+                message: "An unknown error has occurred while processing request." };
       }
     } else {
       ret = { error: "unrecognizedPacketType",
-              message: ('Actor "' + actor.actorID +
-                        '" does not recognize the packet type "' +
-                        aPacket.type + '"') };
+              message: 'Actor "' + actor.actorID + '" does not recognize the packet type "' + aPacket.type + '"' };
     }
 
     if (!ret) {
diff --git a/toolkit/devtools/debugger/tests/unit/head_dbg.js b/toolkit/devtools/debugger/tests/unit/head_dbg.js
index eb96facf6ac..57374f6e952 100644
--- a/toolkit/devtools/debugger/tests/unit/head_dbg.js
+++ b/toolkit/devtools/debugger/tests/unit/head_dbg.js
@@ -7,61 +7,10 @@ const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
-Cu.import("resource://gre/modules/Services.jsm");
-
-// Always log packets when running tests. runxpcshelltests.py will throw
-// the output away anyway, unless you give it the --verbose flag.
-Services.prefs.setBoolPref("devtools.debugger.log", true);
-
 Cu.import("resource:///modules/devtools/dbg-server.jsm");
 Cu.import("resource:///modules/devtools/dbg-client.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
 
-// Convert an nsIScriptError 'aFlags' value into an appropriate string.
-function scriptErrorFlagsToKind(aFlags) {
-  var kind;
-  if (aFlags & Ci.nsIScriptError.warningFlag)
-    kind = "warning";
-  if (aFlags & Ci.nsIScriptError.exceptionFlag)
-    kind = "exception";
-  else
-    kind = "error";
-
-  if (aFlags & Ci.nsIScriptError.strictFlag)
-    kind = "strict " + kind;
-
-  return kind;
-}
-
-// Register a console listener, so console messages don't just disappear
-// into the ether.
-let errorCount = 0;
-let listener = {
-  observe: function (aMessage) {
-    errorCount++;
-    try {
-      // If we've been given an nsIScriptError, then we can print out
-      // something nicely formatted, for tools like Emacs to pick up.
-      var scriptError = aMessage.QueryInterface(Ci.nsIScriptError);
-      dump(aMessage.sourceName + ":" + aMessage.lineNumber + ": " +
-           scriptErrorFlagsToKind(aMessage.flags) + ": " +
-           aMessage.errorMessage + "\n");
-      var string = aMessage.errorMessage;
-    } catch (x) {
-      // Be a little paranoid with message, as the whole goal here is to lose
-      // no information.
-      try {
-        var string = "" + aMessage.message;
-      } catch (x) {
-        var string = "<error converting error message to string>";
-      }
-    }
-
-    do_throw("head_dbg.js got console message: " + string + "\n");
-  }
-};
-
-let consoleService = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
-consoleService.registerListener(listener);
 
 function check_except(func)
 {
diff --git a/toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js b/toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js
index 2aecc881b11..ab5df24536b 100644
--- a/toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js
+++ b/toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js
@@ -27,8 +27,8 @@ function run_test()
 
 function test_breakpoint_running()
 {
-  let path = getFilePath('test_breakpoint-02.js');
-  let location = { url: path, line: gDebuggee.line0 + 2};
+  let path = getFilePath('test_breakpoint-01.js');
+  let location = { url: path, line: gDebuggee.line0 + 3};
 
   gDebuggee.eval("var line0 = Error().lineNumber;\n" +
                  "var a = 1;\n" +  // line0 + 1
@@ -37,6 +37,8 @@ function test_breakpoint_running()
   // Setting the breakpoint later should interrupt the debuggee.
   gThreadClient.addOneTimeListener("paused", function (aEvent, aPacket) {
     do_check_eq(aPacket.type, "paused");
+    do_check_eq(aPacket.frame.where.url, path);
+    do_check_eq(aPacket.frame.where.line, location);
     do_check_eq(aPacket.why.type, "interrupted");
   });
 
diff --git a/toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js b/toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js
index a6b056e9b52..e0796fe830c 100644
--- a/toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js
+++ b/toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js
@@ -70,10 +70,10 @@ function release_grips(aFrameArgs, aThreadGrips)
       arg_grips(aFrameArgs, function (aNewGrips) {
         for (let i = 0; i < aNewGrips.length; i++) {
           do_check_neq(aThreadGrips[i].actor, aNewGrips[i].actor);
+          gThreadClient.resume(function () {
+            finishClient(gClient);
+          });
         }
-        gThreadClient.resume(function () {
-          finishClient(gClient);
-        });
       });
     });
   });

From 0155e321cc751ba60edb21d209b4769340a63c8d Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 2 May 2012 15:40:28 -0400
Subject: [PATCH 159/162] Bug 748764 - LoadlibraryEx and quoted string fix for
 service. r=rstrong, a=ehsan.

---
 toolkit/components/maintenanceservice/serviceinstall.cpp | 2 ++
 toolkit/components/maintenanceservice/workmonitor.cpp    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/maintenanceservice/serviceinstall.cpp b/toolkit/components/maintenanceservice/serviceinstall.cpp
index 4228cd73b67..19fe245c572 100644
--- a/toolkit/components/maintenanceservice/serviceinstall.cpp
+++ b/toolkit/components/maintenanceservice/serviceinstall.cpp
@@ -404,6 +404,8 @@ SvcInstall(SvcInstallAction action)
     return TRUE;
   }
 
+  // Quote the path only if it contains spaces.
+  PathQuoteSpaces(newServiceBinaryPath);
   // The service does not already exist so create the service as on demand
   schService.own(CreateServiceW(schSCManager, SVC_NAME, SVC_DISPLAY_NAME,
                                 SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS,
diff --git a/toolkit/components/maintenanceservice/workmonitor.cpp b/toolkit/components/maintenanceservice/workmonitor.cpp
index 3ad4dab1684..271808628b4 100644
--- a/toolkit/components/maintenanceservice/workmonitor.cpp
+++ b/toolkit/components/maintenanceservice/workmonitor.cpp
@@ -326,7 +326,8 @@ ProcessSoftwareUpdateCommand(DWORD argc, LPWSTR *argv)
   // Check to make sure the udpater.exe module has the unique updater identity.
   // This is a security measure to make sure that the signed executable that
   // we will run is actually an updater.
-  HMODULE updaterModule = LoadLibrary(argv[0]);
+  HMODULE updaterModule = LoadLibraryEx(argv[0], NULL, 
+                                        LOAD_LIBRARY_AS_DATAFILE);
   if (!updaterModule) {
     LOG(("updater.exe module could not be loaded. (%d)\n", GetLastError()));
     result = FALSE;

From 7a64c345c8c71f5f85428a81f4768b4000c44134 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 2 May 2012 15:40:33 -0400
Subject: [PATCH 160/162] Bug 748948 - Possible race condition when launching
 updates from service after security checks. r=rstrong, a=ehsan.

---
 .../maintenanceservice/workmonitor.cpp        | 28 +++++++++++++++++++
 toolkit/mozapps/update/common/errors.h        |  4 ++-
 .../mozapps/update/common/updatehelper.cpp    | 20 +++++++++++++
 toolkit/mozapps/update/common/updatehelper.h  |  1 +
 toolkit/mozapps/update/nsUpdateService.js     |  7 ++++-
 toolkit/mozapps/update/updater/updater.cpp    |  8 ++++++
 6 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/maintenanceservice/workmonitor.cpp b/toolkit/components/maintenanceservice/workmonitor.cpp
index 271808628b4..2b87e14c28f 100644
--- a/toolkit/components/maintenanceservice/workmonitor.cpp
+++ b/toolkit/components/maintenanceservice/workmonitor.cpp
@@ -289,6 +289,34 @@ ProcessSoftwareUpdateCommand(DWORD argc, LPWSTR *argv)
     return FALSE;
   }
 
+  // Make sure the path to the updater to use for the update is local.
+  // We do this check to make sure that file locking is available for
+  // race condition security checks.
+  BOOL isLocal = FALSE;
+  if (!IsLocalFile(argv[0], isLocal) || !isLocal) {
+    LOG(("Filesystem in path %ls is not supported"
+         "Last error: %d\n", argv[0], GetLastError()));
+    if (!WriteStatusFailure(argv[1], 
+                            SERVICE_UPDATER_NOT_FIXED_DRIVE)) {
+      LOG(("Could not write update.status service update failure."
+           "Last error: %d\n", GetLastError()));
+    }
+    return FALSE;
+  }
+
+  nsAutoHandle noWriteLock(CreateFileW(argv[0], GENERIC_READ, FILE_SHARE_READ, 
+                                       NULL, OPEN_EXISTING, 0, NULL));
+  if (INVALID_HANDLE_VALUE == noWriteLock) {
+      LOG(("Could not set no write sharing access on file."
+           "Last error: %d\n", GetLastError()));
+    if (!WriteStatusFailure(argv[1], 
+                            SERVICE_COULD_NOT_LOCK_UPDATER)) {
+      LOG(("Could not write update.status service update failure."
+           "Last error: %d\n", GetLastError()));
+    }
+    return FALSE;
+  }
+
   // Verify that the updater.exe that we are executing is the same
   // as the one in the installation directory which we are updating.
   // The installation dir that we are installing to is argv[2].
diff --git a/toolkit/mozapps/update/common/errors.h b/toolkit/mozapps/update/common/errors.h
index 9fc8e7ed664..b6de0a196d8 100644
--- a/toolkit/mozapps/update/common/errors.h
+++ b/toolkit/mozapps/update/common/errors.h
@@ -71,7 +71,7 @@
 #define MAR_CHANNEL_MISMATCH_ERROR 22
 #define VERSION_DOWNGRADE_ERROR 23
 
-// Error codes 24-30 are related to the maintenance service
+// Error codes 24-32 are related to the maintenance service
 // and so are Windows only
 #define SERVICE_UPDATER_COULD_NOT_BE_STARTED 24
 #define SERVICE_NOT_ENOUGH_COMMAND_LINE_ARGS 25
@@ -80,6 +80,8 @@
 #define SERVICE_UPDATER_IDENTITY_ERROR 28
 #define SERVICE_STILL_APPLYING_ON_SUCCESS 29
 #define SERVICE_STILL_APPLYING_ON_FAILURE 30
+#define SERVICE_UPDATER_NOT_FIXED_DRIVE 31
+#define SERVICE_COULD_NOT_LOCK_UPDATER 32
 
 // The following error codes are only used by updater.exe
 // when a fallback key exists and XPCShell tests are being run.
diff --git a/toolkit/mozapps/update/common/updatehelper.cpp b/toolkit/mozapps/update/common/updatehelper.cpp
index 2a2b0e7dcf7..8729473266e 100644
--- a/toolkit/mozapps/update/common/updatehelper.cpp
+++ b/toolkit/mozapps/update/common/updatehelper.cpp
@@ -652,3 +652,23 @@ DoesFallbackKeyExist()
   RegCloseKey(testOnlyFallbackKey);
   return TRUE;
 }
+
+/**
+ * Determines if the file system for the specified file handle is local
+ * @param file path to check the filesystem type for, must be at most MAX_PATH
+ * @param isLocal out parameter which will hold TRUE if the drive is local
+ * @return TRUE if the call succeeded
+*/
+BOOL
+IsLocalFile(LPCWSTR file, BOOL &isLocal)
+{
+  WCHAR rootPath[MAX_PATH + 1];
+  if (wcslen(file) > MAX_PATH) {
+    return FALSE;
+  }
+
+  wcscpy(rootPath, file);
+  PathStripToRootW(rootPath);
+  isLocal = GetDriveTypeW(rootPath) == DRIVE_FIXED;
+  return TRUE;
+}
diff --git a/toolkit/mozapps/update/common/updatehelper.h b/toolkit/mozapps/update/common/updatehelper.h
index 0e5ff2d581a..6a000f39b50 100644
--- a/toolkit/mozapps/update/common/updatehelper.h
+++ b/toolkit/mozapps/update/common/updatehelper.h
@@ -47,5 +47,6 @@ BOOL WriteStatusPending(LPCWSTR updateDirPath);
 DWORD WaitForServiceStop(LPCWSTR serviceName, DWORD maxWaitSeconds);
 DWORD WaitForProcessExit(LPCWSTR filename, DWORD maxSeconds);
 BOOL DoesFallbackKeyExist();
+BOOL IsLocalFile(LPCWSTR file, BOOL &isLocal);
 
 #define SVC_NAME L"MozillaMaintenance"
diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js
index f5bb1f6d43c..5fe92716b53 100644
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -150,6 +150,8 @@ const SERVICE_UPDATER_COMPARE_ERROR        = 27;
 const SERVICE_UPDATER_IDENTITY_ERROR       = 28;
 const SERVICE_STILL_APPLYING_ON_SUCCESS    = 29;
 const SERVICE_STILL_APPLYING_ON_FAILURE    = 30;
+const SERVICE_UPDATER_NOT_FIXED_DRIVE      = 31;
+const SERVICE_COULD_NOT_LOCK_UPDATER       = 32;
 
 const CERT_ATTR_CHECK_FAILED_NO_UPDATE  = 100;
 const CERT_ATTR_CHECK_FAILED_HAS_UPDATE = 101;
@@ -1415,7 +1417,10 @@ UpdateService.prototype = {
             update.errorCode == SERVICE_UPDATER_COMPARE_ERROR ||
             update.errorCode == SERVICE_UPDATER_IDENTITY_ERROR ||
             update.errorCode == SERVICE_STILL_APPLYING_ON_SUCCESS ||
-            update.errorCode == SERVICE_STILL_APPLYING_ON_FAILURE) {
+            update.errorCode == SERVICE_STILL_APPLYING_ON_FAILURE ||
+            update.errorCode == SERVICE_UPDATER_NOT_FIXED_DRIVE ||
+            update.errorCode == SERVICE_COULD_NOT_LOCK_UPDATER) {
+
           var failCount = getPref("getIntPref", 
                                   PREF_APP_UPDATE_SERVICE_ERRORS, 0);
           var maxFail = getPref("getIntPref", 
diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp
index 4555be752e0..c5665f09686 100644
--- a/toolkit/mozapps/update/updater/updater.cpp
+++ b/toolkit/mozapps/update/updater/updater.cpp
@@ -1817,6 +1817,14 @@ int NS_main(int argc, NS_tchar **argv)
         return 1;
       }
 
+      // Make sure the path to the updater to use for the update is on local.
+      // We do this check to make sure that file locking is available for
+      // race condition security checks.
+      if (useService) {
+        BOOL isLocal = FALSE;
+        useService = IsLocalFile(argv[0], isLocal) && isLocal;
+      }
+      
       // Make sure the service registry entries for the instsallation path
       // are available.  If not don't use the service.
       if (useService) {

From cdc1d98f64c42999d8343311cfa347c9c18a158c Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Wed, 2 May 2012 12:44:17 -0700
Subject: [PATCH 161/162] Bug 751316 - Update mozautolog repo in CI bootstrap
 script, a=npotb,test-only

---
 testing/marionette/client/marionette/venv_automation.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/marionette/client/marionette/venv_automation.sh b/testing/marionette/client/marionette/venv_automation.sh
index e0adacbd03c..fcb01ae8ae8 100644
--- a/testing/marionette/client/marionette/venv_automation.sh
+++ b/testing/marionette/client/marionette/venv_automation.sh
@@ -62,7 +62,7 @@ else
   cd ..
 
   # set up mozautolog
-  hg clone http://hg.mozilla.org/users/jgriffin_mozilla.com/mozautolog/
+  hg clone http://hg.mozilla.org/automation/mozautolog/
   cd mozautolog
   python setup.py develop
   cd ..

From 6c81de89fff0e19897e6f5bf979f80d6fcaba352 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 2 May 2012 16:11:19 -0400
Subject: [PATCH 162/162] Backout changeset b0200dab0ccc to revert the
 incorrect backout of an fx-team range (no bug)

This is the range I mistakenly backed out before:
http://hg.mozilla.org/mozilla-central/pushloghtml?changeset=bc5fee76550b
---
 browser/components/nsBrowserGlue.js           |   6 +
 browser/components/thumbnails/PageThumbs.jsm  | 203 +++++++++++-------
 .../thumbnails/PageThumbsProtocol.js          |   8 +
 .../components/thumbnails/test/Makefile.in    |   1 +
 .../test/browser_thumbnails_redirect.js       |  33 +--
 .../test/browser_thumbnails_storage.js        |  89 ++++++++
 browser/components/thumbnails/test/head.js    |   2 +-
 config/rules.mk                               |   6 +-
 js/src/config/rules.mk                        |   6 +-
 testing/testsuite-targets.mk                  |   2 +-
 toolkit/devtools/debugger/Makefile.in         |   4 +-
 toolkit/devtools/debugger/dbg-client.jsm      |   8 +-
 .../devtools/debugger/server/dbg-server.js    |  18 +-
 .../devtools/debugger/tests/unit/head_dbg.js  |  55 ++++-
 .../debugger/tests/unit/test_breakpoint-02.js |   6 +-
 .../tests/unit/test_threadlifetime-05.js      |   6 +-
 16 files changed, 322 insertions(+), 131 deletions(-)
 create mode 100644 browser/components/thumbnails/test/browser_thumbnails_storage.js

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index e6b32521231..c1e0ac38a16 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -68,6 +68,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "BookmarkHTMLUtils",
 XPCOMUtils.defineLazyModuleGetter(this, "webappsUI", 
                                   "resource:///modules/webappsUI.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "PageThumbs",
+                                  "resource:///modules/PageThumbs.jsm");
+
 const PREF_PLUGINS_NOTIFYUSER = "plugins.update.notifyUser";
 const PREF_PLUGINS_UPDATEURL  = "plugins.update.url";
 
@@ -358,6 +361,8 @@ BrowserGlue.prototype = {
     // Initialize webapps UI
     webappsUI.init();
 
+    PageThumbs.init();
+
     Services.obs.notifyObservers(null, "browser-ui-startup-complete", "");
   },
 
@@ -379,6 +384,7 @@ BrowserGlue.prototype = {
   _onProfileShutdown: function BG__onProfileShutdown() {
     this._shutdownPlaces();
     this._sanitizer.onShutdown();
+    PageThumbs.uninit();
   },
 
   // All initial windows have opened.
diff --git a/browser/components/thumbnails/PageThumbs.jsm b/browser/components/thumbnails/PageThumbs.jsm
index 4cefd4befdc..64dc943ff6d 100644
--- a/browser/components/thumbnails/PageThumbs.jsm
+++ b/browser/components/thumbnails/PageThumbs.jsm
@@ -4,7 +4,7 @@
 
 "use strict";
 
-let EXPORTED_SYMBOLS = ["PageThumbs", "PageThumbsCache"];
+let EXPORTED_SYMBOLS = ["PageThumbs", "PageThumbsStorage", "PageThumbsCache"];
 
 const Cu = Components.utils;
 const Cc = Components.classes;
@@ -12,6 +12,11 @@ const Ci = Components.interfaces;
 
 const HTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
 
+/**
+ * Name of the directory in the profile that contains the thumbnails.
+ */
+const THUMBNAIL_DIRECTORY = "thumbnails";
+
 /**
  * The default background color for page thumbnails.
  */
@@ -25,11 +30,29 @@ XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
   "resource://gre/modules/Services.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
+  "resource://gre/modules/FileUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
+  "resource://gre/modules/PlacesUtils.jsm");
+
+XPCOMUtils.defineLazyGetter(this, "gCryptoHash", function () {
+  return Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash);
+});
+
+XPCOMUtils.defineLazyGetter(this, "gUnicodeConverter", function () {
+  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+                    .createInstance(Ci.nsIScriptableUnicodeConverter);
+  converter.charset = 'utf8';
+  return converter;
+});
+
 /**
  * Singleton providing functionality for capturing web page thumbnails and for
  * accessing them if already cached.
  */
 let PageThumbs = {
+  _initialized: false,
 
   /**
    * The calculated width and height of the thumbnails.
@@ -52,6 +75,20 @@ let PageThumbs = {
    */
   get contentType() "image/png",
 
+  init: function PageThumbs_init() {
+    if (!this._initialized) {
+      this._initialized = true;
+      PlacesUtils.history.addObserver(PageThumbsHistoryObserver, false);
+    }
+  },
+
+  uninit: function PageThumbs_uninit() {
+    if (this._initialized) {
+      this._initialized = false;
+      PlacesUtils.history.removeObserver(PageThumbsHistoryObserver);
+    }
+  },
+
   /**
    * Gets the thumbnail image's url for a given web page's url.
    * @param aUrl The web page's url that is depicted in the thumbnail.
@@ -124,32 +161,14 @@ let PageThumbs = {
           //    Sync and therefore also redirect sources appear on the newtab
           //    page. We also want thumbnails for those.
           if (url != originalURL)
-            PageThumbsCache._copy(url, originalURL);
+            PageThumbsStorage.copy(url, originalURL);
         }
 
         if (aCallback)
           aCallback(aSuccessful);
       }
 
-      // Get a writeable cache entry.
-      PageThumbsCache.getWriteEntry(url, function (aEntry) {
-        if (!aEntry) {
-          finish(false);
-          return;
-        }
-
-        let outputStream = aEntry.openOutputStream(0);
-
-        // Write the image data to the cache entry.
-        NetUtil.asyncCopy(aInputStream, outputStream, function (aResult) {
-          let success = Components.isSuccessCode(aResult);
-          if (success)
-            aEntry.markValid();
-
-          aEntry.close();
-          finish(success);
-        });
-      });
+      PageThumbsStorage.write(url, aInputStream, finish);
     });
   },
 
@@ -197,7 +216,7 @@ let PageThumbs = {
    */
   _getThumbnailSize: function PageThumbs_getThumbnailSize() {
     if (!this._thumbnailWidth || !this._thumbnailHeight) {
-      let screenManager = Cc["@mozilla.org/gfx/screenmanager;1"]
+      let screenManager = Cc["@mozilla.org/gfx/screenmanager;1"]
                             .getService(Ci.nsIScreenManager);
       let left = {}, top = {}, width = {}, height = {};
       screenManager.primaryScreen.GetRect(left, top, width, height);
@@ -208,6 +227,88 @@ let PageThumbs = {
   }
 };
 
+let PageThumbsStorage = {
+  getFileForURL: function Storage_getFileForURL(aURL) {
+    let hash = this._calculateMD5Hash(aURL);
+    let parts = [THUMBNAIL_DIRECTORY, hash[0], hash[1], hash.slice(2) + ".png"];
+    return FileUtils.getFile("ProfD", parts);
+  },
+
+  write: function Storage_write(aURL, aDataStream, aCallback) {
+    let file = this.getFileForURL(aURL);
+    let fos = FileUtils.openSafeFileOutputStream(file);
+
+    NetUtil.asyncCopy(aDataStream, fos, function (aResult) {
+      FileUtils.closeSafeFileOutputStream(fos);
+      aCallback(Components.isSuccessCode(aResult));
+    });
+  },
+
+  copy: function Storage_copy(aSourceURL, aTargetURL) {
+    let sourceFile = this.getFileForURL(aSourceURL);
+    let targetFile = this.getFileForURL(aTargetURL);
+
+    try {
+      sourceFile.copyTo(targetFile.parent, targetFile.leafName);
+    } catch (e) {
+      /* We might not be permitted to write to the file. */
+    }
+  },
+
+  remove: function Storage_remove(aURL) {
+    try {
+      this.getFileForURL(aURL).remove(false);
+    } catch (e) {
+      /* The file might not exist or we're not permitted to remove it. */
+    }
+  },
+
+  wipe: function Storage_wipe() {
+    try {
+      FileUtils.getDir("ProfD", [THUMBNAIL_DIRECTORY]).remove(true);
+    } catch (e) {
+      /* The file might not exist or we're not permitted to remove it. */
+    }
+  },
+
+  _calculateMD5Hash: function Storage_calculateMD5Hash(aValue) {
+    let hash = gCryptoHash;
+    let value = gUnicodeConverter.convertToByteArray(aValue);
+
+    hash.init(hash.MD5);
+    hash.update(value, value.length);
+    return this._convertToHexString(hash.finish(false));
+  },
+
+  _convertToHexString: function Storage_convertToHexString(aData) {
+    let hex = "";
+    for (let i = 0; i < aData.length; i++)
+      hex += ("0" + aData.charCodeAt(i).toString(16)).slice(-2);
+    return hex;
+  },
+
+};
+
+let PageThumbsHistoryObserver = {
+  onDeleteURI: function Thumbnails_onDeleteURI(aURI, aGUID) {
+    PageThumbsStorage.remove(aURI.spec);
+  },
+
+  onClearHistory: function Thumbnails_onClearHistory() {
+    PageThumbsStorage.wipe();
+  },
+
+  onTitleChanged: function () {},
+  onBeginUpdateBatch: function () {},
+  onEndUpdateBatch: function () {},
+  onVisit: function () {},
+  onBeforeDeleteURI: function () {},
+  onPageChanged: function () {},
+  onDeleteVisits: function () {},
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
+};
+
 /**
  * A singleton handling the storage of page thumbnails.
  */
@@ -222,64 +323,6 @@ let PageThumbsCache = {
     this._openCacheEntry(aKey, Ci.nsICache.ACCESS_READ, aCallback);
   },
 
-  /**
-   * Calls the given callback with a cache entry opened for writing.
-   * @param aKey The key identifying the desired cache entry.
-   * @param aCallback The callback that is called when the cache entry is ready.
-   */
-  getWriteEntry: function Cache_getWriteEntry(aKey, aCallback) {
-    // Try to open the desired cache entry.
-    this._openCacheEntry(aKey, Ci.nsICache.ACCESS_WRITE, aCallback);
-  },
-
-  /**
-   * Copies an existing cache entry's data to a new cache entry.
-   * @param aSourceKey The key that contains the data to copy.
-   * @param aTargetKey The key that will be the copy of aSourceKey's data.
-   */
-  _copy: function Cache_copy(aSourceKey, aTargetKey) {
-    let sourceEntry, targetEntry, waitingCount = 2;
-
-    function finish() {
-      if (sourceEntry)
-        sourceEntry.close();
-
-      if (targetEntry)
-        targetEntry.close();
-    }
-
-    function copyDataWhenReady() {
-      if (--waitingCount > 0)
-        return;
-
-      if (!sourceEntry || !targetEntry) {
-        finish();
-        return;
-      }
-
-      let inputStream = sourceEntry.openInputStream(0);
-      let outputStream = targetEntry.openOutputStream(0);
-
-      // Copy the image data to a new entry.
-      NetUtil.asyncCopy(inputStream, outputStream, function (aResult) {
-        if (Components.isSuccessCode(aResult))
-          targetEntry.markValid();
-
-        finish();
-      });
-    }
-
-    this.getReadEntry(aSourceKey, function (aSourceEntry) {
-      sourceEntry = aSourceEntry;
-      copyDataWhenReady();
-    });
-
-    this.getWriteEntry(aTargetKey, function (aTargetEntry) {
-      targetEntry = aTargetEntry;
-      copyDataWhenReady();
-    });
-  },
-
   /**
    * Opens the cache entry identified by the given key.
    * @param aKey The key identifying the desired cache entry.
diff --git a/browser/components/thumbnails/PageThumbsProtocol.js b/browser/components/thumbnails/PageThumbsProtocol.js
index 4cf06067b73..d72e8279857 100644
--- a/browser/components/thumbnails/PageThumbsProtocol.js
+++ b/browser/components/thumbnails/PageThumbsProtocol.js
@@ -72,6 +72,14 @@ Protocol.prototype = {
    * @return The newly created channel.
    */
   newChannel: function Proto_newChannel(aURI) {
+    let {url} = parseURI(aURI);
+    let file = PageThumbsStorage.getFileForURL(url);
+
+    if (file.exists()) {
+      let fileuri = Services.io.newFileURI(file);
+      return Services.io.newChannelFromURI(fileuri);
+    }
+
     return new Channel(aURI);
   },
 
diff --git a/browser/components/thumbnails/test/Makefile.in b/browser/components/thumbnails/test/Makefile.in
index ac00a023a67..c7af21dc9a5 100644
--- a/browser/components/thumbnails/test/Makefile.in
+++ b/browser/components/thumbnails/test/Makefile.in
@@ -14,6 +14,7 @@ include $(topsrcdir)/config/rules.mk
 _BROWSER_FILES = \
 	browser_thumbnails_capture.js \
 	browser_thumbnails_redirect.js \
+	browser_thumbnails_storage.js \
 	browser_thumbnails_bug726727.js \
 	head.js \
 	background_red.html \
diff --git a/browser/components/thumbnails/test/browser_thumbnails_redirect.js b/browser/components/thumbnails/test/browser_thumbnails_redirect.js
index 54803e1e348..7bc420c1ed6 100644
--- a/browser/components/thumbnails/test/browser_thumbnails_redirect.js
+++ b/browser/components/thumbnails/test/browser_thumbnails_redirect.js
@@ -4,9 +4,6 @@
 const URL = "http://mochi.test:8888/browser/browser/components/thumbnails/" +
             "test/background_red_redirect.sjs";
 
-let cacheService = Cc["@mozilla.org/network/cache-service;1"]
-                   .getService(Ci.nsICacheService);
-
 /**
  * These tests ensure that we save and provide thumbnails for redirecting sites.
  */
@@ -19,33 +16,17 @@ function runTests() {
   yield addTab(URL);
   yield captureAndCheckColor(255, 0, 0, "we have a red thumbnail");
 
-  // Wait until the referrer's thumbnail's cache entry has been written.
-  yield whenCacheEntryExists(URL);
+  // Wait until the referrer's thumbnail's file has been written.
+  yield whenFileExists(URL);
   yield checkThumbnailColor(URL, 255, 0, 0, "referrer has a red thumbnail");
 }
 
-function whenCacheEntryExists(aKey) {
+function whenFileExists(aURL) {
   let callback = next;
 
-  checkCacheEntryExists(aKey, function (aExists) {
-    if (!aExists)
-      callback = function () whenCacheEntryExists(aKey);
+  let file = PageThumbsStorage.getFileForURL(aURL);
+  if (!file.exists())
+    callback = function () whenFileExists(aURL);
 
-    executeSoon(callback);
-  });
-}
-
-function checkCacheEntryExists(aKey, aCallback) {
-  PageThumbsCache.getReadEntry(aKey, function (aEntry) {
-    let inputStream = aEntry && aEntry.openInputStream(0);
-    let exists = inputStream && inputStream.available();
-
-    if (inputStream)
-      inputStream.close();
-
-    if (aEntry)
-      aEntry.close();
-
-    aCallback(exists);
-  });
+  executeSoon(callback);
 }
diff --git a/browser/components/thumbnails/test/browser_thumbnails_storage.js b/browser/components/thumbnails/test/browser_thumbnails_storage.js
new file mode 100644
index 00000000000..db91a980173
--- /dev/null
+++ b/browser/components/thumbnails/test/browser_thumbnails_storage.js
@@ -0,0 +1,89 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const URL = "http://mochi.test:8888/";
+const URL_COPY = URL + "#copy";
+
+XPCOMUtils.defineLazyGetter(this, "Sanitizer", function () {
+  let tmp = {};
+  Cc["@mozilla.org/moz/jssubscript-loader;1"]
+    .getService(Ci.mozIJSSubScriptLoader)
+    .loadSubScript("chrome://browser/content/sanitize.js", tmp);
+  return tmp.Sanitizer;
+});
+
+/**
+ * These tests ensure that the thumbnail storage is working as intended.
+ * Newly captured thumbnails should be saved as files and they should as well
+ * be removed when the user sanitizes their history.
+ */
+function runTests() {
+  clearHistory();
+
+  // create a thumbnail
+  yield addTab(URL);
+  yield whenFileExists();
+  gBrowser.removeTab(gBrowser.selectedTab);
+
+  // clear all browser history
+  yield clearHistory();
+
+  // create a thumbnail
+  yield addTab(URL);
+  yield whenFileExists();
+  gBrowser.removeTab(gBrowser.selectedTab);
+
+  // make sure copy() updates an existing file
+  PageThumbsStorage.copy(URL, URL_COPY);
+  let copy = PageThumbsStorage.getFileForURL(URL_COPY);
+  let mtime = copy.lastModifiedTime -= 60;
+
+  PageThumbsStorage.copy(URL, URL_COPY);
+  isnot(PageThumbsStorage.getFileForURL(URL_COPY).lastModifiedTime, mtime,
+        "thumbnail file was updated");
+
+  // clear last 10 mins of history
+  yield clearHistory(true);
+  ok(!copy.exists(), "copy of thumbnail has been removed");
+}
+
+function clearHistory(aUseRange) {
+  let s = new Sanitizer();
+  s.prefDomain = "privacy.cpd.";
+
+  let prefs = gPrefService.getBranch(s.prefDomain);
+  prefs.setBoolPref("history", true);
+  prefs.setBoolPref("downloads", false);
+  prefs.setBoolPref("cache", false);
+  prefs.setBoolPref("cookies", false);
+  prefs.setBoolPref("formdata", false);
+  prefs.setBoolPref("offlineApps", false);
+  prefs.setBoolPref("passwords", false);
+  prefs.setBoolPref("sessions", false);
+  prefs.setBoolPref("siteSettings", false);
+
+  if (aUseRange) {
+    let usec = Date.now() * 1000;
+    s.range = [usec - 10 * 60 * 1000 * 1000, usec];
+  }
+
+  s.sanitize();
+  s.range = null;
+
+  executeSoon(function () {
+    if (PageThumbsStorage.getFileForURL(URL).exists())
+      clearHistory(aFile, aUseRange);
+    else
+      next();
+  });
+}
+
+function whenFileExists() {
+  let callback = whenFileExists;
+
+  let file = PageThumbsStorage.getFileForURL(URL);
+  if (file.exists() && file.fileSize)
+    callback = next;
+
+  executeSoon(callback);
+}
diff --git a/browser/components/thumbnails/test/head.js b/browser/components/thumbnails/test/head.js
index 6bfd76e7d30..6a4ee10335d 100644
--- a/browser/components/thumbnails/test/head.js
+++ b/browser/components/thumbnails/test/head.js
@@ -4,7 +4,7 @@
 let tmp = {};
 Cu.import("resource:///modules/PageThumbs.jsm", tmp);
 let PageThumbs = tmp.PageThumbs;
-let PageThumbsCache = tmp.PageThumbsCache;
+let PageThumbsStorage = tmp.PageThumbsStorage;
 
 registerCleanupFunction(function () {
   while (gBrowser.tabs.length > 1)
diff --git a/config/rules.mk b/config/rules.mk
index 9fab64014b6..515024256b8 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -112,7 +112,7 @@ testxpcsrcdir = $(topsrcdir)/testing/xpcshell
 # See also testsuite-targets.mk 'xpcshell-tests' target for global execution.
 xpcshell-tests:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
@@ -142,7 +142,7 @@ xpcshell-tests-remote:
 # attach a debugger and then start the test.
 check-interactive:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
@@ -155,7 +155,7 @@ check-interactive:
 # Execute a single test, specified in $(SOLO_FILE)
 check-one:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 9fab64014b6..515024256b8 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -112,7 +112,7 @@ testxpcsrcdir = $(topsrcdir)/testing/xpcshell
 # See also testsuite-targets.mk 'xpcshell-tests' target for global execution.
 xpcshell-tests:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
@@ -142,7 +142,7 @@ xpcshell-tests-remote:
 # attach a debugger and then start the test.
 check-interactive:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
@@ -155,7 +155,7 @@ check-interactive:
 # Execute a single test, specified in $(SOLO_FILE)
 check-one:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index 9a869a8e436..194ed384ce0 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -239,7 +239,7 @@ GARBAGE += $(addsuffix .log,$(MOCHITESTS) reftest crashtest jstestbrowser)
 # Usage: |make [TEST_PATH=...] [EXTRA_TEST_ARGS=...] xpcshell-tests|.
 xpcshell-tests:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-	  -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build -I$(DEPTH)/_tests/mozbase/mozinfo \
 	  $(topsrcdir)/testing/xpcshell/runxpcshelltests.py \
 	  --manifest=$(DEPTH)/_tests/xpcshell/xpcshell.ini \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
diff --git a/toolkit/devtools/debugger/Makefile.in b/toolkit/devtools/debugger/Makefile.in
index 43508985e69..871e93d4a89 100644
--- a/toolkit/devtools/debugger/Makefile.in
+++ b/toolkit/devtools/debugger/Makefile.in
@@ -72,5 +72,5 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 libs::
-	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
-	$(NSINSTALL) $(srcdir)/server/*.jsm $(FINAL_TARGET)/modules/devtools
+	$(INSTALL) $(IFLAGS1) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
+	$(INSTALL) $(IFLAGS1) $(srcdir)/server/*.jsm $(FINAL_TARGET)/modules/devtools
diff --git a/toolkit/devtools/debugger/dbg-client.jsm b/toolkit/devtools/debugger/dbg-client.jsm
index 36156207e2d..c81b1699afb 100644
--- a/toolkit/devtools/debugger/dbg-client.jsm
+++ b/toolkit/devtools/debugger/dbg-client.jsm
@@ -375,10 +375,10 @@ DebuggerClient.prototype = {
    */
   request: function DC_request(aRequest, aOnResponse) {
     if (!this._connected) {
-      throw "Have not yet received a hello packet from the server.";
+      throw Error("Have not yet received a hello packet from the server.");
     }
     if (!aRequest.to) {
-      throw "Request packet has no destination.";
+      throw Error("Request packet has no destination.");
     }
 
     this._pendingRequests.push({ to: aRequest.to,
@@ -449,7 +449,7 @@ DebuggerClient.prototype = {
         onResponse(aPacket);
       }
     } catch(ex) {
-      dumpn("Error handling response: " + ex + " - " + ex.stack);
+      dumpn("Error handling response: " + ex + " - stack:\n" + ex.stack);
       Cu.reportError(ex);
     }
 
@@ -536,7 +536,7 @@ ThreadClient.prototype = {
 
   _assertPaused: function TC_assertPaused(aCommand) {
     if (!this.paused) {
-      throw aCommand + " command sent while not paused.";
+      throw Error(aCommand + " command sent while not paused.");
     }
   },
 
diff --git a/toolkit/devtools/debugger/server/dbg-server.js b/toolkit/devtools/debugger/server/dbg-server.js
index 49591d44f2e..6afaaa36771 100644
--- a/toolkit/devtools/debugger/server/dbg-server.js
+++ b/toolkit/devtools/debugger/server/dbg-server.js
@@ -63,6 +63,17 @@ function dbg_assert(cond, e) {
   }
 }
 
+/* Turn the error e into a string, without fail. */
+function safeErrorString(aError) {
+  try {
+    var s = aError.toString();
+    if (typeof s === "string")
+      return s;
+  } catch (ee) { }
+
+  return "<failed trying to find error description>";
+}
+
 loadSubScript.call(this, "chrome://global/content/devtools/dbg-transport.js");
 
 // XPCOM constructors
@@ -445,11 +456,14 @@ DebuggerServerConnection.prototype = {
       } catch(e) {
         Cu.reportError(e);
         ret = { error: "unknownError",
-                message: "An unknown error has occurred while processing request." };
+                message: ("error occurred while processing '" + aPacket.type +
+                          "' request: " + safeErrorString(e)) };
       }
     } else {
       ret = { error: "unrecognizedPacketType",
-              message: 'Actor "' + actor.actorID + '" does not recognize the packet type "' + aPacket.type + '"' };
+              message: ('Actor "' + actor.actorID +
+                        '" does not recognize the packet type "' +
+                        aPacket.type + '"') };
     }
 
     if (!ret) {
diff --git a/toolkit/devtools/debugger/tests/unit/head_dbg.js b/toolkit/devtools/debugger/tests/unit/head_dbg.js
index 57374f6e952..eb96facf6ac 100644
--- a/toolkit/devtools/debugger/tests/unit/head_dbg.js
+++ b/toolkit/devtools/debugger/tests/unit/head_dbg.js
@@ -7,10 +7,61 @@ const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
-Cu.import("resource:///modules/devtools/dbg-server.jsm");
-Cu.import("resource:///modules/devtools/dbg-client.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
+// Always log packets when running tests. runxpcshelltests.py will throw
+// the output away anyway, unless you give it the --verbose flag.
+Services.prefs.setBoolPref("devtools.debugger.log", true);
+
+Cu.import("resource:///modules/devtools/dbg-server.jsm");
+Cu.import("resource:///modules/devtools/dbg-client.jsm");
+
+// Convert an nsIScriptError 'aFlags' value into an appropriate string.
+function scriptErrorFlagsToKind(aFlags) {
+  var kind;
+  if (aFlags & Ci.nsIScriptError.warningFlag)
+    kind = "warning";
+  if (aFlags & Ci.nsIScriptError.exceptionFlag)
+    kind = "exception";
+  else
+    kind = "error";
+
+  if (aFlags & Ci.nsIScriptError.strictFlag)
+    kind = "strict " + kind;
+
+  return kind;
+}
+
+// Register a console listener, so console messages don't just disappear
+// into the ether.
+let errorCount = 0;
+let listener = {
+  observe: function (aMessage) {
+    errorCount++;
+    try {
+      // If we've been given an nsIScriptError, then we can print out
+      // something nicely formatted, for tools like Emacs to pick up.
+      var scriptError = aMessage.QueryInterface(Ci.nsIScriptError);
+      dump(aMessage.sourceName + ":" + aMessage.lineNumber + ": " +
+           scriptErrorFlagsToKind(aMessage.flags) + ": " +
+           aMessage.errorMessage + "\n");
+      var string = aMessage.errorMessage;
+    } catch (x) {
+      // Be a little paranoid with message, as the whole goal here is to lose
+      // no information.
+      try {
+        var string = "" + aMessage.message;
+      } catch (x) {
+        var string = "<error converting error message to string>";
+      }
+    }
+
+    do_throw("head_dbg.js got console message: " + string + "\n");
+  }
+};
+
+let consoleService = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
+consoleService.registerListener(listener);
 
 function check_except(func)
 {
diff --git a/toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js b/toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js
index ab5df24536b..2aecc881b11 100644
--- a/toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js
+++ b/toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js
@@ -27,8 +27,8 @@ function run_test()
 
 function test_breakpoint_running()
 {
-  let path = getFilePath('test_breakpoint-01.js');
-  let location = { url: path, line: gDebuggee.line0 + 3};
+  let path = getFilePath('test_breakpoint-02.js');
+  let location = { url: path, line: gDebuggee.line0 + 2};
 
   gDebuggee.eval("var line0 = Error().lineNumber;\n" +
                  "var a = 1;\n" +  // line0 + 1
@@ -37,8 +37,6 @@ function test_breakpoint_running()
   // Setting the breakpoint later should interrupt the debuggee.
   gThreadClient.addOneTimeListener("paused", function (aEvent, aPacket) {
     do_check_eq(aPacket.type, "paused");
-    do_check_eq(aPacket.frame.where.url, path);
-    do_check_eq(aPacket.frame.where.line, location);
     do_check_eq(aPacket.why.type, "interrupted");
   });
 
diff --git a/toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js b/toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js
index e0796fe830c..a6b056e9b52 100644
--- a/toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js
+++ b/toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js
@@ -70,10 +70,10 @@ function release_grips(aFrameArgs, aThreadGrips)
       arg_grips(aFrameArgs, function (aNewGrips) {
         for (let i = 0; i < aNewGrips.length; i++) {
           do_check_neq(aThreadGrips[i].actor, aNewGrips[i].actor);
-          gThreadClient.resume(function () {
-            finishClient(gClient);
-          });
         }
+        gThreadClient.resume(function () {
+          finishClient(gClient);
+        });
       });
     });
   });